From 5456559b818554719a3e26b5ae722113f4c6bb47 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 10:38:24 +0800 Subject: [PATCH 001/161] =?UTF-8?q?gov/access/menu/nav=20=E4=B8=8D?= =?UTF-8?q?=E9=99=90=E5=88=B6type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/GovMenuServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index a3b63e096b..62f344b3a2 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -234,7 +234,9 @@ public class GovMenuServiceImpl extends BaseServiceImpl Date: Mon, 17 Oct 2022 12:31:20 +0800 Subject: [PATCH 002/161] =?UTF-8?q?navDigitalCommunity=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GovMenuServiceImpl.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index 62f344b3a2..3f7dfdcbc4 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -242,7 +242,14 @@ public class GovMenuServiceImpl extends BaseServiceImpl navDigitalCommunity(TokenDto tokenDto, String tableName) { tableName = getTableName(tableName); - List menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName); + List menuList=new ArrayList<>(); + if("gov_menu".equals(tableName)){ + // 管理平台菜单返回所有的 + menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(),null, HttpContextUtils.getLanguage(),tableName); + }else{ + //数据分析还是沿用原来的 + menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName); + } Result isRootManager = epmetUserOpenFeignClient.getIsRootManager(tokenDto.getUserId()); if (!isRootManager.success()){ throw new EpmetException("getIsRootManager method is failure"); @@ -251,6 +258,11 @@ public class GovMenuServiceImpl extends BaseServiceImpl govMenuDTOS = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); return TreeUtils.buildTree(govMenuDTOS); } + /*for(GovMenuEntity m:menuList){ + if("ic_resi_add".equals(m.getPermissions())){ + logger.info("1、菜单返回了新增居民"); + } + }*/ disposeGovMenu(menuList,tokenDto.getUserId()); Map> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus)); List dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class); @@ -286,11 +298,17 @@ public class GovMenuServiceImpl extends BaseServiceImpl(); return; } + // logger.info("==roleIdList="+ JSON.toJSONString(roleIdList)); List menuIdsList = govRoleMenuDao.getMenuIdsList(roleIdList); if (CollectionUtils.isEmpty(menuIdsList)){ menuList = new ArrayList<>(); return; } + /*for(String mid:menuIdsList){ + if("1581827798717898754".equals(mid)){ + logger.info("2、角色也有此菜单"); + } + }*/ for (String id : menuIdsList) { for (GovMenuEntity m : menuList) { if (m.getId().equals(id)){ From ae27530890ac11c80689643e3b9b1ab30a2481de Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 12:47:32 +0800 Subject: [PATCH 003/161] =?UTF-8?q?/epmetuser/icresiuser/searchbycategory?= =?UTF-8?q?=E4=B8=8E=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A0=E5=AF=86=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcResiUserController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index c70bf78c83..caf4682cea 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -421,6 +421,7 @@ public class IcResiUserController implements ResultDataResolver { * @author yinzuomei * @date 2021/10/28 10:29 上午 */ + @MaskResponse(fieldNames = {"NAME", "MOBILE","ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("detail") public Result queryIcResiDetail(@LoginUser TokenDto tokenDto, @RequestBody IcResiDetailFormDTO pageFormDTO) { //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); @@ -783,6 +784,7 @@ public class IcResiUserController implements ResultDataResolver { * @param tokenDto * @return 根据分类搜索 */ + @MaskResponse(fieldNames = {"name", "mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("searchbycategory") public Result> search(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) { formDTO.setCustomerId(tokenDto.getCustomerId()); From 47deba8e8e79fe8d7094b13b8b3400f873fe8186 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 12:55:08 +0800 Subject: [PATCH 004/161] =?UTF-8?q?/epmetuser/icresiuser/persondata?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=A7=93=E5=90=8D=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/IcResiUserController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index caf4682cea..2300695f0e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -755,6 +755,7 @@ public class IcResiUserController implements ResultDataResolver { * @author zxc * @date 2021/11/3 9:21 上午 */ + @MaskResponse(fieldNames = {"name", "mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) @PostMapping("persondata") public Result personData(@LoginUser TokenDto tokenDto, @RequestBody PersonDataFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); From b053903342486b986731768270b91a83720a37ba Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 12:57:21 +0800 Subject: [PATCH 005/161] =?UTF-8?q?/resi/partymember/icPartyMember/partyme?= =?UTF-8?q?mberagelist=E5=A7=93=E5=90=8D=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/controller/IcPartyMemberController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index fbddc60fb1..228cdedd84 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -30,7 +30,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.form.IcPartyMemberFormDTO; import com.epmet.dto.form.IcPartyMemberListFormDTO; -import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; @@ -253,7 +252,7 @@ public class IcPartyMemberController implements ResultDataResolver { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("partymemberagelist") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberAgelist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ IcPartyOrgEntity org = setOrgId(tokenDto); From b44ad2c870fa7a1b15649317e2a61f76aff33011 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 12:58:18 +0800 Subject: [PATCH 006/161] =?UTF-8?q?/resi/partymember/icPartyMember/partyme?= =?UTF-8?q?mbereducationlist=E5=A7=93=E5=90=8D=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/controller/IcPartyMemberController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 228cdedd84..702a6fe72e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -272,7 +272,7 @@ public class IcPartyMemberController implements ResultDataResolver { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("partymembereducationlist") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberEducationlist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ IcPartyOrgEntity org = setOrgId(tokenDto); From c1b6434e5dd10d4ed2eb74a9b229ae26bcd16269 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 13:11:47 +0800 Subject: [PATCH 007/161] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=97=A7=EF=BC=8C=E8=BF=94=E5=8F=82=E5=8A=A0?= =?UTF-8?q?=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcResiUserController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 2300695f0e..36959c6b80 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -898,7 +898,7 @@ public class IcResiUserController implements ResultDataResolver { * @Date 2021/12/10 17:54 */ @PostMapping("partymemberagelist") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberAgelist(@RequestBody PartyMemberListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return new Result>().ok(icResiUserService.getPartyMemberAgeList(formDTO)); @@ -977,7 +977,7 @@ public class IcResiUserController implements ResultDataResolver { * @Date 2021/12/10 17:58 */ @PostMapping("partymembereducationlist") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberEducationlist(@RequestBody PartyMemberListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return new Result>().ok(icResiUserService.getPartyMemberEducationList(formDTO)); @@ -1045,6 +1045,7 @@ public class IcResiUserController implements ResultDataResolver { * @param resiUserId * @return */ + @MaskResponse(fieldNames = {"icUserName","mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("resi-brief/{resi-user-id}") public Result getResiBrief(@PathVariable("resi-user-id") String resiUserId, @LoginUser TokenDto loginUser) { String customerId = loginUser.getCustomerId(); From 145463571e9a974e597309d545d4b519aa83b1e8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 13:31:50 +0800 Subject: [PATCH 008/161] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7+=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/controller/IcPartyMemberController.java | 4 ++-- .../java/com/epmet/controller/IcResiUserController.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 702a6fe72e..a27833eb76 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -252,7 +252,7 @@ public class IcPartyMemberController implements ResultDataResolver { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("partymemberagelist") - @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberAgelist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ IcPartyOrgEntity org = setOrgId(tokenDto); @@ -272,7 +272,7 @@ public class IcPartyMemberController implements ResultDataResolver { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("partymembereducationlist") - @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberEducationlist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ IcPartyOrgEntity org = setOrgId(tokenDto); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 36959c6b80..70c7fd0640 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -421,7 +421,7 @@ public class IcResiUserController implements ResultDataResolver { * @author yinzuomei * @date 2021/10/28 10:29 上午 */ - @MaskResponse(fieldNames = {"NAME", "MOBILE","ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @MaskResponse(fieldNames = {"MOBILE","ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("detail") public Result queryIcResiDetail(@LoginUser TokenDto tokenDto, @RequestBody IcResiDetailFormDTO pageFormDTO) { //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); @@ -755,7 +755,7 @@ public class IcResiUserController implements ResultDataResolver { * @author zxc * @date 2021/11/3 9:21 上午 */ - @MaskResponse(fieldNames = {"name", "mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) @PostMapping("persondata") public Result personData(@LoginUser TokenDto tokenDto, @RequestBody PersonDataFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -785,7 +785,7 @@ public class IcResiUserController implements ResultDataResolver { * @param tokenDto * @return 根据分类搜索 */ - @MaskResponse(fieldNames = {"name", "mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("searchbycategory") public Result> search(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -1045,7 +1045,7 @@ public class IcResiUserController implements ResultDataResolver { * @param resiUserId * @return */ - @MaskResponse(fieldNames = {"icUserName","mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("resi-brief/{resi-user-id}") public Result getResiBrief(@PathVariable("resi-user-id") String resiUserId, @LoginUser TokenDto loginUser) { String customerId = loginUser.getCustomerId(); From ac5da6a224eab7f6c51451008cf3fd37a8d97ad8 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 17 Oct 2022 14:00:10 +0800 Subject: [PATCH 009/161] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9AMaskProcesso?= =?UTF-8?q?r=E5=AF=B9=E8=BF=94=E5=8F=82=E4=B8=AD=E6=9C=89List=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E5=81=9A=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/processor/MaskProcessor.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index a3169a2ec6..a7b42dd438 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -83,6 +83,9 @@ public class MaskProcessor { String maskResult = maskString((String) value, fieldsMaskType.get(index)); entry.setValue(maskResult); } + } else if (value instanceof List) { + // 列表 + ((List)value).forEach(e -> mask(e)); } } } @@ -155,10 +158,12 @@ public class MaskProcessor { // 2个字以上的，首位字母明文，中间* // 中文不能用\\w，要用[\u4e00-\u9fa5] if (length == 2) { - return originString.replaceAll("^([\\u4e00-\\u9fa5]).*$", "$1*"); +// return originString.replaceAll("^([\\u4e00-\\u9fa5]).*$", "$1*"); + return originString.substring(0).concat("*"); } else { String maskStr = StrUtil.repeat("*", length - 2); - return originString.replaceAll("^([\\u4e00-\\u9fa5]).*([\\u4e00-\\u9fa5])$", "$1" + maskStr + "$2"); +// return originString.replaceAll("^([\\u4e00-\\u9fa5]).*([\\u4e00-\\u9fa5])$", "$1" + maskStr + "$2"); + return originString.charAt(0) + maskStr + originString.charAt(originString.length() - 1); } } From ba8128c3a203b02b21d523695ae4756c85fabc5a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 14:31:35 +0800 Subject: [PATCH 010/161] =?UTF-8?q?/epmetuser/icresiuser/icuserstatislist?= =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88-=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=89=8B=E6=9C=BA=E5=8F=B7=E3=80=81=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/GovMenuController.java | 1 + .../src/main/resources/mapper/GovMenuDao.xml | 13 ++++++++++--- .../com/epmet/controller/IcResiUserController.java | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java index cc94cd91f0..ef763f4a43 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java @@ -106,6 +106,7 @@ public class GovMenuController { /** * 导航 + * +数字社区-系统管理-角色管理配置角色权限，也会调用此接口 * @param tokenDto token * @return List */ diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml index 6bc815e44d..7a005b3c02 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml @@ -47,9 +47,16 @@ select t1.*, lang.field_value name from gov_menu t1 - INNER join gov_language lang on lang.table_name=#{tableName} and lang.field_name='name' and lang.table_id=t1.id and lang.language=#{language} - RIGHT JOIN gov_customer_menu m ON t1.id = m.TABLE_ID - where t1.del_flag = 0 AND m.del_flag = 0 + INNER join gov_language lang + on (lang.table_name=#{tableName} + and lang.field_name='name' + and lang.table_id=t1.id + and lang.language=#{language} + ) + RIGHT JOIN gov_customer_menu m + ON t1.id = m.TABLE_ID + where t1.del_flag = 0 + AND m.del_flag = 0 and t1.type = #{type} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 70c7fd0640..0b2e9ee3f0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1420,6 +1420,7 @@ public class IcResiUserController implements ResultDataResolver { * @Author sun * @Description 【人房概览】居民统计数点击查询列表 **/ + @MaskResponse(fieldNames = {"mobile", "idCard"},fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("icuserstatislist") public Result> icUserStatisList(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); From b7825ec18d219543aac73ef4e76caa17075c34d3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 14:35:49 +0800 Subject: [PATCH 011/161] =?UTF-8?q?/gov/project/icEvent/detail=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96-=E6=8C=87=E6=8C=A5=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=EF=BC=8C=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85showIdCard?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IcEventListResultDTO.java | 4 ++++ .../src/main/java/com/epmet/controller/IcEventController.java | 2 ++ .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 1 + 3 files changed, 7 insertions(+) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java index beac1277a0..f120219c36 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java @@ -73,6 +73,10 @@ public class IcEventListResultDTO implements Serializable { * 身份证号 */ private String idCard; + /** + * 加密的 + */ + private String showIdCard; /** * 上报渠道[字典表] */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 5105ca27bf..3435cf59c6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; @@ -274,6 +275,7 @@ public class IcEventController { * @Author sun * @Description 事件管理-详情 **/ + @MaskResponse(fieldNames = {"showIdCard"},fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index dda3a90647..038b3fdf94 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1050,6 +1050,7 @@ public class IcEventServiceImpl extends BaseServiceImpl list = baseDao.icEventList(formDTO); if (!CollectionUtils.isEmpty(list)) { resultDTO = list.get(0); + resultDTO.setShowIdCard(resultDTO.getIdCard()); //查询网格名称(组织-网格) List gridIds = list.stream().map(IcEventListResultDTO::getGridId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); Result> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds); From 6631564950739955162c2054eb757b7ea4803420 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 14:59:46 +0800 Subject: [PATCH 012/161] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=9A=90=E8=97=8F?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E9=9C=80=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IcEventListResultDTO.java | 4 ---- .../src/main/java/com/epmet/controller/IcEventController.java | 1 - .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 1 - 3 files changed, 6 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java index f120219c36..beac1277a0 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java @@ -73,10 +73,6 @@ public class IcEventListResultDTO implements Serializable { * 身份证号 */ private String idCard; - /** - * 加密的 - */ - private String showIdCard; /** * 上报渠道[字典表] */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 3435cf59c6..3eb4d8eefa 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -275,7 +275,6 @@ public class IcEventController { * @Author sun * @Description 事件管理-详情 **/ - @MaskResponse(fieldNames = {"showIdCard"},fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 038b3fdf94..dda3a90647 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1050,7 +1050,6 @@ public class IcEventServiceImpl extends BaseServiceImpl list = baseDao.icEventList(formDTO); if (!CollectionUtils.isEmpty(list)) { resultDTO = list.get(0); - resultDTO.setShowIdCard(resultDTO.getIdCard()); //查询网格名称(组织-网格) List gridIds = list.stream().map(IcEventListResultDTO::getGridId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); Result> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds); From 1e73bf6b5fdc6a1a681646b90525a0012db5d2ae Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 15:13:18 +0800 Subject: [PATCH 013/161] =?UTF-8?q?/resi/partymember/icPartyMember/1570322?= =?UTF-8?q?92946977587=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/controller/IcPartyMemberController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index a27833eb76..84c079c14a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -89,6 +89,7 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result>().ok(page); } + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result get(@LoginUser TokenDto tokenDto, @PathVariable("id") String id){ IcPartyMemberDTO data = icPartyMemberService.get(tokenDto, id); From 79640cf5d2f2b4e444e8805fc3a0233bf3ebc23e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 15:15:48 +0800 Subject: [PATCH 014/161] =?UTF-8?q?/resi/partymember/icPartyMember/1570322?= =?UTF-8?q?92946977587=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/partymember/dto/partymember/IcPartyMemberDTO.java | 3 ++- .../partymember/controller/IcPartyMemberController.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java index 9832a35e5e..74c7166a2c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java @@ -63,7 +63,8 @@ public class IcPartyMemberDTO implements Serializable { */ @NotBlank(message = "当前网格id不能为空",groups ={AddGroup.class, UpdateGroup.class}) private String mobile; - + private String showMobile; + private String showIdCard; /** * 身份证号 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 84c079c14a..7628cfbb82 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -89,10 +89,14 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result>().ok(page); } - @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result get(@LoginUser TokenDto tokenDto, @PathVariable("id") String id){ IcPartyMemberDTO data = icPartyMemberService.get(tokenDto, id); + if(null!=data){ + data.setShowMobile(data.getMobile()); + data.setShowIdCard(data.getIdCard()); + } return new Result().ok(data); } @NoRepeatSubmit From b89d98cc51a6c980d6c212382fb983692aeb1a2d Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 18 Oct 2022 22:15:59 +0800 Subject: [PATCH 015/161] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/processor/MaskProcessor.java | 7 ++++--- .../epmet/dataaggre/service/impl/CoverageServiceImpl.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index a7b42dd438..0ebc34c00c 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -15,7 +15,6 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; /** * desc:脱敏处理器 @@ -173,7 +172,7 @@ public class MaskProcessor { * @param originString * @return */ - private String maskIdCard(String originString) { + public static String maskIdCard(String originString) { IdCardRegexUtils regexUtil = IdCardRegexUtils.parse(originString); if (regexUtil == null) { @@ -221,7 +220,9 @@ public class MaskProcessor { public static void main(String[] args) { String[] idc = {"idCard"}; String[] idct = {MaskResponse.MASK_TYPE_ID_CARD}; - String r = new MaskProcessor(idc, idct).maskString("333333333333333333", MaskResponse.MASK_TYPE_ID_CARD); + String r = new MaskProcessor(idc, idct).maskString("王五(372284152412022222)", MaskResponse.MASK_TYPE_ID_CARD); System.out.println(r); + String s = MaskProcessor.maskIdCard("372284152412022222"); + System.out.println(s); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index ff931888c3..f4553cd9b8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.processor.MaskProcessor; import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -670,7 +671,7 @@ public class CoverageServiceImpl implements CoverageService { return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, - re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT), + re.getName().concat(StrConstant.BRACKET_LEFT).concat(MaskProcessor.maskIdCard(re.getIdCard())).concat(StrConstant.BRACKET_RIGNT), coordinates[1], coordinates[0]); }).collect(Collectors.toList()); @@ -684,7 +685,7 @@ public class CoverageServiceImpl implements CoverageService { return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, - re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdNum()).concat(StrConstant.BRACKET_RIGNT), + re.getName().concat(StrConstant.BRACKET_LEFT).concat(MaskProcessor.maskIdCard(re.getIdNum())).concat(StrConstant.BRACKET_RIGNT), coordinates[1], coordinates[0]); }).collect(Collectors.toList()); @@ -1276,4 +1277,4 @@ public class CoverageServiceImpl implements CoverageService { } return resultList; } -} \ No newline at end of file +} From 87486760e64dbbdb3b71674b350d8a3d2569fac0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 08:47:10 +0800 Subject: [PATCH 016/161] =?UTF-8?q?/data/aggregator/coverage/search?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dataaggre/controller/CoverageController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index 7a451a9f94..7815998386 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.dto.result.ZhzlCategorySelectDTO; import com.epmet.commons.tools.enums.ZhzlResiCategoryEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -74,6 +75,7 @@ public class CoverageController { * @author zxc * @date 2022/7/26 16:29 */ + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("search") public Result coverageHomeSearch(@RequestBody CoverageHomeSearchFormDTO formDTO, @LoginUser TokenDto tokenDto){ formDTO.setCustomerId(tokenDto.getCustomerId()); From 41da88ef7c320575a988017f6ca47e37f76ec983 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 09:13:55 +0800 Subject: [PATCH 017/161] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85/go?= =?UTF-8?q?v/project/icEvent/detail=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/IcEventController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 3eb4d8eefa..711e66623d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -275,6 +275,7 @@ public class IcEventController { * @Author sun * @Description 事件管理-详情 **/ + @MaskResponse(fieldNames = { "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); From 0e5b917f8e0fc5c78067f36b47b97d6a9699e51b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 09:52:31 +0800 Subject: [PATCH 018/161] =?UTF-8?q?1=E3=80=81=E5=B1=85=E6=B0=91=E9=98=B2?= =?UTF-8?q?=E7=96=AB=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B/epmetuser/epidemi?= =?UTF-8?q?cPrevention/detail=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcEpidemicPreventionController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java index 3fd2bd60fc..e06bed1fc6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java @@ -82,6 +82,7 @@ public class IcEpidemicPreventionController{ * @Author zhaoqifeng * @Date 2022/3/29 16:13 */ + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); From 55a24ec49cff3b919b5365aca86130a285c7ca04 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 10:34:42 +0800 Subject: [PATCH 019/161] =?UTF-8?q?menu/batch-save=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E6=88=91=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/OperMenuController.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java index c04455b92e..e29946ca4c 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java @@ -1,11 +1,9 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -69,6 +67,23 @@ public class OperMenuController { return new Result(); } + /** + * 疯狂家按钮，我要写个接口批量赠.... + * @param formList + * @param tokenDto + * @return + */ + @PostMapping("batch-save") + public Result save(@RequestBody List formList, @LoginUser TokenDto tokenDto){ + //效验数据 + ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class); + for(OperMenuDTO dto:formList){ + operMenuService.save(dto,tokenDto); + } + return new Result(); + } + + @PutMapping public Result update(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 From ea3b3119d9a5e5c3f8ed2314620ead7528e16c8f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 10:35:30 +0800 Subject: [PATCH 020/161] =?UTF-8?q?=E9=9D=A0=EF=BC=8C=E5=8A=A0=E9=94=99?= =?UTF-8?q?=E5=9C=B0=E6=96=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/OperMenuController.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java index e29946ca4c..b9146e88ad 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java @@ -67,23 +67,6 @@ public class OperMenuController { return new Result(); } - /** - * 疯狂家按钮，我要写个接口批量赠.... - * @param formList - * @param tokenDto - * @return - */ - @PostMapping("batch-save") - public Result save(@RequestBody List formList, @LoginUser TokenDto tokenDto){ - //效验数据 - ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class); - for(OperMenuDTO dto:formList){ - operMenuService.save(dto,tokenDto); - } - return new Result(); - } - - @PutMapping public Result update(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 From 6532184e73f20b7e4b597e5fe2407134db77caed Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 10:37:00 +0800 Subject: [PATCH 021/161] /gov/access/menu/batch-save --- .../com/epmet/controller/GovMenuController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java index ef763f4a43..69de505fed 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java @@ -59,6 +59,22 @@ public class GovMenuController { return new Result(); } + /** + * 疯狂家按钮，我要写个接口批量赠.... + * @param formList + * @param tokenDto + * @return + */ + @PostMapping("batch-save") + public Result save(@RequestBody List formList, @LoginUser TokenDto tokenDto){ + //效验数据 + ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class); + for(GovMenuDTO dto:formList){ + govMenuService.save(dto,tokenDto); + } + return new Result(); + } + @PutMapping public Result update(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 From 5e5a7df0c229e921b88035dcdcda29c67ae6c782 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 11:59:51 +0800 Subject: [PATCH 022/161] =?UTF-8?q?2=E3=80=81=E8=A1=8C=E7=A8=8B=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E8=AF=A6=E6=83=85=EF=BC=9A/epmetuser/tripreport/detai?= =?UTF-8?q?l=20=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcTripReportRecordController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index aea630040c..5e4aba1748 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -88,6 +88,7 @@ public class IcTripReportRecordController implements ResultDataResolver { * @param formDTO * @return */ + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto,@RequestBody IcTripReportRecordDTO formDTO){ ValidatorUtils.validateEntity(formDTO,IcTripReportRecordDTO.DetailViewGroup.class); From 63bd61919493d2351cb1cf3f94a4b751b8d6d7e3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 12:03:49 +0800 Subject: [PATCH 023/161] =?UTF-8?q?3=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E8=AE=B0=E5=BD=95=E6=9F=A5=E7=9C=8B/epmetuser/icVacci?= =?UTF-8?q?ne/detail=EF=BC=8CshowMobile,showIdCard=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcVaccineDTO.java | 4 ++-- .../java/com/epmet/controller/IcVaccineController.java | 1 + .../com/epmet/service/impl/IcVaccineServiceImpl.java | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java index 115eeb2154..b9dca879b0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java @@ -36,12 +36,12 @@ public class IcVaccineDTO implements Serializable { * 手机号 */ private String mobile; - + private String showMobile; /** * 身份证号 */ private String idCard; - + private String showIdCard; /** * 是否客户下居民(0:否 1:是) */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java index bb34afd612..8c742919a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java @@ -231,6 +231,7 @@ public class IcVaccineController implements ResultDataResolver { * @Author sun * @Description 疫苗接种情况-列表点击查询详情 **/ + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @NoRepeatSubmit @PostMapping("detail") public Result detail(@RequestBody IcVaccineFormDTO formDTO) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index 09da4b8ee2..6d183807ab 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -21,14 +21,12 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcResiUserDao; import com.epmet.dao.IcVaccineDao; import com.epmet.dao.IcVaccineRelationDao; -import com.epmet.dto.IcNatDTO; import com.epmet.dto.IcVaccineDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.IcVaccineListResultDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.dto.result.VaccineListDTO; -import com.epmet.entity.IcNatEntity; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcVaccineEntity; import com.epmet.entity.IcVaccineRelationEntity; @@ -480,7 +478,12 @@ public class IcVaccineServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 12:32:39 +0800 Subject: [PATCH 024/161] =?UTF-8?q?/epmetuser/tripreport/detail=E5=BD=A2?= =?UTF-8?q?=E6=88=90=E4=B8=8A=E6=8A=A5=E8=BF=94=E5=9B=9EshowMobile?= =?UTF-8?q?=E3=80=81showIdCard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcTripReportRecordDTO.java | 8 ++++---- .../epmet/controller/IcTripReportRecordController.java | 2 +- .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 9d2ab97099..ea4a456f41 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -77,9 +77,9 @@ public class IcTripReportRecordDTO implements Serializable { private String mobile; /** - * 真实手机号不打码 + * 脱敏 */ - private String realMobile; + private String showMobile; /** * 身份证号 @@ -89,9 +89,9 @@ public class IcTripReportRecordDTO implements Serializable { private String idCard; /** - * 真实身份证号 + * 脱敏 */ - private String realIdCard; + private String showIdCard; /** * 用户id diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 5e4aba1748..02bc139e51 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -88,7 +88,7 @@ public class IcTripReportRecordController implements ResultDataResolver { * @param formDTO * @return */ - @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto,@RequestBody IcTripReportRecordDTO formDTO){ ValidatorUtils.validateEntity(formDTO,IcTripReportRecordDTO.DetailViewGroup.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index a758fdba92..bd920882f0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -464,6 +464,11 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 12:43:50 +0800 Subject: [PATCH 025/161] =?UTF-8?q?=E5=BD=A2=E6=88=90=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=AF=E5=8A=A0=E5=AF=86=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E8=BF=98=E4=B8=8D=E8=83=BD=E5=8E=BB=E6=8E=89realMobile?= =?UTF-8?q?=E3=80=81realIdCard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcTripReportRecordDTO.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index ea4a456f41..e88ef1deb7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -76,6 +76,11 @@ public class IcTripReportRecordDTO implements Serializable { @ExcelProperty("手机号") private String mobile; + /** + * 真实手机号不打码 + */ + private String realMobile; + /** * 脱敏 */ @@ -88,6 +93,11 @@ public class IcTripReportRecordDTO implements Serializable { @ExcelProperty("身份证号") private String idCard; + /** + * 真实身份证号 + */ + private String realIdCard; + /** * 脱敏 */ From 73b7ff7f8b7f577d1451207593d46f7c1ae0f178 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 12:48:21 +0800 Subject: [PATCH 026/161] =?UTF-8?q?5=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=9A/epmetuser/icEpidemicSpecialAttention/detail=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0show?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/VaccinationListResultDTO.java | 9 ++++++++- .../controller/IcEpidemicSpecialAttentionController.java | 1 + .../impl/IcEpidemicSpecialAttentionServiceImpl.java | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index 7099e1650b..c48363e679 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -42,7 +42,10 @@ public class VaccinationListResultDTO implements Serializable { * 真实手机号 */ private String realMobile; - + /** + * 脱敏详情用 + */ + private String showMobile; /** * 身份证 */ @@ -52,6 +55,10 @@ public class VaccinationListResultDTO implements Serializable { * 真实的身份证 */ private String realIdCard; + /** + * 脱敏详情用 + */ + private String showIdCard; private String sex; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java index 3ebd6d4f84..85cf3c302e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java @@ -87,6 +87,7 @@ public class IcEpidemicSpecialAttentionController { * @author zxc * @date 2022/4/27 15:47 */ + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@RequestBody AttentionDetailFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO,VaccinationListFormDTO.VaccinationListForm.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 65070ee096..a51b81e28d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -578,7 +578,12 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 12:52:24 +0800 Subject: [PATCH 027/161] =?UTF-8?q?1=E3=80=81=E5=B1=85=E6=B0=91=E9=98=B2?= =?UTF-8?q?=E7=96=AB=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B/epmetuser/epidemi?= =?UTF-8?q?cPrevention/detail=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E8=84=B1=E6=95=8F,show?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/EpidemicPreventionResultDTO.java | 9 +++++++++ .../epmet/controller/IcEpidemicPreventionController.java | 2 +- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java index 4946982090..f65d4f32cc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java @@ -38,6 +38,15 @@ public class EpidemicPreventionResultDTO implements Serializable { */ private String idCard; + /** + * 脱敏详情用 + */ + private String showMobile; + /** + * 脱敏详情用 + */ + private String showIdCard; + private String birthDay; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java index e06bed1fc6..8301cc6b54 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java @@ -82,7 +82,7 @@ public class IcEpidemicPreventionController{ * @Author zhaoqifeng * @Date 2022/3/29 16:13 */ - @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index ec9bf3043c..ae6af1e11f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1748,8 +1748,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.getEpidemicPreventionList(formDTO); - if (CollectionUtils.isNotEmpty(list)) { + if (CollectionUtils.isNotEmpty(list) && null != list.get(NumConstant.ZERO)) { result = list.get(NumConstant.ZERO); + result.setShowIdCard(result.getIdCard()); + result.setShowMobile(result.getMobile()); //查询网格名称 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(result.getGridId()); if (null != gridInfo) { From 71553b7a81bec9b95d4ab1a2f77e3d8d570e2bc3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 13:05:33 +0800 Subject: [PATCH 028/161] =?UTF-8?q?7=E3=80=81=E6=A0=B8=E9=85=B8=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E8=AE=B0=E5=BD=95=E8=AF=A6=E6=83=85=EF=BC=9A/epmetuse?= =?UTF-8?q?r/icNat/detail=E8=BF=94=E5=9B=9Eshow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNatDTO.java | 9 +++++++++ .../main/java/com/epmet/controller/IcNatController.java | 1 + .../java/com/epmet/service/impl/IcNatServiceImpl.java | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java index dbd32f4463..0b0e41294e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java @@ -61,6 +61,15 @@ public class IcNatDTO implements Serializable { */ private String idCard; + /** + * 脱敏详情用 + */ + private String showMobile; + /** + * 脱敏详情用 + */ + private String showIdCard; + /** * 检测时间，精确到分钟 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java index bcb2a2d134..a365373784 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java @@ -125,6 +125,7 @@ public class IcNatController implements ResultDataResolver { * @Author sun * @Description 【核酸】核酸检测信息详情 **/ + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @NoRepeatSubmit @PostMapping("detail") public Result detail(@RequestBody MyNatListFormDTO formDTO) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 40d9818db8..622157306c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -198,7 +198,8 @@ public class IcNatServiceImpl extends BaseServiceImpl imp return resultDTO; } resultDTO = ConvertUtils.sourceToTarget(entity, IcNatDTO.class); - + resultDTO.setShowIdCard(resultDTO.getIdCard()); + resultDTO.setShowMobile(resultDTO.getMobile()); //2.查询对应的通知记录信息 IcNoticeDTO dto = icNoticeService.getNotice(entity.getCustomerId(), entity.getIdCard()); if (null != dto) { From bcf510e350b356b18b8fcc8b1a385a89a08a3256 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 31 Oct 2022 16:38:18 +0800 Subject: [PATCH 029/161] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcDangerAreaDTO.java | 84 +++++++++++++++++++ .../controller/IcDangerAreaController.java | 72 ++++++++++++++++ .../java/com/epmet/dao/IcDangerAreaDao.java | 16 ++++ .../com/epmet/entity/IcDangerAreaEntity.java | 54 ++++++++++++ .../epmet/service/IcDangerAreaService.java | 78 +++++++++++++++++ .../service/impl/IcDangerAreaServiceImpl.java | 83 ++++++++++++++++++ .../main/resources/mapper/IcDangerAreaDao.xml | 6 ++ 7 files changed, 393 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcDangerAreaDao.xml diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java new file mode 100644 index 0000000000..8597671a84 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java @@ -0,0 +1,84 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 疫情风险地区 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-31 + */ +@Data +public class IcDangerAreaDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 风险等级 + */ + private String dangerLevel; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区 + */ + private String district; + + /** + * 省-市-区 + */ + private String allName; + + /** + * + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java new file mode 100644 index 0000000000..a9281264bd --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.service.IcDangerAreaService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 疫情风险地区 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-31 + */ +@RestController +@RequestMapping("icDangerArea") +public class IcDangerAreaController { + + @Autowired + private IcDangerAreaService icDangerAreaService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icDangerAreaService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcDangerAreaDTO data = icDangerAreaService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcDangerAreaDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icDangerAreaService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcDangerAreaDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icDangerAreaService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icDangerAreaService.delete(ids); + return new Result(); + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java new file mode 100644 index 0000000000..40e8775635 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcDangerAreaEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 疫情风险地区 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-31 + */ +@Mapper +public interface IcDangerAreaDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java new file mode 100644 index 0000000000..9d895750f9 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java @@ -0,0 +1,54 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 疫情风险地区 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-31 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_danger_area") +public class IcDangerAreaEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 风险等级 + */ + private String dangerLevel; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区 + */ + private String district; + + /** + * 省-市-区 + */ + private String allName; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java new file mode 100644 index 0000000000..88e680c180 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.entity.IcDangerAreaEntity; + +import java.util.List; +import java.util.Map; + +/** + * 疫情风险地区 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-31 + */ +public interface IcDangerAreaService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-31 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-31 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcDangerAreaDTO + * @author generator + * @date 2022-10-31 + */ + IcDangerAreaDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-31 + */ + void save(IcDangerAreaDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-31 + */ + void update(IcDangerAreaDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-31 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java new file mode 100644 index 0000000000..0e7a4d5b2f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcDangerAreaDao; +import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.entity.IcDangerAreaEntity; +import com.epmet.service.IcDangerAreaService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 疫情风险地区 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-31 + */ +@Service +public class IcDangerAreaServiceImpl extends BaseServiceImpl implements IcDangerAreaService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcDangerAreaDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcDangerAreaDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcDangerAreaDTO get(String id) { + IcDangerAreaEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcDangerAreaDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcDangerAreaDTO dto) { + IcDangerAreaEntity entity = ConvertUtils.sourceToTarget(dto, IcDangerAreaEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcDangerAreaDTO dto) { + IcDangerAreaEntity entity = ConvertUtils.sourceToTarget(dto, IcDangerAreaEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcDangerAreaDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcDangerAreaDao.xml new file mode 100644 index 0000000000..65f889179a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcDangerAreaDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From cd6a530ea43bf03fe6e16de9dafcf165430f37dc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 31 Oct 2022 16:55:43 +0800 Subject: [PATCH 030/161] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E8=BF=81=E5=87=BA=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=88=97=E5=A2=9E=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A5=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E7=9A=84=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ChangeDeathDTO.java | 5 ++ .../com/epmet/dto/ChangeRelocationDTO.java | 5 ++ .../dto/result/IcMoveInListResultDTO.java | 6 ++ .../main/resources/mapper/ChangeDeathDao.xml | 1 + .../resources/mapper/ChangeRelocationDao.xml | 3 +- .../resources/mapper/IcMoveInRecordDao.xml | 86 +++++++++---------- 6 files changed, 62 insertions(+), 44 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java index 879732a1b4..f771404184 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java @@ -26,6 +26,11 @@ public class ChangeDeathDTO implements Serializable { */ private String id; + /** + * ic_resi_user主键 + */ + private String icResiUserId; + /** * epmet用户主键 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java index 088f8431d5..dd632ca671 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java @@ -24,6 +24,11 @@ public class ChangeRelocationDTO implements Serializable { */ private String id; + /** + * ic_resi_user主键 + */ + private String icResiUserId; + /** * 姓名 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java index 9ec9b5956d..d0be989687 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java @@ -18,6 +18,12 @@ public class IcMoveInListResultDTO implements Serializable { * 迁入Id */ private String moveInId; + + /** + * ic_resi_user主键 + */ + private String icResiUserId; + /** * 网格ID */ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml index 36a6f06002..f0e6b117b8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml @@ -28,6 +28,7 @@ SELECT d.id, u.id AS userId, + u.id as icResiUserId, d.GRID_ID, u.`NAME`, d.ID_CARD, diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml index 8bdf2847fe..0018ab91fb 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml @@ -64,7 +64,8 @@ r.CREATED_TIME, r.UPDATED_TIME, r.OUT_OF_TIME, - r.IC_USER_ID + r.IC_USER_ID, + r.IC_USER_ID as icResiUserId FROM pli_change_relocation r LEFT JOIN ic_resi_user u ON u.ID_CARD = r.ID_CARD diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml index 87e2d5f12b..03065d2e60 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml @@ -5,74 +5,74 @@ - \ No newline at end of file + From c62fb6c8d67560b08ce72d385f03bc2be173422a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 31 Oct 2022 17:32:07 +0800 Subject: [PATCH 031/161] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 57 +++++++++++++++++++ .../entity/IcTripReportRecordEntity.java | 57 +++++++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 9d2ab97099..545019565c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -233,4 +233,61 @@ public class IcTripReportRecordDTO implements Serializable { @ColumnWidth(25) @ExcelProperty("核算检测关注名单") private String heSuanCheckDesc; + + /** + * 交通方式，来源字典表(traffic_type) + */ + private String trafficType; + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + private String trafficTypeExplain; + /** + * 来源地详细信息 source_address字段的说明 + */ + private String sourceDetailAddress; + /** + * 疫苗接种针次 (1针 2针 3针)【小寨子】 + */ + private String vaccineNum; + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】 + */ + private String isNatRecord; + /** + * 年龄【磐石】 + */ + private String age; + /** + * 来曹事由【磐石】 + */ + private String describe; + /** + * 48小时核算检查结果(阴性 阳性)【磐石】 + */ + private String natOutcome; + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】 + */ + private String sojournHistory; + /** + * 隔离状态，字典表(isolate_type)【磐石】 + */ + private String isolateType; + /** + * 是否落实"落地检" 0:否 1:是【磐石】 + */ + private String isArriveCheck; + /** + * 上报时间【磐石】 + */ + private Date reportingTime; + /** + * 管控措施【磐石】 + */ + private String controlMeasures; + /** + * 行程记录类型，字典表(trip_data_type)【磐石】 + */ + private String tripDataType; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 7182332216..3791178961 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -115,4 +115,61 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { */ private String remark; + /** + * 交通方式，来源字典表(traffic_type) + */ + private String trafficType; + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + private String trafficTypeExplain; + /** + * 来源地详细信息 source_address字段的说明 + */ + private String sourceDetailAddress; + /** + * 疫苗接种针次 (1针 2针 3针)【小寨子】 + */ + private String vaccineNum; + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】 + */ + private String isNatRecord; + /** + * 年龄【磐石】 + */ + private String age; + /** + * 来曹事由【磐石】 + */ + private String describe; + /** + * 48小时核算检查结果(阴性 阳性)【磐石】 + */ + private String natOutcome; + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】 + */ + private String sojournHistory; + /** + * 隔离状态，字典表(isolate_type)【磐石】 + */ + private String isolateType; + /** + * 是否落实"落地检" 0:否 1:是【磐石】 + */ + private String isArriveCheck; + /** + * 上报时间【磐石】 + */ + private Date reportingTime; + /** + * 管控措施【磐石】 + */ + private String controlMeasures; + /** + * 行程记录类型，字典表(trip_data_type)【磐石】 + */ + private String tripDataType; + } From 794dd311e2230eaac378a6885a12cf38413b9513 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 31 Oct 2022 17:43:48 +0800 Subject: [PATCH 032/161] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 2 +- .../epmet/dto/form/IcTripReportFormDTO.java | 57 +++++++++++++++++++ .../entity/IcTripReportRecordEntity.java | 2 +- 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 545019565c..50aad8dad1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -257,7 +257,7 @@ public class IcTripReportRecordDTO implements Serializable { /** * 年龄【磐石】 */ - private String age; + private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 5c7a53e335..34d1668c8d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -176,5 +176,62 @@ public class IcTripReportFormDTO implements Serializable { */ private String content = ""; + /** + * 交通方式，来源字典表(traffic_type) + */ + private String trafficType; + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + private String trafficTypeExplain; + /** + * 来源地详细信息 source_address字段的说明 + */ + private String sourceDetailAddress; + /** + * 疫苗接种针次 (1针 2针 3针)【小寨子】 + */ + private String vaccineNum; + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】 + */ + private String isNatRecord; + /** + * 年龄【磐石】 + */ + private int age; + /** + * 来曹事由【磐石】 + */ + private String describe; + /** + * 48小时核算检查结果(阴性 阳性)【磐石】 + */ + private String natOutcome; + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】 + */ + private String sojournHistory; + /** + * 隔离状态，字典表(isolate_type)【磐石】 + */ + private String isolateType; + /** + * 是否落实"落地检" 0:否 1:是【磐石】 + */ + private String isArriveCheck; + /** + * 上报时间【磐石】 + */ + private Date reportingTime; + /** + * 管控措施【磐石】 + */ + private String controlMeasures; + /** + * 行程记录类型，字典表(trip_data_type)【磐石】 + */ + private String tripDataType; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 3791178961..14b22ed70e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -138,7 +138,7 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { /** * 年龄【磐石】 */ - private String age; + private int age; /** * 来曹事由【磐石】 */ From 61a7c9aac55d6f7aab672584065b52b76969346f Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 09:51:50 +0800 Subject: [PATCH 033/161] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?sql=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/BirthRecordListFormDTO.java | 80 ++++++++++++++++++ .../java/com/epmet/dao/IcBirthRecordDao.java | 10 ++- .../impl/IcBirthRecordServiceImpl.java | 15 +++- .../resources/mapper/IcBirthRecordDao.xml | 82 ++++++++++++++++++- 4 files changed, 180 insertions(+), 7 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java new file mode 100644 index 0000000000..207fafd28b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java @@ -0,0 +1,80 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/5/10 10:02 + */ +@NoArgsConstructor +@Data +public class BirthRecordListFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = 5077167613040462646L; + /** + * 客户ID + */ + private String customerId; + private String staffId; + + private String icResiUserId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + /** + * 小区ID + */ + private String villageId; + /** + * 楼栋ID + */ + private String buildId; + /** + * 单元ID + */ + private String unitId; + /** + * 房屋ID + */ + private String homeId; + /** + * 姓名 + */ + private String name; + /** + * 手机 + */ + private String mobile; + /** + * 身份证 + */ + private String idCard; + /** + * 性别 + */ + private String gender; + /** + * 出生日开始 + */ + private String startTime; + /** + * 出生日期结束 + */ + private String endTime; + /** + * 是否福利 + */ + private String isWelfare; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java index f3cfc215ee..1d35ce2c12 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcBirthRecordDTO; +import com.epmet.dto.form.BirthRecordListFormDTO; import com.epmet.entity.IcBirthRecordEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 出生管理 * @@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcBirthRecordDao extends BaseDao { - -} \ No newline at end of file + + List selectListByEntity(BirthRecordListFormDTO birthRecordListFormDTO); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java index dc737eed05..bceb6c7fd5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.dao.IcResiUserDao; import com.epmet.dto.ChangeWelfareDTO; import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.form.BirthRecordFormDTO; +import com.epmet.dto.form.BirthRecordListFormDTO; import com.epmet.dto.form.BirthRecordUpdateDTO; import com.epmet.dto.form.IcResiUserTransferFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; @@ -79,10 +80,16 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl wrapper = getWrapper(formDTO, staffInfo); - List entityList = baseDao.selectList(wrapper); - PageInfo pageInfo = new PageInfo<>(entityList); - List list = ConvertUtils.sourceToTarget(entityList, IcBirthRecordDTO.class); +// LambdaQueryWrapper wrapper = getWrapper(formDTO, staffInfo); +// List entityList = baseDao.selectList(wrapper); + + BirthRecordListFormDTO birthRecordListFormDTO = ConvertUtils.sourceToTarget(formDTO, BirthRecordListFormDTO.class); + birthRecordListFormDTO.setAgencyId(staffInfo.getAgencyId()); + List list = baseDao.selectListByEntity(birthRecordListFormDTO); + + + PageInfo pageInfo = new PageInfo<>(list); +// List list = ConvertUtils.sourceToTarget(entityList, IcBirthRecordDTO.class); if (CollectionUtils.isNotEmpty(list)) { //查询网格名称 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml index 52a3ce76eb..9f6ac1e550 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml @@ -34,6 +34,86 @@ + - \ No newline at end of file + + From 61be4504c878c175dbd60d34feaace73ec5977ca Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 10:07:47 +0800 Subject: [PATCH 034/161] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?sql=E6=9F=A5=E8=AF=A2---=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcBirthRecordDTO.java | 4 +++- .../main/java/com/epmet/dto/form/BirthRecordListFormDTO.java | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java index 46bee9f321..6516b5161c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java @@ -25,6 +25,8 @@ public class IcBirthRecordDTO implements Serializable { */ private String id; + private String icResiUserId; + /** * 客户Id customer.id */ @@ -193,4 +195,4 @@ public class IcBirthRecordDTO implements Serializable { @JsonIgnore private Date updatedTime; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java index 207fafd28b..0fd1d33d65 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java @@ -22,8 +22,6 @@ public class BirthRecordListFormDTO extends PageFormDTO implements Serializable private String customerId; private String staffId; - private String icResiUserId; - /** * 组织Id */ From e0ec997ccebc80a684cfa600d665ec3fa5eeb22f Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 10:51:03 +0800 Subject: [PATCH 035/161] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/DeleteIcBirthRecordFormDTO.java | 25 +++++++++++++++++++ .../controller/IcBirthRecordController.java | 9 +++++++ 2 files changed, 34 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java new file mode 100644 index 0000000000..9cc3dd05fe --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + * @author wgf + * @dscription + */ +@Data +public class DeleteIcBirthRecordFormDTO implements Serializable { + + private static final long serialVersionUID = -5220529162950147825L; + /** + * 主键 + */ + @NotBlank(message = "主键不能为空") + private String id; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index 55e6f4cdc2..b8ba028d4c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.form.BirthRecordFormDTO; import com.epmet.dto.form.BirthRecordUpdateDTO; +import com.epmet.dto.form.DeleteIcBirthRecordFormDTO; import com.epmet.excel.IcBirthRecordExcel; import com.epmet.service.IcBirthRecordService; import lombok.extern.slf4j.Slf4j; @@ -92,6 +93,14 @@ public class IcBirthRecordController { return new Result(); } + @PostMapping("deleteById") + public Result deleteById(@RequestBody DeleteIcBirthRecordFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icBirthRecordService.deleteById(dto.getId()); + return new Result(); + } + @NoRepeatSubmit @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO, HttpServletResponse response) throws Exception { From e30cdfa10ca0b08912de1ccd6864779922b8a480 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 1 Nov 2022 11:03:27 +0800 Subject: [PATCH 036/161] =?UTF-8?q?=E6=9A=82=E6=8F=90=E4=B8=80=E6=B3=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 2 + .../java/com/epmet/dto/IcDangerAreaDTO.java | 12 +++ .../epmet/dto/form/DangerAreaListFormDTO.java | 19 ++++ .../controller/IcDangerAreaController.java | 102 ++++++++++++++++-- .../com/epmet/entity/IcDangerAreaEntity.java | 2 + .../java/com/epmet/enums/DangerLevelEnum.java | 55 ++++++++++ .../epmet/excel/IcDangerAreaResultExcel.java | 22 ++++ .../epmet/service/IcDangerAreaService.java | 5 +- .../service/impl/IcDangerAreaServiceImpl.java | 65 ++++++++++- .../excel/ic_danger_area_template.xlsx | Bin 0 -> 9140 bytes 10 files changed, 274 insertions(+), 10 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DangerAreaListFormDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DangerLevelEnum.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaResultExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_danger_area_template.xlsx diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index ec9ee8c209..af4142237d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -268,6 +268,8 @@ public enum EpmetErrorCode { SAMPLE_TIME_IS_NULL_ERROR(8933,"采样时间不能为空"), SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"), + + DANGER_AREA_ERROR(8937,"风险地区已存在"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), //通用错误码 start diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java index 8597671a84..3d41095172 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java @@ -2,8 +2,13 @@ package com.epmet.dto; import java.io.Serializable; import java.util.Date; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 疫情风险地区 @@ -29,28 +34,35 @@ public class IcDangerAreaDTO implements Serializable { /** * 风险等级 */ +// @NotBlank(message = "dangerLevel不能为空",groups = {AddGroup.class}) private String dangerLevel; /** * 省 */ +// @NotBlank(message = "province不能为空",groups = {AddGroup.class}) private String province; /** * 市 */ +// @NotBlank(message = "city不能为空",groups = {AddGroup.class}) private String city; /** * 区 */ +// @NotBlank(message = "district不能为空",groups = {AddGroup.class}) private String district; /** * 省-市-区 */ + @NotBlank(message = "allName不能为空",groups = {AddGroup.class}) private String allName; + private String allNameCode; + /** * */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DangerAreaListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DangerAreaListFormDTO.java new file mode 100644 index 0000000000..9071a4a1c7 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DangerAreaListFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/31 16:59 + */ +@Data +public class DangerAreaListFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = 8868052895161162655L; + + private String name; + private String dangerLevel; + private String customerId; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java index a9281264bd..4dcfd4bb09 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java @@ -1,20 +1,42 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.dto.form.DangerAreaListFormDTO; +import com.epmet.dto.result.NatListCommonExcelResultDTO; +import com.epmet.dto.result.NatListResultDTO; +import com.epmet.enums.DangerLevelEnum; +import com.epmet.excel.IcDangerAreaResultExcel; import com.epmet.service.IcDangerAreaService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.net.URLEncoder; import java.util.List; import java.util.Map; @@ -26,6 +48,7 @@ import java.util.Map; * @since v1.0.0 2022-10-31 */ @RestController +@Slf4j @RequestMapping("icDangerArea") public class IcDangerAreaController { @@ -44,11 +67,18 @@ public class IcDangerAreaController { return new Result().ok(data); } + /** + * @Description 新增 + * @param dto + * @param tokenDto + * @Author zxc + * @Date 2022/11/1 09:09 + */ @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcDangerAreaDTO dto){ - //效验数据 + public Result save(@RequestBody IcDangerAreaDTO dto, @LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); icDangerAreaService.save(dto); return new Result(); } @@ -63,10 +93,70 @@ public class IcDangerAreaController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icDangerAreaService.delete(ids); + public Result delete(@RequestBody List ids,@LoginUser TokenDto tokenDto){ + icDangerAreaService.delete(ids,tokenDto.getUserId()); return new Result(); } + + @RequestMapping("list") + public Result> list(@RequestBody DangerAreaListFormDTO formDTO,@LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icDangerAreaService.list(formDTO)); + } + + @RequestMapping("export") + public void export(@LoginUser TokenDto tokenDto,@RequestBody DangerAreaListFormDTO formDTO,HttpServletResponse response){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ExcelWriter excelWriter = null; + int pageNo = NumConstant.ONE; + formDTO.setPageSize(NumConstant.ONE_THOUSAND); + try { + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("风险地区", response), IcDangerAreaResultExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + Integer size; + do { + PageData list = icDangerAreaService.list(formDTO); + List data = list.getList(); + if (CollectionUtils.isNotEmpty(data)){ + data.forEach(d -> { + d.setDangerLevel(DangerLevelEnum.getNameByCode(d.getDangerLevel())); + }); + } + excelWriter.write(ConvertUtils.sourceToTarget(data,IcDangerAreaResultExcel.class), writeSheet); + formDTO.setPageNo(pageNo++); + size = data.size(); + } while (size == NumConstant.ONE_THOUSAND); + }catch (Exception e){ + log.error("export exception", e); + }finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + + /** + * @Description 模板下载 + * @param response + * @Author zxc + * @Date 2022/11/1 09:52 + */ + @PostMapping("downloadTemplate") + public void downloadTemplate(HttpServletResponse response) throws IOException{ + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("风险地区导入模板", "UTF-8") + ".xlsx"); + InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ic_danger_area_template.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java index 9d895750f9..e7a4968bea 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java @@ -51,4 +51,6 @@ public class IcDangerAreaEntity extends BaseEpmetEntity { */ private String allName; + private String allNameCode; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DangerLevelEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DangerLevelEnum.java new file mode 100644 index 0000000000..9c3441043c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DangerLevelEnum.java @@ -0,0 +1,55 @@ +package com.epmet.enums; + +/** + * desc:数据同步配置枚举 对应data_sync_config中的DATA_CODE + * @author Administrator + */ + +public enum DangerLevelEnum { + + LOW("0", "低风险"), + MIDDLE("1", "中风险"), + HIGH("2", "高风险"), + OTHER("3", "无风险"), + + ; + + private final String code; + private final String name; + + + + DangerLevelEnum(String code, String name) { + this.code = code; + this.name = name; + } + + public static DangerLevelEnum getEnum(String code) { + DangerLevelEnum[] values = DangerLevelEnum.values(); + for (DangerLevelEnum value : values) { + if (value.getCode().equals(code)) { + return value; + } + } + return DangerLevelEnum.OTHER; + } + + public static String getNameByCode(String code) { + DangerLevelEnum[] values = DangerLevelEnum.values(); + for (DangerLevelEnum value : values) { + if (value.getCode().equals(code)) { + return value.getName(); + } + } + return DangerLevelEnum.OTHER.getName(); + } + + + public String getCode() { + return code; + } + + public String getName() { + return name; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaResultExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaResultExcel.java new file mode 100644 index 0000000000..6aa4f89e5b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaResultExcel.java @@ -0,0 +1,22 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * @Author zxc + * @DateTime 2022/11/1 10:26 + */ +@Data +public class IcDangerAreaResultExcel { + + @ColumnWidth(40) + @ExcelProperty(value = "风险地区") + private String allName; + + @ColumnWidth(20) + @ExcelProperty(value = "风险等级") + private String dangerLevel; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java index 88e680c180..9baf3e2b99 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.dto.form.DangerAreaListFormDTO; import com.epmet.entity.IcDangerAreaEntity; import java.util.List; @@ -36,6 +37,8 @@ public interface IcDangerAreaService extends BaseService { */ List list(Map params); + PageData list(DangerAreaListFormDTO formDTO); + /** * 单条查询 * @@ -74,5 +77,5 @@ public interface IcDangerAreaService extends BaseService { * @author generator * @date 2022-10-31 */ - void delete(String[] ids); + void delete(List ids,String staffId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java index 0e7a4d5b2f..498712ae68 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java @@ -1,21 +1,30 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcDangerAreaDao; import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.dto.form.DangerAreaListFormDTO; import com.epmet.entity.IcDangerAreaEntity; import com.epmet.service.IcDangerAreaService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -44,6 +53,24 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl list(DangerAreaListFormDTO formDTO) { + PageData result = new PageData<>(); + LambdaQueryWrapper qr = new LambdaQueryWrapper<>(); + qr.like(StringUtils.isNotBlank(formDTO.getName()),IcDangerAreaEntity::getAllName,formDTO.getName()) + .eq(StringUtils.isNotBlank(formDTO.getDangerLevel()),IcDangerAreaEntity::getDangerLevel,formDTO.getDangerLevel()); + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectList(qr)); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + result.setList(ConvertUtils.sourceToTarget(pageInfo.getList(),IcDangerAreaDTO.class)); + }else { + List entities = baseDao.selectList(qr); + result.setTotal(entities.size()); + result.setList(ConvertUtils.sourceToTarget(entities,IcDangerAreaDTO.class)); + } + return result; + } + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); @@ -59,10 +86,38 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl qw = new LambdaQueryWrapper<>(); + qw.eq(IcDangerAreaEntity::getAllName,dto.getAllName()); + IcDangerAreaEntity icDangerAreaEntity = baseDao.selectOne(qw); + if (null != icDangerAreaEntity){ + throw new EpmetException(EpmetErrorCode.DANGER_AREA_ERROR.getCode()); + } IcDangerAreaEntity entity = ConvertUtils.sourceToTarget(dto, IcDangerAreaEntity.class); + String[] split = dto.getAllName().split("-"); + for (int i = NumConstant.ZERO; i < split.length; i++) { + switch (i){ + case NumConstant.ZERO: + entity.setProvince(split[i]); + break; + case NumConstant.ONE: + entity.setCity(split[i]); + break; + case NumConstant.TWO: + entity.setDistrict(split[i]); + break; + default: + break; + } + } insert(entity); } @@ -75,9 +130,13 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl ids,String staffId) { + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.in(IcDangerAreaEntity::getId,ids) + .set(IcDangerAreaEntity::getUpdatedBy,staffId) + .set(IcDangerAreaEntity::getUpdatedTime,new Date()) + .set(IcDangerAreaEntity::getDelFlag, NumConstant.ONE_STR); + baseDao.update(null,updateWrapper); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_danger_area_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_danger_area_template.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..764d637a6ad1bafcf6d9d86ed0ca59c8ae81a554 GIT binary patch literal 9140 zcmai41yr2Lvc}zALa>40?(XguoZxPQyE_a)f`tGH!7ahv-QC?KXdp}sPrg?_4otaA7Txh zb7f56U|?(zU|?u}7c+ElU~sp!`4HD81Idgfei`_HR&LKqPo}~`9T?6FtL;L>YCqp9 zhY`OsdPC3POnL=tcW$qCi^PgKT2KpgGdS96{tlOEpO#j+8dOc0m*6M?k7p`ttHIr* znE?V(!BfdoTU(Rl>A*QN{J3;qD}jt9fQZ1R+;ooFHH(I>3Y7?Ttdw`AIUtO1Jf}4) zlA-1Lx}OUkWRqqZhQtAv8w}iRMzpj_uew?pA1?$k>N37G+dgR}X4 zZExc~q+*R%5OQuwPwFsem3~-T$$}sLhC^Q5~tCoB!G;~wQQ?JuvwL!XBjiI*wGzesy2d+ zTMCRSJSQq{~I` z64Zy4m=i>VG2K>s$6M)}YrM#<6RDiO=%pjyU3&0|0pIBA7OTbXWk#rShs4quUMj~oCGML{ZN1R=S8_J#tDhSI zZkJsITg(v~ZvloP2r~G3Od`uS-R2iQ-KWAt3lEZ?*#MO!velX_p6uiqVApSd-WqJK z{EoWX07oh1BkD+xsAK+yx{H&uz3mh3IdQ^@K}=XZ$CSRX<6f53*{u+CL7-0e(at(v zYE$xnq)O9zyp{&NZMK(LFV-{ECUnrc<>l;S38VCT}ss76{!;gS|5xSYI4 z<{{oc>t2U^g7u#>3gjcK?lynql7ALJ`6b|H543i&Fg104o_ES-_BeeXt=PbUf#Lm^ z>>n!3Pl2k^Xag;9pf%y{3c`tvsggyM)6JD0k}MC|L9&UDR_>+Jj&XcV%zv9$wV>KU zvNOaT_KC{V3bpCnJ`mzQ3PoDFdL8Q|2gU{z+R@XK+7q{OR$clM z(g8ZG!7zQ#%WDyYHU*oWYk8Zi;;T_j2f_%R@ZXQpwp7-|kRJuw(VnQl40sHaMCG1m zd_I8oj5MDihw>#nO&gOSn#-W%EThUx&E=MY_7H?uZtRDH)mnuMo)Gl2jvUr0L+_74 ztARPVo3|@d8OnAQJ7m`6cL;Fq)H*L_0KtVAX>lGN zGJG*;N8)br4X)BmPs2IxR1S5RNfTvyn}uh2azuSF5pvL4V%{;W1yMS63}1Vlg+_W} z4d_aPZDgQunlWF+#Fz&OfR{e<84I}TjJ&~DHy zDEM$@@o)l*G|Y~Alj6a&dC_vF>l0vpa>tlUeDB-f_u%?)G$ToTf74X;qlKUA0BM_; z2%1L&dd^FDGgO$GOHY(SL@v*@8eM<}10%uzm45#e`$PDT zQ+=ox>`zjRh$#P6K zVA+#u9!APvf81b$L;O9&H6ju4HLc1gtDas`dLskC(fhTH!4u@Vdf$~&=XcMk-3Zz)r3?n2#CR+g)maL~e&6&&YKf!EYfVq(1Ub6cxcY;&Ut zA%LSIrpa?BB2=(OAl?2XTjv&S(G!L*;>yyFnsclS0PyWzso(9qb}dsIRWKCWg3;-) z%X&a)XeUXx+vE0NV|Z0ELwK>Rzh?lMuiJB>b7$6~bu$5m1@&b-J!-Gw>&o&mJ3=vd zzaWqIrFPR{S_tQ@eVOC3b-o{BnQ-014S_Gyt_T)=Bh1!SH$k($y{*duj(!l(+X;E4 z@aSTn{!xmVV$T^_&z7yGA!;h=Eqpetf_sB9ab-2ajx3g%sFt2pB)sfauD0wbWH&6B zl29Z-nxA{*1PWTIMNh0R1@ri=*jKfQETZV>oogkM>CnmO3^=Ynlb)6g(phxbvND6) ztD7#?a2_h8xuv{^i_FD3*t1bwcDcKq&7I>A>qENt2(0d4IK5sHnxbOBX+t+RutDJ`j8 zR1%%#Ld;jLwMPT95Xvb*8tXjuKMK&nir)pa$t8EceRrcn-7rQ^SdmS=V?J`y0+ z(2bR9O?`v8xAbaRfNc0}bnh(9=bSNcX%a>!Tw$py?DyGT%L3V@>X#>9V}g+b@`G;S zRB5AUM&&+rZUKWatYB`@`ewy}Tsr{~2Z->gASP3N!A_A{8#_nMvbb|X65^vu;xP{+ z@;ZQO@`z|>O2oIXmYfpO+wCaQ1n*~KyRc-iJZe&%+hS9iL?_*PA!Rsof4*$fs2{-z zY{*Kd%rOnff5m##yTv|Od_y$62W42oLh>z1{}q5=wedUt@_=j4%0_3M2Z~0gC+3kL z)fhjUtiACp_5uBVlSs>JiwD25(f2>j7G}0`u!3ZYI^OuMPwyO?Y@B+DP!aWWcZG>$ zwnDRIIe-QAD;V%NdJqj5UFEy7$h}!3169WKq}~Siy5nUdDIBvKa7T!(@nGn8LoE_q ze3__epU?t!w%<-`6%`PgF}#H6+j6f`26e;;Z||B}dnC{-Sy#t3pEAHvEpU<=%9$n1 zy1uobhf#lfen$|vP4e;e4-L&qB02`z%P6&yuV7ZD8mqyZZFPkkocnJeBphr-u)=5* zJqmH>ruw|!r!Hg36+sl9sAT8+o8~S=9&~RNOl{@3g5-1n(ZCAn-QL}oltx(VpLnKr zJuDh6OBV(bwa?Y4A~o^Yw38oVy2PE3U5n<0R8^@h_CGk^Zo5LtPzq`FWVRj>2~grs zf|OqAh>^QrV@qY&Uqw;Lc87c;Mc)CR`IJy3ECSemNg>_ydVq04NVSACO~)1yYV8BX z42+h?Ot0|xAz-5q3U*wsf%y~J2S4bLk*fA+sI+@daZbirph# zVF)Et_OfuZ8dtjps6f>K1=SdxnSGFvO^P>}l%O?u?l{NoEo-|(J zif*l5gw7m!`b67m2#?@wi3UBAJkE{`k>y=S$TcD)p&;1lZd=15{yQ>UIOO>|*xyTW z1%#Ueg~tj}L=g-O`PU=E$=Sok)aj|Vo6@z8UC_k82X*>=(QSk6l=B`a;Y}Sk=^mFs z)GiPgflxEWFz=2xMy*yIqSG!IrH71)46awwEa@yS`skenNf%y{WP3TnX1R^&7jT(w zoGA-@VV+y(PEe4*StuEVJw(iHF^-QI_d_#6)fWWeHhi8jL5Y z3CPHe(WN%_;>T2O3okn}1NbK38%flR;K)zPK|WJQyqlo4xiSL*zu;pYi!gLCVp2AG zXXGAzp!v#05SktxIzDDRlK~m^;)->Cwe3prk;T03`iWjLrYmWMzQOSLp>$gX`&Et9 z2~2OMrLLS;5zM+3B6e*uDbr~Rce3M6V?YW8eV5Z(+pbwkGF$UzHG=X|wauBG0Ux+A7Da<34hCcwFH4YiY$X znY?!S*bdb*rLoWT0_y-Sp$ny;Rxdn@)sa7zQady`7h)P7O{BjH0OyT4(@ zlt^5)cQNgt2Bu9((m++YJ||sMGr_ewr5}AW1MBs{X_aAzb)V)dN0*9dec7aUlU592 zGeJd73&o7QVHmnP@AMj~8VGb>Z#J90t_R4}elw80SnHmy>g~B(IE&)r%qq$0U59bM zHUk>ZSy?M!4C%6!hzq=Sn!y;NwZiA(EaOPC^qMYYXj){|D!GYt*wX%36|Cr@PHtgn zhHD*|I{%QSj-Y65NY;cKtT+2c=F-)<@|$9*t-Xf=V`zlj?h$cTi=#t$F1zpxSReNZ zmxZ4JD?e6ksdJ(Y+bW50QY<`GKydUcNnN`IwPoyp0XwDA9=;%fX1c+Np|qRR6F>TEwU=6E;r3VPZst-0Pu^4Z ziaMqlp>veG9C_GoQf*hnk*7>ZfYv{8^g{;Gr}h^Q=A>4$CW{$aG7L3VZ*NMh?9~Se z3?a|k#g(7lSTYmJX^}Z%O(<=nN%;?c)MSZv=KC^gm8@P>S*XrI^I1Vxp}GC9EWkH#g*fAj+EMSzf3*KRMkCt_4xpAO6UThs*| z+mWTqpCDA;Q3bpPqDsG|fLN3{XMugw3UOF`jB3gkD67{rhaIBFS6)H)8JP1|yHL{* z2Da+~i9XG#R;>(8L@-|`B2Eoa*oK=!<98=T3ISBQaugnbHmxo-l`v{)gdFe+rd$d+ zc=IbS(|dLy;asd$F42PR`oK{tja<#uhFcclx0N5$zr3g-Et<`nTJPJ60`K{Nu<5KB zTtDv+2o4>XK-lS?DLRUyFHNLD5LxzFsV7Q}h1>1mi@&}cK=`Y(SnvgyLZ1sLoDUd6 zgpRI@#WPx)a=(=($u*&+MB(DR%4z9n_`Nwx8>mDOa>1Dno27(sjWlD>wLOcwVYsxq9B90Y9RX$MO>ff@48gf47femKD_|XrjkB4wz~=~kAwy?_P;j4vhSPY$}THd);+Kd@0!?h%eyd zecva!Vc?T16h}toFa9EdMZk@vud8<*f<47S7>-r_jUB_7_$TNbN&Mll1laM3?|_KY z4cypJR0Y+D{99H83oQUf30;%$i!nlV!S1fkFrS_344`lmb595#9#6qtOD0n09o@Sq z9$$$7;;R%a+JGnoF>Bc9#m+FdS9=C`r(Gw>EqHf#L28s%{P^g;Nv83Xth%i&(zRLD zQI5=~6VOf-;I)_>MzdNfy#P2S{?2gLzKyS#DduUAt2I*$U$L^bU!+b<*f=#KMUw4xys#+lHGNhOM)VD@E{GBhDR zhP-6vGU45x^VNx42kfOJv7fYMmr~#o0G__k@Rfm5d;}RKy;pXu;;`U#Q2QG+NLY|y z-zMMn`R(T2Sko(|b4lX67z8ZiT)HV{RxpdRHRP8twAacYX-&)~OVDbCR&+Su29Gpb zxB6Mwd~89t(Kjigc&+UMn{e!At2U!NsEW0YpNyG;!D$}%Yp@0GjjLUWNfSQzb64Mr zzW11y33%JzX2R~o>PP!J$>4{hQ^>0XV&$N1z;R3i>dn&Re4rH8lC9ebqxMYN}jXpOf9KAPEA95 zB?}o%EmSI6Jx}P{;hdl<5pkC1>tk0bfae7X1heP(Kh{`k4Y_E;}yqU`N#6hl`hGnHpxCc`v$ilyb6o_Z+AMo zUtg-+f5^Tnfy?L$Xz3?$Cfrwadp~tETxx4GS!rh5!SdluqG@q)j!LIwdl;lQgH&?C zV1jhxSa%><&wc^v z`5*OX#n-alA!RCAdYa+EkqUK|NmeBlsUg{6#lAt=8g&F@$B8N>6)FblL0Rd+z7g3f z^+Gv%jq;j}t#WDx24%4QA=+y7eky9}FXJcsbM zx}e1iBB;CY3koRexNjt2V9ajnB2qnM5c;ljJSeJVC}j|GJW@k)3Wk}QKgc`gevpq? z8tC$2G%xk$G4Ghj(BrtFaOJomaWtvhvF6P@)&?@#AgqF1gl^KRd=KsY~~>UqF@1ti$-#kf~|IoPX5JQg2csJ}3I>dzY4+gm@C<1xze ziXBWyP2{J+ufcoJnV{(S80|9zySgyKS^B=gTJ2!ge!zQoY-En{M%IYhW0Z zXN?!6UgM-!FVBX{u72x_eX&=%rbWe>*nZ2Xxt4a}gQ$_qH==TT^*)Q^D*eoyiK`ll zu%X{m;x!K6UKqO9YSNj1ehpowEymLc>4G3o%I_z4{Vz>%m`6+vfTlLjd);1Ku8j|m z|E)ao5r}`vFg!_?#E-~yGNE-J2OgtsH_N+Wqt7`rl6{jm@$pZQdl;p}jMqABZW30e zo2-Y8O}*ZJzv6AuK)6Jr&zuWt40KTr6teGiZB{<xXoqUpKQsCn z9JI}sIL`ox)ALptWeMY@POu!?Q&SSkBBHzY+ha&b$y#gQ(xM^}M3k|Jy9T4-Wor@bw1Os8@{iYJ)j)4>CPrKfW<$wPqM zKni$9U*z`x_80#N&aIPAc!!TL)<42Y@c8+7w10{HeKY?DU8~0(-F+O?6g1}JI3B|+ z@j<^kYo^2t%$U~C!U$GY=Y36P??J;Z3p(U+Py;&b+awj)H{QQ)9kJ z63^8}ohGu4@l4nm;kmo;2d)+TSQeW9`AR9w@$KeAld*ag%F3soN6aVh;N)ZEcLllo z+yUJjQ@t=aTXNyT24Nn$*r7cN`cAni=OtG|X{U6&?c6@`o;*=HNL^`2c`2YtlCwca z>Np!&9$dVpE61&8P1yWXZ71``bB_Gjh<)O~bVTj#oK5YV4b(gwOr7+e&U;DXfC2dAMytlAyJY zq!622o+>uD&;(cT%vmZnBTh&@%fLz!Dok4 zU7Qwy7M(;Er`qhi@2_G9kFCDVKD+DBX%cjr9qhX8)>?fO^C?1Gm>Gw;2|<>l_6+#K zM@S*Gutgm-dp=Q+Bt(EHi>@|WT`cr206MI}hm z+LpWOcd!wIy2v2=AoWeI2ThpD1}vU^D&xmd{)?!li@0f+`z0Y9eqjaY0{h$>2Fe&uR0&v_l@Z^q)@uL!v)df6o8@ zrT+6VW&EZ7CmZ~4i+*A{e~qU_t3drP@A Date: Tue, 1 Nov 2022 11:04:34 +0800 Subject: [PATCH 037/161] .. --- .../java/com/epmet/commons/tools/enums/DictTypeEnum.java | 4 ++++ .../main/java/com/epmet/constants/ImportTaskConstants.java | 4 ++++ .../src/main/java/com/epmet/dto/IcTripReportRecordDTO.java | 6 +++++- .../main/java/com/epmet/dto/form/IcTripReportFormDTO.java | 6 +++++- .../java/com/epmet/entity/IcTripReportRecordEntity.java | 6 +++++- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index 07d47ba7b0..fcf79a3c89 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -29,6 +29,10 @@ public enum DictTypeEnum { IC_DANGER_TYPE("ic_danger_type","危化品种类",24), POLICY_LEVEL("policy_level","政策级别",25), LOG_TYPE("log_type", "日志类型", 33), + TRAFFIC_TYPE("traffic_type", "日志类型", 36), + SOJOURN_HISTORY("sojourn_history", "日志类型", 37), + ISOLATE_TYPE("isolate_type", "日志类型", 38), + TRIP_DATA_TYPE("trip_data_type", "日志类型", 39), ; private final String code; diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index a8621ce09d..1d9190c9db 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -41,6 +41,10 @@ public interface ImportTaskConstants { * 行程上报 */ String BIZ_TYPE_IC_TRIP_REPORT = "ic_trip_report"; + /** + * 磐石-行程上报 + */ + String PS_BIZ_TYPE_IC_TRIP_REPORT = "ps_ic_trip_report"; /** * 处理状态：处理中 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 50aad8dad1..63d5d28ffa 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -247,7 +247,7 @@ public class IcTripReportRecordDTO implements Serializable { */ private String sourceDetailAddress; /** - * 疫苗接种针次 (1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ private String vaccineNum; /** @@ -278,6 +278,10 @@ public class IcTripReportRecordDTO implements Serializable { * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否达到曹县 0:否 1:是【磐石】 + */ + private String isArrive; /** * 上报时间【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 34d1668c8d..6160420fee 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -189,7 +189,7 @@ public class IcTripReportFormDTO implements Serializable { */ private String sourceDetailAddress; /** - * 疫苗接种针次 (1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ private String vaccineNum; /** @@ -220,6 +220,10 @@ public class IcTripReportFormDTO implements Serializable { * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否达到曹县 0:否 1:是【磐石】 + */ + private String isArrive; /** * 上报时间【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 14b22ed70e..ffbfa4fe1f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -128,7 +128,7 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { */ private String sourceDetailAddress; /** - * 疫苗接种针次 (1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ private String vaccineNum; /** @@ -159,6 +159,10 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否达到曹县 0:否 1:是【磐石】 + */ + private String isArrive; /** * 上报时间【磐石】 */ From 88cf31cb0e3559b8e60770c52bbe33d987e5bba7 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 1 Nov 2022 11:24:44 +0800 Subject: [PATCH 038/161] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=85=B0=E5=9B=BE=E8=A7=86=E5=9B=BE=E7=9A=84jdbcTempl?= =?UTF-8?q?ate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/pom.xml | 4 +- .../jdbc/config/JdbcDataSourceConfig.java | 64 +++++++++++++++++++ .../epmet/jdbc/config/JdbcTemplateConfig.java | 30 +++++++++ .../src/main/resources/bootstrap.yml | 16 +++++ 4 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcDataSourceConfig.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index ba67ff8170..831b99e408 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -28,11 +28,11 @@ epmet-commons-mybatis 2.0.0 - + org.springframework.boot spring-boot-starter-web diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcDataSourceConfig.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcDataSourceConfig.java new file mode 100644 index 0000000000..597ff902a5 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcDataSourceConfig.java @@ -0,0 +1,64 @@ +package com.epmet.jdbc.config; + +import com.alibaba.druid.pool.DruidDataSource; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +import javax.sql.DataSource; + +/** + * jdbc连接外部数据源配置 + */ +@Configuration +public class JdbcDataSourceConfig { + + // ----------------对接兰图的数据源------------------- + @Value("${spring.datasource.yantai.lantu.driver-class-name}") + private String yantaiLantuDriverClassName; + @Value("${spring.datasource.yantai.lantu.url}") + private String yantaiLantuUrl; + @Value("${spring.datasource.yantai.lantu.username}") + private String yantaiLantuUsername; + @Value("${spring.datasource.yantai.lantu.password}") + private String yantaiLantuPassword; + + @Value("${spring.datasource.yantai.lantu.initial-size}") + private Integer yantaiLantuInitialSize; + @Value("${spring.datasource.yantai.lantu.max-active}") + private Integer yantaiLantuMacActive; + @Value("${spring.datasource.yantai.lantu.min-idle}") + private Integer yantaiLantuMinIdle; + @Value("${spring.datasource.yantai.lantu.max-wait}") + private Long yantaiLantuMaxWait; + @Value("${spring.datasource.yantai.lantu.pool-prepared-statements}") + private Boolean yantaiLantuPreparedStatements; + @Value("${spring.datasource.yantai.lantu.max-pool-prepared-statement-per-connection-size}") + private Integer yantaiLantuPspcs; + @Value("${spring.datasource.yantai.lantu.time-between-eviction-runs-millis}") + private Long yantaiLantuTberm; + @Value("${spring.datasource.yantai.lantu.min-evictable-idle-time-millis}") + private Long yantaiLantuMeitm; + + // ----------------对接兰图的数据源------------------- + + /** + * 烟台-连接兰图的数据源 + * @return + */ + DataSource createYantaiLantuDataSource() { + DruidDataSource druidDataSource = new DruidDataSource(); + druidDataSource.setDriverClassName(yantaiLantuDriverClassName); + druidDataSource.setUrl(yantaiLantuUrl); + druidDataSource.setUsername(yantaiLantuUsername); + druidDataSource.setPassword(yantaiLantuPassword); + druidDataSource.setInitialSize(yantaiLantuInitialSize); + druidDataSource.setMaxActive(yantaiLantuMacActive); + druidDataSource.setMinIdle(yantaiLantuMinIdle); + druidDataSource.setMaxWait(yantaiLantuMaxWait); + druidDataSource.setPoolPreparedStatements(yantaiLantuPreparedStatements); + druidDataSource.setMaxPoolPreparedStatementPerConnectionSize(yantaiLantuPspcs); + druidDataSource.setTimeBetweenEvictionRunsMillis(yantaiLantuTberm); + druidDataSource.setMinEvictableIdleTimeMillis(yantaiLantuMeitm); + return druidDataSource; + } +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java new file mode 100644 index 0000000000..4f8be141f3 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java @@ -0,0 +1,30 @@ +package com.epmet.jdbc.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.AutoConfigurationPackage; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.core.JdbcTemplate; + +import javax.sql.DataSource; + +/** + * jdbcTemplate配置类 + */ +@Configuration +public class JdbcTemplateConfig { + + @Autowired + private JdbcDataSourceConfig jdbcDataSourceConfig; + + /** + * 烟台-兰图-jdbcTempalte对象 + * @return + */ + @Bean + JdbcTemplate yantaiLantuJdbcTemplate() { + DataSource yantaiLantuDataSource = jdbcDataSourceConfig.createYantaiLantuDataSource(); + return new JdbcTemplate(yantaiLantuDataSource); + } +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index 11018f0592..184c73ee7b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -52,6 +52,22 @@ spring: wall: config: multi-statement-allow: true + # 对接兰图数据源 + yantai: + lantu: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + username: root + password: root + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From d0718826e903559ff84d386ee2c2c698ac40342f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 1 Nov 2022 13:51:46 +0800 Subject: [PATCH 039/161] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partymember/IcPartyMemberDTO.java | 15 +++++++++++++++ .../form/IcPartyMemberFromDTO.java | 4 ++++ .../entity/IcPartyMemberEntity.java | 15 +++++++++++++++ .../excel/IcPartyMemberImportExcel.java | 9 +++++++++ .../main/resources/excel/ic_party_member.xlsx | Bin 12293 -> 12475 bytes .../mapper/partymember/IcPartyMemberDao.xml | 3 +++ .../service/impl/IcResiUserServiceImpl.java | 7 ++++++- .../excel/ic_resi_import_template.xls | Bin 74240 -> 77824 bytes .../ic_resi_info_cid_for_easy_excel.xlsx | Bin 25515 -> 26796 bytes 9 files changed, 52 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java index 9832a35e5e..6dcaf93a75 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java @@ -110,6 +110,21 @@ public class IcPartyMemberDTO implements Serializable { */ private String isDyzxh; + /** + * 入党时所在党支部 + */ + private String rdsszzb; + + /** + * 组织关系转入社区时间 + */ + private String zzgxzrsqsj; + + /** + * 是否请长假 + */ + private String isQcj; + /** * 是否免学习0否,1是 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java index 5ded6b154c..c31343d3c1 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java @@ -82,4 +82,8 @@ public class IcPartyMemberFromDTO extends PageFormDTO implements Serializable { private String payEndDate; private String year; private String month; + /** + * 是否请长假 + */ + private String isQcj; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java index 1f6a367d80..1133a77bc1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java @@ -98,6 +98,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity { */ private String isDyzxh; + /** + * 入党时所在党支部 + */ + private String rdsszzb; + + /** + * 组织关系转入社区时间 + */ + private String zzgxzrsqsj; + + /** + * 是否请长假 + */ + private String isQcj; + /** * 是否免学习0否,1是 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java index ac937ae045..eca3bdef44 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java @@ -56,6 +56,15 @@ public class IcPartyMemberImportExcel { @ExcelProperty("文化程度") private String culture; + @ExcelProperty("入党时所在党支部") + private String rdsszzb; + + @ExcelProperty("组织关系转入社区时间") + private String zzgxzrsqsj; + + @ExcelProperty("是否请长假") + private String isQcj; + @ExcelProperty("备注") private String remark; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/excel/ic_party_member.xlsx b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/excel/ic_party_member.xlsx index d663ad01c509d4df88563c6b07ffe92856504cf0..b7643ae3063851f89efb524fc40bef75fecdce6e 100644 GIT binary patch delta 3638 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 AND a.IS_MXX = #{isMxx} + + AND a.IS_QCJ = #{isQcj} + AND a.CULTURE = #{culture} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 4b7a485d71..5e6d96668a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -63,7 +63,6 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.*; -import com.epmet.excel.DataSyncRecordDisabilityExcel; import com.epmet.excel.EpidemicPreventionExportExcel; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; @@ -373,6 +372,9 @@ public class IcResiUserServiceImpl extends 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 S3~Y^?{)K29XSe_D68L{IYsGW` diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx index 0dfc8ad7f407867700b7df5b350e92406b074fef..7d0305a997a0681c560f643ca140547e2e9cabf9 100644 GIT binary patch literal 26796 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 Zh}2R8p~A^uBPbc*5OqmfWc^p`e*iA>7DWI6 literal 25515 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�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 From 3f5a2163814ef2188af4801abbe473acf067a115 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 1 Nov 2022 14:31:39 +0800 Subject: [PATCH 040/161] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/DictTypeEnum.java | 8 +- .../IcTripReportRecordController.java | 71 ++++- .../excel/IcPsTripReportRecordExcel.java | 109 ++++++++ .../error/IcPsTripReportRecordErrorExcel.java | 32 +++ .../service/IcTripReportRecordService.java | 5 + .../impl/IcTripReportRecordServiceImpl.java | 249 +++++++++++++++++- 6 files changed, 465 insertions(+), 9 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index fcf79a3c89..57b2461c1e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -29,10 +29,10 @@ public enum DictTypeEnum { IC_DANGER_TYPE("ic_danger_type","危化品种类",24), POLICY_LEVEL("policy_level","政策级别",25), LOG_TYPE("log_type", "日志类型", 33), - TRAFFIC_TYPE("traffic_type", "日志类型", 36), - SOJOURN_HISTORY("sojourn_history", "日志类型", 37), - ISOLATE_TYPE("isolate_type", "日志类型", 38), - TRIP_DATA_TYPE("trip_data_type", "日志类型", 39), + TRAFFIC_TYPE("traffic_type", "交通方式", 36), + SOJOURN_HISTORY("sojourn_history", "7天内旅居史情况", 37), + ISOLATE_TYPE("isolate_type", "隔离状态", 38), + TRIP_DATA_TYPE("trip_data_type", "行程记录类型", 39), ; private final String code; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index aea630040c..74139ac33d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -31,11 +32,13 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -246,7 +249,6 @@ public class IcTripReportRecordController implements ResultDataResolver { } } - /** * 导入excel * @return @@ -300,4 +302,71 @@ public class IcTripReportRecordController implements ResultDataResolver { icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId()); return new Result(); } + + /** + * pc:磐石-行程上报-下载模板 + * @param response + * @throws IOException + */ + @RequestMapping(value = "psdownloadtemplate", method = {RequestMethod.GET, RequestMethod.POST}) + public void psDownloadTemplate(HttpServletResponse response) throws IOException { + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + //response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("行程上报导入模板", "UTF-8") + ".xlsx"); + + InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ps_trip_report_import_template.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + /** + * 磐石-导入excel + * @return + */ + @PostMapping("psimport") + @Transactional(rollbackFor = Exception.class) + public Result psImportExcel(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws Exception { + if (file.isEmpty()) { + throw new RenException("请上传文件"); + } + + // 校验文件类型 + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + if (!"xls".equals(extension) && !"xlsx".equals(extension)) { + throw new RenException("文件类型不匹配"); + } + //1.查询当前工作人员是否有再导入的党员先锋数据,有则不允许导入，没有则进行新的导入 + ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); + importTaskForm.setOriginFileName(file.getOriginalFilename()); + importTaskForm.setOperatorId(tokenDto.getUserId()); + importTaskForm.setBizType(ImportTaskConstants.PS_BIZ_TYPE_IC_TRIP_REPORT); + Result result = commonServiceOpenFeignClient.createImportTask(importTaskForm); + if (!result.success()) { + throw new RenException(result.getInternalMsg()); + } + InputStream inputStream = null; + try { + inputStream = file.getInputStream(); + }catch (Exception e){ + ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); + input.setOperatorId(tokenDto.getUserId()); + input.setTaskId(result.getData().getTaskId()); + input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + commonServiceOpenFeignClient.finishImportTask(input); + log.error("读取文件失败"); + } + //2.执行导入程序 + icTripReportRecordService.psExecAsyncExcelImport(tokenDto, response, inputStream, result.getData().getTaskId()); + + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java new file mode 100644 index 0000000000..011757b7d6 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -0,0 +1,109 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import com.epmet.commons.tools.utils.ExcelVerifyInfo; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +/** + * 磐石-行程上报信息 + * + */ +@Data +public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { + + @Excel(name = "姓名", needMerge = true) + @NotBlank(message = "不能为空") + private String name; + + @Excel(name = "年龄", needMerge = true) + //@NotNull(message = "不能为空") + private Integer age; + + @Excel(name = "证件号", needMerge = true) + @NotBlank(message = "不能为空") + private Integer idCard; + + @Excel(name = "户籍地（省市县区）", needMerge = true) + @NotBlank(message = "不能为空") + private String presentAddress; + + @Excel(name = "手机号", needMerge = true) + @NotBlank(message = "不能为空") + private String mobile; + + @ExcelCollection(name = "来源地") + private List source; + + @Excel(name = "来曹事由（100字以内）", needMerge = true) + @NotBlank(message = "不能为空") + private String describe; + + @Excel(name = "48小时核酸检测", needMerge = true) + @NotBlank(message = "不能为空") + private String natOutcome; + + @Excel(name = "来到本地时间（2022-01-01）", needMerge = true) + @NotBlank(message = "不能为空") + private String arriveDate; + + @ExcelCollection(name = "在曹居住地点") + private List present; + + @ExcelCollection(name = "返回方式") + private List traffic; + + @Excel(name = "7天内旅居史情况", needMerge = true) + private String sojournHistory; + + @Excel(name = "隔离状态", needMerge = true) + private String isolateType; + + @Excel(name = "备注（500字以内）", needMerge = true) + private String remark; + + @Excel(name = "是否落实“落地检”", needMerge = true) + private String isArriveCheck; + + @Excel(name = "是否达到曹县", needMerge = true) + private String isArrive; + + @Excel(name = "上报时间（2022-01-01）", needMerge = true) + private String reportingTime; + + @Excel(name = "管控措施（500字以内）", needMerge = true) + private String controlMeasures; + + @Excel(name = "类型（省内、省外、市内、县内）", needMerge = true) + private String tripDataType; + + + @Data + public class Source { + @Excel(name = "社区（省-市-区-街道-社区）") + @NotBlank(message = "不能为空") + private String sourceAddress; + @Excel(name = "详细地址", width = 20) + private String sourceDetailAddress; + } + @Data + public class Present { + @Excel(name = "村/居") + @NotBlank(message = "不能为空") + private String presentAddress; + @Excel(name = "详细地址", width = 20) + private String detailAddress; + } + @Data + public class Traffic { + @Excel(name = "返回方式") + @NotBlank(message = "不能为空") + private String trafficType; + @Excel(name = "其他返回方式", width = 20) + private String trafficTypeExplain; + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java new file mode 100644 index 0000000000..a330e40462 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java @@ -0,0 +1,32 @@ +package com.epmet.excel.error; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Date; + +/** + * 磐石-行程上报信息 + * + */ +@Data +public class IcPsTripReportRecordErrorExcel { + + @Excel(name = "姓名", width = 20) + private String name; + + @Excel(name = "证件号", width = 25) + private Integer idCard; + + @Excel(name = "户籍地（省市县区）", width = 40) + private String presentAddress; + + @Excel(name = "手机号", width = 20) + private String mobile; + + @Excel(name = "社会自组织名称", width = 40) + private String errorInfo; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index 32447f2d74..998e942b3d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -2,6 +2,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.IcTripReportFormDTO; import com.epmet.dto.form.MyReportedTripFormDTO; @@ -9,6 +10,8 @@ import com.epmet.dto.form.PageTripReportFormDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.entity.IcTripReportRecordEntity; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; import java.nio.file.Path; import java.util.List; import java.util.Map; @@ -102,4 +105,6 @@ public interface IcTripReportRecordService extends BaseService fileList = new ArrayList<>(); + IcPsTripReportRecordErrorExcel excel = null; + //1.读取Excel数据 + ExcelImportResult testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 3, IcPsTripReportRecordExcel.class); + //2.存在错误行数据时存入错误数据集合中 + if (CollectionUtils.isNotEmpty(testExcelImportResult.getFailList())) { + for (IcPsTripReportRecordExcel entity : testExcelImportResult.getFailList()) { + //打印失败的行 和失败的信息 + log.warn("第{}行,{}", entity.getRowNum(), entity.getErrorMsg()); + excel = new IcPsTripReportRecordErrorExcel(); + excel.setName(entity.getName()); + excel.setIdCard(entity.getIdCard()); + excel.setPresentAddress(entity.getPresentAddress()); + excel.setMobile(entity.getMobile()); + excel.setErrorInfo(entity.getErrorMsg()); + fileList.add(excel); + } + } + //3.正确行数据集合 + List list = testExcelImportResult.getList(); + if (CollectionUtils.isNotEmpty(list)) { + //3-1.校验数据值，把填写不对的数据剔除 + Iterator iterator = list.iterator(); + while (iterator.hasNext()) { + AtomicBoolean bl = new AtomicBoolean(false); + StringBuffer errMsg = new StringBuffer(""); + IcPsTripReportRecordExcel obj = iterator.next(); + //返回方式为其他时需要填写"其他返回方式" + if (CollectionUtils.isEmpty(obj.getTraffic()) || + ("其他".equals(obj.getTraffic().get(0).getTrafficType()) && StringUtils.isBlank(obj.getTraffic().get(0).getTrafficTypeExplain()))) { + errMsg.append("返回方式为其他时，请补充“其他返回方式”;"); + bl.set(true); + } + if (bl.get()) { + excel = new IcPsTripReportRecordErrorExcel(); + excel.setName(obj.getName()); + excel.setIdCard(obj.getIdCard()); + excel.setPresentAddress(obj.getPresentAddress()); + excel.setMobile(obj.getMobile()); + excel.setErrorInfo(errMsg.toString()); + fileList.add(excel); + iterator.remove(); + } + } + //3-2.获取需要的字典表数据 + //交通方式 + Result> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + //7天内旅居史情况 + Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); + //隔离状态 + Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + //行程记录类型 + Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); + //获取当前登录用户所属组织id + CustomerStaffInfoCacheResult staffInfo = queryCurrentStaff(tokenDto.getCustomerId(), tokenDto.getUserId()); + //风险地区数据 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcDangerAreaEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(IcDangerAreaEntity::getDelFlag, DelFlagEnum.NORMAL.value()); + List areaList = icDangerAreaDao.selectList(wrapper); + Map map1 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getDistrict, IcDangerAreaEntity::getDangerLevel)); + Map map2 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getCity, IcDangerAreaEntity::getDangerLevel)); + Map map3 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getProvince, IcDangerAreaEntity::getDangerLevel)); + + list.forEach(l -> { + //3-3.数据赋值 + AtomicBoolean bl = new AtomicBoolean(false); + StringBuffer errMsg = new StringBuffer(""); + IcTripReportRecordEntity e = ConvertUtils.sourceToTarget(l, IcTripReportRecordEntity.class); + e.setCustomerId(tokenDto.getCustomerId()); + e.setAgencyId(staffInfo.getAgencyId()); + e.setPids(staffInfo.getAgencyPIds()); + e.setUserType(IcResiUserConstant.USER_TYPE_IMPORT); + if (!CollectionUtils.isEmpty(l.getSource())) { + e.setSourceAddress(l.getSource().get(0).getSourceAddress()); + e.setSourceDetailAddress(l.getSource().get(0).getSourceDetailAddress()); + } + if (!CollectionUtils.isEmpty(l.getPresent())) { + e.setPresentAddress(l.getPresent().get(0).getPresentAddress()); + e.setDetailAddress(l.getPresent().get(0).getDetailAddress()); + } + if (!CollectionUtils.isEmpty(l.getTraffic()) && trafficTypeMap.getData().containsKey(l.getTraffic().get(0).getTrafficType())) { + e.setTrafficType(trafficTypeMap.getData().get(l.getTraffic().get(0).getTrafficType())); + e.setTrafficTypeExplain(l.getTraffic().get(0).getTrafficTypeExplain()); + } + if (StringUtils.isNotBlank(l.getSojournHistory())) { + e.setSojournHistory(sojournHistoryMap.getData().get(l.getSojournHistory())); + } else { + String[] str = e.getSourceAddress().split("-"); + if (str.length < 3) { + bl.set(true); + errMsg.append("数据不完整，‘来源地’信息填写格式错误;"); + } + e.setSojournHistory("4"); + if (map1.containsKey(str[2])) { + e.setSojournHistory(map1.get(str[2]).equals("2") ? "1" : ("1".equals(map1.get(str[2])) ? "2" : ("0".equals(map1.get(str[2])) ? "3" : "4"))); + } + if (map2.containsKey(str[1])) { + e.setSojournHistory(map2.get(str[1]).equals("2") ? "1" : ("1".equals(map2.get(str[1])) ? "2" : ("0".equals(map2.get(str[1])) ? "3" : "4"))); + } + if (map3.containsKey(str[0])) { + e.setSojournHistory(map3.get(str[0]).equals("2") ? "1" : ("1".equals(map3.get(str[0])) ? "2" : ("0".equals(map3.get(str[0])) ? "3" : "4"))); + } + } + if (StringUtils.isNotBlank(l.getIsolateType())) { + e.setIsolateType(isolateTypeMap.getData().get(l.getIsolateType())); + } + if (StringUtils.isNotBlank(l.getTripDataType())) { + e.setTripDataType(tripDataTypeMap.getData().get(l.getTripDataType())); + } + e.setIsArriveCheck("是".equals(l.getIsArriveCheck()) ? "1" : "0"); + e.setIsArrive("是".equals(l.getIsArrive()) ? "1" : "0"); + //必要字段没值的 + if (StringUtils.isEmpty(e.getSourceAddress()) || StringUtils.isEmpty(e.getPresentAddress()) + || StringUtils.isEmpty(e.getTrafficType())) { + errMsg.append("数据不完整，请检查‘来源地’、‘在曹居住地点’、‘返回方式’信息是否填写完整;"); + bl.set(true); + } + if (bl.get()) { + IcPsTripReportRecordErrorExcel el = new IcPsTripReportRecordErrorExcel(); + el.setName(l.getName()); + el.setIdCard(l.getIdCard()); + el.setPresentAddress(l.getPresentAddress()); + el.setMobile(l.getMobile()); + el.setErrorInfo(errMsg.toString()); + fileList.add(el); + return; + } + //3-4.保存数据 + baseDao.insert(e); + }); + } + + //4.错误数据生成文件，修改导入任务状态 + String url = erroeImport(fileList); + upImportTask(url, taskId, tokenDto.getUserId(), true); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【行程上报数据导入】程序错误:{}", errorMsg); + upImportTask(null, taskId, tokenDto.getUserId(), false); + } + } + + /** + * @Author sun + * @Description 行程上报数据导入，错误数据生成导入失败文件存到阿里云，修改导入任务为已结束 + **/ + private String erroeImport(List fileList) throws IOException { + String url = ""; + //1.有错误数据则生成错误数据存放文件传到阿里云服务 + if (!org.springframework.util.CollectionUtils.isEmpty(fileList)) { + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表", "导入失败的数据列表"), + IcPsTripReportRecordErrorExcel.class, fileList); + + // 文件名 + String resultDescFileName = UUID.randomUUID().toString().concat(".xlsx"); + FileItemFactory factory = new DiskFileItemFactory(16, null); + FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName); + OutputStream os = fileItem.getOutputStream(); + Result uploadResult = null; + try { + workbook.write(os); + uploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + } catch (Exception e) { + String errormsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【行程上报数据导入】上传错误描述文件:{}", errormsg); + } finally { + try { + os.close(); + } catch (IOException e) { + String errormsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【行程上报数据导入】上传错误描述文件关闭输出流:{}", errormsg); + } + try { + fileItem.delete(); + } catch (Exception e) { + String errormsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【行程上报数据导入】上传错误描述文件删除临时文件:{}", errormsg); + } + } + + if (uploadResult == null || !uploadResult.success()) { + log.error("【行程上报数据导入】调用OSS上传结果描述文件失败"); + } + url = uploadResult.getData().getUrl(); + } + return url; + } + + /** + * @Author sun + * @Description 行程上报数据导入修改导入任务状态 + **/ + private void upImportTask(String url, String importTaskId, String staffId, Boolean status) { + //2.更新导入任务数据 + ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); + importTaskForm.setOperatorId(staffId); + importTaskForm.setBizType(ImportTaskConstants.PS_BIZ_TYPE_IC_TRIP_REPORT); + importTaskForm.setTaskId(importTaskId); + importTaskForm.setResultDescFilePath(url); + if (status && StringUtils.isBlank(url)) { + importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); + } else { + importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importTaskForm.setResultDesc("行程上报数据导入存在程序错误"); + } + Result result = commonServiceOpenFeignClient.finishImportTask(importTaskForm); + if (!result.success()) { + throw new RenException(result.getInternalMsg()); + } + } + + } From ac570f2d15d7efc812befaafd96c0f2bc1b3b683 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 15:02:35 +0800 Subject: [PATCH 041/161] =?UTF-8?q?=E8=BF=81=E5=87=BA=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=81=A2=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E6=81=A2=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=81=A2=E5=A4=8D=E5=B1=85=E6=B0=91=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=B0=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E8=BF=81=E5=87=BA=E4=BA=BA=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=88=A0=E9=99=A4=E8=AF=A5=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=9A=84=E8=BF=81=E5=87=BA=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=EF=BC=9B?= =?UTF-8?q?=E5=BD=93=E8=BF=81=E5=87=BA=E7=9A=84=E5=B1=85=E6=B0=91=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E8=A2=AB=E8=BF=81=E5=85=A5=EF=BC=8C=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=81=A2=E5=A4=8D=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/ChangeRelocationDTO.java | 5 +++ ...hRecordFormDTO.java => OnlyIdFormDTO.java} | 2 +- .../ChangeRelocationController.java | 15 +++++++ .../controller/IcBirthRecordController.java | 4 +- .../controller/IcMoveInRecordController.java | 9 +++++ .../service/ChangeRelocationService.java | 10 +++++ .../impl/ChangeRelocationServiceImpl.java | 40 +++++++++++++++++++ .../resources/mapper/ChangeRelocationDao.xml | 1 + 8 files changed, 83 insertions(+), 3 deletions(-) rename epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/{DeleteIcBirthRecordFormDTO.java => OnlyIdFormDTO.java} (86%) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java index dd632ca671..7db30e392b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java @@ -29,6 +29,11 @@ public class ChangeRelocationDTO implements Serializable { */ private String icResiUserId; + /** + * ic_resi_user 用户状态 + */ + private String status; + /** * 姓名 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java similarity index 86% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java index 9cc3dd05fe..3e2501850d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java @@ -13,7 +13,7 @@ import java.util.List; * @dscription */ @Data -public class DeleteIcBirthRecordFormDTO implements Serializable { +public class OnlyIdFormDTO implements Serializable { private static final long serialVersionUID = -5220529162950147825L; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java index 1b84302742..6ac14fec7c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.ChangeRelocationDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.ChangeRelocationExcel; import com.epmet.service.ChangeRelocationService; import org.apache.commons.collections4.CollectionUtils; @@ -144,4 +145,18 @@ public class ChangeRelocationController { return new Result(); } + /** + * 恢复迁出人员 + * @param tokenDto + * @param dto + * @return + */ + @PostMapping("recovery") + public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + changeRelocationService.recovery(tokenDto,dto); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index b8ba028d4c..b9229eea74 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -24,7 +24,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.form.BirthRecordFormDTO; import com.epmet.dto.form.BirthRecordUpdateDTO; -import com.epmet.dto.form.DeleteIcBirthRecordFormDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.IcBirthRecordExcel; import com.epmet.service.IcBirthRecordService; import lombok.extern.slf4j.Slf4j; @@ -94,7 +94,7 @@ public class IcBirthRecordController { } @PostMapping("deleteById") - public Result deleteById(@RequestBody DeleteIcBirthRecordFormDTO dto) { + public Result deleteById(@RequestBody OnlyIdFormDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icBirthRecordService.deleteById(dto.getId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java index 18c40e286e..b11e6e369c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcMoveInRecordDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.dto.form.IcMoveInAddEditFormDTO; import com.epmet.dto.form.IcMoveInListFormDTO; import com.epmet.dto.result.IcMoveInListResultDTO; @@ -95,6 +96,14 @@ public class IcMoveInRecordController { return new Result(); } + @PostMapping("deleteById") + public Result deleteById(@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icMoveInRecordService.deleteById(dto.getId()); + return new Result(); + } + @NoRepeatSubmit @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws IOException { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java index 150fc05fa0..fb87579a59 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java @@ -2,8 +2,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.ChangeRelocationDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.entity.ChangeRelocationEntity; import java.util.List; @@ -105,4 +107,12 @@ public interface ChangeRelocationService extends BaseService page(Map params) { @@ -342,6 +352,36 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 15:04:26 +0800 Subject: [PATCH 042/161] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8F=98=E5=8C=96=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 4 +++ .../epmet/dto/form/IcTripReportFormDTO.java | 4 +++ .../entity/IcTripReportRecordEntity.java | 4 +++ .../excel/IcPsTripReportRecordExcel.java | 29 ++++++++++++++----- .../impl/IcTripReportRecordServiceImpl.java | 19 ++++-------- 5 files changed, 39 insertions(+), 21 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 63d5d28ffa..21b26ce7be 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -254,6 +254,10 @@ public class IcTripReportRecordDTO implements Serializable { * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 户籍地 【磐石】 + */ + private String registeredResidence; /** * 年龄【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 6160420fee..aae545ab01 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -196,6 +196,10 @@ public class IcTripReportFormDTO implements Serializable { * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 户籍地 【磐石】 + */ + private String registeredResidence; /** * 年龄【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index ffbfa4fe1f..5feb599051 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -135,6 +135,10 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 户籍地 【磐石】 + */ + private String registeredResidence; /** * 年龄【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 011757b7d6..1f4bd6814d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -29,14 +29,19 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { @Excel(name = "户籍地（省市县区）", needMerge = true) @NotBlank(message = "不能为空") - private String presentAddress; + private String registeredResidence; @Excel(name = "手机号", needMerge = true) @NotBlank(message = "不能为空") private String mobile; - @ExcelCollection(name = "来源地") - private List source; + /* @ExcelCollection(name = "来源地") + private List source;*/ + @Excel(name = "来自地区（格式：省-市-区-街道-社区）") + @NotBlank(message = "不能为空") + private String sourceAddress; + @Excel(name = "来自地区详细地址") + private String sourceDetailAddress; @Excel(name = "来曹事由（100字以内）", needMerge = true) @NotBlank(message = "不能为空") @@ -50,11 +55,21 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { @NotBlank(message = "不能为空") private String arriveDate; - @ExcelCollection(name = "在曹居住地点") - private List present; + /*@ExcelCollection(name = "在曹居住地点") + private List present;*/ + @Excel(name = "现居地") + @NotBlank(message = "不能为空") + private String presentAddress; + @Excel(name = "现居地详细地址") + private String detailAddress; - @ExcelCollection(name = "返回方式") - private List traffic; + /*@ExcelCollection(name = "返回方式") + private List traffic;*/ + @Excel(name = "返回方式") + @NotBlank(message = "不能为空") + private String trafficType; + @Excel(name = "其他返回方式") + private String trafficTypeExplain; @Excel(name = "7天内旅居史情况", needMerge = true) private String sojournHistory; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 37e6df0dad..0b97b0d90d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -497,7 +497,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl fileList = new ArrayList<>(); IcPsTripReportRecordErrorExcel excel = null; //1.读取Excel数据 - ExcelImportResult testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 3, IcPsTripReportRecordExcel.class); + ExcelImportResult testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 2, IcPsTripReportRecordExcel.class); //2.存在错误行数据时存入错误数据集合中 if (CollectionUtils.isNotEmpty(testExcelImportResult.getFailList())) { for (IcPsTripReportRecordExcel entity : testExcelImportResult.getFailList()) { @@ -522,8 +522,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 15:07:28 +0800 Subject: [PATCH 043/161] =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/DictTypeEnum.java | 2 + .../epmet/constants/ImportTaskConstants.java | 1 + .../controller/IcDangerAreaController.java | 70 +++++++++- .../epmet/excel/IcDangerAreaImportExcel.java | 34 +++++ .../IcDangerAreaExcelImportListener.java | 130 ++++++++++++++++++ .../epmet/service/IcDangerAreaService.java | 3 + .../service/impl/IcDangerAreaServiceImpl.java | 123 ++++++++++++++++- 7 files changed, 354 insertions(+), 9 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index 57b2461c1e..d38442798e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -29,6 +29,8 @@ public enum DictTypeEnum { IC_DANGER_TYPE("ic_danger_type","危化品种类",24), POLICY_LEVEL("policy_level","政策级别",25), LOG_TYPE("log_type", "日志类型", 33), + + DANGER_AREA_LEVEL_TYPE("dangerAreaLevel", "风险地区等级", 34), TRAFFIC_TYPE("traffic_type", "交通方式", 36), SOJOURN_HISTORY("sojourn_history", "7天内旅居史情况", 37), ISOLATE_TYPE("isolate_type", "隔离状态", 38), diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index 1d9190c9db..204845c1fb 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -21,6 +21,7 @@ public interface ImportTaskConstants { String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member"; String BIZ_TYPE_IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals"; String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise"; + String BIZ_TYPE_IC_DANGER_AREA="ic_danger_area"; String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring"; String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation"; // 新冠病毒疫苗接种人员信息台账 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java index 4dcfd4bb09..ea4ebcc55b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java @@ -5,25 +5,32 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; -import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.feign.*; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcDangerAreaDTO; import com.epmet.dto.form.DangerAreaListFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.NatListCommonExcelResultDTO; import com.epmet.dto.result.NatListResultDTO; import com.epmet.enums.DangerLevelEnum; import com.epmet.excel.IcDangerAreaResultExcel; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcDangerAreaService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -31,14 +38,18 @@ import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.URLEncoder; +import java.nio.file.Path; import java.util.List; import java.util.Map; +import java.util.UUID; /** @@ -50,10 +61,12 @@ import java.util.Map; @RestController @Slf4j @RequestMapping("icDangerArea") -public class IcDangerAreaController { +public class IcDangerAreaController implements ResultDataResolver{ @Autowired private IcDangerAreaService icDangerAreaService; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @RequestMapping("page") public Result> page(@RequestParam Map params){ @@ -159,4 +172,51 @@ public class IcDangerAreaController { } } + @PostMapping("import") + public Result importExcel(@LoginUser TokenDto tokenDto, @RequestPart("file") MultipartFile file) { + String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_danger_area", "import"); + fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); + } catch (IOException e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【风险地区】创建临时存储文件失败:{}", errorMsg); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败"); + } + + InputStream is = null; + FileOutputStream os = null; + + try { + is = file.getInputStream(); + os = new FileOutputStream(fileSavePath.toString()); + IOUtils.copy(is, os); + } catch (Exception e) { + log.error("method exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); + importTaskForm.setOperatorId(userId); + importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_DANGER_AREA); + importTaskForm.setOriginFileName(originalFilename); + + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "excel导入风险地区错误", + "风险地区导入失败"); + + // 3.执行导入 + icDangerAreaService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId()); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java new file mode 100644 index 0000000000..7358f3ee39 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java @@ -0,0 +1,34 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author zxc + * @DateTime 2022/11/1 11:18 + */ +@Data +public class IcDangerAreaImportExcel { + + @NotBlank(message = "风险地区为必填项") + @ExcelProperty("风险地区") + private String allName; + + @NotBlank(message = "风险等级为必填项") + @ExcelProperty("风险等级") + private String dangerLevel; + + @Data + public static class IcDangerAreaError{ + @ExcelProperty("风险地区") + private String name; + + @ExcelProperty("风险等级") + private String dangerLevel; + + @ExcelProperty("错误信息") + private String errorInfo; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java new file mode 100644 index 0000000000..5e09a8d102 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -0,0 +1,130 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.ValidateException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dao.IcDangerAreaDao; +import com.epmet.entity.IcDangerAreaEntity; +import com.epmet.entity.IcNatEntity; +import com.epmet.enums.DangerLevelEnum; +import com.epmet.excel.IcDangerAreaImportExcel; +import com.epmet.excel.data.IcNatImportExcelData; +import com.epmet.service.IcDangerAreaService; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * 核酸检测excel导入监听器 + */ +@Data +@Slf4j +public class IcDangerAreaExcelImportListener implements ReadListener { + + public static final int MAX_THRESHOLD = 200; + private String customerId = ""; + private Map dangerLevelMap = null; + private List datas = new ArrayList<>(); + private List errorRows = new ArrayList<>(); + + @Autowired + private IcDangerAreaService icDangerAreaService; + @Autowired + private IcDangerAreaDao icDangerAreaDao; + + public IcDangerAreaExcelImportListener(Map dangerLevelMap, String customerId, IcDangerAreaService icDangerAreaService, IcDangerAreaDao icDangerAreaDao) { + this.dangerLevelMap = dangerLevelMap; + this.customerId = customerId; + this.icDangerAreaService = icDangerAreaService; + this.icDangerAreaDao = icDangerAreaDao; + } + + @Override + public void invoke(IcDangerAreaImportExcel data, AnalysisContext context) { + try { + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(IcDangerAreaEntity::getAllName,data.getAllName()); + IcDangerAreaEntity icDangerAreaEntity = icDangerAreaDao.selectOne(qw); + if (null != icDangerAreaEntity){ + throw new EpmetException(EpmetErrorCode.DANGER_AREA_ERROR.getCode()); + } + ValidatorUtils.validateEntity(data); + IcDangerAreaEntity entity = ConvertUtils.sourceToTarget(data, IcDangerAreaEntity.class); + String[] split = data.getAllName().split("-"); + for (int i = NumConstant.ZERO; i < split.length; i++) { + switch (i){ + case NumConstant.ZERO: + entity.setProvince(split[i]); + break; + case NumConstant.ONE: + entity.setCity(split[i]); + break; + case NumConstant.TWO: + entity.setDistrict(split[i]); + break; + default: + break; + } + } + entity.setDangerLevel(dangerLevelMap.get(entity.getDangerLevel())); + entity.setCustomerId(customerId); + datas.add(entity); + if (datas.size() == MAX_THRESHOLD) { + execPersist(); + } + } catch (Exception e) { + String errorMsg = null; + if (e instanceof ValidateException) { + errorMsg = ((ValidateException) e).getMsg(); + } else { + log.error("【风险地区信息导入】出错:{}", e.getStackTrace()); + errorMsg = ((EpmetException)e).getInternalMsg(); + log.error("【风险地区信息导入】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } + IcDangerAreaImportExcel.IcDangerAreaError errorRow = new IcDangerAreaImportExcel.IcDangerAreaError(); + errorRow.setName(data.getAllName()); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + if (CollectionUtils.isNotEmpty(datas)){ + icDangerAreaService.insertBatch(datas); + } + } finally { + datas.clear(); + } + } + + /** + * 获取错误行 + * @return + */ + public List getErrorRows() { + return errorRows; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java index 9baf3e2b99..18a98985fb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java @@ -6,6 +6,7 @@ import com.epmet.dto.IcDangerAreaDTO; import com.epmet.dto.form.DangerAreaListFormDTO; import com.epmet.entity.IcDangerAreaEntity; +import java.nio.file.Path; import java.util.List; import java.util.Map; @@ -78,4 +79,6 @@ public interface IcDangerAreaService extends BaseService { * @date 2022-10-31 */ void delete(List ids,String staffId); + + void execAsyncExcelImport(Path fileSavePath, String taskId, String customerId, String userId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java index 498712ae68..0c56f212f7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java @@ -1,32 +1,58 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.FileUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcDangerAreaDao; import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.DangerAreaListFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcDangerAreaEntity; +import com.epmet.excel.IcDangerAreaImportExcel; +import com.epmet.excel.handler.IcDangerAreaExcelImportListener; +import com.epmet.feign.EpmetAdminOpenFeignClient; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.service.IcDangerAreaService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileItemFactory; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.commons.CommonsMultipartFile; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.*; +import java.util.stream.Collectors; /** * 疫情风险地区 @@ -35,8 +61,16 @@ import java.util.Map; * @since v1.0.0 2022-10-31 */ @Service +@Slf4j public class IcDangerAreaServiceImpl extends BaseServiceImpl implements IcDangerAreaService { + @Autowired + private EpmetAdminOpenFeignClient adminOpenFeignClient; + @Autowired + private OssFeignClient ossFeignClient; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -139,4 +173,85 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.DANGER_AREA_LEVEL_TYPE.getCode()); + Map dangerLevelMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>(); + + IcDangerAreaExcelImportListener dangerAreaExcelImportListener = new IcDangerAreaExcelImportListener(dangerLevelMap, customerId,this ,baseDao); + EasyExcel.read(fileSavePath.toFile(), IcDangerAreaImportExcel.class, dangerAreaExcelImportListener).headRowNumber(1).sheet(0).doRead(); + + Path errorDescFile = null; + String errorDesFileUrl = null; + List errorRows = dangerAreaExcelImportListener.getErrorRows(); + boolean failed = CollectionUtils.isNotEmpty(errorRows); + if (failed) { + // 生成并上传错误文件 + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_danger_area", "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + errorDescFile = errorDescDir.resolve(fileName); + + FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile()); + FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName); + OutputStream os = fileItem.getOutputStream(); + EasyExcel.write(os, IcDangerAreaImportExcel.IcDangerAreaError.class).sheet("导入失败列表").doWrite(errorRows); + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + } finally { + if (Files.exists(errorDescFile)) { + Files.delete(errorDescFile); + } + } + } + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(taskId); + importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); + importFinishTaskForm.setOperatorId(userId); + importFinishTaskForm.setResultDesc(""); + importFinishTaskForm.setResultDescFilePath(errorDesFileUrl); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【风险地区导入】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【风险地区导入】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(taskId); + importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importFinishTaskForm.setOperatorId(userId); + importFinishTaskForm.setResultDesc("导入失败"); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【风险地区导入】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(fileSavePath)) { + try { + Files.delete(fileSavePath); + } catch (IOException e) { + log.error("method exception", e); + } + } + } + } + } \ No newline at end of file From a48159740979c403ffe32ab5912c62035ffac987 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Nov 2022 15:16:11 +0800 Subject: [PATCH 044/161] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/IcEpidemicSpecialAttentionDTO.java | 62 +++++++++++++++- .../dto/result/VaccinationListResultDTO.java | 36 ++++++++++ .../IcEpidemicSpecialAttentionEntity.java | 72 +++++++++++++++++-- ...__ic_epidemic_special_attention_panshi.sql | 20 ++++++ .../mapper/IcEpidemicSpecialAttentionDao.xml | 66 ++++++++++++----- 5 files changed, 232 insertions(+), 24 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java index 5d880153a6..b2b8a7b95d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java @@ -95,7 +95,7 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable { private String idCard; /** - * 原因 + * 关注原因；后磐石改名为隔离原因 */ @Length(max = 500,message = "原因限制500字以内",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class}) private String reason; @@ -106,6 +106,66 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable { @Length(max = 500,message = "备注限制500字以内",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class}) private String remark; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + private String volunteerMobile; + /** * */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index 7099e1650b..3faf74d3d3 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -127,6 +127,42 @@ public class VaccinationListResultDTO implements Serializable { @JsonIgnore private String customerId; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + * gkStartTime-gkEndTime + */ + private String gkTime; + + /** + * 镇（街）干部名称联系方式,需求来源于磐石 + * gbName+gbMobile + */ + private String gb; + + /** + * 村（社区）网格管理员gridManager,需求来源于磐石 + * gridManager+gridManagerMobile + */ + private String gridManager; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + * healthWorker+healthWorkerMobile + */ + private String healthWorker; + + /** + * 民警联系方式,需求来源于磐石 + * policeName+policeMobile + */ + private String police; + + /** + * 志愿者+联系方式,需求来源于磐石 + */ + private String volunteer; + + public VaccinationListResultDTO() { this.vaccinationCount = NumConstant.ZERO; this.name = ""; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java index a22f3f3537..aa4e6052fd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java @@ -73,14 +73,74 @@ public class IcEpidemicSpecialAttentionEntity extends BaseEpmetEntity { */ private String idCard; - /** - * 原因 - */ + /** + * 关注原因；后磐石改名为隔离原因 + */ private String reason; - /** - * 备注 - */ + /** + * 备注 + */ private String remark; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + private String volunteerMobile; + } diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql new file mode 100644 index 0000000000..936a358868 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql @@ -0,0 +1,20 @@ +-- 禅道需求713 +alter table ic_epidemic_special_attention MODIFY COLUMN `reason` varchar(500) DEFAULT NULL comment '关注原因；后磐石改名为隔离原因'; +alter table ic_epidemic_special_attention MODIFY COLUMN `remark` varchar(500) DEFAULT NULL comment '备注'; + +alter table ic_epidemic_special_attention ADD column GK_START_TIME varchar(32) DEFAULT '' COMMENT '管控开始时间yyyy-MM-dd,需求来源于磐石' AFTER remark; +alter table ic_epidemic_special_attention ADD column GK_END_TIME varchar(32) DEFAULT '' COMMENT '管控结束时间yyyy-MM-dd,需求来源于磐石' AFTER GK_START_TIME; + +alter table ic_epidemic_special_attention ADD column GB_NAME VARCHAR(32) DEFAULT '' COMMENT '镇（街）干部名称,需求来源于磐石' AFTER GK_END_TIME; +alter table ic_epidemic_special_attention ADD column GB_MOBILE VARCHAR(32) DEFAULT '' COMMENT '镇（街）干部联系方式,需求来源于磐石' AFTER GB_NAME; + +alter table ic_epidemic_special_attention ADD column GRID_MANAGER VARCHAR(32) DEFAULT '' COMMENT '村（社区）网格管理员,需求来源于磐石' AFTER GB_MOBILE; +alter table ic_epidemic_special_attention ADD column GRID_MANAGER_MOBILE VARCHAR(32) DEFAULT '' COMMENT '村（社区）网格管理员联系方式,需求来源于磐石' AFTER GRID_MANAGER; +alter table ic_epidemic_special_attention ADD column HEALTH_WORKER VARCHAR(32) DEFAULT '' COMMENT '基层医务工作者,需求来源于磐石' AFTER GRID_MANAGER_MOBILE; +alter table ic_epidemic_special_attention ADD column HEALTH_WORKER_MOBILE VARCHAR(32) DEFAULT '' COMMENT '基层医务工作者联系方式,需求来源于磐石' AFTER HEALTH_WORKER; + +alter table ic_epidemic_special_attention ADD column POLICE_NAME VARCHAR(32) DEFAULT '' COMMENT '民警,需求来源于磐石' AFTER HEALTH_WORKER_MOBILE; +alter table ic_epidemic_special_attention ADD column POLICE_MOBILE VARCHAR(32) DEFAULT '' COMMENT '民警联系方式,需求来源于磐石' AFTER POLICE_NAME; + +alter table ic_epidemic_special_attention ADD column VOLUNTEER_NAME VARCHAR(32) DEFAULT '' COMMENT '志愿者,需求来源于磐石' AFTER POLICE_MOBILE; +alter table ic_epidemic_special_attention ADD column VOLUNTEER_MOBILE VARCHAR(32) DEFAULT '' COMMENT '志愿者联系方式,需求来源于磐石' AFTER VOLUNTEER_NAME; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 5db13945cb..7f3c64b11f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -81,7 +81,23 @@ b.UNIT_ID, b.HOME_ID, IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime, - IFNULL(v.vaccinationCount,0) AS vaccinationCount + IFNULL(v.vaccinationCount,0) AS vaccinationCount, + ( + case when a.GK_START_TIME is not null + and a.GK_START_TIME !='' + and a.GK_END_TIME is not null + and a.GK_END_TIME !='' + then concat(a.GK_START_TIME,'-',a.GK_END_TIME) + when a.GK_START_TIME is not null and (a.GK_END_TIME is null or a.GK_END_TIME='') then a.GK_START_TIME + when (a.GK_START_TIME is null or a.GK_START_TIME ='' ) and a.GK_END_TIME is not null and a.GK_END_TIME !='' then a.GK_END_TIME + else '' + end + )as gkTime, + concat(a.GB_NAME,a.GB_MOBILE) as gb, + concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManager, + concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorker, + concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as police, + concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteer FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID LEFT JOIN (SELECT id_card , CUSTOMER_ID, count(1) AS vaccinationCount, CREATED_TIME FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD, CUSTOMER_ID) v ON (v.ID_CARD = a.ID_CARD and v.CUSTOMER_ID=a.CUSTOMER_ID) @@ -125,22 +141,38 @@ From f7b587539513cae6381c256dcc7daa4f131fb8ef Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 1 Nov 2022 15:41:10 +0800 Subject: [PATCH 048/161] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/service/impl/IcPartyMemberServiceImpl.java | 3 +-- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index 9685adfdd6..11066c8b70 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -13,7 +13,6 @@ import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.DictListResultDTO; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; -import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.enums.IcFormCodeEnum; import com.epmet.commons.tools.enums.PartyPostEnum; @@ -691,7 +690,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 15:52:12 +0800 Subject: [PATCH 049/161] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmphasisTripListFormDTO.java | 22 +++++++++++++++++++ .../dto/result/EmphasisTripListResultDTO.java | 16 ++++++++++++++ .../controller/IcDangerAreaController.java | 2 +- .../IcTripReportRecordController.java | 21 ++++++++++++++---- .../service/IcTripReportRecordService.java | 11 ++++++++++ .../impl/IcTripReportRecordServiceImpl.java | 14 ++++++++++++ 6 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java new file mode 100644 index 0000000000..8c2eab988f --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 15:39 + */ +@Data +public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = 5850717233738956442L; + + private String code; + + private String dangerLevel; + + private String staffId; + private String customerId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java new file mode 100644 index 0000000000..85d78ff9cb --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 15:38 + */ +@Data +public class EmphasisTripListResultDTO implements Serializable { + private static final long serialVersionUID = -1646171374911115465L; + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java index ea4ebcc55b..3d3fbd1cc7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java @@ -88,7 +88,7 @@ public class IcDangerAreaController implements ResultDataResolver{ * @Date 2022/11/1 09:09 */ @NoRepeatSubmit - @PostMapping("save") + @PostMapping("add") public Result save(@RequestBody IcDangerAreaDTO dto, @LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); dto.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 74139ac33d..f51061dac1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -23,10 +23,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.IcResiUserConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcTripReportRecordDTO; -import com.epmet.dto.form.IcTripReportFormDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.MyReportedTripFormDTO; -import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; @@ -369,4 +367,19 @@ public class IcTripReportRecordController implements ResultDataResolver { return new Result(); } + /** + * @Description 【重点行程名单】列表 + * @param tokenDto + * @param formDTO + * @Author zxc + * @Date 2022/11/1 15:43 + */ + @PostMapping("list") + public Result> emphasisTripList(@LoginUser TokenDto tokenDto, @RequestBody EmphasisTripListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icTripReportRecordService.emphasisTripList(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index 998e942b3d..b95800b56a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -4,9 +4,11 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcTripReportRecordDTO; +import com.epmet.dto.form.EmphasisTripListFormDTO; import com.epmet.dto.form.IcTripReportFormDTO; import com.epmet.dto.form.MyReportedTripFormDTO; import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.entity.IcTripReportRecordEntity; @@ -107,4 +109,13 @@ public interface IcTripReportRecordService extends BaseService emphasisTripList(EmphasisTripListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 0b97b0d90d..b1f57db163 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -33,6 +33,7 @@ import com.epmet.dao.UserBaseInfoDao; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.*; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcDangerAreaEntity; @@ -628,6 +629,19 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripList(EmphasisTripListFormDTO formDTO) { + PageData result = new PageData<>(); + + return result; + } + /** * @Author sun * @Description 行程上报数据导入，错误数据生成导入失败文件存到阿里云，修改导入任务为已结束 From 35dda6b988b2697076a4b90a57df5208ff13d6d4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 1 Nov 2022 16:07:55 +0800 Subject: [PATCH 050/161] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.12__edit_partymember.sql | 4 ++++ .../main/resources/db/migration/V0.0.80__edit_partymember.sql | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql new file mode 100644 index 0000000000..b6e7cccd0c --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql @@ -0,0 +1,4 @@ +ALTER TABLE `ic_party_member` + ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`, + ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`, + ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql new file mode 100644 index 0000000000..b6e7cccd0c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql @@ -0,0 +1,4 @@ +ALTER TABLE `ic_party_member` + ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`, + ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`, + ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; \ No newline at end of file From 1ea38545ada3d66ffc9a4fca9616e16653d8fda1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 1 Nov 2022 16:10:43 +0800 Subject: [PATCH 051/161] zanti --- .../dto/form/EmphasisTripDetailFormDTO.java | 20 ++++++++++++++ .../form/EmphasisTripPieDetailFormDTO.java | 20 ++++++++++++++ .../EmphasisTripPieDetailResultDTO.java | 18 +++++++++++++ .../IcTripReportRecordController.java | 27 ++++++++++++++++++- .../service/IcTripReportRecordService.java | 21 ++++++++++++--- .../impl/IcTripReportRecordServiceImpl.java | 23 ++++++++++++++++ 6 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java new file mode 100644 index 0000000000..b36ab7db3c --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 15:58 + */ +@Data +public class EmphasisTripDetailFormDTO implements Serializable { + private static final long serialVersionUID = 4725053371888196275L; + + public interface EmphasisTripDetailForm{} + + @NotBlank(message = "id不能为空",groups = {EmphasisTripDetailForm.class}) + private String id; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java new file mode 100644 index 0000000000..ee0e6b5681 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 16:08 + */ +@Data +public class EmphasisTripPieDetailFormDTO implements Serializable { + private static final long serialVersionUID = 8822391154779579664L; + + public interface EmphasisTripPieDetailForm{} + + @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) + private String code; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java new file mode 100644 index 0000000000..4ebb22d6f0 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 16:06 + */ +@Data +public class EmphasisTripPieDetailResultDTO implements Serializable { + private static final long serialVersionUID = -7654816048391073022L; + + private String dangerLevelName; + private String dangerLevel; + private Integer total; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index f51061dac1..316610e690 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -25,6 +25,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; @@ -380,6 +381,30 @@ public class IcTripReportRecordController implements ResultDataResolver { formDTO.setStaffId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icTripReportRecordService.emphasisTripList(formDTO)); - } + } + + /** + * @Description 重点行程详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:05 + */ + @PostMapping("emphasisTripDetail") + public Result emphasisTripDetail(@RequestBody EmphasisTripDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, EmphasisTripDetailFormDTO.EmphasisTripDetailForm.class); + return new Result().ok(icTripReportRecordService.emphasisTripDetail(formDTO)); + } + + /** + * @Description 【重点行程名单】饼图详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:09 + */ + @PostMapping("emphasisTripPieDetail") + public Result> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,EmphasisTripPieDetailFormDTO.EmphasisTripPieDetailForm.class); + return new Result>().ok(icTripReportRecordService.emphasisTripPieDetail(formDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index b95800b56a..5d971a0719 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -4,11 +4,9 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcTripReportRecordDTO; -import com.epmet.dto.form.EmphasisTripListFormDTO; -import com.epmet.dto.form.IcTripReportFormDTO; -import com.epmet.dto.form.MyReportedTripFormDTO; -import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.entity.IcTripReportRecordEntity; @@ -118,4 +116,19 @@ public interface IcTripReportRecordService extends BaseService emphasisTripList(EmphasisTripListFormDTO formDTO); + /** + * @Description 重点行程详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:05 + */ + EmphasisTripListResultDTO emphasisTripDetail(EmphasisTripDetailFormDTO formDTO); + + /** + * @Description 【重点行程名单】饼图详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:09 + */ + List emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index b1f57db163..9b21c1c212 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -34,6 +34,7 @@ import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcDangerAreaEntity; @@ -642,6 +643,28 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO) { + return null; + } + /** * @Author sun * @Description 行程上报数据导入，错误数据生成导入失败文件存到阿里云，修改导入任务为已结束 From 8b7bf3238a081dc7be206949b691cafeef443e7f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Nov 2022 16:14:45 +0800 Subject: [PATCH 052/161] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=88=97=E8=A1=A8m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 57ee4bfd58..1c53a83ed9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -96,7 +96,7 @@ concat(a.GB_NAME,a.GB_MOBILE) as gb, concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, - concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as policeShow, + concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID @@ -171,7 +171,7 @@ concat(a.GB_NAME,a.GB_MOBILE) as gb, concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, - concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as policeShow, + concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID From 2d9112ad08f4b656d69141176e322eedb1d1c987 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 1 Nov 2022 16:26:13 +0800 Subject: [PATCH 053/161] Merge branch 'dev_tripreport' of E:\work\workSpace\epmet-cloud with conflicts. --- .../com/epmet/dto/IcTripReportRecordDTO.java | 53 ++++++++++++++++-- .../IcTripReportRecordController.java | 37 ++++++++++++ .../entity/IcTripReportRecordEntity.java | 2 +- .../excel/data/IcTripReportExcelData.java | 4 +- .../impl/IcTripReportRecordServiceImpl.java | 27 +++++++++ .../excel/trip_report_import_template.xlsx | Bin 9824 -> 9855 bytes 6 files changed, 116 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 21b26ce7be..b3d8819d76 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -85,7 +85,7 @@ public class IcTripReportRecordDTO implements Serializable { * 身份证号 */ @ColumnWidth(22) - @ExcelProperty("身份证号") + @ExcelProperty("证件号") private String idCard; /** @@ -128,7 +128,7 @@ public class IcTripReportRecordDTO implements Serializable { * 详细地址 */ @ColumnWidth(35) - @ExcelProperty("详细地址") + @ExcelProperty("现居地详细地址") private String detailAddress; /** @@ -238,22 +238,42 @@ public class IcTripReportRecordDTO implements Serializable { * 交通方式，来源字典表(traffic_type) */ private String trafficType; + /** + * 交通方式-中国字 + */ + @ColumnWidth(50) + @ExcelProperty("返回方式") + private String trafficTypeName; /** * 其他返回方式，交通方式为其他时此列需要有值 */ + @ColumnWidth(50) + @ExcelProperty("其他返回方式") private String trafficTypeExplain; /** * 来源地详细信息 source_address字段的说明 */ private String sourceDetailAddress; /** - * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0 1 2 3)【小寨子】 */ private String vaccineNum; + /** + * 疫苗接种针次 -中国字(0针 1针 2针 3针) + */ + @ColumnWidth(50) + @ExcelProperty("疫苗接种针次") + private String vaccineNumName; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】-中国字 + */ + @ColumnWidth(50) + @ExcelProperty("48小时核酸检测") + private String isNatRecordName; /** * 户籍地 【磐石】 */ @@ -267,28 +287,49 @@ public class IcTripReportRecordDTO implements Serializable { */ private String describe; /** - * 48小时核算检查结果(阴性 阳性)【磐石】 + * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ private String natOutcome; + /** + * 48小时核算检查结果(阴性 阳性)【磐石】-中国字 + */ + private String natOutcomeName; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】 */ private String sojournHistory; + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字 + */ + private String sojournHistoryName; /** * 隔离状态，字典表(isolate_type)【磐石】 */ private String isolateType; + /** + * 隔离状态，字典表(isolate_type)【磐石】-中国字 + */ + private String isolateTypeName; /** * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否落实"落地检" 0:否 1:是【磐石】-中国字 + */ + private String isArriveCheckName; /** * 是否达到曹县 0:否 1:是【磐石】 */ private String isArrive; + /** + * 是否达到曹县 0:否 1:是【磐石】-中国字 + */ + private String isArriveName; /** * 上报时间【磐石】 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date reportingTime; /** * 管控措施【磐石】 @@ -298,4 +339,8 @@ public class IcTripReportRecordDTO implements Serializable { * 行程记录类型，字典表(trip_data_type)【磐石】 */ private String tripDataType; + /** + * 行程记录类型，字典表(trip_data_type)【磐石】-中国字 + */ + private String tripDataTypeName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 316610e690..185189cfb7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -368,6 +368,43 @@ public class IcTripReportRecordController implements ResultDataResolver { return new Result(); } + /** + * pc:磐石-行程上报-导出 + */ + @NoRepeatSubmit + @PostMapping("psexport") + public void psEexport(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + // formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); + // formDTO.setUserId("35005df15fb0f7c791344f0b424870b7"); + formDTO.setIsPage(false); + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + int pageNo = formDTO.getPageNo(); + try { + // 这里 需要指定写用哪个class去写 + String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD); + String fileName = "行程上报信息".concat(today); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + do { + data = icTripReportRecordService.page(formDTO); + formDTO.setPageNo(++pageNo); + excelWriter.write(data.getList(), writeSheet); + } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); + + } catch (Exception e) { + log.error("export exception", e); + } finally { + // 千万别忘记finish 会帮忙关闭流 + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + /** * @Description 【重点行程名单】列表 * @param tokenDto diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 5feb599051..35bde836c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -148,7 +148,7 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { */ private String describe; /** - * 48小时核算检查结果(阴性 阳性)【磐石】 + * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ private String natOutcome; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java index af4c6aae75..89afb8d7f1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java @@ -19,8 +19,8 @@ public class IcTripReportExcelData { @ExcelProperty("姓名") private String name; - @NotBlank(message = "身份证号为必填项") - @ExcelProperty("身份证号") + @NotBlank(message = "证件号为必填项") + @ExcelProperty("证件号") private String idCard; @NotBlank(message = "手机号为必填项") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 9b21c1c212..67f2e06383 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -75,6 +75,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collector; import java.util.stream.Collectors; /** @@ -117,6 +118,22 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) .doSelectPageInfo(() -> baseDao.pageList(formDTO)); List list = data.getList(); + if(CollectionUtils.isEmpty(list)){ + return new PageData(list, data.getTotal()); + } + //获取需要的字典表数据 + //交通方式 + Result> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //7天内旅居史情况 + Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); + Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态 + Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //行程记录类型 + Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); + Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //3.查询最近一次通知时间、核算检测关注名单 if (CollectionUtils.isNotEmpty(list)) { Map latestNotice = new HashMap<>(); @@ -141,6 +158,16 @@ public class IcTripReportRecordServiceImpl extends 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 delta 2712 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 SCOrWnlT#)p28km80001G@9B#G From 2f90938258e9aa1f0c1819080f4cf664a36fd02f Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 16:26:48 +0800 Subject: [PATCH 054/161] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=81=A2=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E6=81=A2=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=81=A2=E5=A4=8D=E5=B1=85=E6=B0=91=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=B0=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=88=A0=E9=99=A4=E8=AF=A5=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=9A=84=E8=BF=81=E5=87=BA=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChangeDeathController.java | 15 ++++++ .../com/epmet/service/ChangeDeathService.java | 10 ++++ .../service/impl/ChangeDeathServiceImpl.java | 47 +++++++++++++++++-- 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java index 963d2369d0..92cdab0235 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.ChangeDeathDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.ChangeDeathExcel; import com.epmet.service.ChangeDeathService; import org.apache.commons.collections4.CollectionUtils; @@ -94,6 +95,20 @@ public class ChangeDeathController { ExcelUtils.exportEpmetExcel(response, null, list, ChangeDeathExcel.class); } + /** + * 恢复死亡人员 + * @param tokenDto + * @param dto + * @return + */ + @PostMapping("recovery") + public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + changeDeathService.recovery(tokenDto,dto); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java index 7be06b1436..09af4e2bdc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java @@ -2,8 +2,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.ChangeDeathDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.entity.ChangeDeathEntity; import java.util.List; @@ -76,4 +78,12 @@ public interface ChangeDeathService extends BaseService { * @date 2022-05-05 */ void delete(String[] ids); + + /** + * 恢复迁出人员 + * @return + */ + void recovery(TokenDto tokenDto, OnlyIdFormDTO dto); + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java index 04690ad68a..452fd90f53 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; @@ -17,18 +20,19 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.constant.IcResiUserConstant; import com.epmet.dao.ChangeDeathDao; +import com.epmet.dao.IcResiUserDao; import com.epmet.dto.ChangeDeathDTO; import com.epmet.dto.ChangeWelfareDTO; import com.epmet.dto.form.IcResiUserTransferFormDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.dto.form.RentTenantDataFormDTO; import com.epmet.dto.result.RentTenantDataResultDTO; import com.epmet.entity.ChangeDeathEntity; +import com.epmet.entity.ChangeRelocationEntity; import com.epmet.entity.IcResiUserEntity; +import com.epmet.entity.IcUserChangeRecordEntity; import com.epmet.redis.ChangeDeathRedis; -import com.epmet.service.ChangeDeathService; -import com.epmet.service.ChangeWelfareService; -import com.epmet.service.IcResiUserService; -import com.epmet.service.IcUserTransferRecordService; +import com.epmet.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +69,11 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); @@ -201,4 +210,34 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 16:29:42 +0800 Subject: [PATCH 055/161] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/VaccinationExportExcel.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java index 34c11ea835..b3dd1195c7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java @@ -41,4 +41,45 @@ public class VaccinationExportExcel { @Excel(name = "所属房屋",width = 40) private String allName; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + * gkStartTime-gkEndTime + */ + @Excel(name = "管控时间",width = 35) + private String gkTime; + + /** + * 镇（街）干部名称联系方式,需求来源于磐石 + * gbName+gbMobile + */ + @Excel(name = "镇（街）干部及联系方式",width = 35) + private String gb; + + + /** + * 村（社区）网格管理员gridManager,需求来源于磐石 + * gridManager+gridManagerMobile + */ + @Excel(name = "村（社区）网格管理员及联系方式",width = 35) + private String gridManagerShow; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + * healthWorker+healthWorkerMobile + */ + @Excel(name = "基层医务工作者及联系方式",width = 35) + private String healthWorkerShow; + + /** + * 民警联系方式,需求来源于磐石 + * policeName+policeMobile + */ + @Excel(name = "民警及联系方式",width = 35) + private String policeShow; + /** + * 志愿者+联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者及联系方式",width = 35) + private String volunteerShow; + } From 7741245cf6f219c55967dd9d1b2b925f7400d4d8 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 17:04:09 +0800 Subject: [PATCH 056/161] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E5=B1=85=E6=B0=91=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.80__edit_partymember.sql | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql index b6e7cccd0c..f4986b14d1 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql @@ -1,4 +1,8 @@ ALTER TABLE `ic_party_member` ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`, ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`, - ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; \ No newline at end of file + ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; + +alter table ic_user_change_record modify column TYPE varchar(64) NOT NULL COMMENT '操作类型【add:新增 category:类别 transfer:调动;logout注销；recovery_moveout恢复迁出；recovery_death恢复死亡】'; +alter table ic_user_change_record modify column TYPE_NAME varchar(64) NOT NULL COMMENT '操作类型名称【add:新增 category:类别 transfer:调动;logout注销;recovery_moveout恢复迁出；recovery_death恢复死亡】'; +alter table ic_resi_user modify column SUB_STATUS varchar(10) DEFAULT '01' COMMENT '用户详细状态：01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡;51迁出恢复；52死亡恢复'; From 4388526aba592d82eba04593f010bd9c65023c1a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Nov 2022 17:09:37 +0800 Subject: [PATCH 057/161] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E3=80=81=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ImportEpidemicSpecialAttention.java | 71 ++++++++++++++++++ .../excel/attention_nat_template.xlsx | Bin 8897 -> 9319 bytes 2 files changed, 71 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java index c31e0f0cd0..b2ce2de153 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java @@ -66,4 +66,75 @@ public class ImportEpidemicSpecialAttention extends ExcelVerifyInfo { @ExcelIgnore private Integer num; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控开始时间") + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控结束时间") + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + @Excel(name = "镇（街）干部名称") + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + @Excel(name = "镇（街）干部联系方式") + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员") + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员联系方式") + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + @Excel(name = "基层医务工作者") + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + @Excel(name = "基层医务工作者联系方式") + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + @Excel(name = "民警") + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + @Excel(name = "民警联系方式") + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + @Excel(name = "志愿者") + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者联系方式") + private String volunteerMobile; } diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx index de79811f246d04ead8001250cda7a0a01ea40f6b..a12e8bd8591d9e3378252c4cb3d405f478759fba 100644 GIT binary patch delta 5401 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 P>8~g0^)KFV{gwU){MQv8 From d88e1dbc22a511d9b01da1a7c88dec713f1dc3ea Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 1 Nov 2022 17:17:56 +0800 Subject: [PATCH 058/161] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 32 ++-- .../IcTripReportRecordController.java | 8 +- .../IcPsTripReportRecordExportExcel.java | 157 ++++++++++++++++++ 3 files changed, 178 insertions(+), 19 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index b3d8819d76..09134872c2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -66,14 +66,14 @@ public class IcTripReportRecordDTO implements Serializable { * 姓名 */ @ColumnWidth(15) - @ExcelProperty("姓名") + @ExcelProperty(value = "姓名", order = 1) private String name; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty("手机号") + @ExcelProperty(value = "手机号",order = 3) private String mobile; /** @@ -85,7 +85,7 @@ public class IcTripReportRecordDTO implements Serializable { * 身份证号 */ @ColumnWidth(22) - @ExcelProperty("证件号") + @ExcelProperty(value = "证件号",order = 2) private String idCard; /** @@ -121,14 +121,14 @@ public class IcTripReportRecordDTO implements Serializable { * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 */ @ColumnWidth(50) - @ExcelProperty("现居地") + @ExcelProperty(value = "现居地",order = 4) private String presentAddress; /** * 详细地址 */ @ColumnWidth(35) - @ExcelProperty("现居地详细地址") + @ExcelProperty(value = "现居地详细地址",order = 5) private String detailAddress; /** @@ -147,14 +147,14 @@ public class IcTripReportRecordDTO implements Serializable { * 来源地区地址 */ @ColumnWidth(50) - @ExcelProperty("来自地区") + @ExcelProperty(value = "来自地区",order = 6) private String sourceAddress; /** * 到达日期 */ @ColumnWidth(25) - @ExcelProperty("来到本地时间") + @ExcelProperty(value = "来到本地时间",order = 8) @JsonFormat(pattern = "yyyy-MM-dd") private Date arriveDate; @@ -162,7 +162,7 @@ public class IcTripReportRecordDTO implements Serializable { * 离开日期 */ @ColumnWidth(25) - @ExcelProperty("离开本地时间") + @ExcelProperty(value = "离开本地时间",order = 13) @JsonFormat(pattern = "yyyy-MM-dd") private Date leaveDate; @@ -170,7 +170,7 @@ public class IcTripReportRecordDTO implements Serializable { * pc行程上报-列表返参：最近一次通知时间 */ @ColumnWidth(25) - @ExcelProperty("最近一次通知时间") + //@ExcelProperty("最近一次通知时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date latestNoticeTime; @@ -178,7 +178,7 @@ public class IcTripReportRecordDTO implements Serializable { * 备注信息 */ @ColumnWidth(100) - @ExcelProperty("备注") + @ExcelProperty(value = "备注",order = 14) private String remark; /** @@ -242,17 +242,19 @@ public class IcTripReportRecordDTO implements Serializable { * 交通方式-中国字 */ @ColumnWidth(50) - @ExcelProperty("返回方式") + @ExcelProperty(value = "返回方式",order = 9) private String trafficTypeName; /** * 其他返回方式，交通方式为其他时此列需要有值 */ @ColumnWidth(50) - @ExcelProperty("其他返回方式") + @ExcelProperty(value = "其他返回方式",order = 10) private String trafficTypeExplain; /** - * 来源地详细信息 source_address字段的说明 + * 来自地区详细地址 source_address字段的说明 */ + @ColumnWidth(25) + @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** * 疫苗接种针次 (0 1 2 3)【小寨子】 @@ -262,7 +264,7 @@ public class IcTripReportRecordDTO implements Serializable { * 疫苗接种针次 -中国字(0针 1针 2针 3针) */ @ColumnWidth(50) - @ExcelProperty("疫苗接种针次") + @ExcelProperty(value = "疫苗接种针次",order = 12) private String vaccineNumName; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】 @@ -272,7 +274,7 @@ public class IcTripReportRecordDTO implements Serializable { * 是否有48小时核算记录 0:否 1:是 【小寨子】-中国字 */ @ColumnWidth(50) - @ExcelProperty("48小时核酸检测") + @ExcelProperty(value = "48小时核酸检测",order = 11) private String isNatRecordName; /** * 户籍地 【磐石】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 185189cfb7..daa1b388b2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -27,6 +27,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.excel.IcPsTripReportRecordExportExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; import lombok.extern.slf4j.Slf4j; @@ -376,8 +377,6 @@ public class IcTripReportRecordController implements ResultDataResolver { public void psEexport(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - // formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); - // formDTO.setUserId("35005df15fb0f7c791344f0b424870b7"); formDTO.setIsPage(false); ExcelWriter excelWriter = null; formDTO.setPageSize(NumConstant.TEN_THOUSAND); @@ -389,16 +388,17 @@ public class IcTripReportRecordController implements ResultDataResolver { excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; + List list = null; do { data = icTripReportRecordService.page(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcPsTripReportRecordExportExcel.class); formDTO.setPageNo(++pageNo); - excelWriter.write(data.getList(), writeSheet); + excelWriter.write(list, writeSheet); } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); } catch (Exception e) { log.error("export exception", e); } finally { - // 千万别忘记finish 会帮忙关闭流 if (excelWriter != null) { excelWriter.finish(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java new file mode 100644 index 0000000000..bf9c9455d1 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -0,0 +1,157 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 磐石-行程上报信息-导出 + * + */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@Data +public class IcPsTripReportRecordExportExcel implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 姓名 + */ + @ColumnWidth(15) + @ExcelProperty(value = "姓名", order = 1) + private String name; + /** + * 年龄【磐石】 + */ + @ColumnWidth(15) + @ExcelProperty(value = "年龄",order = 2) + private int age; + /** + * 证件号 + */ + @ColumnWidth(20) + @ExcelProperty(value = "证件号",order = 3) + private String idCard; + /** + * 户籍地 【磐石】 + */ + @ColumnWidth(40) + @ExcelProperty(value = "户籍地（省市县区）",order = 4) + private String registeredResidence; + /** + * 手机号 + */ + @ColumnWidth(25) + @ExcelProperty(value = "手机号",order = 5) + private String mobile; + /** + * 来自地区（格式：省-市-区-街道-社区） + */ + @ColumnWidth(40) + @ExcelProperty(value = "来自地区（格式：省-市-区-街道-社区）",order = 6) + private String sourceAddress; + /** + * 来自地区详细地址 source_address字段的说明 + */ + @ColumnWidth(40) + @ExcelProperty(value = "来自地区详细地址",order = 7) + private String sourceDetailAddress; + /** + * 来曹事由（100字以内）【磐石】 + */ + @ColumnWidth(40) + @ExcelProperty(value = "来曹事由（100字以内）",order = 8) + private String describe; + /** + * 48小时核酸检测 0:阴性 1:阳性 -中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "48小时核酸检测",order = 9) + private String isNatRecordName; + /** + * 来到本地时间（2022-01-01） + */ + @ColumnWidth(30) + @ExcelProperty(value = "来到本地时间（2022-01-01）",order = 10) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date arriveDate; + /** + * 现居地 + */ + @ColumnWidth(40) + @ExcelProperty(value = "现居地",order = 11) + private String presentAddress; + /** + * 现居地详细地址 + */ + @ColumnWidth(40) + @ExcelProperty(value = "现居地详细地址",order = 12) + private String detailAddress; + /** + * 交通方式-中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "返回方式",order = 13) + private String trafficTypeName; + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + @ColumnWidth(30) + @ExcelProperty(value = "其他返回方式",order = 14) + private String trafficTypeExplain; + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "7天内旅居史情况",order = 15) + private String sojournHistoryName; + /** + * 隔离状态，字典表(isolate_type)【磐石】-中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "隔离状态",order = 16) + private String isolateTypeName; + /** + * 备注（500字以内） + */ + @ColumnWidth(50) + @ExcelProperty(value = "备注（500字以内）",order = 17) + private String remark; + /** + * 是否落实"落地检" 0:否 1:是【磐石】-中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "是否落实“落地检”",order = 18) + private String isArriveCheckName; + /** + * 是否达到曹县 0:否 1:是【磐石】-中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "是否达到曹县",order = 19) + private String isArriveName; + /** + * 上报时间（2022-01-01）【磐石】 + */ + @ColumnWidth(30) + @ExcelProperty(value = "上报时间（2022-01-01）",order = 20) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date reportingTime; + /** + * 管控措施（500字以内）【磐石】 + */ + @ColumnWidth(35) + @ExcelProperty(value = "管控措施（500字以内）",order = 21) + private String controlMeasures; + /** + * 类型（省内、省外、市内、县内），字典表(trip_data_type)【磐石】-中国字 + */ + @ColumnWidth(35) + @ExcelProperty(value = "类型（省内、省外、市内、县内）",order = 22) + private String tripDataTypeName; +} From 5a75290aa9d2b69d1d088155e59bd7f1c262d803 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 1 Nov 2022 17:25:41 +0800 Subject: [PATCH 059/161] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E5=80=BC?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcTripReportRecordServiceImpl.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 67f2e06383..57363b1bdb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -607,15 +607,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 17:46:16 +0800 Subject: [PATCH 060/161] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/NatExportExcel.java | 71 +++++++++++++++++++ .../epmet/excel/NatHistoryExportExcel.java | 71 +++++++++++++++++++ .../epmet/excel/VaccinationExportExcel.java | 41 ----------- 3 files changed, 142 insertions(+), 41 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java index fd404ca278..4ff6036ea9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java @@ -34,5 +34,76 @@ public class NatExportExcel { @Excel(name = "隔离状态",width = 20) private String isolatedState; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控开始时间",width = 30) + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控结束时间",width = 30) + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + @Excel(name = "镇（街）干部名称",width = 30) + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + @Excel(name = "镇（街）干部联系方式",width = 30) + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员",width = 30) + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员联系方式",width = 30) + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + @Excel(name = "基层医务工作者",width = 30) + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + @Excel(name = "基层医务工作者联系方式",width = 30) + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + @Excel(name = "民警",width = 30) + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + @Excel(name = "民警联系方式",width = 30) + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + @Excel(name = "志愿者",width = 30) + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者联系方式",width = 30) + private String volunteerMobile; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java index 74bbd41676..76e4733310 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java @@ -36,5 +36,76 @@ public class NatHistoryExportExcel { @Excel(name = "隔离状态",width = 20) private String isolatedState; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控开始时间",width = 30) + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控结束时间",width = 30) + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + @Excel(name = "镇（街）干部名称",width = 30) + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + @Excel(name = "镇（街）干部联系方式",width = 30) + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员",width = 30) + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员联系方式",width = 30) + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + @Excel(name = "基层医务工作者",width = 30) + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + @Excel(name = "基层医务工作者联系方式",width = 30) + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + @Excel(name = "民警",width = 30) + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + @Excel(name = "民警联系方式",width = 30) + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + @Excel(name = "志愿者",width = 30) + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者联系方式",width = 30) + private String volunteerMobile; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java index b3dd1195c7..34c11ea835 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java @@ -41,45 +41,4 @@ public class VaccinationExportExcel { @Excel(name = "所属房屋",width = 40) private String allName; - /** - * 管控开始时间yyyy-MM-dd,需求来源于磐石 - * gkStartTime-gkEndTime - */ - @Excel(name = "管控时间",width = 35) - private String gkTime; - - /** - * 镇（街）干部名称联系方式,需求来源于磐石 - * gbName+gbMobile - */ - @Excel(name = "镇（街）干部及联系方式",width = 35) - private String gb; - - - /** - * 村（社区）网格管理员gridManager,需求来源于磐石 - * gridManager+gridManagerMobile - */ - @Excel(name = "村（社区）网格管理员及联系方式",width = 35) - private String gridManagerShow; - - /** - * 基层医务工作者联系方式,需求来源于磐石 - * healthWorker+healthWorkerMobile - */ - @Excel(name = "基层医务工作者及联系方式",width = 35) - private String healthWorkerShow; - - /** - * 民警联系方式,需求来源于磐石 - * policeName+policeMobile - */ - @Excel(name = "民警及联系方式",width = 35) - private String policeShow; - /** - * 志愿者+联系方式,需求来源于磐石 - */ - @Excel(name = "志愿者及联系方式",width = 35) - private String volunteerShow; - } From bf1f2b6258e16a450a80e83c5e4913dd2284fa33 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 1 Nov 2022 17:53:35 +0800 Subject: [PATCH 061/161] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/processor/MaskProcessor.java | 5 +++-- .../service/impl/IcPartyMemberServiceImpl.java | 4 ++++ .../epmet/service/impl/IcResiUserServiceImpl.java | 14 +++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index a3169a2ec6..6692b792d5 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -15,7 +15,6 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; /** * desc:脱敏处理器 @@ -209,7 +208,9 @@ public class MaskProcessor { } String maskStr = StrUtil.repeatByLength("*", length - 7); - + if (length != 11) { + return StringUtils.leftPad(StringUtils.right(originString, 4), length, "*"); + } return originString.replaceAll("^(1\\d{2})\\d*(\\d{4})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index 11066c8b70..d9d43ea387 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -398,6 +398,9 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl partyWrapper = new LambdaQueryWrapper<>(); partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, formDTO.getIcResiUser()); IcPartyMemberEntity partyMember = icPartyMemberDao.selectOne(partyWrapper); From ca5bd3b1881498a7659c4236aeb2b82f48afba81 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Nov 2022 18:01:15 +0800 Subject: [PATCH 062/161] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=87=BA111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcEpidemicSpecialAttentionDao.xml | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 1c53a83ed9..9c9dcb6965 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -97,7 +97,19 @@ concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, - concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow + concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow, + a.GK_START_TIME, + a.GK_END_TIME, + a.GB_NAME, + a.GB_MOBILE, + a.GRID_MANAGER, + a.GRID_MANAGER_MOBILE, + a.HEALTH_WORKER, + a.HEALTH_WORKER_MOBILE, + a.POLICE_NAME, + a.POLICE_MOBILE, + a.VOLUNTEER_NAME, + a.VOLUNTEER_MOBILE FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID LEFT JOIN (SELECT id_card , CUSTOMER_ID, count(1) AS vaccinationCount, CREATED_TIME FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD, CUSTOMER_ID) v ON (v.ID_CARD = a.ID_CARD and v.CUSTOMER_ID=a.CUSTOMER_ID) @@ -172,7 +184,19 @@ concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, - concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow + concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow, + a.GK_START_TIME, + a.GK_END_TIME, + a.GB_NAME, + a.GB_MOBILE, + a.GRID_MANAGER, + a.GRID_MANAGER_MOBILE, + a.HEALTH_WORKER, + a.HEALTH_WORKER_MOBILE, + a.POLICE_NAME, + a.POLICE_MOBILE, + a.VOLUNTEER_NAME, + a.VOLUNTEER_MOBILE FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID WHERE a.DEL_FLAG = 0 From 039720b74279fc93dd360e6796a163e125d44105 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Nov 2022 09:11:40 +0800 Subject: [PATCH 063/161] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/PageTripReportFormDTO.java | 6 ++++++ .../src/main/resources/mapper/IcTripReportRecordDao.xml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java index 45f9152909..4c2e07b48d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java @@ -54,4 +54,10 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable { * 查看详情时此列有值 */ private String id; + + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】 + */ + private String sojournHistory; + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index b3e00357ac..4a94d37ddc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -62,6 +62,9 @@ AND r.id=#{id} + + AND r.sojourn_history = #{sojournHistory} + ORDER BY r.ARRIVE_DATE DESC From 874d28b14cf02ec9a60db878351d324024a5fa99 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Nov 2022 09:17:29 +0800 Subject: [PATCH 064/161] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcTripReportRecordServiceImpl.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 57363b1bdb..8618d0186a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -353,6 +353,36 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectMyReported(formDTO.getUserId(), formDTO.getCustomerId(),idCard)); + + if(CollectionUtils.isEmpty(result.getList())){ + return new ArrayList<>(); + } + //获取需要的字典表数据 + //交通方式 + Result> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //7天内旅居史情况 + Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); + Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态 + Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //行程记录类型 + Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); + Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + for (IcTripReportRecordDTO dto : result.getList()) { + //字典表字段、是否字段赋值对应中国字 + dto.setTrafficTypeName(tMap.containsKey(dto.getTrafficType()) ? tMap.get(dto.getTrafficType()) : "无"); + dto.setVaccineNumName(StringUtils.isNotBlank(dto.getVaccineNum()) ? dto.getVaccineNum().concat("针") : ""); + dto.setIsNatRecordName("1".equals(dto.getIsNatRecord()) ? "是" : "否"); + dto.setNatOutcomeName("1".equals(dto.getIsNatRecord()) ? "阳性" : "阴性"); + dto.setSojournHistoryName(sMap.containsKey(dto.getSojournHistory()) ? sMap.get(dto.getSojournHistory()) : "无"); + dto.setIsolateTypeName(iMap.containsKey(dto.getIsolateType()) ? iMap.get(dto.getIsolateType()) : "无"); + dto.setIsArriveCheckName("1".equals(dto.getIsArriveCheck()) ? "是" : "否"); + dto.setIsArriveName("1".equals(dto.getIsArrive()) ? "是" : "否"); + dto.setTripDataTypeName(tdMap.containsKey(dto.getTripDataType()) ? tdMap.get(dto.getTripDataType()) : "无"); + } + return result.getList(); } From 80c271e5afbcda579b1fb3f94fe7d0faa3553ae3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 2 Nov 2022 09:34:18 +0800 Subject: [PATCH 065/161] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcEpidemicSpecialAttentionDao.xml | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 9c9dcb6965..6484609fba 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -54,6 +54,67 @@ when id_card = #{item.idCard} then #{item.isolatedState} + + + + when id_card = #{item.idCard} then #{item.gkStartTime} + + + + + when id_card = #{item.idCard} then #{item.gkEndTime} + + + + + when id_card = #{item.idCard} then #{item.gbName} + + + + + when id_card = #{item.idCard} then #{item.gbMobile} + + + + + when id_card = #{item.idCard} then #{item.gridManager} + + + + + when id_card = #{item.idCard} then #{item.gridManagerMobile} + + + + + when id_card = #{item.idCard} then #{item.healthWorker} + + + + + when id_card = #{item.idCard} then #{item.healthWorkerMobile} + + + + + when id_card = #{item.idCard} then #{item.policeName} + + + + + when id_card = #{item.idCard} then #{item.policeMobile} + + + + + when id_card = #{item.idCard} then #{item.volunteerName} + + + + + when id_card = #{item.idCard} then #{item.volunteerMobile} + + updated_time = now() WHERE del_flag = 0 From 81cfbc25336ba9eca83247c3ae538bf3ef3df932 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 2 Nov 2022 09:53:13 +0800 Subject: [PATCH 066/161] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=B6=E6=B8=85=E9=99=A4=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 37f4cc13be..da40690ee6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2475,7 +2475,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 2 Nov 2022 10:02:42 +0800 Subject: [PATCH 067/161] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmphasisTripListFormDTO.java | 2 + .../dto/result/EmphasisTripListResultDTO.java | 38 +++++++++++++++++++ .../com/epmet/dao/IcTripReportRecordDao.java | 11 ++++++ .../impl/IcTripReportRecordServiceImpl.java | 29 +++++++++++++- .../mapper/IcTripReportRecordDao.xml | 32 ++++++++++++++++ 5 files changed, 111 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java index 8c2eab988f..4f957a0109 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -19,4 +19,6 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable private String staffId; private String customerId; + + private String agencyId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java index 85d78ff9cb..cb37e7b6f8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java @@ -12,5 +12,43 @@ import java.io.Serializable; public class EmphasisTripListResultDTO implements Serializable { private static final long serialVersionUID = -1646171374911115465L; + private String id; + private String agencyId; + private String name; + private String mobile; + private String idCard; + + /** + * 来源地 + */ + private String sourceAddress; + + /** + * 来曹事由 + */ + private String describe; + + /** + * 核酸检测结果 + */ + private String natOutcome; + private String natOutComeName; + + /** + * 7天旅居史 + */ + private String sojournHistory; + private String sojournHistoryName; + + /** + * 隔离状态 + */ + private String isolateType; + private String isolateTypeName; + + /** + * 来曹时间 + */ + private String arriveDate; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java index 6d98de7a80..dc49d7d584 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java @@ -2,7 +2,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcTripReportRecordDTO; +import com.epmet.dto.form.EmphasisTripListFormDTO; import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.entity.IcTripReportRecordEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -42,4 +44,13 @@ public interface IcTripReportRecordDao extends BaseDao * @return */ int batchDel(@Param("userId")String userId,@Param("agencyId")String agencyId, @Param("ids")String[] ids); + + /** + * @Description 【重点行程名单】列表 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:18 + */ + List emphasisTripList(EmphasisTripListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 8618d0186a..9cee1de2aa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -32,6 +32,7 @@ import com.epmet.dao.IcTripReportRecordDao; import com.epmet.dao.UserBaseInfoDao; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.IcTripReportRecordDTO; +import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; @@ -693,8 +694,34 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripList(EmphasisTripListFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); PageData result = new PageData<>(); - + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.emphasisTripList(formDTO)); + result.setList(CollectionUtils.isEmpty(pageInfo.getList()) ? new ArrayList<>() : pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + List list = baseDao.emphasisTripList(formDTO); + result.setList(list); + result.setTotal(list.size()); + } + // 7天旅居史字典 + Result> sojournMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SOJOURN_HISTORY.getCode()); + Map sojournMap = sojournMapRes.success() && CollectionUtils.isNotEmpty(sojournMapRes.getData()) ? sojournMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); + + // 隔离状态字典 + Result> isolateMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.ISOLATE_TYPE.getCode()); + Map isolateMap = isolateMapRes.success() && CollectionUtils.isNotEmpty(isolateMapRes.getData()) ? isolateMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); + if (CollectionUtils.isNotEmpty(result.getList())){ + result.getList().forEach(l -> { + l.setIsolateTypeName(isolateMap.get(l.getIsolateType())); + l.setSojournHistoryName(sojournMap.get(l.getSojournHistory())); + }); + } return result; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 4a94d37ddc..547a444904 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -69,6 +69,38 @@ r.ARRIVE_DATE DESC + + + update ic_trip_report_record set del_flag='1',UPDATED_BY=#{userId},UPDATED_TIME=NOW() WHERE AGENCY_ID=#{agencyId} From 91a4daf31409dff714c07d6b9d84d4e3f6c9cc7e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Nov 2022 10:51:48 +0800 Subject: [PATCH 068/161] =?UTF-8?q?=E9=A5=BC=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EmphasisTripPieDetailFormDTO.java | 6 ++++ .../EmphasisTripPieDetailResultDTO.java | 3 +- .../IcTripReportRecordController.java | 4 ++- .../com/epmet/dao/IcTripReportRecordDao.java | 10 ++++++ .../impl/IcTripReportRecordServiceImpl.java | 31 ++++++++++++++++++- .../mapper/IcTripReportRecordDao.xml | 16 ++++++++++ 6 files changed, 67 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java index ee0e6b5681..53afd8c1e9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -17,4 +17,10 @@ public class EmphasisTripPieDetailFormDTO implements Serializable { @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) private String code; + + private String customerId; + + private String staffId; + + private String agencyId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java index 4ebb22d6f0..cab03e4b11 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; @@ -14,5 +15,5 @@ public class EmphasisTripPieDetailResultDTO implements Serializable { private String dangerLevelName; private String dangerLevel; - private Integer total; + private Integer total = NumConstant.ZERO; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index daa1b388b2..5814ae7a18 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -439,8 +439,10 @@ public class IcTripReportRecordController implements ResultDataResolver { * @Date 2022/11/1 16:09 */ @PostMapping("emphasisTripPieDetail") - public Result> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO){ + public Result> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO, @LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(formDTO,EmphasisTripPieDetailFormDTO.EmphasisTripPieDetailForm.class); + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icTripReportRecordService.emphasisTripPieDetail(formDTO)); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java index dc49d7d584..fc7a3ce96e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java @@ -3,8 +3,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.EmphasisTripListFormDTO; +import com.epmet.dto.form.EmphasisTripPieDetailFormDTO; import com.epmet.dto.form.PageTripReportFormDTO; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.entity.IcTripReportRecordEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -53,4 +55,12 @@ public interface IcTripReportRecordDao extends BaseDao */ List emphasisTripList(EmphasisTripListFormDTO formDTO); + /** + * @Description 【重点行程名单】饼图详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/2 10:07 + */ + List emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 9cee1de2aa..d114a75190 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -744,7 +744,36 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO) { - return null; + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + List pieDetailResult = baseDao.emphasisTripPieDetail(formDTO); + // 7天旅居史字典 + Result> sojournMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SOJOURN_HISTORY.getCode()); + Map sojournMap = sojournMapRes.success() && CollectionUtils.isNotEmpty(sojournMapRes.getData()) ? sojournMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); + List result = constituteResult(sojournMap); + if (CollectionUtils.isNotEmpty(pieDetailResult)){ + result.forEach(r -> pieDetailResult.stream().filter(p -> p.getDangerLevel().equals(r.getDangerLevel())).forEach(p -> r.setTotal(p.getTotal()))); + } + return result.stream().sorted(Comparator.comparing(EmphasisTripPieDetailResultDTO::getTotal).reversed()).collect(Collectors.toList()); + } + + private List constituteResult(Map sojournMap){ + if (sojournMap.isEmpty()){ + return new ArrayList<>(); + } + List result = new ArrayList<>(); + sojournMap.forEach((k,v) -> { + EmphasisTripPieDetailResultDTO dto = new EmphasisTripPieDetailResultDTO(); + dto.setDangerLevel(k); + dto.setDangerLevelName(v); + if (!k.equals(NumConstant.THREE_STR)){ + result.add(dto); + } + }); + return result; } /** diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 547a444904..554a1055e6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -101,6 +101,22 @@ ORDER BY ARRIVE_DATE DESC,CREATED_TIME DESC + + + update ic_trip_report_record set del_flag='1',UPDATED_BY=#{userId},UPDATED_TIME=NOW() WHERE AGENCY_ID=#{agencyId} From c749b03ea3b7812c3f15e6c30093692a6297c861 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Nov 2022 11:11:44 +0800 Subject: [PATCH 069/161] =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmphasisTripListFormDTO.java | 5 +++++ .../dto/result/EmphasisTripListResultDTO.java | 17 +++++++++++++++++ .../impl/IcTripReportRecordServiceImpl.java | 18 +++++++++++++----- .../resources/mapper/IcTripReportRecordDao.xml | 10 ++++++++-- 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java index 4f957a0109..3539affe85 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -21,4 +21,9 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable private String customerId; private String agencyId; + + /** + * ic_trip_report_record.id + */ + private String id; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java index cb37e7b6f8..578709a489 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java @@ -51,4 +51,21 @@ public class EmphasisTripListResultDTO implements Serializable { */ private String arriveDate; + /** + * 离开时间 + */ + private String leaveDate; + + /** + * 现居地 + */ + private String presentAddress; + + /** + * 详细地址 + */ + private String detailAddress; + + private String remark; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index d114a75190..6858b79366 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -694,11 +694,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripList(EmphasisTripListFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - if (null == staffInfo){ - throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + if (StringUtils.isBlank(formDTO.getId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); } - formDTO.setAgencyId(staffInfo.getAgencyId()); PageData result = new PageData<>(); if (formDTO.getIsPage()){ PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.emphasisTripList(formDTO)); @@ -733,7 +735,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl pageData = emphasisTripList(emphasisTripListFormDTO); + if (CollectionUtils.isEmpty(pageData.getList())){ + throw new EpmetException("未查询到行程信息："+formDTO.getId()); + } + return pageData.getList().get(NumConstant.ZERO); } /** diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 554a1055e6..c752a0d8da 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -78,15 +78,21 @@ ID, AGENCY_ID, SOURCE_ADDRESS, - `describe`, + IFNULL(`describe`,'') as `describe`, ifnull(sojourn_history,'3') as sojournHistory, IFNULL(isolate_type,'4') as isolateType, ARRIVE_DATE, + LEAVE_DATE, + PRESENT_ADDRESS, + DETAIL_ADDRESS, + REMARK, IFNULL(nat_outcome,'0') as natOutcome, (case when nat_outcome = '1' then '阳性' when nat_outcome = '0' then '阴性' else '阴性' end) as natOutComeName FROM ic_trip_report_record WHERE DEL_FLAG = '0' - AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + + AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%') From 6dea7ca5ae5f28208199e989d102d6e5cd0d6fd7 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 2 Nov 2022 14:25:40 +0800 Subject: [PATCH 070/161] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=9F=A5=E8=AF=A2=E6=A0=B8=E9=85=B8=E9=87=87=E6=A0=B7?= =?UTF-8?q?-=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataSyncConfigServiceImpl.java | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index bb72f987a6..a72a56edeb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -12,6 +12,7 @@ import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; @@ -39,12 +40,15 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -72,6 +76,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl resiInfos, String customerId, String isSync) { + List> resiInfobatchs = ListUtils.partition(resiInfos, 50); + for (List resibatch : resiInfobatchs) { + // 50个一批，来处理他们的核酸信息，太多怕给数据库查崩了。 + yantaiHsjcByDbViewBatch(resibatch, customerId, isSync); + } + } + + /** + * 50个一批，来处理他们的核酸信息，太多怕给数据库查崩了。 + * @param resiInfos + * @param customerId + * @param isSync + */ + public void yantaiHsjcByDbViewBatch(List resiInfos, String customerId, String isSync) { + // 将居民信息转化为的map + Map idCardAndResiInfo = resiInfos.stream().collect(Collectors.toMap(resi -> resi.getIdCard(), Function.identity())); + Set idCards = idCardAndResiInfo.keySet();//resiInfos.stream().map(resi -> resi.getIdCard()).collect(Collectors.toList()); + // String idCardsStr = "''" + String.join("','", idCards) + "''"; + // 1.获取核酸采样信息 + String sql = "select id, name,card_no, create_time, realname from hscyxxb where card_no in (:idCards) order by create_time desc"; + HashMap args = new HashMap<>(); + args.put("idCards", idCards); + // 这一批居民的核酸采样列表 + List> hscyList = yantaiJdbcTemplate.queryForList(sql, args); + if (CollectionUtils.isNotEmpty(hscyList)) { + List entities = new ArrayList<>(); + hscyList.forEach(sampleInfo -> { + // 从视图中获取到的核酸采样相关信息 + String name = (String) sampleInfo.get("name"); + String cardNo = (String) sampleInfo.get("card_no"); + Date createTime = (Date) sampleInfo.get("create_time"); + + // 本地数据库中，居民信息 + NatUserInfoResultDTO currentResiInfo = idCardAndResiInfo.get(cardNo); + + IcNatEntity e = new IcNatEntity(); + e.setCustomerId(customerId); + e.setIsResiUser(StringUtils.isBlank(currentResiInfo.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); + e.setUserId(currentResiInfo.getUserId()); + e.setMobile(""); + e.setUserType(isSync.equals(NumConstant.ONE_STR) ? "manualSync" : "sync"); + e.setName(StringUtils.isNotBlank(name) ? name : ""); + e.setIdCard(StringUtils.isNotBlank(cardNo) ? cardNo : ""); + e.setSampleTime(createTime); + // e.setSampleTime(DateUtils.parseDate(createTime, DateUtils.DATE_TIME_PATTERN)); + e.setAgencyId(currentResiInfo.getAgencyId()); + e.setPids(currentResiInfo.getPids()); + e.setAttachmentType(""); + e.setAttachmentUrl(""); + entities.add(e); + }); + if (CollectionUtils.isNotEmpty(entities)){ + List existSampleInfo = icNatDao.getExistNatInfo(entities); + sampleAndNat(existSampleInfo,entities,NumConstant.ONE_STR,customerId,isSync); + } + } + } } From 85544c6823778b42e03639c3b52f6e88354013c4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 2 Nov 2022 14:47:35 +0800 Subject: [PATCH 071/161] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/entity/IcPartyMemberEntity.java | 15 +++++++++++++++ .../epmet/service/impl/IcResiUserServiceImpl.java | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java index 10add799d0..07ca2844b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java @@ -85,6 +85,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity { */ private String isDyzxh; + /** + * 入党时所在党支部 + */ + private String rdsszzb; + + /** + * 组织关系转入社区时间 + */ + private String zzgxzrsqsj; + + /** + * 是否请长假 + */ + private String isQcj; + /** * 预留字段1 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index da40690ee6..53207c7750 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -342,6 +342,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 2 Nov 2022 15:20:01 +0800 Subject: [PATCH 072/161] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 2 +- .../IcTripReportRecordController.java | 32 +- .../entity/IcTripReportRecordEntity.java | 2 +- .../excel/IcPsTripReportRecordExcel.java | 120 +++----- .../excel/data/IcTripReportExcelData.java | 5 +- .../error/IcPsTripReportRecordErrorExcel.java | 19 +- .../IcPsTripReportExcelImportListener.java | 177 +++++++++++ .../IcTripReportExcelImportListener.java | 30 +- .../service/IcTripReportRecordService.java | 2 +- .../impl/IcTripReportRecordServiceImpl.java | 290 ++++++------------ 10 files changed, 396 insertions(+), 283 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 09134872c2..ed73892942 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -287,7 +287,7 @@ public class IcTripReportRecordDTO implements Serializable { /** * 来曹事由【磐石】 */ - private String describe; + private String describeContent; /** * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 5814ae7a18..ba74631d37 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -337,13 +337,37 @@ public class IcTripReportRecordController implements ResultDataResolver { if (file.isEmpty()) { throw new RenException("请上传文件"); } + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_trip_preport", "import"); + fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); + } catch (IOException e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【行程上报导入】创建临时存储文件失败:{}", errorMsg); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败"); + } + InputStream is = null; + FileOutputStream os = null; + try { + is = file.getInputStream(); + os = new FileOutputStream(fileSavePath.toString()); + IOUtils.copy(is, os); + } catch (Exception e) { + log.error("method exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } - // 校验文件类型 + //校验文件类型 String extension = FilenameUtils.getExtension(file.getOriginalFilename()); if (!"xls".equals(extension) && !"xlsx".equals(extension)) { throw new RenException("文件类型不匹配"); } - //1.查询当前工作人员是否有再导入的党员先锋数据,有则不允许导入，没有则进行新的导入 + //2.查询当前工作人员是否有再导入的党员先锋数据,有则不允许导入，没有则进行新的导入 ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); importTaskForm.setOriginFileName(file.getOriginalFilename()); importTaskForm.setOperatorId(tokenDto.getUserId()); @@ -363,8 +387,8 @@ public class IcTripReportRecordController implements ResultDataResolver { commonServiceOpenFeignClient.finishImportTask(input); log.error("读取文件失败"); } - //2.执行导入程序 - icTripReportRecordService.psExecAsyncExcelImport(tokenDto, response, inputStream, result.getData().getTaskId()); + //3.执行导入程序 + icTripReportRecordService.psExecAsyncExcelImport(fileSavePath, result.getData().getTaskId(),tokenDto); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 35bde836c4..c261c5acd9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -146,7 +146,7 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { /** * 来曹事由【磐石】 */ - private String describe; + private String describeContent; /** * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 1f4bd6814d..0e1b7a1769 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -1,12 +1,13 @@ package com.epmet.excel; -import cn.afterturn.easypoi.excel.annotation.Excel; -import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import com.alibaba.excel.annotation.ExcelProperty; import com.epmet.commons.tools.utils.ExcelVerifyInfo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; -import java.util.List; +import java.util.Date; /** * 磐石-行程上报信息 @@ -15,110 +16,87 @@ import java.util.List; @Data public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { - @Excel(name = "姓名", needMerge = true) - @NotBlank(message = "不能为空") + @ExcelProperty("姓名") + @NotBlank(message = "姓名不能为空") private String name; - @Excel(name = "年龄", needMerge = true) - //@NotNull(message = "不能为空") + @ExcelProperty("年龄") + //@NotNull(message = "年龄不能为空") private Integer age; - @Excel(name = "证件号", needMerge = true) - @NotBlank(message = "不能为空") - private Integer idCard; + @ExcelProperty("证件号") + @NotBlank(message = "证件号不能为空") + private String idCard; - @Excel(name = "户籍地（省市县区）", needMerge = true) - @NotBlank(message = "不能为空") + @ExcelProperty("户籍地（省市县区）") + @NotBlank(message = "户籍地不能为空") private String registeredResidence; - @Excel(name = "手机号", needMerge = true) - @NotBlank(message = "不能为空") + @ExcelProperty("手机号") + @NotBlank(message = "手机号不能为空") private String mobile; - /* @ExcelCollection(name = "来源地") - private List source;*/ - @Excel(name = "来自地区（格式：省-市-区-街道-社区）") - @NotBlank(message = "不能为空") + @ExcelProperty("来自地区（格式：省-市-区-街道-社区）") + @NotBlank(message = "来自地区不能为空") private String sourceAddress; - @Excel(name = "来自地区详细地址") + @ExcelProperty("来自地区详细地址") + @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; - @Excel(name = "来曹事由（100字以内）", needMerge = true) - @NotBlank(message = "不能为空") - private String describe; + @ExcelProperty("来曹事由（100字以内）") + @NotBlank(message = "来曹事由不能为空") + private String describeContent; - @Excel(name = "48小时核酸检测", needMerge = true) - @NotBlank(message = "不能为空") + @ExcelProperty("48小时核酸检测") + @NotBlank(message = "48小时核酸检测不能为空") private String natOutcome; - @Excel(name = "来到本地时间（2022-01-01）", needMerge = true) - @NotBlank(message = "不能为空") - private String arriveDate; + @ExcelProperty("来到本地时间\n" + + "（2022-01-01）") + //@NotBlank(message = "来到本地时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date arriveDate; - /*@ExcelCollection(name = "在曹居住地点") - private List present;*/ - @Excel(name = "现居地") - @NotBlank(message = "不能为空") + @ExcelProperty("现居地") + @NotBlank(message = "现居地不能为空") private String presentAddress; - @Excel(name = "现居地详细地址") + @ExcelProperty("现居地详细地址") + @NotBlank(message = "现居地详细地址不能为空") private String detailAddress; - /*@ExcelCollection(name = "返回方式") - private List traffic;*/ - @Excel(name = "返回方式") - @NotBlank(message = "不能为空") + @ExcelProperty("返回方式") + @NotBlank(message = "返回方式不能为空") private String trafficType; - @Excel(name = "其他返回方式") + @ExcelProperty("其他返回方式") private String trafficTypeExplain; - @Excel(name = "7天内旅居史情况", needMerge = true) + @ExcelProperty("7天内旅居史情况") private String sojournHistory; - @Excel(name = "隔离状态", needMerge = true) + @ExcelProperty("隔离状态") private String isolateType; - @Excel(name = "备注（500字以内）", needMerge = true) + @ExcelProperty("备注（500字以内）") private String remark; - @Excel(name = "是否落实“落地检”", needMerge = true) + @ExcelProperty("是否落实“落地检”") private String isArriveCheck; - @Excel(name = "是否达到曹县", needMerge = true) + @ExcelProperty("是否达到曹县") private String isArrive; - @Excel(name = "上报时间（2022-01-01）", needMerge = true) - private String reportingTime; + @ExcelProperty("上报时间\n" + + "（2022-01-01）") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date reportingTime; - @Excel(name = "管控措施（500字以内）", needMerge = true) + @ExcelProperty("管控措施\n" + + "（500字以内）") private String controlMeasures; - @Excel(name = "类型（省内、省外、市内、县内）", needMerge = true) + @ExcelProperty("类型\n" + + "（省内、省外、市内、县内）") private String tripDataType; - @Data - public class Source { - @Excel(name = "社区（省-市-区-街道-社区）") - @NotBlank(message = "不能为空") - private String sourceAddress; - @Excel(name = "详细地址", width = 20) - private String sourceDetailAddress; - } - @Data - public class Present { - @Excel(name = "村/居") - @NotBlank(message = "不能为空") - private String presentAddress; - @Excel(name = "详细地址", width = 20) - private String detailAddress; - } - @Data - public class Traffic { - @Excel(name = "返回方式") - @NotBlank(message = "不能为空") - private String trafficType; - @Excel(name = "其他返回方式", width = 20) - private String trafficTypeExplain; - } - } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java index 89afb8d7f1..083cc5ac3d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java @@ -2,6 +2,7 @@ package com.epmet.excel.data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -45,6 +46,7 @@ public class IcTripReportExcelData { @NotNull(message = "来到本地时间为必填项") @ExcelProperty("来到本地时间（格式：2022-01-01）") + @JsonFormat(pattern = "yyyy-MM-dd") private Date arriveDate; @ExcelProperty("返回方式") @@ -63,6 +65,7 @@ public class IcTripReportExcelData { private String vaccineNum; @ExcelProperty("离开本地时间（格式：2022-01-01）") + @JsonFormat(pattern = "yyyy-MM-dd") private Date leaveDate; /** @@ -80,7 +83,7 @@ public class IcTripReportExcelData { private String name; @ColumnWidth(20) - @ExcelProperty("身份证号") + @ExcelProperty("证件号") private String idCard; @ExcelProperty("手机号") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java index a330e40462..4f569fd9c0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java @@ -1,6 +1,8 @@ package com.epmet.excel.error; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -13,19 +15,20 @@ import java.util.Date; @Data public class IcPsTripReportRecordErrorExcel { - @Excel(name = "姓名", width = 20) + @ExcelProperty("姓名") + @ColumnWidth(20) private String name; - @Excel(name = "证件号", width = 25) - private Integer idCard; + @ColumnWidth(20) + @ExcelProperty("证件号") + private String idCard; - @Excel(name = "户籍地（省市县区）", width = 40) - private String presentAddress; - - @Excel(name = "手机号", width = 20) + @ExcelProperty("手机号") + @ColumnWidth(20) private String mobile; - @Excel(name = "社会自组织名称", width = 40) + @ColumnWidth(60) + @ExcelProperty("错误信息") private String errorInfo; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java new file mode 100644 index 0000000000..b25d41af4d --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java @@ -0,0 +1,177 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.ValidateException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constant.IcResiUserConstant; +import com.epmet.entity.IcTripReportRecordEntity; +import com.epmet.excel.IcPsTripReportRecordExcel; +import com.epmet.excel.data.IcTripReportExcelData; +import com.epmet.excel.error.IcPsTripReportRecordErrorExcel; +import com.epmet.service.impl.IcTripReportRecordServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; + + +/** + * 磐石-行程上报excel导入监听器 + */ +@Slf4j +public class IcPsTripReportExcelImportListener implements ReadListener { + + /** + * 最大条数阈值 + */ + public static final int MAX_THRESHOLD = 200; + /** + * 当前操作用户 + */ + private CustomerStaffInfoCacheResult staffInfo; + private String customerId; + //字典表数据 + private Map trafficTypeMap; + private Map sojournHistoryMap; + private Map isolateTypeMap; + private Map tripDataTypeMap; + private Map areaMap; + + /** + * 数据 + */ + private List datas = new ArrayList<>(); + + /** + * 错误项列表 + */ + private List errorRows = new ArrayList<>(); + + private IcTripReportRecordServiceImpl tripReportRecordService; + + public IcPsTripReportExcelImportListener(String customerId, CustomerStaffInfoCacheResult staffInfo, IcTripReportRecordServiceImpl tripReportRecordService, + Map trafficTypeMap, Map sojournHistoryMap, Map isolateTypeMap, Map tripDataTypeMap, Map areaMap) { + this.customerId=customerId; + this.staffInfo = staffInfo; + this.tripReportRecordService = tripReportRecordService; + this.trafficTypeMap = trafficTypeMap; + this.sojournHistoryMap = sojournHistoryMap; + this.isolateTypeMap = isolateTypeMap; + this.tripDataTypeMap = tripDataTypeMap; + this.areaMap = areaMap; + } + + @Override + public void invoke(IcPsTripReportRecordExcel data, AnalysisContext context) { + + try { + // 先校验数据 + ValidatorUtils.validateEntity(data); + + AtomicBoolean bl = new AtomicBoolean(false); + StringBuffer errMsg = new StringBuffer(""); + IcTripReportRecordEntity e = ConvertUtils.sourceToTarget(data, IcTripReportRecordEntity.class); + e.setCustomerId(customerId); + e.setAgencyId(staffInfo.getAgencyId()); + e.setPids(staffInfo.getAgencyPIds()); + e.setUserType(IcResiUserConstant.USER_TYPE_IMPORT); + if (trafficTypeMap.containsKey(data.getTrafficType())) { + e.setTrafficType(trafficTypeMap.get(data.getTrafficType())); + } + if ("其他".equals(data.getTrafficType()) && StringUtils.isBlank(data.getTrafficTypeExplain())) { + errMsg.append("返回方式为其他时，请补充“其他返回方式”;"); + bl.set(true); + } + if (StringUtils.isNotBlank(data.getSojournHistory())) { + e.setSojournHistory(sojournHistoryMap.get(data.getSojournHistory())); + } else { + String[] str = e.getSourceAddress().split("-"); + if (str.length < 3) { + errMsg.append("数据不完整，‘来源地’信息填写格式错误;"); + bl.set(true); + } + e.setSojournHistory("3");//无风险 + if (areaMap.containsKey(str[2])) { + e.setSojournHistory(areaMap.get(str[2])); + } + } + if (StringUtils.isNotBlank(data.getIsolateType())) { + e.setIsolateType(isolateTypeMap.get(data.getIsolateType())); + } + if (StringUtils.isNotBlank(data.getTripDataType())) { + e.setTripDataType(tripDataTypeMap.get(data.getTripDataType())); + } + e.setIsArriveCheck("是".equals(data.getIsArriveCheck()) ? "1" : "0"); + e.setIsArrive("是".equals(data.getIsArrive()) ? "1" : "0"); + //必要字段没值的 + if (StringUtils.isEmpty(e.getSourceAddress()) || StringUtils.isEmpty(e.getPresentAddress()) + || StringUtils.isEmpty(e.getTrafficType())) { + errMsg.append("数据不完整，请检查‘来源地’、‘在曹居住地点’、‘返回方式’信息是否填写完整;"); + bl.set(true); + } + if (bl.get()) { + IcPsTripReportRecordErrorExcel errorRow = new IcPsTripReportRecordErrorExcel(); + errorRow.setName(data.getName()); + errorRow.setMobile(data.getMobile()); + errorRow.setIdCard(data.getIdCard()); + errorRow.setErrorInfo(errMsg.toString()); + errorRows.add(errorRow); + return; + } + datas.add(e); + + if (datas.size() == MAX_THRESHOLD) { + execPersist(); + } + } catch (Exception e) { + String errorMsg = null; + if (e instanceof ValidateException) { + errorMsg = ((ValidateException) e).getMsg(); + } else { + errorMsg = "未知错误"; + log.error("【行程上报导入】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } + + IcPsTripReportRecordErrorExcel errorRow = new IcPsTripReportRecordErrorExcel(); + errorRow.setName(data.getName()); + errorRow.setMobile(data.getMobile()); + errorRow.setIdCard(data.getIdCard()); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + if (datas != null && datas.size() > 0) { + tripReportRecordService.batchPersist(datas); + } + } finally { + datas.clear(); + } + } + + /** + * 获取错误行 + * @return + */ + public List getErrorRows() { + return errorRows; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java index a9e1a102d7..c20465d1e2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java @@ -10,11 +10,15 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.IcResiUserConstant; import com.epmet.entity.IcTripReportRecordEntity; import com.epmet.excel.data.IcTripReportExcelData; +import com.epmet.excel.error.IcPsTripReportRecordErrorExcel; import com.epmet.service.impl.IcTripReportRecordServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; /** @@ -33,6 +37,8 @@ public class IcTripReportExcelImportListener implements ReadListener trafficTypeMap; /** * 数据 @@ -46,10 +52,11 @@ public class IcTripReportExcelImportListener implements ReadListener trafficTypeMap) { this.customerId=customerId; this.staffInfo = staffInfo; this.tripReportRecordService = tripReportRecordService; + this.trafficTypeMap = trafficTypeMap; } @Override @@ -59,12 +66,33 @@ public class IcTripReportExcelImportListener implements ReadListener> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - IcTripReportExcelImportListener listener = new IcTripReportExcelImportListener(customerId,staffInfo, this); + IcTripReportExcelImportListener listener = new IcTripReportExcelImportListener(customerId,staffInfo, this, tMap); EasyExcel.read(filePath.toFile(), IcTripReportExcelData.class, listener).headRowNumber(2).sheet(0).doRead(); @@ -550,139 +553,105 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl fileList = new ArrayList<>(); - IcPsTripReportRecordErrorExcel excel = null; - //1.读取Excel数据 - ExcelImportResult testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 2, IcPsTripReportRecordExcel.class); - //2.存在错误行数据时存入错误数据集合中 - if (CollectionUtils.isNotEmpty(testExcelImportResult.getFailList())) { - for (IcPsTripReportRecordExcel entity : testExcelImportResult.getFailList()) { - //打印失败的行 和失败的信息 - log.warn("第{}行,{}", entity.getRowNum(), entity.getErrorMsg()); - excel = new IcPsTripReportRecordErrorExcel(); - excel.setName(entity.getName()); - excel.setIdCard(entity.getIdCard()); - excel.setPresentAddress(entity.getPresentAddress()); - excel.setMobile(entity.getMobile()); - excel.setErrorInfo(entity.getErrorMsg()); - fileList.add(excel); + //获取当前登录用户所属组织id + CustomerStaffInfoCacheResult staffInfo= queryCurrentStaff(tokenDto.getCustomerId(), tokenDto.getUserId()); + //获取需要的字典表数据 + //交通方式 + Result> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //7天内旅居史情况 + Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); + Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态 + Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //行程记录类型 + Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); + Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //风险地区数据 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcDangerAreaEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(IcDangerAreaEntity::getDelFlag, DelFlagEnum.NORMAL.value()); + List areaList = icDangerAreaDao.selectList(wrapper); + Map areaMap = new HashMap<>(); + areaList.forEach(a->{ + if(StringUtils.isNotBlank(a.getDistrict())){ + areaMap.put(a.getDistrict(), a.getDangerLevel()); } - } - //3.正确行数据集合 - List list = testExcelImportResult.getList(); - if (CollectionUtils.isNotEmpty(list)) { - //3-1.校验数据值，把填写不对的数据剔除 - Iterator iterator = list.iterator(); - while (iterator.hasNext()) { - AtomicBoolean bl = new AtomicBoolean(false); - StringBuffer errMsg = new StringBuffer(""); - IcPsTripReportRecordExcel obj = iterator.next(); - //返回方式为其他时需要填写"其他返回方式" - if ("其他".equals(obj.getTrafficType()) && StringUtils.isBlank(obj.getTrafficTypeExplain())) { - errMsg.append("返回方式为其他时，请补充“其他返回方式”;"); - bl.set(true); + }); + + IcPsTripReportExcelImportListener listener = new IcPsTripReportExcelImportListener(tokenDto.getCustomerId(), staffInfo, this, + tMap, sMap, iMap, tdMap, areaMap); + + EasyExcel.read(filePath.toFile(), IcPsTripReportRecordExcel.class, listener).headRowNumber(2).sheet(0).doRead(); + + Path errorDescFile = null; + String errorDesFileUrl = null; + List errorRows = listener.getErrorRows(); + + boolean failed = errorRows.size() > 0; + if (failed) { + // 生成并上传错误文件 + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_trip_preport", "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + errorDescFile = errorDescDir.resolve(fileName); + + FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile()); + FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName); + OutputStream os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcPsTripReportRecordErrorExcel.class).sheet("导入失败列表").doWrite(errorRows); + + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); } - if (bl.get()) { - excel = new IcPsTripReportRecordErrorExcel(); - excel.setName(obj.getName()); - excel.setIdCard(obj.getIdCard()); - excel.setPresentAddress(obj.getPresentAddress()); - excel.setMobile(obj.getMobile()); - excel.setErrorInfo(errMsg.toString()); - fileList.add(excel); - iterator.remove(); + } finally { + if (Files.exists(errorDescFile)) { + Files.delete(errorDescFile); } } - //3-2.获取需要的字典表数据 - //交通方式 - Result> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); - //7天内旅居史情况 - Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - //行程记录类型 - Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); - //获取当前登录用户所属组织id - CustomerStaffInfoCacheResult staffInfo = queryCurrentStaff(tokenDto.getCustomerId(), tokenDto.getUserId()); - //风险地区数据 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcDangerAreaEntity::getCustomerId, tokenDto.getCustomerId()); - wrapper.eq(IcDangerAreaEntity::getDelFlag, DelFlagEnum.NORMAL.value()); - List areaList = icDangerAreaDao.selectList(wrapper); - Map map1 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getDistrict, IcDangerAreaEntity::getDangerLevel)); - Map map2 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getCity, IcDangerAreaEntity::getDangerLevel)); - Map map3 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getProvince, IcDangerAreaEntity::getDangerLevel)); - - list.forEach(l -> { - //3-3.数据赋值 - AtomicBoolean bl = new AtomicBoolean(false); - StringBuffer errMsg = new StringBuffer(""); - IcTripReportRecordEntity e = ConvertUtils.sourceToTarget(l, IcTripReportRecordEntity.class); - e.setCustomerId(tokenDto.getCustomerId()); - e.setAgencyId(staffInfo.getAgencyId()); - e.setPids(staffInfo.getAgencyPIds()); - e.setUserType(IcResiUserConstant.USER_TYPE_IMPORT); - if (trafficTypeMap.getData().containsKey(l.getTrafficType())) { - e.setTrafficType(trafficTypeMap.getData().get(l.getTrafficType())); - e.setTrafficTypeExplain(l.getTrafficTypeExplain()); - } - if (StringUtils.isNotBlank(l.getSojournHistory())) { - e.setSojournHistory(sojournHistoryMap.getData().get(l.getSojournHistory())); - } else { - String[] str = e.getSourceAddress().split("-"); - if (str.length < 3) { - bl.set(true); - errMsg.append("数据不完整，‘来源地’信息填写格式错误;"); - } - e.setSojournHistory("3");//无风险 - if (map1.containsKey(str[2])) {//高风险 - e.setSojournHistory(map1.get(str[2])); - } else if (map2.containsKey(str[1])) {//中风险 - e.setSojournHistory(map2.get(str[1])); - } else if (map3.containsKey(str[0])) {//低风险 - e.setSojournHistory(map3.get(str[0])); - } - } - if (StringUtils.isNotBlank(l.getIsolateType())) { - e.setIsolateType(isolateTypeMap.getData().get(l.getIsolateType())); - } - if (StringUtils.isNotBlank(l.getTripDataType())) { - e.setTripDataType(tripDataTypeMap.getData().get(l.getTripDataType())); - } - e.setIsArriveCheck("是".equals(l.getIsArriveCheck()) ? "1" : "0"); - e.setIsArrive("是".equals(l.getIsArrive()) ? "1" : "0"); - //必要字段没值的 - if (StringUtils.isEmpty(e.getSourceAddress()) || StringUtils.isEmpty(e.getPresentAddress()) - || StringUtils.isEmpty(e.getTrafficType())) { - errMsg.append("数据不完整，请检查‘来源地’、‘在曹居住地点’、‘返回方式’信息是否填写完整;"); - bl.set(true); - } - if (bl.get()) { - IcPsTripReportRecordErrorExcel el = new IcPsTripReportRecordErrorExcel(); - el.setName(l.getName()); - el.setIdCard(l.getIdCard()); - el.setPresentAddress(l.getPresentAddress()); - el.setMobile(l.getMobile()); - el.setErrorInfo(errMsg.toString()); - fileList.add(el); - return; - } - //3-4.保存数据 - baseDao.insert(e); - }); } - //4.错误数据生成文件，修改导入任务状态 - String url = erroeImport(fileList); - upImportTask(url, taskId, tokenDto.getUserId(), true); + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); + importFinishTaskForm.setOperatorId(tokenDto.getCustomerId()); + importFinishTaskForm.setResultDesc(""); + importFinishTaskForm.setResultDescFilePath(errorDesFileUrl); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【行程上报导入】finishImportTask失败"); + } } catch (Exception e) { String errorMsg = ExceptionUtils.getErrorStackTrace(e); - log.error("【行程上报数据导入】程序错误:{}", errorMsg); - upImportTask(null, taskId, tokenDto.getUserId(), false); + log.error("【行程上报导入】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importFinishTaskForm.setOperatorId(tokenDto.getCustomerId()); + importFinishTaskForm.setResultDesc("导入失败"); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【行程上报导入】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + log.error("method exception", e); + } + } } } @@ -784,74 +753,5 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl fileList) throws IOException { - String url = ""; - //1.有错误数据则生成错误数据存放文件传到阿里云服务 - if (!org.springframework.util.CollectionUtils.isEmpty(fileList)) { - Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表", "导入失败的数据列表"), - IcPsTripReportRecordErrorExcel.class, fileList); - - // 文件名 - String resultDescFileName = UUID.randomUUID().toString().concat(".xlsx"); - FileItemFactory factory = new DiskFileItemFactory(16, null); - FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName); - OutputStream os = fileItem.getOutputStream(); - Result uploadResult = null; - try { - workbook.write(os); - uploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); - } catch (Exception e) { - String errormsg = ExceptionUtils.getErrorStackTrace(e); - log.error("【行程上报数据导入】上传错误描述文件:{}", errormsg); - } finally { - try { - os.close(); - } catch (IOException e) { - String errormsg = ExceptionUtils.getErrorStackTrace(e); - log.error("【行程上报数据导入】上传错误描述文件关闭输出流:{}", errormsg); - } - try { - fileItem.delete(); - } catch (Exception e) { - String errormsg = ExceptionUtils.getErrorStackTrace(e); - log.error("【行程上报数据导入】上传错误描述文件删除临时文件:{}", errormsg); - } - } - - if (uploadResult == null || !uploadResult.success()) { - log.error("【行程上报数据导入】调用OSS上传结果描述文件失败"); - } - url = uploadResult.getData().getUrl(); - } - return url; - } - - /** - * @Author sun - * @Description 行程上报数据导入修改导入任务状态 - **/ - private void upImportTask(String url, String importTaskId, String staffId, Boolean status) { - //2.更新导入任务数据 - ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); - importTaskForm.setOperatorId(staffId); - importTaskForm.setBizType(ImportTaskConstants.PS_BIZ_TYPE_IC_TRIP_REPORT); - importTaskForm.setTaskId(importTaskId); - importTaskForm.setResultDescFilePath(url); - if (status && StringUtils.isBlank(url)) { - importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); - } else { - importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); - importTaskForm.setResultDesc("行程上报数据导入存在程序错误"); - } - Result result = commonServiceOpenFeignClient.finishImportTask(importTaskForm); - if (!result.success()) { - throw new RenException(result.getInternalMsg()); - } - } - } From a8487d66a4fbe83067304673ff4d74c950d25561 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Nov 2022 16:01:47 +0800 Subject: [PATCH 073/161] =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java | 2 +- .../java/com/epmet/controller/IcTripReportRecordController.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java index 53afd8c1e9..96a5ed7399 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -15,7 +15,7 @@ public class EmphasisTripPieDetailFormDTO implements Serializable { public interface EmphasisTripPieDetailForm{} - @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) +// @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) private String code; private String customerId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index ba74631d37..b29697f1ce 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -464,7 +464,6 @@ public class IcTripReportRecordController implements ResultDataResolver { */ @PostMapping("emphasisTripPieDetail") public Result> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO, @LoginUser TokenDto tokenDto){ - ValidatorUtils.validateEntity(formDTO,EmphasisTripPieDetailFormDTO.EmphasisTripPieDetailForm.class); formDTO.setStaffId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icTripReportRecordService.emphasisTripPieDetail(formDTO)); From 53cae0981ab742527a9423ead274a9bd74669c33 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Nov 2022 16:02:34 +0800 Subject: [PATCH 074/161] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E5=80=BC?= =?UTF-8?q?=E7=BF=BB=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcPsTripReportExcelImportListener.java | 1 + .../impl/IcTripReportRecordServiceImpl.java | 32 +++++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java index b25d41af4d..8fc2a65e39 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java @@ -82,6 +82,7 @@ public class IcPsTripReportExcelImportListener implements ReadListener> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); - Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //7天内旅居史情况 Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); - Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //隔离状态 Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); - Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //3.查询最近一次通知时间、核算检测关注名单 if (CollectionUtils.isNotEmpty(list)) { Map latestNotice = new HashMap<>(); @@ -160,15 +160,15 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); - Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //7天内旅居史情况 Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); - Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //隔离状态 Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); - Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); for (IcTripReportRecordDTO dto : result.getList()) { //字典表字段、是否字段赋值对应中国字 - dto.setTrafficTypeName(tMap.containsKey(dto.getTrafficType()) ? tMap.get(dto.getTrafficType()) : "无"); + dto.setTrafficTypeName(trafficTypeMap.getData().containsKey(dto.getTrafficType()) ? trafficTypeMap.getData().get(dto.getTrafficType()) : "无"); dto.setVaccineNumName(StringUtils.isNotBlank(dto.getVaccineNum()) ? dto.getVaccineNum().concat("针") : ""); dto.setIsNatRecordName("1".equals(dto.getIsNatRecord()) ? "是" : "否"); dto.setNatOutcomeName("1".equals(dto.getIsNatRecord()) ? "阳性" : "阴性"); - dto.setSojournHistoryName(sMap.containsKey(dto.getSojournHistory()) ? sMap.get(dto.getSojournHistory()) : "无"); - dto.setIsolateTypeName(iMap.containsKey(dto.getIsolateType()) ? iMap.get(dto.getIsolateType()) : "无"); + dto.setSojournHistoryName(sojournHistoryMap.getData().containsKey(dto.getSojournHistory()) ? sojournHistoryMap.getData().get(dto.getSojournHistory()) : "无"); + dto.setIsolateTypeName(isolateTypeMap.getData().containsKey(dto.getIsolateType()) ? isolateTypeMap.getData().get(dto.getIsolateType()) : "无"); dto.setIsArriveCheckName("1".equals(dto.getIsArriveCheck()) ? "是" : "否"); dto.setIsArriveName("1".equals(dto.getIsArrive()) ? "是" : "否"); - dto.setTripDataTypeName(tdMap.containsKey(dto.getTripDataType()) ? tdMap.get(dto.getTripDataType()) : "无"); + dto.setTripDataTypeName(tripDataTypeMap.getData().containsKey(dto.getTripDataType()) ? tripDataTypeMap.getData().get(dto.getTripDataType()) : "无"); } return result.getList(); From b14b677b6fc4b02dec84e160f9795eaf83670bde Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Nov 2022 16:06:56 +0800 Subject: [PATCH 075/161] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/EmphasisTripListResultDTO.java | 2 +- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java index 578709a489..f44bf4e952 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java @@ -26,7 +26,7 @@ public class EmphasisTripListResultDTO implements Serializable { /** * 来曹事由 */ - private String describe; + private String describeContent; /** * 核酸检测结果 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index c752a0d8da..212ab88ca6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -78,7 +78,7 @@ ID, AGENCY_ID, SOURCE_ADDRESS, - IFNULL(`describe`,'') as `describe`, + IFNULL(`describe_content`,'') as describeContent, ifnull(sojourn_history,'3') as sojournHistory, IFNULL(isolate_type,'4') as isolateType, ARRIVE_DATE, From 86fa1f40e05b341f0a0c1e25c9525a280b4238e4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 2 Nov 2022 16:10:06 +0800 Subject: [PATCH 076/161] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 53207c7750..73888d2edb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2401,6 +2401,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 2 Nov 2022 16:13:07 +0800 Subject: [PATCH 077/161] =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E7=AE=A1=E6=8E=A7=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8D=95=E5=85=83=E6=A0=BC=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=9C=AC=E6=96=87=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/attention_nat_template.xlsx | Bin 9319 -> 9373 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx index a12e8bd8591d9e3378252c4cb3d405f478759fba..e0d2c01236a25cd065c368a98bbee606d94caf06 100644 GIT binary patch delta 4222 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 U0000H01*HO1ONblAOHXW06L1~L;wH) delta 4150 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 AaR2}S From f4f694ed21d00f517c480df911425b5979673a12 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Nov 2022 16:21:19 +0800 Subject: [PATCH 078/161] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/StrConstant.java | 2 ++ .../epmet/dto/form/IcTripReportFormDTO.java | 3 ++ .../impl/IcTripReportRecordServiceImpl.java | 29 +++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index 1dd825b18e..fb294721f8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -99,6 +99,8 @@ public interface StrConstant { String PY_CUSTOMER = "6f203e30de1a65aab7e69c058826cd80"; //平音客户跟组织Id String PY_ROOT_AGENCY = "53613e1c5de6ed473467f0159a10b135"; + //磐石街道客户Id + String PS_CUSTOMER_ID = "1580460084738760705"; /** * 单位积分,积分上限，积分说明，积分事件 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index aae545ab01..54d6dedc26 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -179,6 +179,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 交通方式，来源字典表(traffic_type) */ + @NotBlank(message = "返回方式不能为空", groups = {ResiUserRequired.class}) private String trafficType; /** * 其他返回方式，交通方式为其他时此列需要有值 @@ -187,6 +188,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 来源地详细信息 source_address字段的说明 */ + @NotBlank(message = "来自地区不能为空", groups = {ResiUserRequired.class}) private String sourceDetailAddress; /** * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 @@ -199,6 +201,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 户籍地 【磐石】 */ + @NotBlank(message = "户籍地不能为空", groups = {ResiUserRequired.class}) private String registeredResidence; /** * 年龄【磐石】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 8698e35be1..bd627a273c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.epmet.commons.mybatis.enums.DelFlagEnum; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -205,6 +206,20 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Wed, 2 Nov 2022 16:50:42 +0800 Subject: [PATCH 079/161] =?UTF-8?q?=E5=85=B3=E4=BA=8Eexcel=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E5=88=97=E5=80=BC=E6=8E=A5=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/IcPsTripReportRecordExcel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 0e1b7a1769..04a8a16900 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -1,10 +1,9 @@ package com.epmet.excel; import com.alibaba.excel.annotation.ExcelProperty; -import com.epmet.commons.tools.utils.ExcelVerifyInfo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.util.Date; @@ -14,7 +13,7 @@ import java.util.Date; * */ @Data -public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { +public class IcPsTripReportRecordExcel { @ExcelProperty("姓名") @NotBlank(message = "姓名不能为空") @@ -45,6 +44,7 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { @ExcelProperty("来曹事由（100字以内）") @NotBlank(message = "来曹事由不能为空") + @Length(max = 500,message = "来曹事由不能超过100字") private String describeContent; @ExcelProperty("48小时核酸检测") @@ -77,6 +77,7 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { private String isolateType; @ExcelProperty("备注（500字以内）") + @Length(max = 500,message = "备注不能超过500字") private String remark; @ExcelProperty("是否落实“落地检”") @@ -92,6 +93,7 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { @ExcelProperty("管控措施\n" + "（500字以内）") + @Length(max = 500,message = "管控措施不能超过500字") private String controlMeasures; @ExcelProperty("类型\n" + From 405b03b50f0930a10dd78780a3fdec1277ec1bcd Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 2 Nov 2022 17:16:50 +0800 Subject: [PATCH 080/161] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcUserChangeRecordDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml index 4b7203f075..c5717beea3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml @@ -25,7 +25,7 @@ WHERE del_flag = '0' AND ic_user_id = #{icUserId} - ORDER BY change_time DESC, type ASC + ORDER BY CREATED_TIME DESC, type ASC @@ -81,4 +81,4 @@ where IC_USER_ID = #{icResiUserId} - \ No newline at end of file + From fcefb9e355f41f30ca86e2c09e4fbaa54d706cf3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Nov 2022 17:40:10 +0800 Subject: [PATCH 081/161] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 6 +- .../IcTripReportRecordController.java | 9 +- .../IcPsTripReportRecordExportExcel.java | 43 +++--- .../excel/IcTripReportRecordExportExcel.java | 123 ++++++++++++++++++ 4 files changed, 154 insertions(+), 27 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index ed73892942..a53882076c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -156,7 +156,7 @@ public class IcTripReportRecordDTO implements Serializable { @ColumnWidth(25) @ExcelProperty(value = "来到本地时间",order = 8) @JsonFormat(pattern = "yyyy-MM-dd") - private Date arriveDate; + private String arriveDate; /** * 离开日期 @@ -164,7 +164,7 @@ public class IcTripReportRecordDTO implements Serializable { @ColumnWidth(25) @ExcelProperty(value = "离开本地时间",order = 13) @JsonFormat(pattern = "yyyy-MM-dd") - private Date leaveDate; + private String leaveDate; /** * pc行程上报-列表返参：最近一次通知时间 @@ -332,7 +332,7 @@ public class IcTripReportRecordDTO implements Serializable { * 上报时间【磐石】 */ @JsonFormat(pattern = "yyyy-MM-dd") - private Date reportingTime; + private String reportingTime; /** * 管控措施【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index b29697f1ce..1133cf4688 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -28,6 +28,7 @@ import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcPsTripReportRecordExportExcel; +import com.epmet.excel.IcTripReportRecordExportExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; import lombok.extern.slf4j.Slf4j; @@ -230,13 +231,15 @@ public class IcTripReportRecordController implements ResultDataResolver { // 这里 需要指定写用哪个class去写 String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD); String fileName = "行程上报信息".concat(today); - excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordExportExcel.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; + List list = null; do { data = icTripReportRecordService.page(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcTripReportRecordExportExcel.class); formDTO.setPageNo(++pageNo); - excelWriter.write(data.getList(), writeSheet); + excelWriter.write(list, writeSheet); } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); } catch (Exception e) { @@ -409,7 +412,7 @@ public class IcTripReportRecordController implements ResultDataResolver { // 这里 需要指定写用哪个class去写 String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD); String fileName = "行程上报信息".concat(today); - excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPsTripReportRecordExportExcel.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; List list = null; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index bf9c9455d1..a701be4c74 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -41,107 +42,107 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 户籍地 【磐石】 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "户籍地（省市县区）",order = 4) private String registeredResidence; /** * 手机号 */ - @ColumnWidth(25) + @ColumnWidth(15) @ExcelProperty(value = "手机号",order = 5) private String mobile; /** * 来自地区（格式：省-市-区-街道-社区） */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "来自地区（格式：省-市-区-街道-社区）",order = 6) private String sourceAddress; /** * 来自地区详细地址 source_address字段的说明 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** * 来曹事由（100字以内）【磐石】 */ - @ColumnWidth(40) + @ColumnWidth(25) @ExcelProperty(value = "来曹事由（100字以内）",order = 8) - private String describe; + private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "48小时核酸检测",order = 9) private String isNatRecordName; /** * 来到本地时间（2022-01-01） */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "来到本地时间（2022-01-01）",order = 10) @JsonFormat(pattern = "yyyy-MM-dd") - private Date arriveDate; + private String arriveDate; /** * 现居地 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "现居地",order = 11) private String presentAddress; /** * 现居地详细地址 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "现居地详细地址",order = 12) private String detailAddress; /** * 交通方式-中国字 */ - @ColumnWidth(30) + @ColumnWidth(15) @ExcelProperty(value = "返回方式",order = 13) private String trafficTypeName; /** * 其他返回方式，交通方式为其他时此列需要有值 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "其他返回方式",order = 14) private String trafficTypeExplain; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "7天内旅居史情况",order = 15) private String sojournHistoryName; /** * 隔离状态，字典表(isolate_type)【磐石】-中国字 */ - @ColumnWidth(30) + @ColumnWidth(15) @ExcelProperty(value = "隔离状态",order = 16) private String isolateTypeName; /** * 备注（500字以内） */ - @ColumnWidth(50) + @ColumnWidth(35) @ExcelProperty(value = "备注（500字以内）",order = 17) private String remark; /** * 是否落实"落地检" 0:否 1:是【磐石】-中国字 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "是否落实“落地检”",order = 18) private String isArriveCheckName; /** * 是否达到曹县 0:否 1:是【磐石】-中国字 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "是否达到曹县",order = 19) private String isArriveName; /** * 上报时间（2022-01-01）【磐石】 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "上报时间（2022-01-01）",order = 20) @JsonFormat(pattern = "yyyy-MM-dd") - private Date reportingTime; + private String reportingTime; /** * 管控措施（500字以内）【磐石】 */ @@ -151,7 +152,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 类型（省内、省外、市内、县内），字典表(trip_data_type)【磐石】-中国字 */ - @ColumnWidth(35) + @ColumnWidth(25) @ExcelProperty(value = "类型（省内、省外、市内、县内）",order = 22) private String tripDataTypeName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java new file mode 100644 index 0000000000..5b2bfbc0d9 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java @@ -0,0 +1,123 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 行程上报信息 + * + */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@Data +public class IcTripReportRecordExportExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 姓名 + */ + @ColumnWidth(15) + @ExcelProperty(value = "姓名", order = 1) + private String name; + + /** + * 证件号 + */ + @ColumnWidth(20) + @ExcelProperty(value = "证件号",order = 2) + private String idCard; + + /** + * 手机号 + */ + @ColumnWidth(15) + @ExcelProperty(value = "手机号",order = 3) + private String mobile; + + /** + * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 + */ + @ColumnWidth(30) + @ExcelProperty(value = "现居地",order = 4) + private String presentAddress; + + /** + * 详细地址 + */ + @ColumnWidth(30) + @ExcelProperty(value = "现居地详细地址",order = 5) + private String detailAddress; + + /** + * 来源地区地址 + */ + @ColumnWidth(30) + @ExcelProperty(value = "来自地区",order = 6) + private String sourceAddress; + + /** + * 来自地区详细地址 source_address字段的说明 + */ + @ColumnWidth(30) + @ExcelProperty(value = "来自地区详细地址",order = 7) + private String sourceDetailAddress; + + /** + * 到达日期 + */ + @ColumnWidth(20) + @ExcelProperty(value = "来到本地时间",order = 8) + @JsonFormat(pattern = "yyyy-MM-dd") + private String arriveDate; + + /** + * 交通方式-中国字 + */ + @ColumnWidth(15) + @ExcelProperty(value = "返回方式",order = 9) + private String trafficTypeName; + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + @ColumnWidth(20) + @ExcelProperty(value = "其他返回方式",order = 10) + private String trafficTypeExplain; + + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】-中国字 + */ + @ColumnWidth(20) + @ExcelProperty(value = "48小时核酸检测",order = 11) + private String isNatRecordName; + + /** + * 疫苗接种针次 -中国字(0针 1针 2针 3针) + */ + @ColumnWidth(20) + @ExcelProperty(value = "疫苗接种针次",order = 12) + private String vaccineNumName; + + /** + * 离开日期 + */ + @ColumnWidth(20) + @ExcelProperty(value = "离开本地时间",order = 13) + @JsonFormat(pattern = "yyyy-MM-dd") + private String leaveDate; + + /** + * 备注信息 + */ + @ColumnWidth(40) + @ExcelProperty(value = "备注",order = 14) + private String remark; +} From 7e23b0862c65a36810a0d2bf0fdd52c057c1326e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Nov 2022 09:11:08 +0800 Subject: [PATCH 082/161] =?UTF-8?q?=E5=8A=A0=E4=B8=8A**?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcTripReportRecordController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 1133cf4688..50728a1db7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -440,6 +440,7 @@ public class IcTripReportRecordController implements ResultDataResolver { * @Date 2022/11/1 15:43 */ @PostMapping("list") + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) public Result> emphasisTripList(@LoginUser TokenDto tokenDto, @RequestBody EmphasisTripListFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); formDTO.setStaffId(tokenDto.getUserId()); From 8e4ba0710ba35120dd6a2650bcc98b0819cc9513 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 09:47:01 +0800 Subject: [PATCH 083/161] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 53 ++++++++++++------- .../IcTripReportRecordController.java | 2 - .../IcPsTripReportRecordExportExcel.java | 12 ++--- .../excel/IcTripReportRecordExportExcel.java | 8 +-- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index a53882076c..f40344f6cb 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -66,14 +66,14 @@ public class IcTripReportRecordDTO implements Serializable { * 姓名 */ @ColumnWidth(15) - @ExcelProperty(value = "姓名", order = 1) + @ExcelProperty(value = "姓名") private String name; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty(value = "手机号",order = 3) + @ExcelProperty(value = "手机号") private String mobile; /** @@ -85,7 +85,7 @@ public class IcTripReportRecordDTO implements Serializable { * 身份证号 */ @ColumnWidth(22) - @ExcelProperty(value = "证件号",order = 2) + @ExcelProperty(value = "证件号") private String idCard; /** @@ -121,14 +121,14 @@ public class IcTripReportRecordDTO implements Serializable { * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 */ @ColumnWidth(50) - @ExcelProperty(value = "现居地",order = 4) + @ExcelProperty(value = "现居地") private String presentAddress; /** * 详细地址 */ @ColumnWidth(35) - @ExcelProperty(value = "现居地详细地址",order = 5) + @ExcelProperty(value = "现居地详细地址") private String detailAddress; /** @@ -147,14 +147,14 @@ public class IcTripReportRecordDTO implements Serializable { * 来源地区地址 */ @ColumnWidth(50) - @ExcelProperty(value = "来自地区",order = 6) + @ExcelProperty(value = "来自地区") private String sourceAddress; /** * 到达日期 */ @ColumnWidth(25) - @ExcelProperty(value = "来到本地时间",order = 8) + @ExcelProperty(value = "来到本地时间") @JsonFormat(pattern = "yyyy-MM-dd") private String arriveDate; @@ -162,7 +162,7 @@ public class IcTripReportRecordDTO implements Serializable { * 离开日期 */ @ColumnWidth(25) - @ExcelProperty(value = "离开本地时间",order = 13) + @ExcelProperty(value = "离开本地时间") @JsonFormat(pattern = "yyyy-MM-dd") private String leaveDate; @@ -178,7 +178,7 @@ public class IcTripReportRecordDTO implements Serializable { * 备注信息 */ @ColumnWidth(100) - @ExcelProperty(value = "备注",order = 14) + @ExcelProperty(value = "备注") private String remark; /** @@ -237,112 +237,127 @@ public class IcTripReportRecordDTO implements Serializable { /** * 交通方式，来源字典表(traffic_type) */ + @ExcelIgnore private String trafficType; /** * 交通方式-中国字 */ - @ColumnWidth(50) - @ExcelProperty(value = "返回方式",order = 9) + @ExcelIgnore private String trafficTypeName; /** * 其他返回方式，交通方式为其他时此列需要有值 */ - @ColumnWidth(50) - @ExcelProperty(value = "其他返回方式",order = 10) + @ExcelIgnore private String trafficTypeExplain; /** * 来自地区详细地址 source_address字段的说明 */ - @ColumnWidth(25) - @ExcelProperty(value = "来自地区详细地址",order = 7) + @ExcelIgnore private String sourceDetailAddress; /** * 疫苗接种针次 (0 1 2 3)【小寨子】 */ + @ExcelIgnore private String vaccineNum; /** * 疫苗接种针次 -中国字(0针 1针 2针 3针) */ - @ColumnWidth(50) - @ExcelProperty(value = "疫苗接种针次",order = 12) + @ExcelIgnore private String vaccineNumName; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ + @ExcelIgnore private String isNatRecord; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】-中国字 */ - @ColumnWidth(50) - @ExcelProperty(value = "48小时核酸检测",order = 11) + @ExcelIgnore private String isNatRecordName; /** * 户籍地 【磐石】 */ + @ExcelIgnore private String registeredResidence; /** * 年龄【磐石】 */ + @ExcelIgnore private int age; /** * 来曹事由【磐石】 */ + @ExcelIgnore private String describeContent; /** * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ + @ExcelIgnore private String natOutcome; /** * 48小时核算检查结果(阴性 阳性)【磐石】-中国字 */ + @ExcelIgnore private String natOutcomeName; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】 */ + @ExcelIgnore private String sojournHistory; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字 */ + @ExcelIgnore private String sojournHistoryName; /** * 隔离状态，字典表(isolate_type)【磐石】 */ + @ExcelIgnore private String isolateType; /** * 隔离状态，字典表(isolate_type)【磐石】-中国字 */ + @ExcelIgnore private String isolateTypeName; /** * 是否落实"落地检" 0:否 1:是【磐石】 */ + @ExcelIgnore private String isArriveCheck; /** * 是否落实"落地检" 0:否 1:是【磐石】-中国字 */ + @ExcelIgnore private String isArriveCheckName; /** * 是否达到曹县 0:否 1:是【磐石】 */ + @ExcelIgnore private String isArrive; /** * 是否达到曹县 0:否 1:是【磐石】-中国字 */ + @ExcelIgnore private String isArriveName; /** * 上报时间【磐石】 */ + @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd") private String reportingTime; /** * 管控措施【磐石】 */ + @ExcelIgnore private String controlMeasures; /** * 行程记录类型，字典表(trip_data_type)【磐石】 */ + @ExcelIgnore private String tripDataType; /** * 行程记录类型，字典表(trip_data_type)【磐石】-中国字 */ + @ExcelIgnore private String tripDataTypeName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 50728a1db7..5444efca73 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -221,8 +221,6 @@ public class IcTripReportRecordController implements ResultDataResolver { public void export(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - // formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); - // formDTO.setUserId("35005df15fb0f7c791344f0b424870b7"); formDTO.setIsPage(false); ExcelWriter excelWriter = null; formDTO.setPageSize(NumConstant.TEN_THOUSAND); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index a701be4c74..150dfd684d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -24,13 +24,13 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 姓名 */ - @ColumnWidth(15) + @ColumnWidth(12) @ExcelProperty(value = "姓名", order = 1) private String name; /** * 年龄【磐石】 */ - @ColumnWidth(15) + @ColumnWidth(10) @ExcelProperty(value = "年龄",order = 2) private int age; /** @@ -42,7 +42,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 户籍地 【磐石】 */ - @ColumnWidth(30) + @ColumnWidth(28) @ExcelProperty(value = "户籍地（省市县区）",order = 4) private String registeredResidence; /** @@ -103,7 +103,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 其他返回方式，交通方式为其他时此列需要有值 */ - @ColumnWidth(20) + @ColumnWidth(18) @ExcelProperty(value = "其他返回方式",order = 14) private String trafficTypeExplain; /** @@ -121,7 +121,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 备注（500字以内） */ - @ColumnWidth(35) + @ColumnWidth(30) @ExcelProperty(value = "备注（500字以内）",order = 17) private String remark; /** @@ -146,7 +146,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 管控措施（500字以内）【磐石】 */ - @ColumnWidth(35) + @ColumnWidth(30) @ExcelProperty(value = "管控措施（500字以内）",order = 21) private String controlMeasures; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java index 5b2bfbc0d9..77754cdefd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java @@ -25,7 +25,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 姓名 */ - @ColumnWidth(15) + @ColumnWidth(12) @ExcelProperty(value = "姓名", order = 1) private String name; @@ -88,7 +88,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 其他返回方式，交通方式为其他时此列需要有值 */ - @ColumnWidth(20) + @ColumnWidth(18) @ExcelProperty(value = "其他返回方式",order = 10) private String trafficTypeExplain; @@ -109,7 +109,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 离开日期 */ - @ColumnWidth(20) + @ColumnWidth(15) @ExcelProperty(value = "离开本地时间",order = 13) @JsonFormat(pattern = "yyyy-MM-dd") private String leaveDate; @@ -117,7 +117,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 备注信息 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "备注",order = 14) private String remark; } From 83aac2dc0ac1110a906bd90b05f53908447001dd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 10:17:17 +0800 Subject: [PATCH 084/161] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 10 ++++++---- .../src/main/resources/mapper/IcResiUserDao.xml | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 4b7a485d71..e77dc98b27 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -63,7 +63,6 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.*; -import com.epmet.excel.DataSyncRecordDisabilityExcel; import com.epmet.excel.EpidemicPreventionExportExcel; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; @@ -1693,9 +1692,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl epidemicPreventionList(EpidemicPreventionFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - if (null != staffInfo) { - formDTO.setAgencyId(staffInfo.getAgencyId()); + if(StringUtils.isBlank(formDTO.getAgencyId())){ + //没有指定查询某个组织时，默认查询当前用户所属组织及下级 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null != staffInfo) { + formDTO.setAgencyId(staffInfo.getAgencyId()); + } } List list = new ArrayList<>(); if (formDTO.getIsPage()){ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 497d96a25b..9c48f39c2f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -879,13 +879,13 @@ AND a.CUSTOMER_ID = #{customerId} - AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' )) + AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' )) AND ID = #{id} - AND GRID_ID = #{gridId} + AND GRID_ID = #{gridId} AND VILLAGE_ID = #{neighborId} From 35a3c587e6f2fe9ffc2588d549a6f26d8b6ad3b6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 10:25:19 +0800 Subject: [PATCH 085/161] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E7=A3=90?= =?UTF-8?q?=E7=9F=B37=E5=A4=A9=E6=97=85=E5=B1=85=E5=8F=B2=E8=B5=8B?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcTripReportRecordServiceImpl.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index bd627a273c..b663a0ea1f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -215,6 +215,29 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcDangerAreaEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(IcDangerAreaEntity::getDelFlag, DelFlagEnum.NORMAL.value()); + List areaList = icDangerAreaDao.selectList(wrapper); + Map areaMap = new HashMap<>(); + areaList.forEach(a -> { + if (StringUtils.isNotBlank(a.getDistrict())) { + areaMap.put(a.getDistrict(), a.getDangerLevel()); + } + }); + String[] str = formDTO.getSourceAddress().split("-"); + if (str.length < 3) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "‘来源地’信息填写格式错误", "‘来源地’信息填写格式错误"); + } + if (areaMap.containsKey(str[2])) { + formDTO.setSojournHistory(areaMap.get(str[2])); + } else { + formDTO.setSojournHistory("3");//无风险 + } + } }else {//其他客户 if(StringUtils.isEmpty(formDTO.getVaccineNum())||StringUtils.isEmpty(formDTO.getIsNatRecord())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "疫苗接种针次和48小时核算记录为必填", "疫苗接种针次和48小时核算记录为必填"); @@ -350,6 +373,29 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcDangerAreaEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(IcDangerAreaEntity::getDelFlag, DelFlagEnum.NORMAL.value()); + List areaList = icDangerAreaDao.selectList(wrapper); + Map areaMap = new HashMap<>(); + areaList.forEach(a -> { + if (StringUtils.isNotBlank(a.getDistrict())) { + areaMap.put(a.getDistrict(), a.getDangerLevel()); + } + }); + String[] str = formDTO.getSourceAddress().split("-"); + if (str.length < 3) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "‘来源地’信息填写格式错误", "‘来源地’信息填写格式错误"); + } + if (areaMap.containsKey(str[2])) { + formDTO.setSojournHistory(areaMap.get(str[2])); + } else { + formDTO.setSojournHistory("3");//无风险 + } + } }else {//其他客户 if(StringUtils.isEmpty(formDTO.getVaccineNum())||StringUtils.isEmpty(formDTO.getIsNatRecord())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "疫苗接种针次和48小时核算记录为必填", "疫苗接种针次和48小时核算记录为必填"); From fc5d2680c8962aa05daecc686a0f42bc4a823436 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 10:50:34 +0800 Subject: [PATCH 086/161] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 54d6dedc26..7476636916 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -234,6 +234,8 @@ public class IcTripReportFormDTO implements Serializable { /** * 上报时间【磐石】 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date reportingTime; /** * 管控措施【磐石】 From 188816c1d55043fdcb989806a64ebf8c8e2a47d8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Nov 2022 11:06:40 +0800 Subject: [PATCH 087/161] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcDangerAreaServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java index 0c56f212f7..ab3cd225a4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -92,7 +93,8 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl result = new PageData<>(); LambdaQueryWrapper qr = new LambdaQueryWrapper<>(); qr.like(StringUtils.isNotBlank(formDTO.getName()),IcDangerAreaEntity::getAllName,formDTO.getName()) - .eq(StringUtils.isNotBlank(formDTO.getDangerLevel()),IcDangerAreaEntity::getDangerLevel,formDTO.getDangerLevel()); + .eq(StringUtils.isNotBlank(formDTO.getDangerLevel()),IcDangerAreaEntity::getDangerLevel,formDTO.getDangerLevel()) + .orderByDesc(BaseEpmetEntity::getCreatedTime); if (formDTO.getIsPage()){ PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectList(qr)); result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); From d4d9bd6f3a81b676fb09d09e7a54c0cfc3cdf4a2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 11:08:42 +0800 Subject: [PATCH 088/161] =?UTF-8?q?/heart/icpartyunit/list=20=E8=81=94?= =?UTF-8?q?=E5=BB=BA=E5=8D=95=E4=BD=8D=E5=88=97=E8=A1=A8=E6=9C=AC=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=8F=8A=E4=B8=8B=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/PartyUnitFormDTO.java | 5 +++ .../controller/IcPartyUnitController.java | 18 +++++++---- .../java/com/epmet/dao/IcPartyUnitDao.java | 8 +++++ .../service/impl/IcPartyUnitServiceImpl.java | 11 +++++-- .../main/resources/mapper/IcPartyUnitDao.xml | 31 +++++++++++++++++++ 5 files changed, 64 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java index cf7841d93e..ec4a1751dd 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java @@ -24,4 +24,9 @@ public class PartyUnitFormDTO implements Serializable { private String contactMobile; private Integer pageNo; private Integer pageSize; + + /** + * 工作端当前登录人员 + */ + private String currentStaffId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index 95093177cb..8a0ba036ff 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -3,6 +3,7 @@ package com.epmet.controller; import com.epmet.commons.rocketmq.messages.ServerSatisfactionCalFormDTO; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; @@ -16,10 +17,6 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcPartyUnitDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.PartyActivityFormDTO; -import com.epmet.dto.form.PartyUnitFormDTO; -import com.epmet.dto.form.PartyUnitListFormDTO; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.*; @@ -37,12 +34,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -70,9 +65,20 @@ public class IcPartyUnitController { private Path IC_PARTY_UNIT_UPLOAD_DIR; + /** + * 联建单位-列表查询 + * 本组织及下级数据 + * @param tokenDto + * @param formDTO + * @return + */ @PostMapping("list") public Result> search(@LoginUser TokenDto tokenDto, @RequestBody PartyUnitFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); + //工作端调用的话，赋值当前登录用户id + if(AppClientConstant.APP_GOV.equals(tokenDto.getApp())){ + formDTO.setCurrentStaffId(tokenDto.getUserId()); + } PageData page = icPartyUnitService.search(formDTO); return new Result>().ok(page); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java index 0c02e737b7..e0cb649327 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; +import com.epmet.dto.form.PartyUnitFormDTO; import com.epmet.dto.form.PartyUnitListbriefFormDTO; import com.epmet.dto.result.PartyTypepercentResultDTO; import com.epmet.dto.result.PartyUnitDistributionResultDTO; @@ -116,4 +117,11 @@ public interface IcPartyUnitDao extends BaseDao { @Param("customerId") String customerId); List selectByIds(@Param("partyUnitIds") List partyUnitIds); + + /** + * 联建单位-分页列表查询 + * @param formDTO + * @return + */ + List pageList(PartyUnitFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 304705ac2d..71711ea98e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -77,7 +77,6 @@ import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; @@ -119,7 +118,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl search(PartyUnitFormDTO formDTO) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + /*LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcPartyUnitEntity::getAgencyId, formDTO.getAgencyId()); wrapper.like(StringUtils.isNotBlank(formDTO.getUnitName()), IcPartyUnitEntity::getUnitName, formDTO.getUnitName()); wrapper.like(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter()); @@ -127,7 +126,13 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); + List list = baseDao.selectList(wrapper);*/ + //本组织及下级 + if(StringUtils.isNotBlank(formDTO.getCurrentStaffId())&&StringUtils.isBlank(formDTO.getAgencyId())){ + CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getCurrentStaffId()); + formDTO.setAgencyId(staffInfo.getAgencyId()); + } + List list = baseDao.pageList(formDTO); PageInfo pageInfo = new PageInfo<>(list); List dtoList = ConvertUtils.sourceToTarget(list, IcPartyUnitDTO.class); Result> unitTypeMap = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode()); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml index c1800190cb..e57c6d2419 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml @@ -193,4 +193,35 @@ ) + + \ No newline at end of file From c96b063dd7541fce9d68e9733d94b2e8a51614e3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 11:11:17 +0800 Subject: [PATCH 089/161] =?UTF-8?q?sql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.26__alter_dict.sql | 35 +++++++++++++++++++ .../V0.0.81__alter_ic_trip_report.sql | 19 ++++++++++ 2 files changed, 54 insertions(+) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql new file mode 100644 index 0000000000..f01ae19551 --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql @@ -0,0 +1,35 @@ + +-- 相成的 +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017193115787265', 'dangerAreaLevel', '风险地区级别', '', 0, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:42:39', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:42:39'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017335055228929', 1587017193115787265, '低风险', '0', '0', '', 0, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:13', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:13'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017381859467265', 1587017193115787265, '中风险', '1', '0', '', 1, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:24', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:24'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017428642734082', 1587017193115787265, '高风险', '2', '0', '', 2, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:35'); + + + + + +-- 字典表新增数据【自己的】 +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000001', 'traffic_type', '交通方式', '交通方式【行程上报】', '36', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000002', 'sojourn_history', '7天内旅居史情况', '7天内旅居史情况【行程上报】', '37', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000003', 'isolate_type', '隔离状态', '隔离状态【行程上报】', '38', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000004', 'trip_data_type', '行程记录类型', '行程记录类型【行程上报】', '39', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); + + +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000001', '2100000000000000001', '飞机', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000002', '2100000000000000001', '动车', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000003', '2100000000000000001', '火车', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000004', '2100000000000000001', '自驾', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000005', '2100000000000000001', '其他', '5', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000001', '2100000000000000002', '高风险', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000002', '2100000000000000002', '中风险', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000003', '2100000000000000002', '低风险', '0', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000004', '2100000000000000002', '无风险', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000001', '2100000000000000003', '集中隔离', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000002', '2100000000000000003', '居家隔离', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000003', '2100000000000000003', '居家健康检测', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000004', '2100000000000000003', '不需要隔离', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000001', '2100000000000000004', '省内', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000002', '2100000000000000004', '省外', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000003', '2100000000000000004', '市内', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000004', '2100000000000000004', '县内', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql new file mode 100644 index 0000000000..8d7d62ce97 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql @@ -0,0 +1,19 @@ +ALTER TABLE `ic_trip_report_record` +ADD COLUMN `traffic_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交通方式，来源字典表(traffic_type)' AFTER `UPDATED_TIME`, +ADD COLUMN `traffic_type_explain` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '其他返回方式，交通方式为其他时此列需要有值' AFTER `traffic_type`, +ADD COLUMN `source_detail_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源地详细信息(source_address字段的说明)' AFTER `traffic_type_explain`, +ADD COLUMN `vaccine_num` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '疫苗接种针次 (0针 1针 2针 3针)【小寨子】' AFTER `source_detail_address`, +ADD COLUMN `is_nat_record` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否有48小时核算记录 0:否 1:是 【小寨子】' AFTER `vaccine_num`, +ADD COLUMN `registered_residence` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '户籍地 【磐石】' AFTER `is_nat_record`, +ADD COLUMN `age` int(11) NULL DEFAULT NULL COMMENT '年龄【磐石】' AFTER `registered_residence`, +ADD COLUMN `describe_content` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来曹事由【磐石】' AFTER `age`, +ADD COLUMN `nat_outcome` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '48小时核算检查结果(0:阴性 1:阳性)【磐石】' AFTER `describe_content`, +ADD COLUMN `sojourn_history` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '7天内旅居史情况，字典表(sojourn_history)【磐石】' AFTER `nat_outcome`, +ADD COLUMN `isolate_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '隔离状态，字典表(isolate_type)【磐石】' AFTER `sojourn_history`, +ADD COLUMN `is_arrive_check` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否落实\"落地检\" 0:否 1:是【磐石】' AFTER `isolate_type`, +ADD COLUMN `is_arrive` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否达到曹县 0:否 1:是 【磐石】' AFTER `is_arrive_check`, +ADD COLUMN `reporting_time` date NULL DEFAULT NULL COMMENT '上报时间【磐石】' AFTER `is_arrive`, +ADD COLUMN `control_measures` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '管控措施【磐石】' AFTER `reporting_time`, +ADD COLUMN `trip_data_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '行程记录类型，字典表(trip_data_type)【磐石】' AFTER `control_measures`; + + From 9b11a0123e04cc305399010bc2b10e29007ece40 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 11:18:06 +0800 Subject: [PATCH 090/161] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcTripReportRecordServiceImpl.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index b663a0ea1f..cee2d141ab 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -607,6 +607,16 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + //7天内旅居史情况 + Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); + //隔离状态 + Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + //行程记录类型 + Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); + for (IcTripReportRecordDTO dto : list) { //默认未加入 dto.setHeSuanCheck(false); @@ -618,6 +628,16 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 3 Nov 2022 11:22:32 +0800 Subject: [PATCH 091/161] =?UTF-8?q?/icpartyactivity/search=E8=81=94?= =?UTF-8?q?=E5=BB=BA=E6=B4=BB=E5=8A=A8=EF=BC=8C=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/PartyActivityFormDTO.java | 1 + .../controller/IcPartyActivityController.java | 8 ++++- .../resources/mapper/IcPartyActivityDao.xml | 36 +++++++++++-------- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java index 0481b07fc4..fb67921cd8 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java @@ -29,4 +29,5 @@ public class PartyActivityFormDTO implements Serializable { private String serviceMatter; private Integer pageNo; private Integer pageSize; + private String customerId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 2ff977b4db..67b3c5da5a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -71,8 +71,14 @@ public class IcPartyActivityController { @Resource private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + /** + * 联建活动-列表 + * @param formDTO + * @return + */ @PostMapping("search") - public Result> page(@RequestBody PartyActivityFormDTO formDTO){ + public Result> page(@LoginUser TokenDto tokenDto,@RequestBody PartyActivityFormDTO formDTO){ + formDTO.setCustomerId(formDTO.getCustomerId()); PageData page = icPartyActivityService.search(formDTO); return new Result>().ok(page); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 0c5c86d30d..bf3af69b84 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -66,37 +66,43 @@ ic_party_activity a INNER JOIN ( SELECT - ACTIVITY_ID, - GROUP_CONCAT( UNIT_ID ) AS unitId + ur.ACTIVITY_ID, + GROUP_CONCAT( ur.UNIT_ID ) AS unitId FROM - ic_activity_unit_relation + ic_activity_unit_relation ur WHERE - DEL_FLAG = '0' - AND AGENCY_ID = #{agencyId} + ur.DEL_FLAG = '0' + + AND (ur.AGENCY_ID = #{agencyId} or ur.PIDS like concat('%',#{agencyId},'%')) + - AND UNIT_ID = #{unitId} + AND ur.UNIT_ID = #{unitId} GROUP BY - ACTIVITY_ID + ur.ACTIVITY_ID ) b ON a.ID = b.ACTIVITY_ID INNER JOIN ( SELECT - ACTIVITY_ID, - GROUP_CONCAT( SERVICE_MATTER ) AS serviceMatter + sr.ACTIVITY_ID, + GROUP_CONCAT( sr.SERVICE_MATTER ) AS serviceMatter FROM - ic_activity_service_relation + ic_activity_service_relation sr WHERE - DEL_FLAG = '0' - AND AGENCY_ID = #{agencyId} + sr.DEL_FLAG = '0' + + AND (sr.AGENCY_ID = #{agencyId} or sr.PIDS like concat('%',#{agencyId},'%')) + - AND SERVICE_MATTER = #{serviceMatter} + AND sr.SERVICE_MATTER = #{serviceMatter} GROUP BY - ACTIVITY_ID + sr.ACTIVITY_ID ) c ON a.ID = c.ACTIVITY_ID WHERE a.DEL_FLAG = '0' - AND a.AGENCY_ID = #{agencyId} + + AND (a.AGENCY_ID = #{agencyId} or a.PIDS like concat('%',#{agencyId},'%')) + AND a.GRID_ID = #{gridId} From 9bef7ca1460578d22cbab50d1235bdb6f7233017 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 12:30:54 +0800 Subject: [PATCH 092/161] ZUZHIid --- .../src/main/java/com/epmet/dto/IcPartyActivityDTO.java | 6 +++++- .../src/main/java/com/epmet/dto/IcPartyUnitDTO.java | 1 + .../com/epmet/service/impl/IcPartyActivityServiceImpl.java | 3 ++- .../java/com/epmet/service/impl/IcPartyUnitServiceImpl.java | 2 ++ .../src/main/resources/mapper/IcPartyActivityDao.xml | 3 ++- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java index b0367639ed..0115706902 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java @@ -55,8 +55,12 @@ public class IcPartyActivityDTO implements Serializable { /** * 组织ID */ - @JsonIgnore + // @JsonIgnore private String agencyId; + /** + * 组织名称 + */ + private String agencyName; private String gridId; private String gridName; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java index 5935d564de..1aed3be19f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java @@ -51,6 +51,7 @@ public class IcPartyUnitDTO implements Serializable { * 组织ID */ private String agencyId; + private String agencyName; /** * diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index c645ffbc55..e7b3fbc4e5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -128,7 +128,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl(dtoList, pageInfo.getTotal()); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index bf3af69b84..b02c91bfd5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -61,7 +61,8 @@ ADDRESS, LONGITUDE, LATITUDE, - RESULT + RESULT, + a.AGENCY_ID FROM ic_party_activity a INNER JOIN ( From 89cd99e66dd9c8788749df8668da7c86ff693380 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Nov 2022 13:27:58 +0800 Subject: [PATCH 093/161] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/handler/IcDangerAreaExcelImportListener.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java index 5e09a8d102..0227d89e1b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -79,6 +79,15 @@ public class IcDangerAreaExcelImportListener implements ReadListener Date: Thu, 3 Nov 2022 13:36:02 +0800 Subject: [PATCH 094/161] =?UTF-8?q?=E6=88=B7=E7=B1=8D=E5=9C=B0=E5=8F=AA?= =?UTF-8?q?=E8=A6=81=E7=A3=90=E7=9F=B3=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcTripReportFormDTO.java | 1 - .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 7476636916..6be4201a24 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -201,7 +201,6 @@ public class IcTripReportFormDTO implements Serializable { /** * 户籍地 【磐石】 */ - @NotBlank(message = "户籍地不能为空", groups = {ResiUserRequired.class}) private String registeredResidence; /** * 年龄【磐石】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index cee2d141ab..87d6efeb14 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -212,6 +212,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 3 Nov 2022 13:42:25 +0800 Subject: [PATCH 095/161] =?UTF-8?q?=E8=B0=83=E4=BA=86=E8=B0=83=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E5=8A=A0=E4=BA=86=E4=B8=AA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/IcDangerAreaImportExcel.java | 10 +++++++--- .../IcDangerAreaExcelImportListener.java | 1 + .../excel/ic_danger_area_template.xlsx | Bin 9140 -> 9172 bytes 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java index 7358f3ee39..afee6099db 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java @@ -1,6 +1,7 @@ package com.epmet.excel; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -22,13 +23,16 @@ public class IcDangerAreaImportExcel { @Data public static class IcDangerAreaError{ - @ExcelProperty("风险地区") + @ColumnWidth(30) + @ExcelProperty(value = "风险地区") private String name; - @ExcelProperty("风险等级") + @ColumnWidth(20) + @ExcelProperty(value = "风险等级") private String dangerLevel; - @ExcelProperty("错误信息") + @ColumnWidth(40) + @ExcelProperty(value = "错误信息") private String errorInfo; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java index 0227d89e1b..9ab01d6a9d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -105,6 +105,7 @@ public class IcDangerAreaExcelImportListener implements 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 From c2f14b032a42b7c995387d513b14f837eedc30e7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 14:00:14 +0800 Subject: [PATCH 096/161] =?UTF-8?q?=E4=B8=8D=E7=94=A8=E6=89=93=E5=8D=B0err?= =?UTF-8?q?or,=20=E5=B7=B2=E7=BB=8F=E5=9C=A8excel=E9=87=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/handler/IcDangerAreaExcelImportListener.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java index 9ab01d6a9d..e8258c17ff 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -12,10 +12,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dao.IcDangerAreaDao; import com.epmet.entity.IcDangerAreaEntity; -import com.epmet.entity.IcNatEntity; -import com.epmet.enums.DangerLevelEnum; import com.epmet.excel.IcDangerAreaImportExcel; -import com.epmet.excel.data.IcNatImportExcelData; import com.epmet.service.IcDangerAreaService; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -99,9 +96,9 @@ public class IcDangerAreaExcelImportListener implements ReadListener Date: Thu, 3 Nov 2022 14:01:10 +0800 Subject: [PATCH 097/161] =?UTF-8?q?=E5=92=B1=E6=98=AF=E6=94=BE=E5=BC=80?= =?UTF-8?q?=E6=B5=8B=E7=A3=90=E7=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 87d6efeb14..b8d994c851 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -211,7 +211,8 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 3 Nov 2022 14:11:43 +0800 Subject: [PATCH 098/161] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcDangerAreaDao.java | 5 ++++- .../com/epmet/service/impl/IcDangerAreaServiceImpl.java | 4 ++++ .../src/main/resources/mapper/IcDangerAreaDao.xml | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java index 40e8775635..e009c7e52e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcDangerAreaEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 疫情风险地区 @@ -12,5 +13,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcDangerAreaDao extends BaseDao { - + + Integer delAllDangerArea(@Param("customerId")String customerId); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java index ab3cd225a4..b330196a1b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java @@ -178,6 +178,10 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl + + update ic_danger_area + set del_flag = 1, + updated_time = now() + where customer_id = #{customerId} + limit 1000 + \ No newline at end of file From 0bb12740584c154e2146f2450e9ed78e870b05f6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Nov 2022 14:29:42 +0800 Subject: [PATCH 099/161] =?UTF-8?q?=E5=85=A8=E5=88=A0=20=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/handler/IcDangerAreaExcelImportListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java index e8258c17ff..03dcc4e1ae 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -52,12 +52,12 @@ public class IcDangerAreaExcelImportListener implements ReadListener qw = new LambdaQueryWrapper<>(); + /*LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); qw.eq(IcDangerAreaEntity::getAllName,data.getAllName()); IcDangerAreaEntity icDangerAreaEntity = icDangerAreaDao.selectOne(qw); if (null != icDangerAreaEntity){ throw new EpmetException(EpmetErrorCode.DANGER_AREA_ERROR.getCode()); - } + }*/ ValidatorUtils.validateEntity(data); IcDangerAreaEntity entity = ConvertUtils.sourceToTarget(data, IcDangerAreaEntity.class); String[] split = data.getAllName().split("-"); From afa5738b9b397e9e9fb2896b4dd82d71c5a94024 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 14:31:51 +0800 Subject: [PATCH 100/161] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcTripReportFormDTO.java | 15 ++++++++-- .../IcTripReportRecordController.java | 20 +++++++++++++ .../impl/IcTripReportRecordServiceImpl.java | 28 ------------------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 6be4201a24..b088332acf 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -33,6 +33,10 @@ public class IcTripReportFormDTO implements Serializable { public interface PcUpdateRequired extends CustomerClientShowGroup { } + public interface PsAdd extends CustomerClientShowGroup { + } + public interface XzzAdd extends CustomerClientShowGroup { + } @NotBlank(message = "主键不能为空", groups = {PcUpdateRequired.class}) private String id; @@ -179,7 +183,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 交通方式，来源字典表(traffic_type) */ - @NotBlank(message = "返回方式不能为空", groups = {ResiUserRequired.class}) + @NotBlank(message = "返回方式不能为空", groups = {PcAddRequired.class, ResiUserRequired.class}) private String trafficType; /** * 其他返回方式，交通方式为其他时此列需要有值 @@ -188,19 +192,22 @@ public class IcTripReportFormDTO implements Serializable { /** * 来源地详细信息 source_address字段的说明 */ - @NotBlank(message = "来自地区不能为空", groups = {ResiUserRequired.class}) + @NotBlank(message = "来自地区不能为空", groups = {PcAddRequired.class, ResiUserRequired.class}) private String sourceDetailAddress; /** * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ + @NotBlank(message = "疫苗接种针次不能为空", groups = {XzzAdd.class}) private String vaccineNum; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ + @NotBlank(message = "48小时核算记录不能为空", groups = {XzzAdd.class}) private String isNatRecord; /** * 户籍地 【磐石】 */ + @NotBlank(message = "户籍地不能为空", groups = {PsAdd.class}) private String registeredResidence; /** * 年龄【磐石】 @@ -209,10 +216,12 @@ public class IcTripReportFormDTO implements Serializable { /** * 来曹事由【磐石】 */ - private String describe; + @NotBlank(message = "来曹事由不能为空", groups = {PsAdd.class}) + private String describeContent; /** * 48小时核算检查结果(阴性 阳性)【磐石】 */ + @NotBlank(message = "48小时核算检测不能为空", groups = {PsAdd.class}) private String natOutcome; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 5444efca73..dece4ce2c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -116,6 +116,16 @@ public class IcTripReportRecordController implements ResultDataResolver { if(IcResiUserConstant.USER_TYPE_IC_RESI.equals(formDTO.getUserType())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.IcResiInternalGroup.class); } + //磐石客户 + if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); + }else { + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); + } + //校验参数 + if ("5".equals(formDTO.getTrafficType()) && StringUtils.isBlank(formDTO.getTrafficTypeExplain())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "返回方式为其他时，“其他返回方式”为必填", "返回方式为其他时，“其他返回方式”为必填"); + } String id=icTripReportRecordService.save(formDTO); return new Result().ok(id); } @@ -170,6 +180,16 @@ public class IcTripReportRecordController implements ResultDataResolver { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"请输入正确的证件号","请输入正确的证件号"); } } + //磐石客户 + if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); + }else { + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); + } + //校验参数 + if ("5".equals(formDTO.getTrafficType()) && StringUtils.isBlank(formDTO.getTrafficTypeExplain())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "返回方式为其他时，“其他返回方式”为必填", "返回方式为其他时，“其他返回方式”为必填"); + } return new Result().ok(icTripReportRecordService.resiSave(formDTO)); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index b8d994c851..9b27816145 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -206,19 +206,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 3 Nov 2022 14:43:55 +0800 Subject: [PATCH 101/161] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=B9=B4=E9=BE=84=E5=AD=97=E6=AE=B5=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 5 ----- .../epmet/dto/form/IcTripReportFormDTO.java | 4 ---- .../entity/IcTripReportRecordEntity.java | 4 ---- .../excel/IcPsTripReportRecordExcel.java | 4 ---- .../IcPsTripReportRecordExportExcel.java | 16 ++++------------ .../V0.0.81__alter_ic_trip_report.sql | 3 +++ .../excel/ps_trip_report_import_template.xlsx | Bin 11236 -> 11192 bytes 7 files changed, 7 insertions(+), 29 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index f40344f6cb..79824e838a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -279,11 +279,6 @@ public class IcTripReportRecordDTO implements Serializable { */ @ExcelIgnore private String registeredResidence; - /** - * 年龄【磐石】 - */ - @ExcelIgnore - private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index b088332acf..1f2cf09949 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -209,10 +209,6 @@ public class IcTripReportFormDTO implements Serializable { */ @NotBlank(message = "户籍地不能为空", groups = {PsAdd.class}) private String registeredResidence; - /** - * 年龄【磐石】 - */ - private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index c261c5acd9..497e0707c6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -139,10 +139,6 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 户籍地 【磐石】 */ private String registeredResidence; - /** - * 年龄【磐石】 - */ - private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 04a8a16900..4410c61293 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -19,10 +19,6 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "姓名不能为空") private String name; - @ExcelProperty("年龄") - //@NotNull(message = "年龄不能为空") - private Integer age; - @ExcelProperty("证件号") @NotBlank(message = "证件号不能为空") private String idCard; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index 150dfd684d..73af0b78d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -6,10 +6,8 @@ import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; /** @@ -25,31 +23,25 @@ public class IcPsTripReportRecordExportExcel implements Serializable { * 姓名 */ @ColumnWidth(12) - @ExcelProperty(value = "姓名", order = 1) + @ExcelProperty(value = "姓名") private String name; - /** - * 年龄【磐石】 - */ - @ColumnWidth(10) - @ExcelProperty(value = "年龄",order = 2) - private int age; /** * 证件号 */ @ColumnWidth(20) - @ExcelProperty(value = "证件号",order = 3) + @ExcelProperty(value = "证件号") private String idCard; /** * 户籍地 【磐石】 */ @ColumnWidth(28) - @ExcelProperty(value = "户籍地（省市县区）",order = 4) + @ExcelProperty(value = "户籍地（省市县区）") private String registeredResidence; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty(value = "手机号",order = 5) + @ExcelProperty(value = "手机号") private String mobile; /** * 来自地区（格式：省-市-区-街道-社区） diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql index 8d7d62ce97..847f53f326 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql @@ -17,3 +17,6 @@ ADD COLUMN `control_measures` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb ADD COLUMN `trip_data_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '行程记录类型，字典表(trip_data_type)【磐石】' AFTER `control_measures`; +ALTER TABLE `ic_trip_report_record` +DROP COLUMN `age`; + diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 5566dc466db856edb40bf99499b2940f50295831..186dee0bf753fba81f65cebf36e84a3ef9374e85 100644 GIT binary patch delta 5091 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 delta 5192 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 From 24f1d574e39d9247a0b8388b67f6fd6a7fd140f3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 15:05:07 +0800 Subject: [PATCH 102/161] =?UTF-8?q?=E6=9C=AA=E5=81=9A=E6=A0=B8=E9=85=B8?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E3=80=81=E9=87=87=E6=A0=B7=E6=97=B6=E9=97=B4=E3=80=82=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=8B=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=BF=98=E6=9C=89=E5=AF=BC=E5=87=BAsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcNatCompareRecordDTO.java | 8 +++ .../yqfk/IcNatCompareRecordPageFormDTO.java | 4 ++ .../entity/IcNatCompareRecordEntity.java | 10 ++- ...IcNatCompareRecordExcelImportListener.java | 66 +++++++++++++------ .../mapper/IcNatCompareRecordDao.xml | 4 ++ 5 files changed, 72 insertions(+), 20 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java index b422af6b61..be20e5fa68 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java @@ -82,6 +82,14 @@ public class IcNatCompareRecordDTO implements Serializable { @ExcelIgnore private String icResiUserId; + /*** + * 采样时间 + */ + @ColumnWidth(30) + @ExcelProperty("最近一次采样时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date latestCyTime; + /** * 最近一次核酸时间:接口填入 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java index c5f6ddd53e..ac323d4b8f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java @@ -38,5 +38,9 @@ public class IcNatCompareRecordPageFormDTO extends PageFormDTO { private String customerId; private String userId; private String agencyId; + /** + * 采样日期：yyyyMMdd + */ + private String cyDate; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java index 0110312ed9..75b18618fe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java @@ -45,7 +45,10 @@ public class IcNatCompareRecordEntity extends BaseEpmetEntity { * 是否客户下居民，ic_resi_user.id */ private String icResiUserId; - + /** + * 最近一次采样时间:接口填入 + */ + private Date latestCyTime; /** * 最近一次核酸时间:接口填入 */ @@ -68,4 +71,9 @@ public class IcNatCompareRecordEntity extends BaseEpmetEntity { * 最新一次导入时间，对应ic_nat_compare_rec_relation.IMPORT_TIME */ private Date latestImportTime; + + /** + * 备注；系统内部使用，方便看看错误 + */ + private String internalRemark; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java index 03c01a2f37..44ed565c6e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java @@ -5,6 +5,7 @@ import com.alibaba.excel.read.listener.ReadListener; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDetailDTO; import com.epmet.commons.tools.enums.EnvEnum; @@ -84,27 +85,54 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener AND (r.AGENCY_ID = #{agencyId} or r.pids like concat('%',#{agencyId},'%') ) + + and DATE_FORMAT(c.LATEST_CY_TIME,'%Y%m%d') = #{cyDate} + ORDER BY r.IMPORT_TIME DESC,r.AGENCY_ID desc From dc49dcef0051b6cb93681c8cb6d7d335ffb70ede Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 15:06:07 +0800 Subject: [PATCH 103/161] =?UTF-8?q?=E7=AD=89=E4=BC=9A=E5=9B=9E=E6=9D=A5?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=84=9A=E6=9C=AC=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.77__data_compare_d_c - 副本.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql new file mode 100644 index 0000000000..f19afc8b27 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql @@ -0,0 +1,2 @@ +alter table ic_nat_compare_record add COLUMN `LATEST_CY_TIME` datetime DEFAULT NULL COMMENT '最近一次采样时间:接口填入' after IC_RESI_USER_ID; +ALTER TABLE ic_nat_compare_record ADD COLUMN INTERNAL_REMARK VARCHAR ( 128 ) DEFAULT '' COMMENT '备注；系统内部使用，方便看看错误' AFTER LATEST_IMPORT_TIME; \ No newline at end of file From b9834e88ee4bc69c51315f220e14ff2d98299b70 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 15:09:21 +0800 Subject: [PATCH 104/161] user80 --- ...nshi.sql => V0.0.80__ic_epidemic_special_attention_panshi.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.79__ic_epidemic_special_attention_panshi.sql => V0.0.80__ic_epidemic_special_attention_panshi.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__ic_epidemic_special_attention_panshi.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__ic_epidemic_special_attention_panshi.sql From 24320e97ebf4b36ed5473af61abcd61633bbfee5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 15:12:54 +0800 Subject: [PATCH 105/161] 80 --- ....77__data_compare_d_c - 副本.sql => V0.0.80__natcompare.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.77__data_compare_d_c - 副本.sql => V0.0.80__natcompare.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__natcompare.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__natcompare.sql From 5f6d9fdabda9955ff316b19a7c5f113eb63704f0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 15:25:21 +0800 Subject: [PATCH 106/161] =?UTF-8?q?81,82,=E7=94=9F=E4=BA=A780=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E5=8F=91=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nshi.sql => V0.0.81__ic_epidemic_special_attention_panshi.sql} | 0 ...alter_ic_trip_report.sql => V0.0.82__alter_ic_trip_report.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.80__ic_epidemic_special_attention_panshi.sql => V0.0.81__ic_epidemic_special_attention_panshi.sql} (100%) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.81__alter_ic_trip_report.sql => V0.0.82__alter_ic_trip_report.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__ic_epidemic_special_attention_panshi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__ic_epidemic_special_attention_panshi.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__ic_epidemic_special_attention_panshi.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__ic_epidemic_special_attention_panshi.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__alter_ic_trip_report.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__alter_ic_trip_report.sql From 2d4caaef63813345c1da7eadaa078acb27efc3e6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 15:52:25 +0800 Subject: [PATCH 107/161] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E9=98=B4=E9=98=B3?= =?UTF-8?q?=E6=80=A7=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 9b27816145..5db0b44648 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -164,7 +164,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 3 Nov 2022 17:16:02 +0800 Subject: [PATCH 108/161] id --- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 212ab88ca6..759764368f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -90,6 +90,9 @@ (case when nat_outcome = '1' then '阳性' when nat_outcome = '0' then '阴性' else '阴性' end) as natOutComeName FROM ic_trip_report_record WHERE DEL_FLAG = '0' + + AND id = #{id} + AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') From ca3842b0022ea568da8a282a57116a96873267ff Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 17:22:19 +0800 Subject: [PATCH 109/161] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E5=85=B8=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.26__alter_dict.sql | 5 --- .../commons/tools/enums/DictTypeEnum.java | 1 - .../impl/IcTripReportRecordServiceImpl.java | 34 +++++++++--------- .../excel/ps_trip_report_import_template.xlsx | Bin 11192 -> 11209 bytes 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql index f01ae19551..10b2bf3ea5 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql @@ -12,7 +12,6 @@ INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, ` -- 字典表新增数据【自己的】 INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000001', 'traffic_type', '交通方式', '交通方式【行程上报】', '36', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000002', 'sojourn_history', '7天内旅居史情况', '7天内旅居史情况【行程上报】', '37', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000003', 'isolate_type', '隔离状态', '隔离状态【行程上报】', '38', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000004', 'trip_data_type', '行程记录类型', '行程记录类型【行程上报】', '39', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); @@ -25,10 +24,6 @@ INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, ` INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000002', '2100000000000000002', '中风险', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000003', '2100000000000000002', '低风险', '0', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000004', '2100000000000000002', '无风险', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000001', '2100000000000000003', '集中隔离', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000002', '2100000000000000003', '居家隔离', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000003', '2100000000000000003', '居家健康检测', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000004', '2100000000000000003', '不需要隔离', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000001', '2100000000000000004', '省内', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000002', '2100000000000000004', '省外', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000003', '2100000000000000004', '市内', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index d38442798e..a07838684d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -33,7 +33,6 @@ public enum DictTypeEnum { DANGER_AREA_LEVEL_TYPE("dangerAreaLevel", "风险地区等级", 34), TRAFFIC_TYPE("traffic_type", "交通方式", 36), SOJOURN_HISTORY("sojourn_history", "7天内旅居史情况", 37), - ISOLATE_TYPE("isolate_type", "隔离状态", 38), TRIP_DATA_TYPE("trip_data_type", "行程记录类型", 39), ; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 5db0b44648..a5e811f000 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -130,9 +130,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); //Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - //Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态【磐石的跟之前字典表值不一样】 + Map isolateTypeMap = new HashMap<>(); + isolateTypeMap.put("0", "集中隔离");isolateTypeMap.put("1", "居家隔离");isolateTypeMap.put("2", "居家健康监测");isolateTypeMap.put("3", "已出隔离期");isolateTypeMap.put("4", "不需要隔离"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); //Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); @@ -166,7 +166,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); //Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - //Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态【磐石的跟之前字典表值不一样】 + Map isolateTypeMap = new HashMap<>(); + isolateTypeMap.put("0", "集中隔离");isolateTypeMap.put("1", "居家隔离");isolateTypeMap.put("2", "居家健康监测");isolateTypeMap.put("3", "已出隔离期");isolateTypeMap.put("4", "不需要隔离"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); //Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); @@ -433,7 +433,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); //7天内旅居史情况 Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + //隔离状态【磐石的跟之前字典表值不一样】 + Map isolateTypeMap = new HashMap<>(); + isolateTypeMap.put("0", "集中隔离");isolateTypeMap.put("1", "居家隔离");isolateTypeMap.put("2", "居家健康监测");isolateTypeMap.put("3", "已出隔离期");isolateTypeMap.put("4", "不需要隔离"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); @@ -614,7 +615,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态【磐石的跟之前字典表值不一样】 + Map iMap = new HashMap<>(); + iMap.put("集中隔离", "0");iMap.put("居家隔离", "1");iMap.put("居家健康监测", "2");iMap.put("已出隔离期", "3");iMap.put("不需要隔离", "4"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); @@ -760,8 +761,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl sojournMap = sojournMapRes.success() && CollectionUtils.isNotEmpty(sojournMapRes.getData()) ? sojournMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); // 隔离状态字典 - Result> isolateMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.ISOLATE_TYPE.getCode()); - Map isolateMap = isolateMapRes.success() && CollectionUtils.isNotEmpty(isolateMapRes.getData()) ? isolateMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); + Map isolateMap = new HashMap<>(); + isolateMap.put("0", "集中隔离");isolateMap.put("1", "居家隔离");isolateMap.put("2", "居家健康监测");isolateMap.put("3", "已出隔离期");isolateMap.put("4", "不需要隔离"); + if (CollectionUtils.isNotEmpty(result.getList())){ result.getList().forEach(l -> { l.setIsolateTypeName(isolateMap.get(l.getIsolateType())); diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 186dee0bf753fba81f65cebf36e84a3ef9374e85..88ee9650a459b7e69e8589f4117a4da20d13ce2f 100644 GIT binary patch delta 2843 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 From 39e1436ca4383418a041b1d1f96e20b61e29b1bc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 17:23:49 +0800 Subject: [PATCH 110/161] . --- .../excel/ps_trip_report_import_template.xlsx | Bin 11209 -> 11193 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 88ee9650a459b7e69e8589f4117a4da20d13ce2f..c5a91432ad7f868b9f7287e8fa95804b4746186e 100644 GIT binary patch delta 2487 zcmV;o2}t(ISGiZP*%uCq*(4h@2><{?D*yl(0F&D)8h^xEZExGw75+Y8|AFO#BEdLG zB;_~Gc45nwCEJp1$<{tIGGz;)L{*~WWS^P>>3|IjT43n1H5dkT%hna!Fl_6J7Tx|# z<;4G@&n05krw^~w>9(CMuYJ*T z`hM8S&~a@a^B8z<6x_{MLQ1k1n!N{$yb2*y0SA6?^({Y`) z@0`K_s`69M>owc93$e=!6F=)ri5r4U{C&@Rz&fjz6$DC*4#3d`(?ZIo9wlD^B<9++R}-GlvK3q6ZF=~!0Z?5O&Z46#8Hm*@)-4MnOrG;ZHM)akGzL?XEc}GKF2czN2M>BJC zw}v}{*0}Q4!AgltI?YBp)>zP%-Eb=v=6@er=iX#DeDEc~P*W#>FbF4*#Dl(c3)AU5 zO4tpbfqn}GJWTW?PV{2VoIA{P9xCjHPvBN2;K8HghIgRn7U%ZAj;IT5I1zs4Z93rb zr%wc6@fJ4Z5vWgu;KD6zXz(y(H{1j(x9Nb#p^*xsxlL%qQM70-CxHMt@m9n3%YSey z3wF&d+qc(Ohu)=vX9Y$d4Q%%0(JeLuwjUO86?a2ygN(kx_~2qt5ZPnm;d)^;|B#Ik zQ8pt=G1x&_qY^>32(nF(GC_6-QXxo{AiD(FBgj5MY6PhhiPibq*YGj=FrDb1+RQI^w;YRJIaibq*VGj>A;dnUycU05J{ zbSAoB)_n;@uxl-(q>ZAmDC|F$`W?bZ6Sv9Pj$2ec`$%A7SZmf+yY;(z1daaNO11Sixvg(c1GX?DPYiOC6GIh0TYdmnKM@3tWV zO%XT_fvILW5gWB8fK*sx<4A?|%?BYK!K?)iZb<}(081VdHwiIQia3jLt1W_T6QoR# z9fDK{QYFYPLG}o;Pmmfx>JgHx-h&V^QXwiVhQpY{eSAca20@wxIe#X|2|-#BVlX?W z{0#5h&d-~y1rmhB(WMAkNt{TKZGw~uvO|yxL8=7VCCDB@_6brWNIgW5r*n54L`Zmc zXKVYAAV&mg5Tr?vV}hIz1l1H~XCugyLzjhBjW9p&Im5G{`Y}@4-bEiP%tW>wqe)RF zC>;p+X3>IN=oIjSVt-V`$;badfn#uvqLkllqhQkU`aUbgute(d0CkPNSMvH%Wh*e8 z*FWvDGLh|u4?iC@E?%42(3K6-+9)a;hJ~yS8%L*c;W|-Q&LdQ=My#TQBFv)>8-|@Y z2E(p5?D~&cPP)F@LFwkgwbwW5TX#zbC-viM`R*Ovx}$3w`hUG2a^we%?ebf4oUzpIvn(*PNu(BZv zlOj|YXc-Et7#6bEIkX|SO|-F~yjfa>NRuK|8fY0xs~Hw@;n~ty5g?IPWc5gywlMl? zM4J?$+Ca-t8-H@|IfS7)G9hfb(~gKRDME#TmZ31580HX${5cV3uH4|Ua0h7+VN!$& z11&>gO~b-DW)5xGgeSBuPu12W+N22823m&NaQK=-7@mBIFjOz)%Pe%-2@xhms4&nn z6owPy9Kw)=O$eL5%vwa46rsXE%TU;+X>BqO%z9L_l7C;K%~+b^G(+1o#YdVHq1r&p zP+Q5ga6q0zTPh7P7N=?}5p7b0Y6C4pZ8+A?AuN@Lpr(BDN;9-=B20=_fx5Os(km%K1%HB;p+LO4nyo9HexQNu)ETD3+eDTW zp|U{BP*%%S8m5Am2D8PbQV{c|Gc{9ZXk`+WQiQ4lEkkvCrnQf#G%XbJXA4ZFBB%)8 z>^?)=BLbxe6$skx1fJq8f6I2exT4|~7ZF)*oBmf+opZY*UsY_^^)5GEyZ<0~MLat9 zE`O{2!G&K#;m$roJrLex;P!Cn4O3wFbyh=HnmR(mYUqXH^1{-h(lo7Rbe~v8Ustc5 z|6Ln@_)?7vb26!gsXNuQ2v7<1Z>(8HGfBNkDH=k+We)(5^_sz5D?&{aS5AWXC zbdieGWM;hn^mkV;zS71&|MTl_UTUwNe1Fa^uYdNJ>(BnHjh}w;?bjc_u_;%P?@Fiq z{9jk^{Ykri{!d)q*z8)S)soHb)r%+N51wl5@`sPL@t5zjU*l*0!{v?5^-#ACWplm$ z@%k?Tgfp@smG}zxvOsPd>W(_b(9Fzr23&-s_i7LdtY8!az!7 zFA1>xYxeN0i@n5kI(Q#Z$gwZYhT%7q;Sb*%1Y5*?&&Riv!R z4dyI+N&x@>U;+RD5dZ)H0000000000001?UAS*rrwv%5gJpp`^ohv2=;wS(B004FF Bs8|31 delta 2502 zcmV;%2|4z;SIJkf*%uB>+-6fn2><|8D*yl(0F%oq8h^xEZExdP75a@`~afsdN44-yZnneOJ0tqbxJ3>ec1Ir2!0+!XT7XHj; zX8JGoxwfwz-*cO!lF@vrou|)zdCoca`rKo$z5A%|Di58J-}46Rs$N)76=%@#&U%CM zb@lY5@_+pmRq+FRaAv#Sz*$!xJHGnv#<#z*0S)kTP<*>*}U%wSO1Y;>KDya=YhT`4jg_VBc>!uG0ye zGZ;Ws0&jTWbc3?vy6b8Mz>htz-|E;d)UPZ~{A@63;4qL`rk4HF?jcSPAWSG*Zr-u6^kSWzYR#?<}}jS65YzHNC5< z(|a3&&;#j%KMF!q}0tXso4}zMRsR3c4}x zXo&Q1G+g;;W?}Bua7Wl0SKc~YILMFXgr9kv4tV_O69HJdg$;QG>JuTjcncdEJPg?lH^J&{I^c0=WWs1}6B=1-KMc7bjKf45}5~N0uJ%a2L@lM;$9ERcOV6J0RtfrKL1wH{G2z7Y)DkWd869!8W&MY>?xBYz1+ur%xK$`-q!dVm35xl%Bp$J~C zN+^PtYZ8j!<-Lf)60^k1rhnk&ecFvFIQc+ANqrnX&gv41;DiRJu%wwi%?>#*F*(62 z;cTN=R;z>>$* zO+w6+W6o02YMUTC1gQ{YmmpPw)CjUikbQz25Ts6!MvSDZ_b@_?On-<9i{U8Ya33EN zq)Ct#K~4yAN|1Jp7|hNYKf^n>^Ya#KfdnCSbU8*=QzsH+haeS#>=L9(kQzbu2(nL* z1A^2E(ufe`>D(QMF%q5K+1frL$T2~h1ZffEgdnE`L3xGQ*$DI7$YoJgBg)VF&geX> ze)vkqyBuJJnaH*iG=Htqgrx%k-zr&<3!MUfSc!+ zh60a#nMF=JCBmc#6$V<4!f;}oLm0BK31QQhS(^xxB7amEXgLboGOaDt zX@<5#gh>%94741Dq0BIcuuKwyBj_|?yF{22p~67RQCQWqQ2dy!Et7;GL!KtBN~B2< zDh;$8rGKGfGh0_C2buPyHncq=ONvlgpyep5Zdxe+%vP33Lhw%O29Fum9Yd=VX;Oqr z11(2ss6Wltl}SKQ5V%1Xj%S8;Oms;RstdFnb)jlDTURFkFs6rMi|CRfR2OJD>O%2v zwysS2F)gh!v=bsricndg zvvpXXSI-_)Whscs5R2FDC%4(ZR(^T-%V79nS3S!=Lre^94twN$wicoc+<*07o zvGUGHkkwFeKvSH%8>cU2n+x=2OpGBaL({C~SwFTT*mKmGHYuU=}epM1(LZ+`NZ>reix zjh}w@^_L&MwJFz-?@Fiq{9mu$`;&J4{GYhIwb`{zt1X+|>laVPA3W9Ayd69$>w_f(FZJAfBUP~FTd2r|9Cq7+h>^{<0pR{fAOE!AN}&xzfgaM zxc>R|i}&8Vd=gQnixE~Ldr5%hU$;l+J?teeKJ~=sng#Zy*(mykGWvnfK*KHKz8BzI z%JB9AU#~iNwX(oIVC;Hcz<;n8Rmu0T8{d|}8vq&LV0tEq=(>$BAr6URl z2~6B(Q$+~?092E>Dm@$0{>|}80RRAC0ssIJ00000000000000007jD#D?S0nlTRx> Q0gRK4D<%f=C;$Ke0MTr;`v3p{ From 5360a09b924bf645463673ebde2a07c270e933bd Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 3 Nov 2022 17:28:50 +0800 Subject: [PATCH 111/161] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.12__edit_partymember.sql | 8 +++++++- .../resources/db/migration/V0.0.80__edit_partymember.sql | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql index b6e7cccd0c..cd551d050f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql @@ -1,4 +1,10 @@ ALTER TABLE `ic_party_member` ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`, ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`, - ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; \ No newline at end of file + ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; + + +UPDATE ic_party_member +SET IS_QCJ = '0' +WHERE + IS_QCJ IS NULL; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql index f4986b14d1..0bf4647c5f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql @@ -6,3 +6,8 @@ ALTER TABLE `ic_party_member` alter table ic_user_change_record modify column TYPE varchar(64) NOT NULL COMMENT '操作类型【add:新增 category:类别 transfer:调动;logout注销；recovery_moveout恢复迁出；recovery_death恢复死亡】'; alter table ic_user_change_record modify column TYPE_NAME varchar(64) NOT NULL COMMENT '操作类型名称【add:新增 category:类别 transfer:调动;logout注销;recovery_moveout恢复迁出；recovery_death恢复死亡】'; alter table ic_resi_user modify column SUB_STATUS varchar(10) DEFAULT '01' COMMENT '用户详细状态：01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡;51迁出恢复；52死亡恢复'; + +UPDATE ic_party_member +SET IS_QCJ = '0' +WHERE + IS_QCJ IS NULL; \ No newline at end of file From 433e27026e1f1f787f8fad027148c1642c8f2702 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 4 Nov 2022 10:28:12 +0800 Subject: [PATCH 112/161] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.83__ic_danger_area.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql new file mode 100644 index 0000000000..e264168061 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql @@ -0,0 +1,18 @@ +CREATE TABLE `ic_danger_area` +( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `DANGER_LEVEL` varchar(10) NOT NULL COMMENT '风险等级；字典表key【dangerAreaLevel】\n0：低风险；\n1：中风险；\n2：高风险；', + `PROVINCE` varchar(255) NOT NULL COMMENT '省', + `CITY` varchar(255) DEFAULT NULL COMMENT '市', + `DISTRICT` varchar(255) DEFAULT NULL COMMENT '区', + `ALL_NAME` varchar(255) NOT NULL COMMENT '省-市-区', + `ALL_NAME_CODE` varchar(255) DEFAULT NULL, + `DEL_FLAG` int(11) NOT NULL, + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='疫情风险地区'; \ No newline at end of file From c30fde5c62aac39e93b9c2ebae1743bf8f02e0a2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 11:13:07 +0800 Subject: [PATCH 113/161] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95=E6=97=B6?= =?UTF-8?q?=E9=9A=94=E7=A6=BB=E7=8A=B6=E6=80=81=E5=8E=BB=E5=BD=A2=E6=88=90?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcTripReportRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index a5e811f000..789e4219f3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -296,7 +296,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Fri, 4 Nov 2022 11:23:43 +0800 Subject: [PATCH 114/161] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9A=8F=E8=AE=BF?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=88=96=E8=80=85=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E5=90=AB*=E5=8F=B7=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=EF=BC=8C=E9=81=BF=E5=85=8D=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=97=A0=E6=95=88=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcFollowUpRecordServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java index 0999660b0e..451271fd6a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java @@ -83,7 +83,9 @@ public class IcFollowUpRecordServiceImpl extends BaseServiceImpl Date: Fri, 4 Nov 2022 11:28:24 +0800 Subject: [PATCH 115/161] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9A=8F=E8=AE=BF?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=88=96=E8=80=85=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E5=90=AB*=E5=8F=B7=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=EF=BC=8C=E9=81=BF=E5=85=8D=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=97=A0=E6=95=88=E6=95=B0=E6=8D=AE1=C2=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcFollowUpRecordServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java index 0999660b0e..451271fd6a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java @@ -83,7 +83,9 @@ public class IcFollowUpRecordServiceImpl extends BaseServiceImpl Date: Fri, 4 Nov 2022 13:46:03 +0800 Subject: [PATCH 116/161] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=9C=8980=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=3D=E3=80=8B81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0.0.80__edit_partymember.sql => V0.0.81__edit_partymember.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.80__edit_partymember.sql => V0.0.81__edit_partymember.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__edit_partymember.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__edit_partymember.sql From 9b8c610a26b3d253769d78050a2a31892d2a707f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 4 Nov 2022 14:14:17 +0800 Subject: [PATCH 117/161] resi --- .../main/java/com/epmet/service/impl/IcNoticeServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java index 1d2af49a28..bacf657789 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java @@ -178,7 +178,7 @@ public class IcNoticeServiceImpl extends BaseServiceImpl Date: Fri, 4 Nov 2022 14:16:02 +0800 Subject: [PATCH 118/161] =?UTF-8?q?=E6=9D=A5=E6=9B=B9=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=9C=A8=E6=9B=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/IcPsTripReportRecordExcel.java | 2 +- .../IcPsTripReportRecordExportExcel.java | 4 ++-- .../excel/ps_trip_report_import_template.xlsx | Bin 11193 -> 11235 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 4410c61293..c0841b4a29 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -38,7 +38,7 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; - @ExcelProperty("来曹事由（100字以内）") + @ExcelProperty("在曹事由（100字以内）") @NotBlank(message = "来曹事由不能为空") @Length(max = 500,message = "来曹事由不能超过100字") private String describeContent; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index 73af0b78d0..bfdd634a1f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -56,10 +56,10 @@ public class IcPsTripReportRecordExportExcel implements Serializable { @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** - * 来曹事由（100字以内）【磐石】 + * 在曹事由（100字以内）【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "来曹事由（100字以内）",order = 8) + @ExcelProperty(value = "在曹事由（100字以内）",order = 8) private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index c5a91432ad7f868b9f7287e8fa95804b4746186e..6b325c4fe83ba70e3adaaa9b4593131be1ee0543 100644 GIT binary patch delta 2795 zcmVikp1@?lt8k2~qO$e($Qlb8d2-6Ujx- zSCbQ{JqP1(P=5@I z9-HR$R1>rmlz@vp0WVdBZVeR5Fnfy{#|41W*1Fl381tZZ0%8ixDOL&T%i+D_I_7>x zKkVw;Z74@^4AeH^uVd8XEW?2FoYt))J)16J{sQbC8oPI(QGSq%)&d<-Req35xa5d> ze{UUS;TE|9XK3m++^+xk0XHfzb$66s<*nJoER`IU&fT*a@1PXvS?x1 zbP%!3YTGI39cb#9g{S8khjWHqSU_H2os4644sQyyTAEr!8=0lA;Id$Cgr1!oa_zHJ z>WORFeMqK2G6x#bq2I?c2N*IkQf1K(1?xQ)B)5bn_&XI()9!BGw7nTHmH2z6?G)8GO z+dY2(009600{~D<0|XQR29v!b2eJ*>3I*F^!vi<7-WON{e@uZ=4JlY$@i5EjPIf~E zdnm<}l{96K&O{g1(7uEsSiTlgQoa#PUzbn>+aH9KNkO_`{6h&vu>O%`Ai?|%2}Lk& zQ$i7}dmK`9Tw?3$f_YCQ97C{gOU6kIoLWuT>crKA*5Qf~R?|Yf%#t*cZ=9@~HFYW8 z6oZtO0f`brfAC+4x0#>_{@apJ1pjSw3frsoWn*Dw0S{dDID~A$_ z;FTjz;oUYwpeX{!Au!b}Ct{=41ds}AY#gbuzWE@;ebX*kZppL39>_w3PGv_*(JyxLG}q!BS<|$lGS?5NSy?0Unl|Cr^Z>#H4oMYzDhD~@vf7|j@ZB3$0icoE!WvC5@uQ`O_$(IO2^-{jf zLZ_V&VN!$&11&>gI5Ey43|ZKOu<6UJMTAKaDh#v?g>9PFCiB3oM>Q+?CEARoDNZxA zO;dcNNfD|Iv<$VCObZ9(IkctH5Myzwwi3}MMW{B=GSr4+{T#wlc?fFCH?K59f7>R) zqzDxTT86?Sa{1YTVE;#DNYlpYda*pk|IEecxfN82pxsX3Dc$4Oe?`?fw>$Dx#dclq za?`c@4}w?3qjT@F+8j&O$Kfchu$y+hF@njbfu{yG^~bRC@wE7EhiOTb@rN(ff4DHGqac@_+5dH>c#RV~3e&m%{Q32#&#r&-nfC3Mf8}@I zJd5tGe*OFK?u|_ssYp#`#_LaiclF{cZT#~;zy9W>_Ug&!?DG0&f4TnbzuNfe7vFyU z@f(|R75T1o%Fq9G_1>Sf>*xQ(<&Dj*Wm+xS>|VWiGXCJH#x8&Oe^?uT`9AwKe)d0H z-q>6Zb?Zlg36 ze)%M%Ocx`pMD~&Z%fDt1&$`%4T&IKg5rrK4(rg%hLmB??y+N==-1mHZOBvjr<6~6^ zuT~1|1ICW$`TPfa2T>J&{<{7hldmHc1fP1vq_amMGy#94n?pm};Rm~NAXrhn3(46Q zY|@fMyZw99cB>rt04g#mn6SWoZHr1|cyjDkS8?ap zVapo@^6pUFO0A4?-gfy6{|*FPZ$B_WM!|;-_NO<>>+JraT%jT*X&O@!lSN5p?CORQ z^4`6F*5COJ7y4-NFOkM%UXlf)b2g_F;t5dn-sgX!_y)7EBS8iVcZl)?^a20?8U~a5 zDN+I%4UU;+RD5dZ)H0000000000003W;5Gy_b;FC`)JprbZjVmSw3@HEr005S&64n3! delta 2756 zcmYjTc{CJ?7akgn-7t2NeHm-<7-by^g)w0m%Sg5viA3d*$;2p<(FobcmY#hKdLmgS zCP`tkm0c8LO_rDD=l$M!=e+yZJ?DPsyZ3(gkMGW-{zTPt@bTFRt-B6z0sw1VWPUzb zd}f&Q1On1Kowp}%H$B?Cr|%8GXpgIpnFBsJ*_WB1vspe*G)q9w8Fv`nDtFSwIyK!b z_jPNRnr|1#SYe`WQE7iM!-Js<}z<=h$6Lp-FJD0^^&*TH`YBmv=8nGsn*2S=S`8?0%3a)$?qrHZhiG{CC7Y?f zF5s9pSV&R1oqCyi%o2-ZeK(==SLV-P?QI*-cD_G+{Fie6(mbrM2{*nk*Su6rwU3vd zmk#cAP7l!Y+kHRQeiyxI_0Ef5&c!pH#D8PK@^^fA+R2-#$Ei@m=sf%t6g&1+lc>F1 zMvtcb^p0<@1)3=vrt$iBhkiPEu|=*~;<2Hw_QhSLtfq4ZKvSMv(}2CNlGVdT-2;QA zk|vTX`2~#%d@_QL1M{{)vrz9Z)oB~!jN;y+$3xEOmB{aO!=6(J{@w6iM4(=>t*ut_ zXu9iZxt@*$YG*^f&z1AuqiGZGHwIS4GtyTl3hA(iUx*s$s?fxXrITNmxLFTabZyDa zyO*Y!XZmv&6Za1TG%`{{zQs&G{~;G8u2C>vnk&x(LjDXvPeI|t4UMHRWXGU;c?&`H_ zG$GW3`do>*z^t;2xcPw3)z8jvR!Ei61ac5cd-%GZ$qNV|JIr2#z;1>mv6u(chI;B9 z9-3zTn|vdKteHi5-m@E#XRX0)-j5MLy>%iaD~Im;8<*bthpQJl8Gng7%+1eSb0;H! z>Laiu)qz#)jaLcx8N9x*Oaw4i;Tqq1vm&P>*hDDdSr7~?+oX2K)#LKKUDD0~kK*x8 zd^MNQReNAE;QVnhV_t)cDJH4cs&oif#L6y^aK_Z zQc+8r*qzgTJI;p0ZIugzsrB(%p~3$8r=R{5SpW2HFt3_RG_mJHImpvK-;NYU$mFHM zNqkm+0LNAPj$8fUMJn5w*^r)IzbR*fx4U&CIP@>liE}`#NSQt9G9h0C$bxzWUl zh`n66RAJnGeOJB3e(k6UUa;EPO8xgIAw;oxxh_(YBPj3XTeM9Mgwl1?b*us#c2fB5 z@2-uHFeL*XxpRi_NkjU%+<#{BV$dQi3*lZ`f(8;#aZqp=G7)#wJj~?dprZEU6B zZHH5|FeUtj6vUAL(L`NZ6-jfwSHhmD0HwDKvEoXO zDG2NlSWrA~ycG%Sqp3GhSfZZD#5bHea8ILQ>;2$ns;emBCffMc+xj&rblSi2!4I*` zwXU25!Yjenh%={X$|dJh5I)6$m3V%)#v`u%WCJruo=rA{(t5O-WD349x_l@di+xOy z7yFn0G%?a&i-(xhBG9-~jwH<)CbTxghoG9)T!bu&Wm{`*4YVM>IAL`}x}tm1CJREL z9#OgXyUJ7$vbh`S}xgF^yEA0re0I8q}zwgTUjUTLTU*$U>rP_9%7nqD=B zPbzbkgTz4-EMVcB4!-}!i{~YC5|Uugt9idrt_9a$C}Z5NjPB?f`@CSExOMi7>8@_o zVP_HsKKsrbZYDAnF!Li~S@5FYUbH(Lm1}C!P zJ!BgHb-XEG-$ZV-pira7VPbna9>T%R&sjNCO&(;5i=jm?p{nA*g>=i1zvCewQx+L zrsI%Vm5m9V$DfgBvr zaxK-ZOmqD03_!sz+Odt-6b(7>G&+UC+PLcj6RFmiN?N$W{~Ok>g zmhVC0taF_w1pu7}hQ*e#$-^pi3r}J9KP_a5Z?vD4S>)&syWD&y5vT3+wViyiex9o+#Hs?-8L{lvLlQzPR$Gv0vl>CVR_>x8S^djXGzW{wQSOfK>N zJS`G&_plEL=29@7DAF>n+dqW2Tf5m(wVmuQNEk7`G6hu^+VSk_j$K*3kq>hie;IO{ znz3O&_GJ#(`3`QwoGr#Q{>NX}ly$iO`$MW~Avw1M$T3 Date: Fri, 4 Nov 2022 14:41:07 +0800 Subject: [PATCH 119/161] =?UTF-8?q?/epmetuser/tripreport/emphasisTripDetai?= =?UTF-8?q?l=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=AF=81=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcTripReportRecordController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 4f6d71eacb..b6b2ad9856 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -473,6 +473,7 @@ public class IcTripReportRecordController implements ResultDataResolver { * @Author zxc * @Date 2022/11/1 16:05 */ + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("emphasisTripDetail") public Result emphasisTripDetail(@RequestBody EmphasisTripDetailFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, EmphasisTripDetailFormDTO.EmphasisTripDetailForm.class); From 1c1751dcdbeb0405f9862f57771043f0a51c8324 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 4 Nov 2022 15:17:14 +0800 Subject: [PATCH 120/161] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E6=9C=8981=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nshi.sql => V0.0.82__ic_epidemic_special_attention_panshi.sql} | 0 ...alter_ic_trip_report.sql => V0.0.83__alter_ic_trip_report.sql} | 0 .../{V0.0.83__ic_danger_area.sql => V0.0.84__ic_danger_area.sql} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.81__ic_epidemic_special_attention_panshi.sql => V0.0.82__ic_epidemic_special_attention_panshi.sql} (100%) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.82__alter_ic_trip_report.sql => V0.0.83__alter_ic_trip_report.sql} (100%) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.83__ic_danger_area.sql => V0.0.84__ic_danger_area.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__ic_epidemic_special_attention_panshi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__ic_epidemic_special_attention_panshi.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__ic_epidemic_special_attention_panshi.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__ic_epidemic_special_attention_panshi.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__alter_ic_trip_report.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__alter_ic_trip_report.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__alter_ic_trip_report.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql From 5788cf56c6ea4607659e00db47920b7cf6377451 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 15:46:27 +0800 Subject: [PATCH 121/161] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E9=87=8C=E8=BE=B9=E5=85=88=E6=8C=89=E5=88=B0=E8=BE=BE=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=80=92=E5=8F=99=E5=86=8D=E6=8C=89=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 759764368f..e39f594606 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -66,7 +66,7 @@ AND r.sojourn_history = #{sojournHistory} ORDER BY - r.ARRIVE_DATE DESC + r.ARRIVE_DATE DESC, r.CREATED_TIME DESC From ec06dd0ae33aad9b6279db161134eaf1decdee3c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 15:49:14 +0800 Subject: [PATCH 122/161] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ps_trip_report_import_template.xlsx | Bin 11235 -> 10357 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 6b325c4fe83ba70e3adaaa9b4593131be1ee0543..d483cdfc8a6d6a2d3df39875a11d1f5612ad134c 100644 GIT binary patch delta 3977 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 WfB+UPsX?YHjQt=fN|i7A5Az>C;YL0H delta 4908 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 From 2880d512da33db5c634c160b2fa483a2db756bbb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 16:05:13 +0800 Subject: [PATCH 123/161] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=8A=A0=E5=85=B3=E6=B3=A8=E6=97=B6=E6=B2=A1=E6=9C=89=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E7=8A=B6=E6=80=81=E7=9A=84=E8=AE=BE=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E2=80=9C=E5=B1=85=E5=AE=B6=E9=9A=94=E7=A6=BB=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcTripReportRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index fa84cee2a4..4debd80010 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -296,7 +296,8 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Fri, 4 Nov 2022 16:13:31 +0800 Subject: [PATCH 124/161] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B5=8B=E5=B0=8F?= =?UTF-8?q?=E5=AF=A8=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcTripReportRecordController.java | 5 +++-- .../excel/IcPsTripReportRecordExcel.java | 2 +- .../IcPsTripReportRecordExportExcel.java | 4 ++-- .../impl/IcTripReportRecordServiceImpl.java | 6 ++---- .../excel/ps_trip_report_import_template.xlsx | Bin 10357 -> 10352 bytes 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index b6b2ad9856..354c3be87c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -118,7 +119,7 @@ public class IcTripReportRecordController implements ResultDataResolver { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.IcResiInternalGroup.class); } //磐石客户 - if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); }else { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); @@ -182,7 +183,7 @@ public class IcTripReportRecordController implements ResultDataResolver { } } //磐石客户 - if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); }else { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index c0841b4a29..4410c61293 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -38,7 +38,7 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; - @ExcelProperty("在曹事由（100字以内）") + @ExcelProperty("来曹事由（100字以内）") @NotBlank(message = "来曹事由不能为空") @Length(max = 500,message = "来曹事由不能超过100字") private String describeContent; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index bfdd634a1f..73af0b78d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -56,10 +56,10 @@ public class IcPsTripReportRecordExportExcel implements Serializable { @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** - * 在曹事由（100字以内）【磐石】 + * 来曹事由（100字以内）【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "在曹事由（100字以内）",order = 8) + @ExcelProperty(value = "来曹事由（100字以内）",order = 8) private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 4debd80010..00d805abad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -207,8 +207,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl!zh*l-nU_5N#Lb7 zJ{M^x327|^^O+YG1%5csNqRUJX&Bb-zW}oc4Jir*iU4Y`l#@0WHh+`UB$?8GYt|<1 zk~X~d5+||d_=4>=Ew5Ij4GF{q5*md~2x(9l6CebPY181#kaqnRJm>Q{@txNt(oo;z z&QE^#{C^(bn+XTi7-V^1k89 zmx`~ymLFi}y4y7jPk#aqwp)<9p4Zn>DYw}*db*p$eZz)-+Suvo9y~gol-qXtHctE5{dEGFuqQh zmEl+#q`E#6B2{mC=B}}5Sb$ztz<=-idcYQxNQGLA@0ms`zPmOZsb#eF9m`w9)_Z2l z>lWmBnbB%^uxgl{u2+y1H3=FwcU%wm7!46AO>6;6_?3DliK{I2^gY1K(ja8#di%sk z-!&mp4Un(~NPi`r%w@q5Av};5=*7fQL9@YeSlMxuob)i@d@W%O4kLw=O--Y+G66h0 zf@hLQnN%7iwl57X>xpN5s4_A4cD=~+HPP-FgCvSD6IPc9m88GmA_LN-i+sa(L42f>ChK*`L+ z@kfw#)Q4l~r%uCwi zH%bIBCu}vOU(#0Qcg-c;(~Efr4r2q3g0l0%CEWl5kc3zQXsa#^6P3Y4-yxgt>31j@QVsR)#+K-mx| zn*!ykK&c6ox!RuSTEXhdP&>hvI)xv3A=CoV9;$P$H%-(n1ei{DZVgp1!YgOFB@a?0HN9K4_T#9m>jF?F~o zUygxrQC^LKa8WMDK)5Jhp%8Mf3!|)XQC<_-s9ccOV<4j#`){*K41^0pl|jgznFMZw z5k|_XTvRq=AY4?gG6-W^;|X=1utf=Hx_@PxKLjINn0GX->EuN306oL$_!E{ZHSvxO z-bV0752>TU&mT`x;U6#*^}8_0dS(-btTwhiGQN@KyWfXd$i|D<4yIu`M%gWsjF!4Z zE5?Jln9Xw~B$ZTYTa`8xt)WOIMS~U!zHZlcEF)lO?7__Il35hSx4kwI26puw6Ms9V zw@BUlYX=ZU_ySi0gnYnUi&>M0I0prd(fG zFICrO;NZoJ`4r;}R~%m{|27q45h#sg$js1+qCrP~xn}uzw$U0~O`t z!(S7_&yM71hvnR~Yp7ZyPP>zP2Y=cel>(l+CCJ-vI2Wb4;o zoE$w(41c>h{N+*PVR-QU@X22%cRxS=^ApJHPfzdNcz$$1A!i%IRU&!iL&;Zkr(;6@ zu#7g`7Sc)bt;wNZQR#z+`+i%vhCTS2>TkR7x!Qo6Q<{9jY-8-P2O;uZBK!be{0{&C z|NjF3P)h>@6aWSQ2mk;8Appk_Z{bO^10E*tv$~lqLj4pm`&t-WKSkTE*8W za-M0y>PAC>4&czTyu8S{p}ev1WE%t4OK?#jX-By!(9U~9F?M_hin$~tbSQ2btC$Z* zf4jwo@ej5IoDs6X3Op0cGu#1VGZN7eDfoyqpSJD+f@7#bf%XokNs5269;|YIHuRNA zQb~U>VWy+*lr8vB9MgLz$6(vGNjvK`f`5wN){oEqsIk=Dt~j7F7o2hn%r~~Id5$N? zZgn+tejT>Fks$64<*iUsOXqEu&++d-LcsO*0~16PeCS|*s=UtbAF359Gm>R-N@B98 z$c$dyP(t3j_s{w}zu`h1E&e5@F_~B7nx+|@Pl+c$*?XV=iSiq>Y#>1f1Zy=#8I!Rl zx&?{=YOs`(a3?_<#}RMgNdW)=U;+RD5dZ)H0000000000008Zi%qKnpZIcTqJpnV5 NNhl@;nI!-K008mN0YCr% delta 2182 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 IB>(^b04j+Ly8r+H From ca8aa294607459b15081a0cd15a840828b9a48f5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 4 Nov 2022 16:25:54 +0800 Subject: [PATCH 125/161] =?UTF-8?q?dangerLevel=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index e39f594606..7bff317ba3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -101,7 +101,7 @@ - AND sojourn_history != #{dangerLevel} + AND sojourn_history = #{dangerLevel} AND sojourn_history != '3' From d327852db6f15baac5379573e0235fc6d9a390ad Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 4 Nov 2022 16:39:53 +0800 Subject: [PATCH 126/161] =?UTF-8?q?sql=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?Name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/govorg/CustomerAgencyDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 90f40009c2..262b5435d9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -328,7 +328,7 @@ From 908f2a41f02c654da58f899cdd99e3ea54985ea6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 4 Nov 2022 16:51:12 +0800 Subject: [PATCH 127/161] =?UTF-8?q?=E5=AE=A2=E6=88=B7ID=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcBirthRecordDao.xml | 3 +++ .../src/main/resources/mapper/IcMoveInRecordDao.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml index 9f6ac1e550..b4b8b4894b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml @@ -68,6 +68,9 @@ ibr.UPDATED_TIME from ic_birth_record ibr left join ic_resi_user iru on iru.ID_CARD = ibr.ID_CARD and iru.DEL_FLAG = 0 + + and iru.CUSTOMER_ID=#{customerId} + where ibr.DEL_FLAG = 0 AND ibr.CUSTOMER_ID = #{customerId} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml index 03065d2e60..9aa41b001d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml @@ -30,7 +30,7 @@ mir.householder_name householderName, mir.householder_relation householderRelation FROM ic_move_in_record mir - left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0 + left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0 and iru.CUSTOMER_ID=#{customerId} WHERE mir.del_flag = '0' AND mir.customer_id=#{customerId} From a454096f6a4a51dbf05c3a25773f94e63bb43b45 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 4 Nov 2022 16:59:44 +0800 Subject: [PATCH 128/161] name --- .../src/main/resources/mapper/govorg/CustomerAgencyDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 90f40009c2..262b5435d9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -328,7 +328,7 @@ From 4db3ec588931ba21861e8433458441d70d7bcd6e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 17:14:23 +0800 Subject: [PATCH 129/161] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/excel/data/IcTripReportExcelData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java index 083cc5ac3d..9981c1d03f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java @@ -50,7 +50,7 @@ public class IcTripReportExcelData { private Date arriveDate; @ExcelProperty("返回方式") - @NotBlank(message = "不能为空") + @NotBlank(message = "返回方式不能为空") private String trafficType; @ExcelProperty("其他返回方式") From 62f5a02f17b34bb96cc8d85a5c982cec8ec93c67 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Nov 2022 13:49:02 +0800 Subject: [PATCH 130/161] =?UTF-8?q?ic=5Fparty=5Forg.PARTY=5FORG=5FNAME?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.13__partyorgnamelength.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.13__partyorgnamelength.sql diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.13__partyorgnamelength.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.13__partyorgnamelength.sql new file mode 100644 index 0000000000..bb4ecd63dc --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.13__partyorgnamelength.sql @@ -0,0 +1 @@ +alter table ic_party_org MODIFY COLUMN `PARTY_ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称'; \ No newline at end of file From d8627ec90bd8cd7f6bebd7871b448d542c45da12 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Nov 2022 13:54:05 +0800 Subject: [PATCH 131/161] ic_vaccine_prarmeter.ID_CARD chagndu tiaozhegn --- .../main/resources/db/migration/V0.0.84__ic_danger_area.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql index e264168061..5fd0915a68 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql @@ -15,4 +15,6 @@ CREATE TABLE `ic_danger_area` `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='疫情风险地区'; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='疫情风险地区'; + +alter table ic_vaccine_prarmeter MODIFY COLUMN `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号'; \ No newline at end of file From e4f710913fb6e4d21183aae65a5ef912b3548103 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Nov 2022 14:03:03 +0800 Subject: [PATCH 132/161] /resi/partymember/icPartyOrg/ --- .../partyOrg/service/impl/IcPartyOrgServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 8862404285..0b18281ce5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -101,24 +101,24 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl Date: Mon, 7 Nov 2022 15:51:08 +0800 Subject: [PATCH 133/161] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ps_trip_report_import_template.xlsx | Bin 10352 -> 10373 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 191e4581f8d62536fb39c6e749d15fa132f6bb21..7c0894d75e0dd7c6692baa24cb3ca93f004aafd3 100644 GIT binary patch delta 2595 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 Date: Mon, 7 Nov 2022 16:08:25 +0800 Subject: [PATCH 134/161] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=8B=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=9B=B8=E5=90=8C=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E7=9A=84=E6=A8=A1=E6=9D=BF!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcExportTemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 8151e9c0b2..4c30471bc4 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -124,7 +124,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl { if (formDTO.getName().equals(t.getName())) { - throw new EpmetException(9999, "当前组织下已存在相同名称的模板!", "当前组织下已存在相同名称的模板!"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的模板!", "当前组织下已存在相同名称的模板!"); } }); sort = templist.get(NumConstant.ZERO).getSort() + NumConstant.ONE; From b95631c2bc82e9befd8bb1e863ca955afdd24720 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Nov 2022 16:16:48 +0800 Subject: [PATCH 135/161] epmetuser/icEpidemicSpecialAttention/vaccination-update --- .../IcEpidemicSpecialAttentionServiceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 0a76221ff0..31acd1ec00 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -349,6 +350,19 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl Date: Mon, 7 Nov 2022 17:50:15 +0800 Subject: [PATCH 136/161] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/excel/IcPsTripReportRecordExcel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 4410c61293..743aa60438 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -6,6 +6,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -51,6 +52,7 @@ public class IcPsTripReportRecordExcel { "（2022-01-01）") //@NotBlank(message = "来到本地时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd") + @NotNull(message = "来到本地时间为必填项") private Date arriveDate; @ExcelProperty("现居地") From 610bfdf7b4feddb8285a7047e1ca49fd8e6e4580 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 7 Nov 2022 17:55:18 +0800 Subject: [PATCH 137/161] . --- .../IcPsTripReportRecordExportExcel.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index 73af0b78d0..fd9c52e04a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -23,128 +23,128 @@ public class IcPsTripReportRecordExportExcel implements Serializable { * 姓名 */ @ColumnWidth(12) - @ExcelProperty(value = "姓名") + @ExcelProperty(value = "姓名", order = 1) private String name; /** * 证件号 */ @ColumnWidth(20) - @ExcelProperty(value = "证件号") + @ExcelProperty(value = "证件号", order = 2) private String idCard; /** * 户籍地 【磐石】 */ @ColumnWidth(28) - @ExcelProperty(value = "户籍地（省市县区）") + @ExcelProperty(value = "户籍地（省市县区）", order = 3) private String registeredResidence; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty(value = "手机号") + @ExcelProperty(value = "手机号", order = 4) private String mobile; /** * 来自地区（格式：省-市-区-街道-社区） */ @ColumnWidth(30) - @ExcelProperty(value = "来自地区（格式：省-市-区-街道-社区）",order = 6) + @ExcelProperty(value = "来自地区（格式：省-市-区-街道-社区）",order = 5) private String sourceAddress; /** * 来自地区详细地址 source_address字段的说明 */ @ColumnWidth(30) - @ExcelProperty(value = "来自地区详细地址",order = 7) + @ExcelProperty(value = "来自地区详细地址",order = 6) private String sourceDetailAddress; /** * 来曹事由（100字以内）【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "来曹事由（100字以内）",order = 8) + @ExcelProperty(value = "来曹事由（100字以内）",order = 7) private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 */ @ColumnWidth(20) - @ExcelProperty(value = "48小时核酸检测",order = 9) + @ExcelProperty(value = "48小时核酸检测",order = 8) private String isNatRecordName; /** * 来到本地时间（2022-01-01） */ @ColumnWidth(20) - @ExcelProperty(value = "来到本地时间（2022-01-01）",order = 10) + @ExcelProperty(value = "来到本地时间（2022-01-01）",order = 9) @JsonFormat(pattern = "yyyy-MM-dd") private String arriveDate; /** * 现居地 */ @ColumnWidth(30) - @ExcelProperty(value = "现居地",order = 11) + @ExcelProperty(value = "现居地",order = 10) private String presentAddress; /** * 现居地详细地址 */ @ColumnWidth(30) - @ExcelProperty(value = "现居地详细地址",order = 12) + @ExcelProperty(value = "现居地详细地址",order = 11) private String detailAddress; /** * 交通方式-中国字 */ @ColumnWidth(15) - @ExcelProperty(value = "返回方式",order = 13) + @ExcelProperty(value = "返回方式",order = 12) private String trafficTypeName; /** * 其他返回方式，交通方式为其他时此列需要有值 */ @ColumnWidth(18) - @ExcelProperty(value = "其他返回方式",order = 14) + @ExcelProperty(value = "其他返回方式",order = 13) private String trafficTypeExplain; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字 */ @ColumnWidth(20) - @ExcelProperty(value = "7天内旅居史情况",order = 15) + @ExcelProperty(value = "7天内旅居史情况",order = 14) private String sojournHistoryName; /** * 隔离状态，字典表(isolate_type)【磐石】-中国字 */ @ColumnWidth(15) - @ExcelProperty(value = "隔离状态",order = 16) + @ExcelProperty(value = "隔离状态",order = 17) private String isolateTypeName; /** * 备注（500字以内） */ @ColumnWidth(30) - @ExcelProperty(value = "备注（500字以内）",order = 17) + @ExcelProperty(value = "备注（500字以内）",order = 16) private String remark; /** * 是否落实"落地检" 0:否 1:是【磐石】-中国字 */ @ColumnWidth(20) - @ExcelProperty(value = "是否落实“落地检”",order = 18) + @ExcelProperty(value = "是否落实“落地检”",order = 17) private String isArriveCheckName; /** * 是否达到曹县 0:否 1:是【磐石】-中国字 */ @ColumnWidth(20) - @ExcelProperty(value = "是否达到曹县",order = 19) + @ExcelProperty(value = "是否达到曹县",order = 18) private String isArriveName; /** * 上报时间（2022-01-01）【磐石】 */ @ColumnWidth(20) - @ExcelProperty(value = "上报时间（2022-01-01）",order = 20) + @ExcelProperty(value = "上报时间（2022-01-01）",order = 19) @JsonFormat(pattern = "yyyy-MM-dd") private String reportingTime; /** * 管控措施（500字以内）【磐石】 */ @ColumnWidth(30) - @ExcelProperty(value = "管控措施（500字以内）",order = 21) + @ExcelProperty(value = "管控措施（500字以内）",order = 20) private String controlMeasures; /** * 类型（省内、省外、市内、县内），字典表(trip_data_type)【磐石】-中国字 */ @ColumnWidth(25) - @ExcelProperty(value = "类型（省内、省外、市内、县内）",order = 22) + @ExcelProperty(value = "类型（省内、省外、市内、县内）",order = 21) private String tripDataTypeName; } From 92c4adea66d29429f1d1f87aeca205e6cb27270c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 7 Nov 2022 18:21:28 +0800 Subject: [PATCH 138/161] =?UTF-8?q?=E4=B8=A4=E6=9D=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 7bff317ba3..490810a020 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -31,7 +31,9 @@ r.ID_CARD as realIdCard, r.MOBILE as realMobile FROM ic_trip_report_record r - LEFT JOIN ic_epidemic_special_attention a ON (a.ID_CARD = r.ID_CARD AND a.DEL_FLAG = 0 AND a.IS_ATTENTION = 1 AND a.ATTENTION_TYPE = 2) + LEFT JOIN ( + select * from ic_epidemic_special_attention GROUP BY id_card ORDER BY created_time DESC + ) a ON (a.ID_CARD = r.ID_CARD AND a.DEL_FLAG = 0 AND a.IS_ATTENTION = 1 AND a.ATTENTION_TYPE = 2) WHERE r.DEL_FLAG = '0' AND r.CUSTOMER_ID = #{customerId} From 50d79f46b3ebfc24f736ba28095a5e88fe8ef5b0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Nov 2022 19:28:24 +0800 Subject: [PATCH 139/161] list.add(dto); --- ...IcEpidemicSpecialAttentionServiceImpl.java | 30 +++++++++++-------- .../impl/IcTripReportRecordServiceImpl.java | 18 +++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 31acd1ec00..317a04fe33 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -290,6 +291,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl idCards = entities.stream().map(m -> m.getIdCard()).collect(Collectors.toList()); Integer attentionType = entities.get(NumConstant.ZERO).getAttentionType(); List existList = baseDao.getExistList(attentionType, idCards); + log.info("ic_epidemic_special_attention是否存在记录？attentionType="+attentionType+";idCards="+JSON.toJSONString(idCards)+";existList="+ JSON.toJSONString(existList)); List existsEntities = new ArrayList<>(); if (CollectionUtils.isNotEmpty(existList)){ for (String s : existList) { @@ -303,19 +305,21 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl { - e.setIsAttention(NumConstant.ONE); - e.setOrgId(agencyInfo.getId()); - e.setPid(agencyInfo.getPid()); - e.setPids(agencyInfo.getPids()); - e.setCustomerId(formDTO.getCustomerId()); - e.setIsHistory(NumConstant.ZERO_STR); - if(StringUtils.isBlank(e.getIsolatedState())){ - //从行程上报界面，点击加入重点人群关注，默认隔离状态是居家隔离 - e.setIsolatedState(NumConstant.ONE_STR); - } - }); - insertBatch(entities); + if(CollectionUtils.isNotEmpty(entities)){ + entities.forEach(e -> { + e.setIsAttention(NumConstant.ONE); + e.setOrgId(agencyInfo.getId()); + e.setPid(agencyInfo.getPid()); + e.setPids(agencyInfo.getPids()); + e.setCustomerId(formDTO.getCustomerId()); + e.setIsHistory(NumConstant.ZERO_STR); + if(StringUtils.isBlank(e.getIsolatedState())){ + //从行程上报界面，点击加入重点人群关注，默认隔离状态是居家隔离 + e.setIsolatedState(NumConstant.ONE_STR); + } + }); + insertBatch(entities); + } //新增通知表信息 List needSedNotice = formDTO.getList().stream().filter(l -> CollectionUtils.isNotEmpty(l.getChannel())).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(needSedNotice)) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 00d805abad..c7e37d77dd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -1,8 +1,5 @@ package com.epmet.service.impl; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -17,7 +14,6 @@ import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; -import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -25,7 +21,10 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.FileUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.constant.IcResiUserConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcDangerAreaDao; @@ -63,21 +62,17 @@ import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; -import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.commons.CommonsMultipartFile; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; /** @@ -292,12 +287,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Tue, 8 Nov 2022 09:42:34 +0800 Subject: [PATCH 140/161] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9B=B4=E6=8D=A2=E6=A8=A1=E6=9D=BF=E3=80=90?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80=EF=BC=8C?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E5=8A=A0=E6=98=9F=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=8E=9F=E6=A8=A1=E6=9D=BF=E4=BF=9D=E7=95=99=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E6=94=B9=E4=B8=BAold=5F20221108=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 77824 -> 76288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 707fec0bae8077c9cd3e592f0a05b2442b408d9c..553966a9f2139973810cc343a340ff42400f0e52 100644 GIT binary patch delta 13126 zcmdU033yaRwm#L}Njm8y-P!2u=`3X569`!dfv~7-37|j-1OjP@1Ox&&D9}L$WJCcu zGcW3Z12c}J4#NP=2Y%`VMBcdJHtGWh6%ZYld7=z1PaVkn>)y`o?j-bcmiK+w_v^0v z*QrzI)TvXa&aK>ZoHca3Vc1qD+VTVC?Zw+fjkaLyaPF=tj{k>7w`!D4L<{6VG7EvU<4aP{? zri^jpG2Ujj7I{$(6s%AMZR}OAa>;sDd){a1({qr!=d-=3I4HkNdamo;Gl8m&$kvw{=B9oQD;?t{ie)|z^V0tyq;@-c`f(b=H|cpnOt^^S zX9g5t*3QCi($T)`wh+n2@?(fq>-l1oRrs-pw(`CK%lO!U=ztuBV&voj))*t2dh->y zsP+9)dw9dFR$=6GF;=dzMvG7$9%+RGEVWvBmo=2vT7yI|??#(og%ZH8;XY8gw@O{a z0FH?sBO-WCv^6HOM~9!ES!@;_3xqnG%T#s)M+AvYLy^G7nAdwm|;5j^wWt}9uj|y zUx>HF#3`K<6=5~T60HsktFhJCunL{23Fk!gYGWj=md4gTE9vscOJDLkwlVByvxuQQ z!1fl$3>?I_Ct3L3%t8EzbPK0vhx3aWNurvc$guGrGwF>=D}oHECB-EtC_RnqY&YypVrp(Ki_kOq>C^6;%_(%*e&%hVY=?pt<;4XbIpaU#Cx!u1h`#O_e?#UXu3 zV6zA?wAkPM>sP$HG;&@th4~g#+>f9XpMr{^kV}wXi~YOz-;{zTCR4a?K_&eNO24Wg zZXA>aswHN z4p!h(kf(#480Y-shb}>Jz6JH?U?n~Uc{a_L`*z6JH?Uzt}G#8nm2zmk0S*`I&q zUbWBO{#9Jk{pS{`JOtT%3+m6m3VjOl^snNQEswqJ5|r#)P=Eea>Qj)Xe-)QJ`r18G zkaK6{B%#~;lJjC!s-Y~329c3O-z~Bh;S%xB^$~`IZllLW%Ew1!fp>6UUgLYBcRVAgM-ivT4{HzYb5)(X`@4UOPHg zm-c6VV06507zY^rIV)mZPSTA%@QW5r|*tZuz?2C}tmx^Z%C zy+Pi5^s{lxzMhQR-1&u5%bLfpR>-eU51FDPF}As4zS4@%k4<%kjk`_9JI5x6qe_Z7 zG~;)(&`7rBtrL>{6e;YSFsclzv!%YF{;QUn=FF)L^#v^-Z3`lCeC@Mq+v~qu-L|!* zUi!^fEnoZ$JO%djDPM1P{A^5}^M5AP>Kxs)9WL95r=eh2;~>g;D1)kqolxtDu>xoXG+=Q}t7}0wuA3`|=Ik~Qe=m5$k zC~Y`CI2DDPO}Hr?PV_#?Z76H}xnfeHSi;jMCHdWP*HaPS@|sD>j+>t;w2bn)8qR_KWW>WIcH@yQogTK4Z@pfjsNv$*CV)h%C&y|KTYgKUiKB z&23v#A9_0=ZB^@<_;nw|Rz@6MTXW}M4rMwn-2LV8>vmi`{_2WvvP~mT?z(OLa|MNW zJ-ct$=ihx3oYrxlY1(g}Et%8s%RgC;oz2}hvM}K0wI7w7IrMV#`A^qIwpOpVo_fhp za-?zgm%~0O_|SjGDf6B~V?KVb(Q!Qaa^C4l3-h`C${SB^%a6|QJbZA@Uyl5480_5L zt*5%NdP5}nJ9kfh(daVA(#D%a4nNm8L`1TfdA)cIzmeQDvq1cfx6Z5(pYjVc%TwG( zWr!U*dElXbzsgWU`!GSSg+Hx5QJ z|E?f04o^%Mr2TeP4RTI!_Qp+IWA8Fx}_mpl(5%XWKIL5zzO3zC$svczdD@wk)Y z>!M8jCTzE-j?Z(k40D-7flZ&&wSOE1|X@Piu`~=G~^G28FaXa z0f1(WXatgzsWJxAd_1rBpdiq~HDm&c&`>a1%GIRug@6{Np-><<%?vaEG)ET-0b%xD zm(|rtH0rHdCow?oPGW(i?No7bUbJ|i7>$+yB&S_%nFti8A_s&g0mf@Y8&HCVl7Zx0 zsf;N=Ng7H8vS}y{C|N@Tfl@S-4wR~)44^a@atQdA9mg#_BC>$eHIxmMp`jcg>4~Z` zxj!#fX{j|76aw=5UB(xUqhup1sWOzRH&iBKt&oV z1Cq}(s-i=H+^UrWm1s0a1ze_7gOwo46klbm0+M;SiiQG}X{Z`#h=zs%m20R5ND7oI zOJHTq0+!b-?V1K!nhXchP`$4ON{#v(stDI%ZOldnOT4&cDO`3MSfykBBUfv`tyL*K z{nRMZWGHH)TGw#op;i-()R4{rI7)+hpwU2UbwP+>1|X_))JTiz5uloAjMma0=sF-h zBDWr42rX&Jh{Bw}5o&8A&7td2cM>sU38GgOT_>jKb)s4qPKRVPqZ)kY5&zYm6eD$% z(O7PJgndItM~xp)tge<5<|jBu%&!spXo}_y3x=i^E7L9i_9EwtFi$mL6fmh(DeGx6 zcbv}R&{qHJWwathDRpl#D=V0=a^-48UZuFEoU|hP3;{My@rMH+dr_`5YK$2cf)u7K*=&vsvYD&j4mh~uk>B4G6WmR|uRq(7f z8&|ePn^xAVb=a9vH^kh7<1y4OQKIyqn_X>Jg-PiW`<42(ML)4#s)Gx|_G!4J zELnDm$qGGcQBK6fsVcn;hLUuY(8b1|wI-S}r>cEcQYFu9&5UShP{%WrhAM4sl-fBw zNn~C%S(07qk#Y#ry(8Ccn#@+CTPe2G?C|AjuUlUzdKIU z^SaNIxam-kW0KY;7;PqNCzbfbpMKsRZ~0yI@aVL;O~6b>ZwB30iAv}@2% zB+v}^o)ZPw2;xa>^9M1~NSekMk41}<)LD(YXIU(H2yvc)w8`*Z)pPcBeTkZ3y4}45iMFu6t}|V zRnwfG{ph&PakJ8_$AuPB@2kzjg>ELrf--}CZ zeD;E!7ysSPHD9Iw0HVPR*lXE#qDl7=HSEA?$}cdKZ=Kb@8lex7liagG2y76G+4i%)B)t%k&DBzR;W7xH@ee6Bc)82?6uBTiijsIWvHUCH(y^OD`oacU1BAmZHd_I70*chS=+~zgt zXOHAy^Sg9pn9rT^j(tR#2V8^Qq^yn^D}M;9L#7HRoXEwWBHHr|(YMbltK+`o$8_BB za3~9Vq{DNPZbSQ?*z8^q^3HQnEc42)+P$)?cCYNJ-77S=(?o50{NTjMzUi_9+c926 z1FX}C0YGLA8G-6G6bKZqp&+0L4VkcNZU^c@UL@ZnSn73!ySy#}wdzA(JVGdTwPom} z@1@#BhdryFR=Y&#&}ltRxYVVo!wBkWt%gE@(48ViJ_y!RhlVUb>ogPwbcc%MdphBO zcxH61)CgMc40%2y9PT>k^d>KNeeQI-&(+B%h#q~7X#bl;sc&Jfr*D6^DonoAh!Cl~ z+{m)rKj#A8__4ZB7ruWm zfSZmKxE3pNL9fw&zr|W{n&|Vln^@=4QZV0orB9o zqkeQKUOq=~)QJ~=k9SM2rBuPEnJpg>{qZj_^L2vbzuEBvagOGXaA^JswB9Q^7wE+` zwDb5h_CtR~PWGv4?0wxo6k~sNfoR9)*P^j=yq9Bq&uUao1Zw_9^ujktgb|>x_zAAR z`1Rqx`-y(iGLId91#LhlJ0KP;heWI zfiq4cwd_oY6CGaL)pMuIJI}?5id64u^Nyl-8U>XH$>}y>BKQhlc-MU2soleE*A zAomzLUrP}Y{w9nVFU3Ob!((kCO%}4T+;(c>r6-&8~!6x7y>)OpL{eN z|8AmZ5mF-ml|%0@be+kuBBHY)Q*?;n!>2RFP9ZuvS7i%_SlOAJF2)|l8!@MZc&IZW zPo#=lJBR0q3aj+K;=)12c|}F}MfrvKMa5-M(&) zBcjNRI_kU;(PqT)b3$}xoKbNGW_%-zD4wVgV3sybVj|851A0#u}UVJw#as~ zU8aT@WsBJ+-!w(ZVTyt1NDoX6?!Al9{JEjDA z(qwiBHAan9zgg-eJ{4&h84@dhW{#JqO%~mEsdBZMp%wIImm{P|$l0Mo<<8J>*Y40? z2w7w>$*ORJE`;P&;V*^MPI*1}71B|VNk&DyDkA0E5gDQXa`OFf#SjuQ)KV^-a-qfU z`;K?&#GQ51rxa5(9Y;OP)UMR>R-J6O*yDBnsTJPTlh!_|<=)h)$X=;}O!R_|+YII| zi+zG0vp~6?RNoQ>RR)MJ5P}A2@v_a@hs~Sn%Vt0uxpe|{@WwCoXPauZ3#ILNccZU# za-R}ojpXlDk#?s~-fpy~$LZ-Y59dJI?~T{ps*4hnsF@Z~D>QKpo+esL4w^&tG@crf z;-Hx{fp`Rb^7+-#w;T|!EQb->gFck0h$ z>|l7>&hH}uB|SVMHc%<~ZXVvj4%b?aSLe|IID~yLr#i(E!&g# z-RwenB1f%vP;P{5$WDh;xZIvSOvX6Mxb`w4%OjnYwL&&$TJ3|t98BTpA}*t{veI2f zduFCg&73ILr>DE?_F;O8JdkFUwdo#?)#(YcIae*Q9VH$}^T=|_OG+QwIb_!|7vXb-%H)He;+j>@dj1`DyYS$Yth^mHo5J`OE-M$&B)fd{MK8xQs@vj59@Rl{z(FmU(BfFV`^*F;|P+SdcI0 zl(frZg%0CtAD%FuUMVZ}FmRqVGNmwItmT~II$791{u-%^Co6@JD4`%+nQGtgVP;Krt&bBElmjt)#* z7J#@gAaR+O*wol`?9@3oaZF(1K>>(M0ur-TaCfJYfjFx?7zPm^hFE3aBraUcaK4M^;(0EenyKDnQXr^izg z6A!u~1#o~kkfc`uN=kRVv}0HddN?^SZJ^=L3`pxc{3WGd?7LZtVLbdPfr$eRe{LUQ zd3+cTe`;WkK*L|qhokrKmz4G#YvRg**b$gG(C`-pB=#NtlG1HYyyYfN3rrkn_y-0g z_8tC`(kBjYV`A6x@@Yc%>qD*=M`RfEW-608W5$U=a^)B&+@jC$9wJwct;h+dp;$46 zcWoFBy90ybzJwteTg9pyWa6ki$PV+$@^JT-O;cspE3(7AvOI#lWwTV-w-niOuPl#L zZ`nLmcKB$n!w9b|cYbf#{;KRQMYh5#%l+9~wpf+@W^}%MYV47UZ>DgoLq)~9VbjOX zjcoaPR>6`}Q&ujVxuCIT>Fu{rEEyYEB3RVc%%0(!l0b`^Wam{$x<59{<5#8V2CtJB zfeyFJgmFo_sJrEmaY?oR@i1pLixV5;8lIoro1ot_YU-&e2k-2i8b>X^;Z&1&b3tXj zvCX&WI4b>%+&eBo_r}}uRTP$eN}e8_^=f+QS?iB{~t}xi)hIqA4k7bShIriv+aI^EvI}|f+!mJ6wI|}!U!i0zD zrvr7=WV!|q65N-LEJWQ^3JU6WAcU~O%PurO$mryk2T&EIe2z^b^(dzjJ=E6LMi+>z zAJg?ZCR@R|D5yIZp+LLG0P%*0E6Yjz%^_FSb20Wj+#JuP#_<`5`{Ib+0{Jq{U{kgg zo+6qNlW1UBdE~o99B-J74D=kWd_{2fxZd(l%O zqLqs=vrMPZ?i7Rvk=sO@#7NK_6jr#vU7`x#Js5KndBzo+Wm6a))XT)iRv^xQlxRxSl6aWqjiNQGO|WB*3{N~*;v((JFB*4K;vl~ zhJ;~}9*h+A3Q@)6!b#E2-f2cPZ9r4@j0<-w?Gfwfksx0AdnK>i*PZ*lL+@B zEUX~9h;ReKiD>L;gwG-zQ;9i*k=c!~1);8r=rF>H+4#st2k%3;5up{G`VPVs2+J}2 z#}WPt;h0e%fXeSi*n;pP!dH!Q_S6*YMQ)gyYCQ9f4n|H-)sF{YVdD< zf8PU-O?>LysQk>26UWVa^u*vP$DX`q>!yUb^7=IL?LM74`dlVOtmcb%`Us{|5($@7{X$t$)mEdExDC&urT;X#SzeFZM()JYRX* z_V+{1I-YtxJ$jmYwd*%EhfVJ8xTE$OQ6x{*4iWJ(p>Bfshg@7YT3nEi*9{Zr2P z)4gYuSdw(n+s3X_IHoNE6>x);moPiD!`_>&Emyuq`Shr8A2(Px}v-|43(~m_Tq4O zm%j2Ta0(r<-t<%&>6bo=?k8tg*j%jwyVxR_=c>J>W7Fobr?vPp>3A9v)zaPQ7=n42 zrNm((Aa1ieZnhG~pq7%{adVV7=s)6iusBr-3w_ILkQ1PuW2loHcnfN{#Jvb-H%b=R z+{KWCtd1?M1xSsz;)_e{ z_emp^3co_2YgwHemGwkLIv`&3Rip>Pc@H^NXaHo(ry?T|pNgs|2#9q-MZrK=$lb^U z#9E=InQ`RIi;{{$kQSw(P#~Lz!hm>Mek-3|7~^b&|KiDIK}w8;BM@7 z$GOXjM?80qT5#I5rT`{tC>1D4Lk=Kby;aFHARaFjr30mE zCilV-YQ-0!_3SiTyQH;+L@$s8CBA2sA)LWk5w58U$3Vp}|1xDXHZR z0V)Nut8gfww{F9zQ66hZT-k^z;mI%p61?E6@)bZsG*k&RR6|uj!!$G!h?#i;2~41Q zzLh

1d^4<2Ioy~Ay+KsyqUc$Yrx)khOsaK) z`M_7u`;@L5Bl|Tb>qpW^*Qmy^LT@39yrXGEMyYbjM^vVCH=&zHq8S2afIC;vG@8-T z87uOpqdZ(}N7zkfn*m2iG0lWY#uJM$p;(Ow>Qh3Wp$4i$_l#h>;kodOY7g6=PVBu$ z?utn_Qx)0u!n_0yS|j3hIyAbcr-CY!FpVe80RHf)$*S@X#? z*davnH?Ab>&_KB*|jD5W8^SY%Z>yI$4dYaps`FZO-4;*_W?fuEwQa z_t@k;)83yarX);8y9TNC3r)Z^R6O77xMAfPh3QFTO)k8J#xy5(>z#a*>yfzE?7CxS&wv{;=J|;@*);t z!trc?M~F4{YE3pQ;EEgLHZpMd{Z`b8ekb2AL@u3J031p$H&&s%}XO&@>HMfp~hUERjIaB{zx!nyDch zT}QWQC>rQiZ}BmJw;}OOv~WMvDw<}~SyaJ7x^6ZuMP%w`Z-O&>fXBYCNnZp?%5I@9HUNu zxoLI5Wi?2B+O&-oMxJYI;CZP^+JJZ|<;{r>>O7u=tLcvawD9l9 zs}s^}mtC9T)4<9n;@8(XyS7TIFxDv=$9slgg60U20 z*&VFvWMm(mlrNsK$y@fuiIsBq-dUG4zTEwiB=|ZmQN=ZA7cX<$_1TdwUF))tU_VeXHwvSFAb04kwir&yG7Tj^}A)Snqj? zKFJr0T}Kd@C)X@z_OFSCl8+x^6g7PbjXWCc$>BJ@X z23O!rDq92b6W2{AKQtAerAMF%y6y*1J*(RZ=OJr8&d#^K`(}Lial&y{?sme_1?+^g z1Y4IKVQM_*W<4#%4?e6*PBI9CP=EG0h((;eW2=&)I`LLu`0yAtz9PH%JrCy-G0?8j`3V!h01}R3f1#juDpPvewxa$*jR&2haTg-1%7+`(uQrU->!gb&AV@_+mDX( z(E`q+T+Ie#{>zyZOPH@4fgg;%Ia7RDEBDbmM0-wZs+|@T=F9f@#`lRbKXmQ+WUu(aJ+&*Zb=PU4>pw!R#|znV z{(&Elf?T$*qt0Ua`$X;Q=X(BKG-SqSFiD>)eZAx2ze`vD@*Ga{zW8x;by7ru+Yc|;d}7y zJ#uLETNE$rCrEKqAlPd(0Z(T?1#9|`a1^L#l#GM zMfP78^TGwa6~PL8kk5BIWSlsTEi_*|sLbZ;$a%iUK=V9K+-N_29qs4XkM?uyNBimP zXg|Mxv{zmEhyT$O(Xr3L=e`}*1ThYqFg_~eKP&gRI3Xe4xq8_q-e46pG)igWfhQ70 zrugx;uLuW++`b~*27|YKKL0e0sY07No!JO$NDsJ%Ymv~ zF<;!9E(~Tmdj9i&nhj;qqe-NJg{t#t9A5F0wyVemvVOI&?mOqMt* z#Ga1i9FZZ`bd1aq!))wwmlTzi^dDF_sIa(j@W8U-jvYCou;Yas;fUa0pW`MqFKS)6 fW@Xdbj_w?hZ05;4_QpkxEeDcw#e4kEdg1>K^UuR1 From 147fbcb78fd7703e0791031215a837c7d87ec506 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Nov 2022 09:44:02 +0800 Subject: [PATCH 141/161] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9B=B4=E6=8D=A2=E6=A8=A1=E6=9D=BF=E3=80=90?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80=EF=BC=8C?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E5=8A=A0=E6=98=9F=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=8E=9F=E6=A8=A1=E6=9D=BF=E4=BF=9D=E7=95=99=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E6=94=B9=E4=B8=BAold=5F20221108=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic_resi_import_template_old_20221108.xls | Bin 0 -> 77824 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls new file mode 100644 index 0000000000000000000000000000000000000000..c0c8966ab55c15bee0eadbbc5a8285173ced4d18 GIT binary patch literal 77824 zcmeHw2YeO9_W$0Sc0&?U2mwM1J@hmPJ)yUdkU|Negg^pFD25^^B_gOuw_pJ)BB;*- zcF@oT1QiQ{kEeo&Vgb>o4^cG#^WAfIc6aVvn)?3we(e3s-80{Fc4l_w%Fh`D4srqHT;u}DRUj8cE|^>hxr*dM$&m_Z;p8I7RU#Kjt}?kOa#hGxC0C7HG`Z^J zYLKf*t`@o4iFQYfG*jx%T8bkn2dU6S)*}spLA7>q4$8xo+gTlj}jQC%InadXwuz zt}nSXa{b7qlgl92pIj!nEOOc8a>xxJH;~*Qa)Zg`k{d!UkK9ml!^jOMH-cO~xsl`w z$c-X5np`2dB64HMjU_jZ+%@FJlPe}Sf!ri=D7VRUzLs1GxhdqPlAA_uI=Sn}%^)|E z-1X#cAUBKLY;tqR%_Ub#E{j5&L|4Ypolm55iGBq!F7b#WjWJZ+N!P@<@ULlG^?yAp zwJm36js5PM!;ZLrM%)+v@52rs;-x~V=omz?m(bl6=;^>+UfvO*IUUehBMp~wwLb~f zjB@Cr-Ko^NQ%+5#(jQ6xD38lIA}M}^gnL37F7;X`5>1C6Y0fk%)d>_c^1e5fLXn;) zK&DdpPa?$o5litSUSATq)c8?H-**Rzw4=n3euRN!A%Cv4{-YhS)_?e~r2gYN)PJ0> z9)DgA1iHdBhrbqjpYtG!TyOJ#3BB2;P4B3?Cqtu1LAJWJ`oDcfdXADqywdqMBuRmb z4vHafbXW}kMb2Ks^>W>BwKZEhjO)eO;FFjwy@p>-pWzpLFV`JqT#pB`ZokJFJiXjd z(WyEa={ZUs!ezg4y@4Cy>wZl;uQza8%Z)QtPlQUxQT<;&8*+R$uJ?8}!?j;WxP!x& z&zycEJmY%9?|HV%Bgq`DaUUM>dbwZka>!rATU*a>I=lVICnJ5zvtG~SaL#S+>soMj;L-IQ%zmMeimHd8^-(T_vNPd^(50v~BB!7_P50?BPlE0$l50(63l0RJX zM@arkl0Q=NSGM@woe;f@uIvvLpo0DcwO^0oKf2(-@6Tn74SRBhOKaNbxew7_eUw}P zIq*}-;hBqmri&cb)6UQG_q>h<)nMjsm2y#3~e$2L61{xI@) z9z9{)#Bo!mmW-S_3H?IIA*@0Dvtu%fipGti4rVI(HQxz}5E_q!(pV&%@(yJmNn?;G$}1-!)%1IyJ|cxuN&kOF5Ajv~zaw4o(_H-4bZVoQ zh(jCgld8)t(f{k}{}t)qp}nME^G_X#r&!KVnB{Yqqad}L=QPNR$;Qyi= zui_>;oI~|lvk4Wys1~t zo1GDkel#{1MPr6ZH1?ZBV+M@ja%s%ai^h=Sh#o*=3FxEcI$M6I;;H3Zm1-8XHFek4 zt=Ftxy}0&73~jEHwR~$*ovUi$z!e`4ec697BRlV)W=o#I$#N-RUuby3OnAp41UBwR~HU$$*RoBVw%AHHooa)Fj4s zMG6@f$V6a`j1pl6@4nQAQ2;3^W~8mjK0%fU5vd_7;xz&3%4pJU8jlUF&o|k){m@u9 zJ+yHx-`bSlGf`DdN`82Hyoj=t?k#+lhke4HKP>Nwb9y{+PLC(7(Dm>5#N8}sp zLq!9p^m95n{Q(x7?~C;f{dZORJ@v<%UbWKm!Bd{|#}iNVBHzgi&Uy za=fWJO1Kn`z`31-lmoq#$@X+IPU$poTliMo8onhQe-7WgFC+a{c`E(>h=~qc_*UGT zyfyul|1p?aq5OB}GlJCfS)^Z=f9Z`_HyU& zE#cV8%ZgjmPx&7wmsdRBZ<36=%hyBRoj*!_v*@SD2Y2|hRN-6XZRHN!5uS>2ahI>D z|L*egzzsd&dSuG0^358rRZn!>LG@A6e;p5_)KGe?@}zH4KA7=39F%^cpC(S(t;E9| z^rRB6+N$JPDq`e($ z7BkBgsm;OzOdQj-VfXHgo$czZ&9>onNWzCK5s~^l3dHpeHH`-<(s;^=0jZCckcfv2 zjbdn=5) z2aNLl_m&%h1kf!4n>%-IIo+LpxD*)dGlm?A>qi9z=9xXzc3eDr_NSqvY$VDv5K`QW z2U1vc;Xp8#Y!(!G)Omd2K%j6J4J08E&wKB;6LV>SKv%s7((Y0M;h912fz-H^KoSyR z?(`lAjOCY*C-xd3D=(SJEz0}zY)!4a-+%x8e^GhcUdo-ZHQ0Ohv=V`!2CXjia%bgV zuNHUaSp(3KHuKnPD|2C$X(9qaO33J>&g0j=ed_`#q0Y&rq{OZ=1Ei*^DFxyyT3(Oa zL9=8`Z5tVjX34;erphy)Vnyoo%+~zXw^+X0dW*6yVwH;7kYW~B*^sVXyH@0r(U7L3 zqR?KKffl(~_VKk&xY_>~IRBMto69rjiqEr>cngFA9w_=x`DESFmpAu!NC5p$E zC~KJ+<`!3k|LzgW&SiTS{ zDe=7j2DVtCaJCE7)mctDjT$Z`=@))fHM9ldB_-u4_NR=Tl1{cj$YZ}9E>2!7>AfUi zg1e|r>`%LJN)kjMP-^sUJTg|-_ELw??AfkZsd}W+r4D**n$JNaklC&dl57`}<)TO4 zSvA>yJxAzyebKk?e)a%!tcdp7*oFb+LO$x5ygdddo*Fnlfcp4_szIajTkNU zx{`S@v^L^)S5IOh~MIRpfUL8+mbv&&V@gykYfsw+UZ-IqH zpMLvKbv#jsCrP12p88gs;!#P8czpM#y>{rdI-V-(cvSjUPZ^I@-}a~dwC^c(JXO{4 zsPwIoG9IhG?N2*$7IQ5la_-}a}ye)M^DJT(wc>r2wN7>Y+FY3f@-;;QYRb3CN&unvm$t)@C2 zmA=(i#$(mDgv1}7ov)6kmO37lzQrozvFckw;@-V`)$!C;$D`7>X3BW1`j(Jb{$Y_i zo)~pJDt(Jn#$(mDgv6zfyX%i!K6TXbsPrvK8IM)p5)vOjuvB$FzFOTGerkq8u>xo_lV0HMI--gqAxsaL^smpQSX8@0N3o zp=%-Z+NCdF%g^bK()D5VZW*oz7rN^aMgSSw0%%a2x9T88b%!&A9{wUkXsjG!xCoK8 z^b$gBXod*gltYXVA+kPt39&roAN#*@r?HV4BDAojbk~(ch|oM`&IQm5st(O@df4qQ z=ogBD4~L^Vy*724Mrr&6^Ml!w<_VB0(5q=O!CliS+e$Sm;bY0KuLvE9<{|74s$hVfs{VH=6%CHrZPtz%D&8IavIv%}ciUDKpg zRH67xzBMhF12WPg9tB2PFvsGr=OAKdpOF^!8EIi3(h`TX9AEgxibnaj6gC@ky9=Fg zJ*V_PhqD#MXY#EYgqwAjehAfis?0@;`s8pZQblnFQAIJh)-WiYMi`;g&!@CNPmO#@ zkF zN&_k1rPk3INcsN#uq}&D-!*@_XY*A`Q&~d!+CurvF=TstVffahvNpIzffy|gZUj?k zqB7yh)XoeKPbN9MIwCx4|4GwM&5qYI#v{D;W_Wlm$>B8+;aU4hnr2jXkMKH};o+$y zhu2tyXYCKsJ#N+1>Fa2QhfR zA6skr4otc%pjTUdfsI=Wa&(&6F1!2C@Zz5bH5+p*V^aQr5rvs!Z(Trdruo52N*0YF znS*nzoM>$nY>HZ-BR%7zj7{lwZVhc0tbJMq$442fSEdxm{AewCCSM(&8=daSJ%HP# zus4>@fAE&vDY^ETBkp9bwtVJ@RhgU8?c68VF!z%=RTc3z*~r{u8Cw>~@mAG}UjWzT zI5Z+7>h;%uI?Pcja~mFGZhY=HC32k6+Stzw?yq#E zJs+dBC%!Pa*B5zm&ws_-MdQn+d2&0QW^SY0T?+2<@0eRKQpJ7u2ja%*T?BEYTSc($BsLM)o>;Ci~ zptrAh9~f`YRiOU}`fYQ#$Z6V=B&Sy78c2>9?!$?FW6q@NKL0Z@bS7avT+|;p+zp&T zr)ssn3nRb&A~sESmX?-kXKCx1ueIsa$I;GAgrMesCYH_)%ENBt!-@o?6)ey=qop+t z_zj1`ei=W8_5T*Gvd=LsVw03L(Y;JUZgl}2+!Mra3T~;BONjeIMys02mDyv zfpbN2xJNwi;2%W}Wou0*@Db#2u1OB^#{G67+Bm?6E*J;=h(|tv&$56h?{IQBV@l#u z52V4GPWY|mY^2c$4}Qdvtp%OIGLtQIwM)Cv(V2qT;s_(-^;SnJ(dDF+F3r$9dQ-(k zHO57E;)3R#*Jk)HqF`>N5U6wV^PtojsB%Q+7H-sAI3lNJu2~XaGCP;ZyYq4jk7b-m zC$g~rOT*o=Cx#8paFcJ(NuTgy$qShz(0yozfumlph5iqMFBE^B?(ucfQ90yW3*yL+cU zoP|7Wz4C?ek7pI-5kIwHO+Ff1f6al@n*3eU{!{qFU6gom3Pv^}fOu$e4IW+9vZ!Is z_Uw-`i2Ult!|Cs=xc?p^GYcQjvXBVJr8%BVKa>ql#iG~eEE}$;8D%qoMi6wHX{FJ~ zsm(LB<>48)g2DlbaOjp?V_Fv$W|CaLSuK~49P&T4Aa+pPAo4sr1;rURD0L8Bv?)Eg z0EJ9=MIzg$Ps#jc7U2-tm9H26kRiY1y7i#nis}7^_4{4Qkb2wVA*+O?R#_1 z<+T_-y@1F&hd0Rg&Gny3B+9^l>N`-V7xP+8`(e)M3`)fG%n#DfE^_Ndvl{}_-I{r1 z;HbPwMW+T*R>W&(vuBOd31}u+9a9*WOsBRgF*z=wO;UW@wh3{G35l&+CB#z% zMh}QcsQ8O{PeIq7T>5LeTX_mIhh(}ly?EKE@oo~bEelWLCh<%}C{&IH*`6R=t{2|J zP)uk8%8c#=Kd(e#5LqD7AO8w=FtRSR3`D@YbXy zQFC?u0O?jFbhZ!z1@~aKp*K`eMkmZ&H{f-r9wgF7#kV9gerR-h)r_P0?)xn*XgS7R zF(CF}_R)a|i-gV$EL(XlZ{%XSQKQNLP8nH!3`tnKZAfZnh^ecB3>h5Y`5 zbYJ#&8U52wE+>KG=?`QL&LIMttrO7e!8sJB*@>j<58pTcLEIDFptZYY@wy|&&9@k? zH)U;d-lcxo;2gRfo%gS=8#SJS4N0FgFYE5`p;L!bf!$KNDE*ew88gdf4WGGdnoILT z&xDl}wSGt@)DmNr8v6co#H6DFi|w4Vdk(5?@v_29gpaJ1Mg3S5Ied1}+`D@Amj%kT z+vv&EsU!E{R?>Mi#c-6)Pt&;tEmJ#B=UH^_Lr8K+vvi(A=P-H@eoW_ybnZY8`G3**2|9P{Lf2DA>H#_z)A>A|-=Om-R}?u- z98rQ=>6#X_(!v3we_tQpNa|YvuA_bVap)E@=4dr29hK;u*LBjwsf81#j>wrgxp2y` z7BeOk|6|3z^c`_w-Ou(qf76NPeO7Nwbv5{M-tMKlADOjv&%O1d_8#82Zon^R)85VL zvOXrNxY>t^XCG*PyyUgo0Wa*hXZ5;1&wSsdY5lLO_Z+tNljMvKpBlLE#^|aYMy?IL z=Z8&Yuf`_dQrdgreOYU7_^zpV#l+=3rD;?CZ<~R&$qOHVBt4MKFBS8 z^`oU5m(FTEe1H13^2q!jQ%+WTZ~xr9xs)U2WZ1Rm*V+%(eX*7DskMXmVjNLYSUja= z3;fSt_VzV9;(~AacEM{my)!%W-5pgMOmDe%dDoU}W^2b{=Z>vg{Ydq%k7VrjudvxQ z|Iu&HKHl-Srx%?&cIOu{QTILJzvI)cDf`AAo8EED+++7i&w|L{o3;Ng-^U+>%a>y zpZnlfx)skG9Y1qr)J=4ww~@n3B~!;1PAF_?`R_M!;>a+0yvyB~V@!6S!G9KR{~txqBkuId|-+iZ0}$Zdshwz&1B zGqakltG@o9y=v@gR(x!C<$n^ZkH z?6oQ<=MMhnwH2eku9r|Z;Kfd#Hk=;Ot9cb^=F;PZ1CAh-}4Qh-#Fl@)=dNJKK||6 zSjS5*HLMhoKli$0FJ^4JuE~OES8VMj>t@ufo<6=pozEZX`^t5T$L_wRT9@ew+e6oW zn_0hphm$`I`1OlH)1S#XkUp~83IDtu6CWzCuz7pT>WN>rotf04(Nl-2|M>avFGu*S zAG-U;ykCp9#{`P_z2KK`~~9=s9sGyF@mB)&Im#uSb^+pEP0G*HOc7Dw#DUjnbS3Q*fqBW_C4{~kiG|eUJuavr`}e-cgMDG zpYiqUzhzjrz4ui5c6qlAIqyAGbMfLY&h?M^;O6%iKj3P!cl7Qp57apv-uIbjMx6iY z=Us{4{2WFrBYVV+l zuf~11rTm8vCvBPYrT_L$LlUk(_v3ph52VaK_vROKe>=0&@yYSA#oK$<-?n}8!i-nj zH@oqLFSj1v|J^-X?%fsJW9P=y_@Ab~e0twu=f|t-eYO46sP;3?w&`_i(2NQH+4^a_ z#plu@cJELAbf>dce2=r$uJb>7^L_hnJu`M?kJEe4?ce!P=aYw9T~}r8z-xYaF8KL7 zULHDqRPj5n_RDONIX}Bu#~&B>i=Y0F)1B%J9J;L6)_e0Sefd$Nk2}?UYx&|mhnqaQ z_8mv>n3hwjbnf*++Ebl#QSbn&4BX^-qYQ8GW`8vpZQ zdk=RnY4gR63%?Euymx6_;qa85U0yDpcv+sVp>&|-? zezRd*a*y7hZ?D)pdez}&yCVBU&V1?KsoR#_^IF&UuiN9(C;72oYHb_1>Fua_n;%-; zaBbm@>l-DW-gBbW{(t;j^Q|v^M?RGh^UccPjp}#Ie)ZqgKHfKd_b119zB04oz@67u zI-L^xPRFFalSUn`{B`rMUhA@D(Ae_1&m36wpYN%4SQ~j$pC@7mKmO>d-+Xm{<*n)?cVT0cD@E&o{ErOz+feee1CduCK!6P*5S zs}XG%c01NCV)*O6|BC+c+4o-B{$6g$&h6(v$bIth>P0PTIrpBJ@j~X(9ZNcYezIu% z%sZNVH2%dEW#6@M#U4qnGcv8{j>FTJk8SQhVEGTfM$h{^=HWsA894a)n$21?J-aC9 zsSVmSg#(Yy|7_bUPaIGFD&N^-@`Nstw=~I^`9zfu5AL0{>fVnd)1GubaVBfc`qIM3 zj@n9#Rcw+7JrD=Kf7neNO`{bUJwHg*ge)>qegC}Q>eRbT^NA}%0pgqS(H#FZiZT_!o{tkKFNO=Pva>uhpRU?m_!nzL%Q)RGs_sCItB&yT8F9|J<2} z_H=&tRQ=<7eFNT2+Z_K$-TUYIEqMEd?dNh+i~%ZN|VyYoUb@9V*K;h zG%2kUe&)7yD|;r^KQnM+@{X_qH8f&@SchQv;g^_lx?XPt9?^ z?pSax$ftUW_T9;CoBvhqt}g2$=A;~TRqWPvcEiSnU00p{jXF}EPq&bFmOuC+J=Lny zv#*i#bmK?5{>ZRAg6{N$+h6ThZ{NTMs<-zRT7|Sush|1H zsgS3exmw&Zvh3b*oA17VZ>3QQAIFbT}2H1GnXzD}B1nnq>n&tGnj0&U-c==yi75?1#Qv z<(Rdr{%ZwcHyqTet?Yka`E$RviC#FSW$mb8zh!ow^5Fu%*hgO9f3)7JC(?Z1$lJ7O z=O=VyeCrNpb9%|ZTc3}_EQg{8*uSqm0J#%nUL8mIY3UNl7s{Oq^TKM>+wyoyTe4pc zNq)kcA$_0J4h&p-a% zyZs9Kr;O0?COVEK1DZBZM@scBKL^`@CiETJ?T#CXvyFxWykYoFy7YYgzoC#mnbOEY z#|rvPN@ENCuvV9hj-x45{17W`YW;Gp1z%?#O)<_6ZMCZ*Ii0EeJ4*M-#{de$McZV< zNUmx5QA6}F;YavegG@io1Jmfv^us{@kjwPLRGuGd`cYC=c^J`SEZ4)F{!ol54z5N(UNHNx}{pRXu2xKa(}h8&NhA*?LP7k z74ffv^)zrOXOk0#V>Siz2Inp(2E(B5)C*y&V~_?68aPCo=f(!>7(7Gtp`WI0b>!+8 zHJ60l4sk8j5vu*FPblyP>6%ui#SreGi8}Rf6lo}5QBl_gl69hbgp!Z(FrpA|88)jS zbMt7$FWN0zop?wOhf#xk97au|P%Fx4bS3mE&V6Nqo0~{} zq?Y4LA|J=siYOSg%P1~vYi|$R^mQhQsw9y~TiMIMTsAlrmiTiLg`o4eN{EWkyji>H2KUh zs*{gKZf;%;8?Pq$pgDY9E%M>bO7_(zAI7TeiyKP+I;=f6zq#2AKCNt zR6D6&AVm!Rw-}X z8DH61Pm>SDF;hac6oRjE>b1VAc+?swkC({q-X7t0kIsI^M zK|h>Z(hui2`r#Z;Kb#xV59dbo!#S3IIAdE>oSW!tLY-8ho9g};YJz~*p&!n5>4$SY z`r%xkemFOvAI{PA!?`;BaIQf=oNLk#XLKuYu1!Cj(JjFl-4UEa=!bJf`r#Z(Kb))4 z4`+0fa7OnCXLO5jM!DdOZV=AA;s9TMK?8s~V$)>!2^35rl>xbv z-m-}14sxi=HUu4d&TZr*O3#;W0cYGw7(JBBsJpMqg*>FGnWHGL&e*7eS;JE@PYtAn z3fToK=@UEy?xt!UcJIV{F(<8Qy9#fA^p=C%beSY60mgcD|uBWOr5}3 z?P=@MAIds0%#jgI83SuM5&_jKb1YCMVh|G1#4)cZB;9Y~ka6^tp)s52Qp~_oi#cj{PSms=BSLT7HBHm*FD;%CMfeA^Qij6M0rTn(ZZ(inv>s)S6lDa}5J8YbOJ6sK zMwj}3p#FbkAdve@IgMxtE)qnuoK;zx_DE?qZng+Crq;|L(595pKtiQG@km7#N9fR^ zyf?CMDg1sq^cw4O58sFXM!A*fzuA~~D7XPLzNRtkkZk;;(&Glv{FFJel|eT^(Bb-= zy_WvNjheP8J(kv1gwQ{IS&C-*Hl>3`mwCVpC+e^M6hN?e8k9LUD1*HT!KON<=QqmV zQd*zVTUPoYt$vt%>#6IFVu>nfK-~LFGX~v2Di?lZ^Ypjwp^st_wqr!QF?Ww0PImww z_>J<*l}lzc%5S

(vfJK%N!p%ZgO}wRnIvn(T5$qY3+!n9h->%j|bxa?FINhG!Os7M&SSS zVEo^mf&b}K@jrVy{@3)!|632>f3(gmnFcyZ53}|l(D%;&EE{K^;rHtjwFkYJ2mhX& z4nuLiwg12MP!8XBt?u7jFmxvH8tEg`aei*j+=Vz#D!Sz!ocH9!&hMKE>W4X z%9cG`$kexEB8T?P9ID5#crK(O^6~!C}W{6aq!lk^*jDLy;x71&+sZ^ zz`uR;-U6JDj31<@{g|6y=dPBzT*}H|J)DU}Q)WS~=9ty1aUQ?q`y8B4-u1&UoIjqz z=Wj~xeGvYi2mQPV=bXWTIeZU0GX~9lrVyBOMdOK#gPi?h|j52Mkqm0yYa`K1x&^^q6>S26vSX#`@Gk3!i7 zcBa(O;kLveZ9M5{SYo2I!8*8=YOrC6iP9(jHL|)4)O+l>W+eV-Y!FTVDhtaf(h>Bu zG4VWF{}3L_1}p6mm33KkcKT4R7^5!-`2vN{Nj`*!P@$xKZ1#pe`iJ(I=SMuNy`c}~ ztZ`ic@z6zMNf-J0311-j&>>@91@f5|h9L6MqruG!CLcY0+`bU<(R1JJt4KZ=204^a z^3fB@?F%CxJw@HVaPm=S#O;e9-vHsOM9at*2wx=mZWg}EUiLpFz}>c!0k6rr-E@B0U|E;FeooI=m9zjo___KJrO zzUW6_{R$mNF(lW|p%=9?vsD?=c02RdP_woph8T+<1C>%*n}Z@i>w|9gR@#CV2mBbg zSg%LdyEMd<$3V&|j{#Loq{&C?b=2a=1H&rMcIM6$3da{jnqlzmtq*bZmIf&cQnWrn zlz-rrQj3H-g=3`tfAQ7_7yk8H6x7?(l(I+~qN=q}h%5P2>mX zh?*5lZC}3oxo&7S@(xA-Q?tXg@p@~xm4@2JbCvczabrDn44yEd?b$l!W5F~>sE+w6 zFtpdkwT2w(o{R-3Fgz<{IXrh|40TV&Pfu&3c|w@2dg&D2VrL3ZQKtL_6(A^D z`|IWg3W^r`x-op7j<2Qn%-vLopy(xCHx?==)C;}>wSg(r0j8k&OhMn7f|fG{-DV0J z%@p*QDQGWK&{?LSsZ2pXnSxd_1zltc8rX~arrorksG%x$rfEmXc#QtQmHg0F#!!fI z{i>tD>MF2$3aq{YYoNdyDzHWhELMRvR$xsOSW^YoOo265U@a6FHWQHZ3NQ7`SiAzm z3-_{Iq5?}&V67BbYXz39z}hIVwhFAB0&B0pIw-J?3apa?OOY_tbm$-JHnff@=o(Yd zFs7haOhKENf(|hS&0z}q!W6WGDd+}M&$?!1^h$bOn~7!1^n&Oa+#u zz_JxsjshE?zy>O?K?-cJ0?SokLljt^0vjq}sLRkH)=y{-Q_vTtpe0N}H<*G(Fa5!%A6^bG*c*FrckO(p)8p~2{MIpV+y6k6v~JxlnhfS52jEGOd;=?LXI~0K4yB4T5M zU?kg zIbXrW=fVxl;NlU(7`CZ0D1+-Sxc-9cFG3Cw+yKE15L}nwx&+rHxPgKjD7b-wTS0Iu z2yO+z4HDcS!3`4JV8KNj%y$$lxFLcYBDf)fTTyT;3T{Qg4Heu_!3`B$v?m-}nBZdi ziZQe-24$oQ26x8L#u${rjSyV4Hq5OgLarpZXm^+!DY%h>ix!Bvl?Au5;G!*JZj|6g z2`*YC=2j8hDuRpliMdq;x2oWxrDAS1!NqRbjG@gkDC2&k1sAOsbE}JMs|zmLG3M3~ z+!}&wT90Z9ZcV{8ElRZnx0c|tl?nB&w&2#*xv)GAh^(7 z<~9`EhJp(%W^N=iZ;GzaFx4Gap7hKc@=C%;r7J`df!Q7UD+fr~*KbRXQxN(Aun!?<8!HpMO)EVX` z2yTMlqV_O1QE(Fl7xjp_NrIasxTsOgZ6&y^1Q&ISxvd4awcw(bF*jLolLZ&`jk#?E zw~gSU<}tUe;I?pV$1=qA_b`so9 zg3DG;)YTNhP0_h{4yDontk`*F&mZF|!}4iu8-T%nC1bE;$rx-}G6w6GjCEIFuz1OG zuzkrGtY9(*dzg&DGA3iNk;xdWWikf4nT)}LCS$Or$yk2{mZ`w96j-(b%TZth6xcuo zHb{XDR$#dj1|2i4m#ISAQiU#>7R}Cr+gWg-8(asv2yPd_g_bb4tKfDOT<8mPy9sVL z!G-29x4YnW7hLENb9)GG55a{tF}J7S_7q&`6?1zDZZE-whB3Fd;Pw_==o)kT2yP$2 zh1M~*ui*9-T<9Nj(*!q7aG{CJ?I*bX1Q$BV+;qWB7hGs3b29`tLvW#|%Qn%{d-RfbuSvZds?Xbc(YJr#g*sU z#!45oP{WAlZH50LGOtwW=9oJC*hFj#JT~XXp~2dq1IyA%$@)MtNi)`^NAy2+7j3+?Oj{0qyD?KT7o|t1WA8S| zMHMgyTlQiPxF%y3=G{ID+t3*+{jVJglQwcXoD#iEX$2pNM7N~QDxo44X+#^!aJ z)+9aK1DiIv{RCO=*}|}bxp(1K@D9gY=}pFL&weOt_cCiz2GEv#c=ZwHfpAI^&fX34 zlqAzIU%ZU(!jH7*iVX8G-tqw(?dL1#wUs;m?;7N-i$#C`V$%TIV$nZqF)8+mgTdWg z%6@e*DHd|O7n5RaN3Dj2mog{dv8Jf^l%t6HbFXt|UnJT&3fsW0rcZRO)7lKd)J z)W-5MZPip3$_`U9s;R7gVlk^Zm6a|Qv&z#rcnZqc|HY{+c@axEJ)&eRLV;CMV37)} zvI2`zU{w@YRRvZ}fx#>+ry0gz8G{K}#$foBF_?R03`SlnhRGHjn0PU#vdk?_Ov+r$ zI)S!#FsHI6YS!N*(te)6`D;&QjiEc>bYd!Ntngtf3k!RhhpDVN#w(D(@FWy9dI8(`3edhE9UwODnL*!K?Mq`f}nx~6)dO_K~)q~ zsG!0Gh1$aLqK+_yn!yz615>C4OhNaVg2poiJ!cBq&6GLSVNPq9QyAuSg*i3B(-1KA zRHfkvPdS*2)-IParW~v~Z%jGJ7|gpe2BWTw!IUdw4HOv6wz3?IwK4`1t&G7iD`POn z${38WG6vJDjKSb4V=%MI7>uhj29v6c#VfD`1(vA5k`!1g1=d=DB`dHt3aqUHgSk__ z4;VRR45m#PgF#cqV8)a&7%#1ueagX{UVyG~4S|L+1-)Vl+Qbxeh$(0eQ_vTtpe0N} zH<*G(Fa5!%A6^bG*c*FrckO(p)8p~2{MIpV+y6k6v~JxlnhfS52jEGOqr%; z)2wWokWF*3X&PoTFxr8ui(UD3J>x|knBlBChV~4`HyMM;O~znolQEdrWDG_%8G|WJ z#xfOHmIBLGU^xnGfC3w+zy>L>!3r!_fen!`yBXLt`I_ck)0AtPZM#z_tlOqJ)-=7E zW>(XrigM#CP+Cl(jF>{nFop793Z=jl@}4Q=I8(@HrjWZ#Ay1h?PBMl3V+y&(6!MBG zyI=AIw%V7`{Ycrny`$m5;01H%>`#C zy|{#)my>pBfd7h2TjpDy7~JiBRMXZyu4&IaMVstz_`46xuXN36u=Y?zb0AHt6+PB; z@<15t7}1E~2oY;K&4F-;c!${>2-7Z_D0T{y-{8bRSjI3AmNBg9lrgO7lrgO7lrgO7 zlrgO7lrapcWDILMWenyF8AD#k7}j*k7}j*kSQsg>+(3sbum}ZKNr6Qwu*wQ7N`X~T zU{w`ZH3b%}!2X&8VS15UAJ$<_=cK>I!1r28u{rQ9ai{<4uoN4}84tn>4@)1TW~JEK zjrKIWk_RMTb9GqCt@hPnX&804JX`In!%~0RbH}KUSBIr&FEAXDpY9l#$QXtwGKRs5 zjA7U!V;I257=|)3hCz*tT^*K&(OwCj`Eqqw>Q6g87(hox9q!Nbri8h+YWR-`^ht1F(z00G-<{xP46 z_~SPT{PSLQ{5!6!@Z2Qu>dFes$_jnm2`RJrTJxW_O&4C&yX{3ytGk81gZ#Rty}bYL zUX!kTWrbF;KV>8<#$eEqF&K1Y3lsYSy0T#kNgFTeTGus9B=e5Bvf)~K zJ>D>*IJ6SmmZ~Lsyli6eAs!5W?DHjGn(+CN55_*``I8T3KK2EW4+cK=xyaW~_yWln zA$%3cN43%|8Kh0trjoCW)&$|XKiT$+a7$Gpw6ZQ$L$BM{QW%~;&J}z&Ad@yndl>5B;!6UV+6>_fB_Hki?dFA%kM?13`@+e0gYZR=uRZyAeMBW~ica}Z zdG^xF!iUmeY!qgkBXk*GA>->+29|ve$Iq*bzmW0wDia`N0=&w&gpA9pOrVen^eR(9 z$W-tu6C`A?`GS!z#+macSjYr>l?f3tAzo!F3Ym&tWkQ8as8<=ZXIvIxUS-g}u}rvE z8MJpS6X8_`?H|ij@+yP&kYysh%AkE@naW;e&|b1klvf$FpDa_ws|?yxmZ|Dh2JI`$ zRP!o>_LgO$y~?2dWtr+;W!NN&_OOOm88((erlwaJUflzkT3%&%-4A4HD`l_}pg%Rc zSP}FVeG&~zY_H^Jm|m^V3Sd~9A!AsjA!AstA!As%A!7{`7*=!0a#+_PV_4xKV_54U zV@(to)_=%ySP3FyFulqcR)@$K)``d%Omi{@Bb|&TD6m8YmZZR1DX`WGELnlIQDAKq z7)-BnnqhjCF|1UPF|1jUF|1yZF|1>;V&;k<=z5G&*CE4eg&u_DKGSF9+ zspnM&`pYu)y~;qJS*C$k8R$35H1sM1eP@|QUS**FEEDTh2K9ku8he#N{a~3UUS&{U zSf;608Pp$^Y35Z1^@(MgdzC@`Vwo0RWl-N(rlnUIHjP6!;=IbR(Ht`IUS&`}Ij#h+ zGN`XCljv0j^_OLmyvm?HvrH?mGN|7y)7q;H>O0FMdzC@`XPGu$WzZh5Ok1xqXdhUn zomUyO7cA4>s|?x?mg(SC2JH#Ubo462tK(3noxIBMx;e*rQN>hIeH~ePxBf) zGx74QwQU22^;0s2sS6py)P;;;>O#gabs=Mzx{xtUUC0=wE@TW-7cz#a3mL;2Eg8dV zEg9>lz_5Z#mcv>u8SAgWG8I^s0?SrlISOom0vo8n1}U(?3M^NF4N+iu5@xQlgKnlO zbrUkY{thyoy~;qJxUO{ZDg*sunXX=Cpl>YG&8rObk7c@hm4QC8Ob@Rz&`*}>=~V{$ z$}+vY%0Pcvrngra=rhaUlP<=X&^Yth5cpuVw8j#nAfKb9HbRR;BuWd?ec zLH%TzL0)B0Us-0bR~gh_mdW)hgZj)eL%hnMeq*(02l`4UegEqUpC+E`MK3rp2cs|< zifE^JqV&y8F$-`#8Oty;aG_6Bf{(?We6VRSi2PUt8bk&)@NwV_3}^gswtkuten0x* zj4!&F9|!T=M3pB1y?uHz&^7_6e|i#mitjZd*CYOjb*PzdYucFi>2qv{>7#K+{_fKl zSGo?BcKNWpzzHqUEMEcBUkJ5)^$RbATII1~%lcg&nA=J%FOsA{@b* zF%4qwRT?b5VAA785}8NtCUW!1Eg*L@xm(EHN^T*!+sG{=yP)PQm}qr=|1BVb61bQb`I!zf)*%Pn(jf1Cu3OGEMr*LEMr*LEMr*LEMu6= zkTI-lmNB%NGKT358H3)-7^XU83=XmtgZrsQBszJ5mLq)C@>fqWjPoXWei3{8H3SK#$Y6r zF&G793`Rg1gV9gMVC0iA81-Z;;tpaPOz}hP? z7{TN`fYD3FVC0f97`3bzG#dKHn$Mph=1|x@z^;ck- z3M@;3Wh<~81vWr|4OC!*6xd(|maD*qNEo!u++C5)dceAn9BV3@=zy^y4peu+WuqD} zHl2ZD0~shbgMmW1ad;>#rcg#qp=6jsc`$`iU1$T#FG#I63-1ga2V# z4_aCjLCcTE`8w(VF^*uujAOJO7VZQ~3QyMtP8Jsm%t>+e(#1RtLx4S3Y&-cy;xIi) z{H5fJeZ|#os2NAyA>5kxJ@A5Uh8hPfKPb~bWDmTrKGw8{j{aXY%xJa`Cd23!V==72 z{C2q?T;6K=9K1gndW;Vw;{(lq)}DArp+3@{c;;$uV*oZ1LbRSOn*J~Jd3OZ%KlOoS zv{Sg{KW*i<*{~q04xeh;r^o;9HR{S&Z2ukKeK1U;sk#{qHQ?&I5C6?~AM7<~&IwJc z|HaiBglER@eS_)8V``AUtrw?H-$|b; zv`)`q`p(+xgNYNpLJU=q9-6SA>AKG3qr?4aK~@h;Wnj>cBS@>DgIgU}pGk`_Kjc2d zPRIY{8Wr&ky@z+|YK{71YSe${ne=aTD$p>Pj|!Icj#so# zNey>En*KTDGe2tD^}kX#+}EK!9q9O*?^klAHaq$hx@CDHjXyk=6AsmL4I>j{d=jRW zxyL8wa>6jN#IT20PDa~{>2jrxo;pVJI5h2I-%)@jKs+!^5Xo{FLCF}FlgSu{3o?e~ zWHN?@Niv2pn2cdLnT%mMnT(;%$QWvljA5=w#=;d?gaWIiz#;Fe!6ag{j&cU6z;oO{Ei~0k2_v}n{RWuJ%NoJ8?=-+%Ug`+0eUAa=^72P;?Yj$v(i<$@v@Cjz z6+6?kP4s0O<0G+`d&ZL)OVX^ZB`_>blQAq)lQAqeFeA<@G?no?K=uEmzPe0 zYu`(NxxAbbT>CBp%;hDP;M(^OU@kP4TLk;g0nFv4n7G!yX8?0~c_z5_-2#})OE$r^ z?-RgWUd9QoeTM+%LdQ8(_Pqg^3vFkveOCbHLhqSt-w%Mfr~%Bi?*zbH)CK0+_W)on zY6WxcZ~rqF^@F+g_x_oSn!;TB8~@Bjonfy1U4Q1H_AuA}mOpb*kC1Qr#8FTG#^D`Iqjk)&s_?e5E$6Wgx{LDoiWUl?)edh9VS?GrSt$pV5 z5?XNW@9Q&{m(_x6e^Z~iywnz4`#bu~<>j~F+TYIS=TIsQvHqx!n_JrkJcqCVQ^v3q zQ^v3;Q^v47Q^vY0Ff7@W<*;~D#;}Z2#;~AM#;~+g#<0j!#<1K|#<1{H#;^ob#;_Pv z#`-I;Oa+#uz_JxsjshE?zy>O?K?-cJ0?SokLljt^gyFft%XFcY_V@BxXQ4SjAYg$Z5XUbS(dtxdNiy!NaAF?b5 z$1V=W!XHdo`BG6>P-l`6{vaL$iU*#ex{HjwHAu$DBP#l>8LP0>HJnl zg$hP9@CQyu*=y5vVGgZr#NWL(b-UuvsOMX13tC9)w3PlbhNX6S)+S#q-%?x9&{;PN zSJkegmhe=yD<<5m-B)WD)V>1MLp-4WklGbTO&}VVIQsee{^_;rU?qokcjc?K%UCXP zwRZhaKf5aGk7NfuM2T|!uG&Sl^y=}yodc=3y~98LxZ>1d2i9m@?(thW275fjv0e+r zdGO7Ht6NkLyW?(`*0kBVr@Im6Ct?30!F$MICLSHiUgWBf>rW0H#=+#U{v@9q9zbKs zMUk6K4xL8q`;Tt!bP5A;uBV&e`@oDTAKuQjC}4zz`1XFW`=_$^c6_(_+=j9PyWW0e z`>T7t-f&9qd%p18`x`6}Qt`r@8`kXEXM^!!gAHpAzWve`i2?aH*1h|J0)Fq;ZJ)hd zw(Dsr^f&jtd!+3Ao_#X>+`-orfgITN(hdp6o6#SXz5nvTPb@(I-1_#;uk7LaQAc?a zeXC-cHbE=YCer$dY@MEzlG4duFZhbsfW(775h zXStQlK^==p6!v5-Lo3j(xzJ@w9=?rrx$!rmkj5!PyE5={ Date: Tue, 8 Nov 2022 10:00:17 +0800 Subject: [PATCH 142/161] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E4=BA=BA=E7=BE=A4=E5=90=8D=E5=8D=95=EF=BC=8C=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E9=98=B2=E7=96=AB=E4=B8=AD=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=9A=94=E7=A6=BB=E7=8A=B6=E6=80=81=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=B7=B2=E5=87=BA=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 6484609fba..afb67b17d8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -8,7 +8,9 @@ UPDATE ic_epidemic_special_attention SET UPDATED_TIME = NOW(), IS_ATTENTION = 0, - IS_HISTORY = '1' + IS_HISTORY = '1', + + ISOLATED_STATE = '3' WHERE del_flag = 0 AND attention_type = #{attentionType} AND id IN ( From 3e70714e357727292baa40ac0b76e7fb0d91281a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 8 Nov 2022 10:30:38 +0800 Subject: [PATCH 143/161] test --- .../src/main/java/com/epmet/controller/AgencyController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 3d86d05fb6..7b3933ad70 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -414,7 +414,7 @@ public class AgencyController { //获取AccessToken String accessToken = ThirdUtils.getAccessToken(tokenDto.getCustomerId()).getResiToken(); if (org.apache.commons.lang3.StringUtils.isBlank(accessToken)) { - log.warn("获取accessToken失败，customerId:{}", tokenDto.getCustomerId()); + log.error("获取accessToken失败，customerId:{}", tokenDto.getCustomerId()); throw new RenException("获取accessToken失败，customerId:{}", tokenDto.getCustomerId()); } CustomerAgencyDTO customerAgencyDTO = customerAgencyService.get(id); @@ -446,6 +446,7 @@ public class AgencyController { qrCodeMultipartFile.setOriginalFilename(originalFilename); Result uploadResult = ossFeignClient.uploadQrCode(qrCodeMultipartFile); if (!uploadResult.success()) { + log.error("调用oss服务上传活动居民信息录入码失败"); throw new RenException("调用oss服务上传活动居民信息录入码失败"); } From 922abb6bd44cb817d71fa2af36a9e52c4950e28a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Nov 2022 14:47:13 +0800 Subject: [PATCH 144/161] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=9A=82=E6=97=B6=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 76288 -> 77824 bytes ...s => ic_resi_import_template_new_1108.xls} | Bin 77824 -> 76288 bytes 2 files changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/excel/{ic_resi_import_template_old_20221108.xls => ic_resi_import_template_new_1108.xls} (53%) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 553966a9f2139973810cc343a340ff42400f0e52..c0c8966ab55c15bee0eadbbc5a8285173ced4d18 100644 GIT binary patch delta 14516 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 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls similarity index 53% rename from epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls rename to epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls index c0c8966ab55c15bee0eadbbc5a8285173ced4d18..553966a9f2139973810cc343a340ff42400f0e52 100644 GIT binary patch delta 13125 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 delta 14516 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 Date: Tue, 8 Nov 2022 15:00:54 +0800 Subject: [PATCH 145/161] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9=E6=A0=87=E7=BA=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 77824 -> 77824 bytes ... ic_resi_import_template_old_20221108.xls} | Bin 76288 -> 77824 bytes 2 files changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/excel/{ic_resi_import_template_new_1108.xls => ic_resi_import_template_old_20221108.xls} (53%) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index c0c8966ab55c15bee0eadbbc5a8285173ced4d18..cac3bb824cb18be22265bea1c4c08d825c7077bd 100644 GIT binary patch delta 15427 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 delta 15527 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 bEgjh+-o%b**v+$R>vzTHh?D%+-Jt&kGBx76 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls similarity index 53% rename from epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls rename to epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls index 553966a9f2139973810cc343a340ff42400f0e52..c0c8966ab55c15bee0eadbbc5a8285173ced4d18 100644 GIT binary patch delta 14516 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 From 892de51f78048e8110116252da914b84237dfd5e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Nov 2022 15:18:01 +0800 Subject: [PATCH 146/161] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 77824 -> 77824 bytes ...s => ic_resi_import_template_new_1108.xls} | Bin 77824 -> 77824 bytes 2 files changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/excel/{ic_resi_import_template_old_20221108.xls => ic_resi_import_template_new_1108.xls} (53%) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index cac3bb824cb18be22265bea1c4c08d825c7077bd..e93a220109893f906aadd80c20ecd0fd7f6ba213 100644 GIT binary patch delta 15527 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%0D=zf9ZwzNrOH=_4Q+^C)V$H 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 bTRO5uyonvruv=%>*6)hX5hwYtyFvd8VVmMo delta 15427 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 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls similarity index 53% rename from epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls rename to epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls index c0c8966ab55c15bee0eadbbc5a8285173ced4d18..8f9cf94926449c101231a9a451d7fbd5b68bc34a 100644 GIT binary patch delta 15427 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 delta 15527 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 bEgjh+-o%b**v+$R>vzTHh?D%+-Jt&kGBx76 From 8d8ff32cdce6768735e8787db6bc5051b11bcab7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Nov 2022 15:22:27 +0800 Subject: [PATCH 147/161] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 77824 -> 79360 bytes .../ic_resi_import_template_old_1108.xls | Bin 0 -> 77824 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index e93a220109893f906aadd80c20ecd0fd7f6ba213..2137379ab92584418e891469ab4e75eb52cf0c59 100644 GIT binary patch delta 13722 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 NnZIzaW-$Ab{U2O0&Q<^b delta 12800 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 MIqW2(e(EtDd diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls new file mode 100644 index 0000000000000000000000000000000000000000..e93a220109893f906aadd80c20ecd0fd7f6ba213 GIT binary patch literal 77824 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 Date: Tue, 8 Nov 2022 15:58:21 +0800 Subject: [PATCH 148/161] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic_resi_import_template_old_1108.xls | Bin 77824 -> 0 bytes ... ic_resi_import_template_old_20221108.xls} | Bin 77824 -> 77824 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls rename epmet-user/epmet-user-server/src/main/resources/excel/{ic_resi_import_template_new_1108.xls => ic_resi_import_template_old_20221108.xls} (66%) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls deleted file mode 100644 index e93a220109893f906aadd80c20ecd0fd7f6ba213..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77824 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 Date: Tue, 8 Nov 2022 17:08:57 +0800 Subject: [PATCH 149/161] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 79360 -> 79360 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 2137379ab92584418e891469ab4e75eb52cf0c59..4d7e3660d70c03c14b60ef06fc052ed571a7b71c 100644 GIT binary patch delta 7263 zcmchb3vg7`8OOhKcazN~*=#ni-Ay*hCIkfXCcK{k!~{?v0s;vjuka=>5>!MMMFsIi zIka2Q86Sm_ss-yZjerfvR7b5v?P#?vqkt8PqC<;MeD(j`d-v>;;HVR)_s-pOf9Lz| zIp6)xcfND(Za8P%aL)SFN^8v4-Tijg$Y$#%ZMrXX(Rwake(SUcUe?6jbyFvoQyLv7 zB0FsrDCo|p`lUk9Kzdf|TwnA(_15pHKTciSk#{D$#LKeD<;L%nWVbh}U)GOP{YrmV zsXZb+k<2Yr>g_!2>eLR=aP?mDsm|>Xjf_Z>^%l-M-Q`i1oX4xjDV>PNxISLh%h&kX zr&BgtQsW@_^t)uD{p>Ux)+~7_qts^ipMay|5fZ&#gMQz|mta!*E!Jec8;Eg5BU zOh&b>T$kBpp1V}U%e*wVNRYR>-6D~Hy$*Dt_xA?*EB%!jL`QUe2Wxth!ct{Tu`YG$ z?IcU|CtT9ysq&_THMhH5!GvG}Su=FaRN3rti!@z7UH{FH2Rv1Bb9zdyX<7J5)yDwS z;&QLsYwsehFs1XoZozNm7H&B|!|nBiHDSTw+{3wH3%v3k2GFP*QPWQP_$cDV+ z&{e&+ico9e^H!N%nk*K`lG0Myr#x9KRCkNiT|MqbiN*3*S)o`W8~PW^y3!P}R5p|r zie>uma+b*<{hIVPRV_wl-m>e7nk5``&N)S-W_5y=TF}Nu8fx@QfinIr;G2ouwYyb%>>L z;;rjP&5zj--Lr>Qydfu5XCeTXRcC8+&&bWyz7Y?9V6;{~>zfUoTg#+VABClB7k8ER zmnYHCnoqWk_h~PFE_25F5a`3kXAhm2!YRon-o0tif@l*mX-7Is>|*q)J=Y$b^xo8H zsgFMQ$Zg|KE=m(Lj-SV6HLn=6I z@1*O?ELmo?$LM0N*6&jI5mlEOVCgVi;e*+Yi%Xur{G$C#UWhUlS9EZ*-u0$D8zt+9 zjTwXc@WFaK8^ed$kL+P}W%K>IumB}L?=s8f(iKzKlN}V@D|56HnYCZ!rN(ggntbT$ zv9{i}Er5IE*{ctPes|5m7+F2lAzP=uUi@e!(NTy#Lz#gGXOBkjDEFg$17-XeqP{R; zIm#`vWm=E)NmmjzVC?pyJcjZ?jO(+Z$ETf4hwU z;^|~iA}u9eZVhrkmZ~TT6p=YWX^?eL23{x`bm{3f+wh=19r0(P7Z_Qd&-Z6qP~NS5f&T z&-DWpDp>`nh$)~4UVmV*5)J^BC>jVVRWt}xrf4uIV%iW;xsnY<#Pm}%46+JE!$JLZ zn#FNH0ysbkM}h__8U-4ps1n2-^3)QTT64gB&Qa$~$ON&SkU5J z8mq_x!V*C1wRmJOD~P59DtY`Y6a&JtV73_xx(Z}LCbuBTK$Du}+*QuBD%`z=Io^bf zG@Po%G>azWy=y%}$epX!CS+=3VS)xnj*w>>vn_*YkhC=w%l(aI@^)O)a24SCq@hf{ z(%`pv@XEo4a*i>K5swRDJm3@@Ly);R6*)1LJrKyxVu*!BoBUV~TW$3OT$1*Bd{jmExT&SDZ72;z-5mY7Qatxs%TQ-8%u?3p z(lo>3g{*vafsNPh=(<+a`QVZcF+*>o9D41mhua)*Ux%2g*Y!kQN^4mH225|42d;FN z*Rm1y%UU;;lpv5Xt_3)`TP{1q-^E6eh!^FxH*$r%UiY5O}y-4mo7(N94p4ltv3x4 z6XfWTX#!oX$N{=WQ4(m9A}46FqGZq%MJ`Z{q7=}zic)Dl-KHoFv@x>W zr2}u5>(^!pzudX@OziJh5#7)TKRg^fq6vSfYF&Sk_k-S$w|+BDz29>$jSvfiuUkbr zzP=jPw>h$!iR#u6EnJK3XXyO;KU&7FfISiauB6WAswn@ipsBhp8=Yust|Dh=pAJEQ zNBMNRBKGNZirA;vTbi2e)0v@T8#l!#-MfM4P3#}$+)s31yYhg{Jv}&7cmFiY#2@rR zl+6v;6dDUW+uYFUOzmuYpjKJL@ldCTZRfqK5i4x_97Sw9=RZTn@xb2;25~&hQ^fHw zUr{QE--Wkr8fJbqiBQgVe9tz>iM#fThHbmI;a2Xhi_Q5p(Vuo);tF~G(QS~Fp^SklUuqWI_ZD{c0V=NOn2}Yu$>&CG@%F~V5T1PzHMA2t6b@lWj zXh&uq_hb-z8fnrb_B7J5N$lyRirCZ07N(3ny<8D{nq%8&lRdo>6z%D=dso`=&%t%i ztWFY75WTyP=u8OT5ba?f`1Oc;^}v2@*iZ8VX0EvvPo(C~5$0@AR&j(ihW@#?LWFjA zRK_i|Fw(Pyy)Jx}!LD@5o28t$q# zwC&GFwE&OHk00|UU6=R2Sn)48G3KWCiQ4pUTVpH)wdmi;25BJ9-UeByC4fX8Mk|El z6~%yfO*d3yK@LSWP$ZYefhH)K9TfRihzCW!6%uGQAt_>kNyGAz2nwvmPxwqx@w3|8 z%lR-<`F&b0a~dm=h8L)T)G$;-qcvzROb$@1q9jn8A}44~csr@V<{G*|303c}o-CcwjI2^{MGecfCpU&_9SC zdxyw-DjWbD@V|NVUs~ws=^a|>Pl@^Qbd%h2HnQ?yWfg0U$gcnJh)tBqUKjR>k3)aE z;1jX=?-RX!I=a)r2=H^=3+%So)_-Gj_W?KCjs-JG$S=O^=45G${lka&_vE8Un?b(~ z|J5eHl+s;ezxWt`www?9V9zfz#Dm>!a>9QxnJ%Cx|v@@2`oTwg?&;FX*&W1oJfUdHZLHV!synDe=38ZpLKl&{Iev ztuasIPbA*Bw*2_~6;59Pf=ajyiGWH%fCLC<$OH(=Apyk%Pdj8|L%NkoNTphHMuf_=Pf7WsRdrFBC>3(5I_c(jhCA6TV$9qZzjSaW#?I|^pD_pnQ z=_>AKmBnaTz^bsdi-e$I;WnMxi1cx7bh;WMG%ejU!z~=cP)b$5;qp@`kL{&=FUl|a z)fkU(k1r){GbdXiID64a#2S2A`pB2l3S+F^<1pPSkEXiZm+E92QjzA8&!nx8`_j_o zinJm*E^R_gu_lX^Ij%yHCUa6;B1vv?xkLuv-6`lo>+fCimV3+7hz@A_DXi&sgrv%v z0!`}H+DVY;PuOK*dZjx)r1?N%Vjw;cPnI-I(0{-#)TC^~ zwoqNw%TUASVzVm(>~3@~X@!!HldV5yf84lCOG_)7QtQ(0cA%T{qK$aRp@iQ!G?Z zi`3I%^|U1PBu5VM$@)U4XqNvPlrMiAvPx!xS|QJte=qTh74p7f(anL#11i&}mL(j_2Yc9!iX;t+{D>*VLA|Gv+L)S+s2nWl(*yoL%WL zz2cMWE3-_+8|A~59`UB^sLV9k9+DqcdTO8iBiFTxk2j<@?yKrqKd(cVc1?Zd?w-iVJep{+{6ZHqN1@QgjDBRUB{7qq*M|hi*&VzyIbR|Zqw>eFyCZwmCI)4pi9Z8X+Hto`d0}iL^38JL^xV|yYlwW9)juJB8~HZO_%p#rrgz0hx8F$A zI!8WwZ&mQ!xlcs-ZB(98s~LGK*(iZB>3}WFS(HWIv@mB=MK}34+6A7a>OaKev(AD| zxJ*1zq1981r&tqS2e@kK0XCZsh#TXyLJW>-<>{tme=T_o(M(Okb5Kh=Sb@rggDy}U zKhi?&-br5Mf)@Rsv={@@YuKqt^Sm(eN^yYnawnd+!%oBw%&u%*mRgu$$ofFW{p)o+ zs!k@Jcm_LZ0Pb0+lY8A@qfQ}Yyq!AXOrjzXry+*41kc>R-eM_8w_+%sc=L6_-9*FC zqT62qN(a?odV8jsT0M5kYPth=Zbcxirmc!hplyoGpgR>=KzAvMqDIYHy_IOl?k4gZ zjmAL8^Qa4BA-qSCmFB^fAz2(Wd46@xco1(Eoot{aMG2^vtjG=-zr1x#2Z&{U9i6~b zU?-(ve2Jj$Dcz{%Mmb*j24#T49rOWl?9f~EbdzO**vq;s3*^?xkM6R8yexE~7t}{l z4#=bE3J`}GT{9QN6RA@kC|glqkXKPZP>!PhpeqdW3#_h2%2mQEL3xS>g8C}T2lZ1l z2-IIu0f^VBZp>g%*fWKoE0wH>7SO;D`KcJf{19RZM^-EW4N|gFP=TVMpuviUfeIB3 z2NfwA0V-BB5)?MgUk2m|uiHHeOQuB8Xvj(xjR6f+bQNfrqOqXiipoJF6jgw@L*8cs z`>YZH&*1u4fZo0EVg=gx3IVFtMryMAiOsy`v9?FGlJG=nj{*{7IBiQvFS~xSXNH4r(%(FBqG_|yteKN6Zgnhf_ArS0fG=1 zcq0)u5N{g7X5l45SQw;s zNsH)O*K`q=U3z_)UMIQC!ismz@dYe0!EqNaa?_mWP@b&!^WmTQn`s>@lF*0_H5*qZ;`fJ4)?#s`VU&j?_CojaHBt)$(Pgm`}{_}bj`ttS`!{R~9)&U`unmoOg;pYqHxQdwS*8 zq*#+SZG90dSp~T)Uxk4LXRT@%al`fDS@AWx@%%N>sY{49EyK}hw>-SzCOPNkV14qpwTmIpNIR6x==~2x_ zlju4{2_W{mF0+HCDsq6T6*)mQiV{KBD@p=QQdCxNFN+`jW; zvonLX+qTBpr*0w&;FOeoKhe711s}b4ie=(2`XIvAW*k-7)->F0)Z9Hu@j^FW>1&}* z*}-dp56-&%Y;nCJUJKaIhKw!dZyQ~c*TP&yycQZ1@mj#{H#Cz$^FVz1G$Ec$AQ7A; z@vYx1?|ghO?pHmr1NWm()I}fvJ^t<5g&8|9i_TWbBj=jr@u&J-)`Ix)={Ebohl%1I zBT9OT==NuMp#|nfiL&78XUCZn5CL%+tAh7W|M1>gj<;>tvn>>ve7$>?BX)Q#aN}Xm z@}%m-o?WDfJ-b*DdzP1~uF0NVs)#+iOc8sw85HT+&i#EwaLS97vBD=GXkTf6?Kz@H z_Ygh17jMD8VC?6D2_1V)mk!$f2zFrr-qeYp)OUM`8vwy7>f79f@UKd@q z53jD5yG>)+8<#hY+b=8(c;kiLe*0gEJg*bYe~aj)cfxad!50@;}Ss37pRZ`IBvdc_z} zI2gu)Caa28kW*0{C{a;7tw7=-q@YckMqHw&B*Uy^uztGqV7K{sJgvPX-7hALpoUf& zU6{~l4fOR9nqYDbwJEZLRx5IV5Ms4XO)$BJZc&s7TBB16Y)As~=}KRv$+R+f?cotg z@=(_x?O3(Ft4N;iDsx!)&=We3kV%$(GQ&RkeWHesh!%fL^wB4n>_;E_%oM1I!W*sr z)5qn2j)Y*szwhZ~F(-uQeIl)uZ+v-a3>52vz7uC+g;&o1?nUu_Fy)L#M1S@<(XKCy zmHX9Y1)l8}+Mx5T@)A`S}ih>07Z#u1al(qxWg1|@(tDzbxcellbZ(B}4u zPI1CvFEYLoxw~~oWb1b&ft6m-VtOt{rk)ue7?>kQ1)j_igXGGVlt3FE0!MR1nIo!u z913JyA!bD9rU-g3Rhv9So)LlOTyadjLiy8D@W~;tG*65dlLF2Gf=}LG<%vqs#3xfv zpsKHEiEecXDsi`C34A7gRqf{op!VSmLEAmQzIJ=uAW L?d5~TftddR_u Date: Tue, 8 Nov 2022 17:29:29 +0800 Subject: [PATCH 150/161] =?UTF-8?q?/heart/icpartyactivity/search=E8=81=94?= =?UTF-8?q?=E5=BB=BA=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyUnitServiceImpl.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 7a07763ea1..17ed0d4dde 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -43,6 +43,7 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; @@ -75,6 +76,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -114,7 +116,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl search(PartyUnitFormDTO formDTO) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); @@ -329,11 +332,18 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl option(IcPartyUnitDTO dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcPartyUnitEntity::getAgencyId, dto.getAgencyId()); - wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime); - wrapper.eq(StringUtils.isNotBlank(dto.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, dto.getServiceMatter()); - List list = baseDao.selectList(wrapper); + // LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + // wrapper.eq(IcPartyUnitEntity::getAgencyId, dto.getAgencyId()); + // wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime); + // wrapper.eq(StringUtils.isNotBlank(dto.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, dto.getServiceMatter()); + // List list = baseDao.selectList(wrapper); + // 改成查询当前组织及下级的数据 + String customerId = loginUserUtil.getLoginUserCustomerId(); + PartyUnitFormDTO partyUnitFormDTO = new PartyUnitFormDTO(); + partyUnitFormDTO.setCustomerId(customerId); + partyUnitFormDTO.setAgencyId(dto.getAgencyId()); + partyUnitFormDTO.setServiceMatter(dto.getServiceMatter()); + List list = baseDao.pageList(partyUnitFormDTO); if (CollectionUtils.isEmpty(list)) { return Collections.emptyList(); } From 599109db1c9c8ea3b53857b900d3860f84d65148 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 8 Nov 2022 18:17:42 +0800 Subject: [PATCH 151/161] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/IcPartyUnitDao.java | 2 ++ .../com/epmet/dao/IcServiceItemDictDao.java | 3 +++ .../com/epmet/service/IcPartyUnitService.java | 20 ++++++++++++------- .../service/IcServiceItemDictService.java | 2 ++ .../impl/IcPartyActivityServiceImpl.java | 17 ++++++++++++++++ .../service/impl/IcPartyUnitServiceImpl.java | 14 +++++++++++++ .../impl/IcServiceItemDictServiceImpl.java | 5 ++++- .../resources/mapper/IcPartyActivityDao.xml | 3 ++- .../main/resources/mapper/IcPartyUnitDao.xml | 13 ++++++++++++ .../resources/mapper/IcServiceItemDictDao.xml | 10 ++++++++++ 10 files changed, 80 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java index e0cb649327..30fcd451c8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java @@ -124,4 +124,6 @@ public interface IcPartyUnitDao extends BaseDao { * @return */ List pageList(PartyUnitFormDTO formDTO); + + List getUnitNames(@Param("unitIds") List unitIds); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java index 1e1fd873c9..c01c80b4d4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.result.demand.ServiceItemResultDTO; import com.epmet.entity.IcServiceItemDictEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -36,4 +37,6 @@ public interface IcServiceItemDictDao extends BaseDao { List pageList(String customerId); IcServiceItemDictEntity selectMax(String customerId); + + String selectName(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java index 8cc2d342a7..3ea2e48394 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java @@ -6,13 +6,12 @@ import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcPartyUnitDTO; -import com.epmet.dto.form.PartyActivityFormDTO; -import com.epmet.dto.form.PartyTypepercentFormDTO; -import com.epmet.dto.form.PartyUnitFormDTO; -import com.epmet.dto.form.PartyUnitListFormDTO; -import com.epmet.dto.form.PartyUnitListbriefFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.form.demand.ServiceQueryFormDTO; -import com.epmet.dto.result.*; +import com.epmet.dto.result.CheckStaffInfoResultDTO; +import com.epmet.dto.result.PartyTypepercentResultDTO; +import com.epmet.dto.result.PartyUnitDistributionResultDTO; +import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcPartyUnitEntity; import org.springframework.web.multipart.MultipartFile; @@ -20,7 +19,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; /** * 联建单位 @@ -181,4 +179,12 @@ public interface IcPartyUnitService extends BaseService { List getTypepercent(PartyTypepercentFormDTO form); void editPartyOrCommunity(CheckStaffInfoResultDTO formDTO); + + /** + * 查询联建单位名称， + * 不限制del_flag='0' + * @param unitIds + * @return + */ + List getUnitNames(List unitIds); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java index af01c8a4c3..6ed62cbdf2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java @@ -79,4 +79,6 @@ public interface IcServiceItemDictService extends BaseService unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA)); List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(unitNames)){ + unitNames=icPartyUnitService.getUnitNames(unitIds); + } dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA)); if (StringUtils.isNotEmpty(dto.getGridId())) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); @@ -132,6 +135,20 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl serviceMatterid = Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA)); + List serviceMatterNameList=new ArrayList<>(); + for(String id:serviceMatterid){ + String categoryName=icServiceItemDictService.getCategoryName(dto.getCustomerId(),id); + if(StringUtils.isNotBlank(categoryName)){ + serviceMatterNameList.add(categoryName); + } + } + dto.setServiceMatterList(serviceMatterid); + dto.setServiceMatterNameList(serviceMatterNameList); + dto.setServiceMatterName(StringUtils.join(serviceMatterNameList, StrConstant.COMMA)); + } }); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 17ed0d4dde..0f31a1287d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -778,4 +778,18 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl getUnitNames(List unitIds) { + if(CollectionUtils.isEmpty(unitIds)){ + return new ArrayList<>(); + } + return baseDao.getUnitNames(unitIds); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java index 3fbda7cd37..a34bb83907 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java @@ -201,5 +201,8 @@ public class IcServiceItemDictServiceImpl extends BaseServiceImpl order by u.CREATED_TIME desc + + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml index 787ccb9d66..4582741dbb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml @@ -31,4 +31,14 @@ order by CATEGORY_CODE desc limit 1 + + \ No newline at end of file From a093d3a0df80e93ad5f07fd179978dcce0ea406a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 8 Nov 2022 18:28:42 +0800 Subject: [PATCH 152/161] zaishishi --- .../com/epmet/service/impl/IcPartyActivityServiceImpl.java | 1 + .../src/main/resources/mapper/IcPartyUnitDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 75a58580cf..96219850ae 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -127,6 +127,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl - - ID = #{i.id} + + u.ID = #{id} From d2b124d87556bc7048ff518b1110f2abdbebc687 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 8 Nov 2022 20:05:00 +0800 Subject: [PATCH 153/161] 1 --- .../service/impl/IcPartyActivityServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 96219850ae..2367f0bbb1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -119,16 +119,17 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); + // Map option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); dtoList.forEach(dto -> { //联建单位ID与单位名匹配 List unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA)); - List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(unitNames)){ - unitNames=icPartyUnitService.getUnitNames(unitIds); - } + // List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); + // if(CollectionUtils.isEmpty(unitNames)){ + List unitNames=icPartyUnitService.getUnitNames(unitIds); + // } dto.setUnitIdList(unitIds); dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA)); + dto.setUnitNameList(unitNames); if (StringUtils.isNotEmpty(dto.getGridId())) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); if (null != gridInfo) { From de445aa48ca2097385034726fce0e4e066b8b83f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 8 Nov 2022 20:32:24 +0800 Subject: [PATCH 154/161] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8B=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcPartyUnitDao.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml index f595e07234..42137b9611 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml @@ -236,5 +236,11 @@ u.ID = #{id} + ORDER BY field( + u.ID, + + #{unitId} + + ) \ No newline at end of file From 18ab80e5f38c6e1ac5c33e010663b9037ba34202 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 09:07:03 +0800 Subject: [PATCH 155/161] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E8=B0=83=E5=A4=A7=E4=B8=80=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.85__ic_volunteer_poly.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.85__ic_volunteer_poly.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.85__ic_volunteer_poly.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.85__ic_volunteer_poly.sql new file mode 100644 index 0000000000..da82f0f859 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.85__ic_volunteer_poly.sql @@ -0,0 +1,3 @@ +alter table ic_volunteer_poly MODIFY COLUMN `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号'; + +alter table ic_volunteer_poly_category MODIFY COLUMN `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号'; \ No newline at end of file From bb51816f8e62eb2fb20d112eb8b31542bb31c37e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 10:54:43 +0800 Subject: [PATCH 156/161] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcFollowUpRecordController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java index 7428da58be..b3b5d05816 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java @@ -56,6 +56,11 @@ public class IcFollowUpRecordController { return new Result>().ok(page); } + /** + * 随访记录，查看详情 + * @param id + * @return + */ @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result get(@PathVariable("id") String id){ IcFollowUpRecordDTO data = icFollowUpRecordService.get(id); @@ -86,6 +91,11 @@ public class IcFollowUpRecordController { return new Result(); } + /** + * 随访记录删除 + * @param ids + * @return + */ @PostMapping("delete") public Result delete(@RequestBody String[] ids){ //效验数据 From 8f187adf0e2434adeae7b8c6a0c7c3b97c5d45ef Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 11:04:52 +0800 Subject: [PATCH 157/161] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=9A=E5=91=98?= =?UTF-8?q?=E9=A3=8E=E9=87=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartymemberStyleController.java | 11 +++++++++++ .../service/impl/IcPartymemberStyleServiceImpl.java | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java index 786f22d542..9f23510fa6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java @@ -89,6 +89,12 @@ public class IcPartymemberStyleController { return new Result().ok(data); } + /** + * 党员风采-新增 + * @param tokenDto + * @param dto + * @return + */ @PostMapping("save") @NoRepeatSubmit public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto) { @@ -98,6 +104,11 @@ public class IcPartymemberStyleController { return new Result(); } + /** + * 党员风采-删除 + * @param dto + * @return + */ @PostMapping("delete") public Result delete(@RequestBody IcPartymemberStyleDTO dto) { //效验数据 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java index 435038822f..b7299c3ad8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java @@ -208,11 +208,17 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl Date: Wed, 9 Nov 2022 11:15:03 +0800 Subject: [PATCH 158/161] =?UTF-8?q?=E6=B2=A1=E4=BB=80=E4=B9=88=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcPartyActivityController.java | 6 ++++++ .../java/com/epmet/controller/IcPartyUnitController.java | 6 ++++++ .../com/epmet/service/impl/IcFollowUpRecordServiceImpl.java | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 67b3c5da5a..38b63b836d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -89,6 +89,12 @@ public class IcPartyActivityController { return new Result().ok(data); } + /** + * 联建活动-新增 + * @param tokenDto + * @param dto + * @return + */ @PostMapping("save") @NoRepeatSubmit public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActivityDTO dto){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index 8a0ba036ff..4545cb226b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -90,6 +90,12 @@ public class IcPartyUnitController { return new Result().ok(data); } + /** + * 联建单位新增 + * @param tokenDto + * @param dto + * @return + */ @PostMapping("save") @NoRepeatSubmit public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyUnitDTO dto) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java index 451271fd6a..3628786d60 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java @@ -76,6 +76,10 @@ public class IcFollowUpRecordServiceImpl extends BaseServiceImpl Date: Wed, 9 Nov 2022 13:33:40 +0800 Subject: [PATCH 159/161] =?UTF-8?q?/gov/org/agency/maporg=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/AgencyServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 10499f4b52..3cf98078f5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -766,6 +766,9 @@ public class AgencyServiceImpl implements AgencyService { } if (formDTO.getLevel().equals(OrgInfoConstant.AGENCY)) { CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getOrgId()); + if (null == entity) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customer_agency is null orgId:" + formDTO.getOrgId(), "组织信息查询为空orgId:" + formDTO.getOrgId()); + } result = ConvertUtils.sourceToTarget(entity, MapOrgResultDTO.class); result.setName(entity.getOrganizationName()); result.setLevel(formDTO.getLevel()); From 84861a2d7248c6d29a7e1d088350bdaa4abfca82 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 9 Nov 2022 14:03:04 +0800 Subject: [PATCH 160/161] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E9=A5=BC=E5=9B=BE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/EmphasisTripListFormDTO.java | 1 + .../com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java | 1 + .../src/main/resources/mapper/IcTripReportRecordDao.xml | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java index 3539affe85..5f338be962 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -14,6 +14,7 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable private static final long serialVersionUID = 5850717233738956442L; private String code; + private String name; private String dangerLevel; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java index 96a5ed7399..a6bc94b2ed 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -17,6 +17,7 @@ public class EmphasisTripPieDetailFormDTO implements Serializable { // @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) private String code; + private String name; private String customerId; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 490810a020..b9f942b776 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -98,8 +98,8 @@ AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%') + + AND SOURCE_ADDRESS LIKE CONCAT('%',#{name},'%') @@ -120,8 +120,8 @@ FROM ic_trip_report_record WHERE DEL_FLAG = '0' AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%') + + AND SOURCE_ADDRESS LIKE CONCAT('%',#{name},'%') AND sojourn_history != '3' group by dangerLevel From a11c7f920761cc382ce2ee30b361b0761baa0df7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 15:34:49 +0800 Subject: [PATCH 161/161] =?UTF-8?q?gov/access/govrole/page=E5=88=86?= =?UTF-8?q?=E4=B9=9F=E4=B8=8D=E5=A5=BD=E4=BD=BF=E4=B9=9F=E6=B2=A1=E4=BA=BA?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E5=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GovRoleServiceImpl.java | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java index 3f7bae6b47..5b3be75aa5 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -18,7 +18,6 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -34,6 +33,8 @@ import com.epmet.redis.GovRoleRedis; import com.epmet.service.GovRoleMenuService; import com.epmet.service.GovRoleService; import com.epmet.service.GovRoleUserService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -64,11 +65,20 @@ public class GovRoleServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, GovRoleDTO.class); + Integer pageNo = Integer.valueOf((String) params.get("pageNo")); + Integer pageSize = Integer.valueOf((String) params.get("pageSize")); + String id = (String) params.get(FieldConstant.ID_HUMP); + String name = (String) params.get(FieldConstant.NAME_HUMP); + String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) + .like(StringUtils.isNotBlank(name), FieldConstant.NAME, name) + .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId); + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.selectList(wrapper); + List resList = ConvertUtils.sourceToTarget(list, GovRoleDTO.class); + PageInfo pageInfo = new PageInfo<>(resList); + return new PageData<>(resList, pageInfo.getTotal()); } @Override @@ -79,10 +89,10 @@ public class GovRoleServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - String name = (String)params.get(FieldConstant.NAME_HUMP); - String customerId = (String)params.get(FieldConstant.CUSTOMER_ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String name = (String) params.get(FieldConstant.NAME_HUMP); + String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name) .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId); @@ -101,7 +111,7 @@ public class GovRoleServiceImpl extends BaseServiceImpl