diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingShanSpecialTypeSaveFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingShanSpecialTypeSaveFormDTO.java index d0ede466a0..dd7a76b94b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingShanSpecialTypeSaveFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingShanSpecialTypeSaveFormDTO.java @@ -1,6 +1,8 @@ package com.epmet.dto.form.lingshan; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -11,6 +13,7 @@ public class LingShanSpecialTypeSaveFormDTO { private String name; private String idCard; + private String headPhoto; private SpecialCrowdDetails specialCrowdDetails; @Data @@ -34,8 +37,12 @@ public class LingShanSpecialTypeSaveFormDTO { * 释放日期 */ @NotNull(message = "释放日期不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date releaseDate; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date originPrisonTerm; /** @@ -51,6 +58,8 @@ public class LingShanSpecialTypeSaveFormDTO { /** * 安置日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date emplacementDate; /** @@ -89,6 +98,8 @@ public class LingShanSpecialTypeSaveFormDTO { /** * 初次发现日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date firstDiscoveryDate; /** @@ -182,11 +193,15 @@ public class LingShanSpecialTypeSaveFormDTO { /** * 矫正开始日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date rectificateStartDate; /** * 矫正结束日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date rectificateEndDate; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingShanSpecialTypeSaveResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingShanSpecialTypeSaveResultDTO.java index 3ed43eb2bd..f1e7a75eca 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingShanSpecialTypeSaveResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingShanSpecialTypeSaveResultDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.form.lingshan; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -17,6 +18,7 @@ public class LingShanSpecialTypeSaveResultDTO { private String domicilePlace; private String name; private String mobile; + private String headPhoto; private String address; private String idCard; private SpecialCrowdDetails specialCrowdDetails = new SpecialCrowdDetails(); @@ -42,8 +44,10 @@ public class LingShanSpecialTypeSaveResultDTO { * 释放日期 */ @NotNull(message = "释放日期不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") private Date releaseDate; + @JsonFormat(pattern = "yyyy-MM-dd") private Date originPrisonTerm; /** @@ -59,6 +63,7 @@ public class LingShanSpecialTypeSaveResultDTO { /** * 安置日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date emplacementDate; /** @@ -97,6 +102,7 @@ public class LingShanSpecialTypeSaveResultDTO { /** * 初次发现日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date firstDiscoveryDate; /** @@ -190,11 +196,13 @@ public class LingShanSpecialTypeSaveResultDTO { /** * 矫正开始日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date rectificateStartDate; /** * 矫正结束日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date rectificateEndDate; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java index 19862d22d5..a0814a8d9c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java @@ -140,53 +140,6 @@ public class LingShanSpecialCrowdController { } } - // /** - // * @description: 安置帮教新增 - // * @param azbjData: - // * @return - // * @author: WangXianZhang - // * @date: 2023/4/20 2:50 PM - // */ - // @PostMapping("anzhibangjiao/save") - // public Result saveSpecialCrowd(@RequestBody LingShanSpecialCrowdDetailAzbjExcelData azbjData) { - // ValidatorUtils.validateEntity(azbjData); - // - // lingShanSpecialCrowdService.createSpecialCrowd(azbjData, "anzhibangjiao"); - // return new Result(); - // } - // - // @PostMapping("jiedurenyuan/save") - // public Result saveSpecialCrowd(@RequestBody LingshanSpecialCrowdDetailJdryExcelData jdryData) { - // ValidatorUtils.validateEntity(jdryData); - // - // lingShanSpecialCrowdService.createSpecialCrowd(jdryData, "jiedurenyuan"); - // return new Result(); - // } - // - // @PostMapping("jingzhanhuanzhe/save") - // public Result saveSpecialCrowd(@RequestBody LingshanSpecialCrowdDetailJzhzExcelData jzhzData) { - // ValidatorUtils.validateEntity(jzhzData); - // - // lingShanSpecialCrowdService.createSpecialCrowd(jzhzData, "jingzhanhuanzhe"); - // return new Result(); - // } - // - // @PostMapping("shequjiaozheng/save") - // public Result saveSpecialCrowd(@RequestBody LingshanSpecialCrowdDetailSqjzExcelData sqjzData) { - // ValidatorUtils.validateEntity(sqjzData); - // - // lingShanSpecialCrowdService.createSpecialCrowd(sqjzData, "shequjiaozheng"); - // return new Result(); - // } - // - // @PostMapping("xinfangrenyuan/save") - // public Result saveSpecialCrowd(@RequestBody LingshanSpecialCrowdDetailXfryExcelData xfryData) { - // ValidatorUtils.validateEntity(xfryData); - // - // lingShanSpecialCrowdService.createSpecialCrowd(xfryData, "xinfangrenyuan"); - // return new Result(); - // } - /** * @description: 保存 * @param input: diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index a78fae885d..966b7f8553 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -96,6 +96,11 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String gender; + /** + * 头像 + */ + private String headPhoto; + /** * 证件号 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java index 3853d81eca..9b66ceb6e3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java @@ -433,6 +433,11 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ ArrayList types2Save = new ArrayList<>(); + // 保存居民头像 + HashMap dm = new HashMap<>(); + dm.put("HEAD_PHOTO", input.getHeadPhoto()); + icResiUserDao.upTable("ic_resi_user", vt.getResiId(), dm); + // 保存人群详情 if (input.getSpecialCrowdDetails().getAnzhibangjiao() != null) { LingshanSpecialCrowdDetailAzbjEntity azbj = ConvertUtils.sourceToTarget(input.getSpecialCrowdDetails().getAnzhibangjiao(), LingshanSpecialCrowdDetailAzbjEntity.class); @@ -544,6 +549,9 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ LingShanSpecialTypeSaveResultDTO d = new LingShanSpecialTypeSaveResultDTO(); + // 头像 + d.setHeadPhoto(person.getHeadPhoto()); + // 2.查询人员类别详情 LambdaQueryWrapper azbjQ = new LambdaQueryWrapper<>(); azbjQ.eq(LingshanSpecialCrowdDetailAzbjEntity::getIdCard, person.getIdCard()); diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/special_crowd_anzhibangjiao_import.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/special_crowd_anzhibangjiao_import.xlsx index f3e412780e..a50dfb04b2 100644 Binary files a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/special_crowd_anzhibangjiao_import.xlsx and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/special_crowd_anzhibangjiao_import.xlsx differ