代码提交

liusheng

2024-07-04 497b7272445d3cfbc1b61565a3e81880d74d6d7e

代码提交

 smartor/src/main/java/com/smartor/domain/PatArchive.java

@@ -220,6 +220,7 @@
    @Excel(name = " 科室 ")
    private String dept;


    /**
     * 钉钉号
     */

 smartor/src/main/java/com/smartor/domain/PatArchiveVO.java

@@ -66,6 +66,22 @@
    @Excel(name = " 年龄 ")
    private Long age;


    /**
     * 证件号码
     */
    @ApiModelProperty("居住地")
    @Excel(name = " 居住地 ")
    private String placeOfResidence;


    /**
     * 证件号码
     */
    @ApiModelProperty("出生地")
    @Excel(name = " 出生地 ")
    private String birthplace;

    /**
     * 来源
     */
@@ -76,7 +92,12 @@
    /**
     * 建档时间
     */
    /**
     * 建档时间
     */
    @ApiModelProperty("建档时间")
    @Excel(name = " 建档时间 ")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date archivetime;

    /**

 smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java

@@ -118,14 +118,15 @@
    public Boolean saveOrUpdatePatInfo(PatArchiveVO patArchiveVO) {
        //通过isoperation来判断是否新增
        PatArchive patArchive = DtoConversionUtils.sourceToTarget(patArchiveVO, PatArchive.class);
        if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 1) {
        if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 1 || patArchiveVO.getPatid() == null) {
            //新增
            List<PatArchive> patArchives = new ArrayList<>();
            patArchive.setUpdateTime(DateUtils.getNowDate());
            patArchives.add(patArchive);
            patArchiveMapper.insertPatArchive(patArchives);
        } else if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 2) {
        } else if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 2 || patArchiveVO.getPatid() != null) {
            //修改
            patArchiveVO.setIsoperation(2);
            patArchiveMapper.updatePatArchive(patArchive);
        }


 smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml

@@ -169,10 +169,10 @@
        <!--        </trim>-->

        insert into
        pat_archive(name,viptype,sex,idcardno,birthdate,age,sourcefrom,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
        pat_archive(name,viptype,sex,idcardno,birthdate,birthplace,place_of_residence,age,sourcefrom,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
        ,create_by,create_time,isupload,upload_time,pattype,place_of_residence,nation,birthplace,native_place) values
        <foreach item="item" index="index" collection="list" separator=",">
            (#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.age},#{item.sourcefrom},#{item.archivetime},#{item.archiveby}
            (#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.birthplace},#{item.placeOfResidence},#{item.age},#{item.sourcefrom},#{item.archivetime},#{item.archiveby}
            ,#{item.telcode},#{item.archiveby},#{item.idcardtype},#{item.orgid},#{item.openid},#{item.dduserid},#{item.updateBy},
            #{item.updateTime},#{item.createBy},#{item.createTime},#{item.isupload},#{item.uploadTime},#{item.pattype},#{item.placeOfResidence},#{item.nation},#{item.birthplace},#{item.nativePlace}
            )
@@ -186,6 +186,8 @@
            <if test="sex != null">sex = #{sex},</if>
            <if test="idcardno != null">idcardno = #{idcardno},</if>
            <if test="birthdate != null">birthdate = #{birthdate},</if>
            <if test="placeOfResidence != null">place_of_residence = #{placeOfResidence},</if>
            <if test="birthplace != null">birthplace = #{birthplace},</if>
            <if test="age != null">age = #{age},</if>
            <if test="sourcefrom != null">sourcefrom = #{sourcefrom},</if>
            <if test="archivetime != null">archivetime = #{archivetime},</if>