liusheng
2025-09-28 c39c4a43afeb97619711a0c4e8d05527dc72d1f7
修改字段
已修改3个文件
18 ■■■■■ 文件已修改
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -195,12 +195,10 @@
    @ApiModelProperty("学历")
    private String education;
    /** 职业 */
    /**
     * 职业
     */
    @ApiModelProperty("职业")
    private String work;
    private String occupation;
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -702,7 +702,7 @@
            map.put("发票附件", fpuuid);
            map.put("发票识别", null);
            map.put("识别人", null);
            map.put("税额", null);
            map.put("税额", serviceFunddetailShared.getTaxamount());
            long qtuuid = COUNTER.incrementAndGet();
            map.put("其他附件", qtuuid);
            map.put("项目编码", serviceFunddetailShared.getItemcode());
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -49,11 +49,11 @@
        <result property="operatorname"    column="operatorname"    />
        <result property="nation"    column="nation"    />
        <result property="education"    column="education"    />
        <result property="work"    column="work"    />
        <result property="occupation"    column="occupation"    />
    </resultMap>
    <sql id="selectServiceRelativesconfirmationVo">
        select ID, InfoID,nation,education,work, DonorNo, Name, IDCardType, IDCardNo, Phone, ResidenceAddress, ResidenceProvince, ResidenceProvinceName, ResidenceCity, ResidenceCityName, ResidenceTown, ResidenceTownName, ResidenceCommunity, ResidenceCommunityName, ResidenceCountyCode, ResidenceCountyName, Kinship, Kinship_ChildrenNum, SignFamilyRelations, KinshipConfirmationSign, OrganDecision, OrganDecision_Other, RelativeConfirmationSign, FamilyRelations, AcquisitionTissueNo, AcquisitionTissueName, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, SignDate, del_flag, create_by, create_time, update_by, update_time,operatorname,operatorno from service_relativesconfirmation
        select ID, InfoID,nation,education,occupation, DonorNo, Name, IDCardType, IDCardNo, Phone, ResidenceAddress, ResidenceProvince, ResidenceProvinceName, ResidenceCity, ResidenceCityName, ResidenceTown, ResidenceTownName, ResidenceCommunity, ResidenceCommunityName, ResidenceCountyCode, ResidenceCountyName, Kinship, Kinship_ChildrenNum, SignFamilyRelations, KinshipConfirmationSign, OrganDecision, OrganDecision_Other, RelativeConfirmationSign, FamilyRelations, AcquisitionTissueNo, AcquisitionTissueName, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, SignDate, del_flag, create_by, create_time, update_by, update_time,operatorname,operatorno from service_relativesconfirmation
    </sql>
    <select id="selectServiceRelativesconfirmationList" parameterType="com.ruoyi.project.domain.ServiceRelativesconfirmation" resultMap="ServiceRelativesconfirmationResult">
@@ -154,7 +154,7 @@
        `service_relativesconfirmation`.`operatorname` AS `operatorname`,
        `service_relativesconfirmation`.`nation` AS `nation`,
        `service_relativesconfirmation`.`education` AS `education`,
        `service_relativesconfirmation`.`work` AS `work`
        `service_relativesconfirmation`.`occupation` AS `occupation`
    FROM
            `service_donatebaseinfo`