代码提交

liusheng

2023-12-21 9840fb122989b48729a244a8ffe2ec8bd95235f9

代码提交

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java

@@ -171,6 +171,14 @@
    @ApiModelProperty("联络人二姓名")
    private String coordinatedusernamet;

    /** 专职人员编号 */
    @ApiModelProperty("专职人员编号")
    private String operatorno;

    /** 专职人员姓名 */
    @ApiModelProperty("专职人员姓名")
    private String operatorname;

    /** 签署日期 */
    @ApiModelProperty("签署日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java

@@ -102,4 +102,6 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endtime;
    private String city;
    private String operatorno;
    private String operatorname;
}

 ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml

@@ -45,13 +45,15 @@
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="operatorno"    column="operatorno"    />
        <result property="operatorname"    column="operatorname"    />
    </resultMap>

    <sql id="selectServiceRelativesconfirmationVo">
        select ID, InfoID, 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 from service_relativesconfirmation
        select ID, InfoID, 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="ServiceRelativesconfirmation" resultMap="ServiceRelativesconfirmationResult">
    <select id="selectServiceRelativesconfirmationList" parameterType="com.ruoyi.project.domain.ServiceRelativesconfirmation" resultMap="ServiceRelativesconfirmationResult">
        <include refid="selectServiceRelativesconfirmationVo"/>
        <where>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>
@@ -142,6 +144,8 @@
        `service_relativesconfirmation`.`create_time` AS `createTime`,
        `service_relativesconfirmation`.`update_by` AS `updateBy`,
        `service_relativesconfirmation`.`update_time` AS `updateTime`
        `service_relativesconfirmation`.`operatorno` AS `operatorno`
        `service_relativesconfirmation`.`operatorname` AS `operatorname`
    FROM

            `service_donatebaseinfo`