From 789678a2178d1f7c91a2bed15bd35a2ee0fc3f37 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 22 Aug 2022 15:56:39 +0800 Subject: [PATCH 01/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/VaccinePrarmeterListFormDTO.java | 32 ++++++++++++ .../IcVaccinePrarmeterController.java | 27 ++++++++++ .../com/epmet/dao/IcVaccinePrarmeterDao.java | 11 +++- .../mapper/IcVaccinePrarmeterDao.xml | 51 ++++++++++++++++++- 4 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java new file mode 100644 index 0000000000..6f77ae6b3b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author wgf + * @DateTime 2022/8/22 10:30 + * @DESC + */ +@Data +public class VaccinePrarmeterListFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = -498378993902522370L; + + /** + * 手机号 + */ + private String mobile; + + /** + * 地点名称 + */ + private String name; + + /** + * user所属组织ID + */ + private String orgId; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 102e5e0ea7..4c7091ba20 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -1,7 +1,10 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +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.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -9,7 +12,12 @@ 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.dao.IcVaccinePrarmeterDao; +import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.IcVaccinePrarmeterDTO; +import com.epmet.dto.form.PointHSYMFormDTO; +import com.epmet.dto.form.VaccinePrarmeterListFormDTO; +import com.epmet.excel.IcPointNucleicMonitoringExcel; import com.epmet.excel.IcVaccinePrarmeterExcel; import com.epmet.service.IcVaccinePrarmeterService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +41,9 @@ public class IcVaccinePrarmeterController { @Autowired private IcVaccinePrarmeterService icVaccinePrarmeterService; + @Autowired + private IcVaccinePrarmeterDao icVaccinePrarmeterDao; + @RequestMapping("page") public Result> page(@RequestParam Map params){ PageData page = icVaccinePrarmeterService.page(params); @@ -77,6 +88,22 @@ public class IcVaccinePrarmeterController { ExcelUtils.exportExcelToTarget(response, null, list, IcVaccinePrarmeterExcel.class); } + /** + * Desc: 【新冠病毒疫苗接种人员信息台账】导出 + * @param response + * @param formDTO + * @param tokenDto + * @author wgf + * @date 2022/6/24 13:57 + */ + @PostMapping("vaccine-export") + public void vaccineExport(HttpServletResponse response, @RequestBody VaccinePrarmeterListFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception { + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + List list = icVaccinePrarmeterDao.vaccineExport(formDTO); + ExcelUtils.exportExcelToTarget(response, null, list, IcVaccinePrarmeterExcel.class); + + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java index a2e7c17a67..cbe6c686b4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java @@ -1,9 +1,14 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcPointNucleicMonitoringDTO; +import com.epmet.dto.IcVaccinePrarmeterDTO; +import com.epmet.dto.form.VaccinePrarmeterListFormDTO; import com.epmet.entity.IcVaccinePrarmeterEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 新冠病毒疫苗接种人员信息台账 * @@ -12,5 +17,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcVaccinePrarmeterDao extends BaseDao { - -} \ No newline at end of file + + List vaccineExport(VaccinePrarmeterListFormDTO formDTO); + +} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 363554832c..68fffc3f4b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -39,5 +39,54 @@ + - \ No newline at end of file + + From 7c958d6fd98c303ba6e2c98cd7143acf70274aed Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 22 Aug 2022 16:54:46 +0800 Subject: [PATCH 02/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcVaccinePrarmeterController.java | 14 ++++++ .../epmet/excel/IcVaccinePrarmeterExcel.java | 41 ++---------------- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 0 -> 75264 bytes 3 files changed, 17 insertions(+), 38 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 4c7091ba20..d50fcfa1cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -1,10 +1,12 @@ package com.epmet.controller; +import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; 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.ExcelPoiUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -24,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -104,6 +107,17 @@ public class IcVaccinePrarmeterController { } + /** + * 导出模板 + * @param response + * @throws Exception + */ + @PostMapping("exporttemplate") + public void exportTemplate( HttpServletResponse response) throws Exception { + TemplateExportParams templatePath = new TemplateExportParams("excel/ic_vaccine_prarmeter_excel.xls"); + ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"新冠病毒疫苗接种人员信息台账",response); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index dc58b059b3..ac28c37a33 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -14,49 +14,32 @@ import java.util.Date; @Data public class IcVaccinePrarmeterExcel { - @Excel(name = "主键") - private String id; - @Excel(name = "客户Id customer.id") - private String customerId; - - @Excel(name = "网格ID") - private String gridId; @Excel(name = "网格名称") private String gridName; - @Excel(name = "组织Id") - private String agencyId; @Excel(name = "组织的pids") private String pids; - @Excel(name = "所属小区ID；") - private String villageId; @Excel(name = "所属小区名称") private String villageName; - @Excel(name = "所属楼宇Id") - private String buildId; @Excel(name = "所属楼宇名称") private String buildName; - @Excel(name = "单元id") - private String unitId; @Excel(name = "单元名") private String unitName; - @Excel(name = "所属家庭Id") - private String homeId; @Excel(name = "房间名") private String homeName; - @Excel(name = "户口性质：0户籍 1外来") + @Excel(name = "户口性质", replace = {"户籍_0","外来_1"}) private String householdType; @Excel(name = "姓名") @@ -89,29 +72,11 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "第三次接种地点") private String thirdVacSite; - @Excel(name = "原因：禁忌症/拒绝接种/其他原因") + @Excel(name = "原因") private String reason; @Excel(name = "备注") private String note; - @Excel(name = "删除标识 0.未删除 1.已删除") - private Integer delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls new file mode 100644 index 0000000000000000000000000000000000000000..23d4778dc4a09ffc912ddcc7cae7fd02e157551b GIT binary patch literal 75264 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 literal 0 HcmV?d00001 From 1db5a91cfc7af2a3f10557d9d6ec0cefa054eac5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 23 Aug 2022 14:15:59 +0800 Subject: [PATCH 03/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 2 + .../dto/result/GridInfoByNameResultDTO.java | 41 +++ .../controller/CustomerAgencyController.java | 12 + .../java/com/epmet/dao/CustomerAgencyDao.java | 3 + .../epmet/service/CustomerAgencyService.java | 9 + .../impl/CustomerAgencyServiceImpl.java | 7 + .../resources/mapper/CustomerAgencyDao.xml | 14 + .../form/GridInfoVaccinePrarmeterFormDTO.java | 31 ++ .../IcVaccinePrarmeterController.java | 54 +++ .../epmet/excel/IcVaccinePrarmeterExcel.java | 6 +- .../excel/IcVaccinePrarmeterImportExcel.java | 95 ++++++ .../com/epmet/feign/GovOrgFeignClient.java | 11 + .../fallback/GovOrgFeignClientFallBack.java | 6 + .../IcPointNucleicMonitoringService.java | 4 +- .../service/IcVaccinePrarmeterService.java | 13 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 323 +++++++++++++++++- 16 files changed, 619 insertions(+), 12 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java 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 2108042cd6..3136aea839 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 @@ -23,6 +23,8 @@ public interface ImportTaskConstants { String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise"; String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring"; String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation"; + // 新冠病毒疫苗接种人员信息台账 + String IC_VACCINE_PRARMETER = "ic_vaccine_prarmeter"; /** * 核酸检测 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java new file mode 100644 index 0000000000..fd91d086b5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 网格所属组织基本信息 + * @Author wgf + * @Date 2020/4/26 22:35 + */ +@Data +public class GridInfoByNameResultDTO implements Serializable { + private static final long serialVersionUID = 4360690752084258055L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 网格组织ID + */ + private String deptId; + + /** + * 网格名称 + */ + private String deptName; + + /** + * 网格的上级组织 + */ + private String pid; + + /** + * 网格的所有上级组织 + */ + private String pids; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 73316bad52..c1aba9bb3c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -475,6 +475,18 @@ public class CustomerAgencyController { return customerAgencyService.getCommunityInfo(formDTO); } + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据网格名称查询所属组织信息 + * @Date 2022/6/21 22:41 + **/ + @PostMapping("getGridInfoByGridName") + public Result getGridInfoByGridName(@RequestBody GridInfoVaccinePrarmeterFormDTO formDTO) { + return customerAgencyService.getGridInfoByGridName(formDTO); + } + /** * @param userId * @return com.epmet.commons.tools.utils.Result diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index b54b4a28b7..37e8d93c98 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.form.GridInfoVaccinePrarmeterFormDTO; import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.form.OrgTreeByUserAndTypeFormDTO; import com.epmet.dto.result.*; @@ -352,6 +353,8 @@ public interface CustomerAgencyDao extends BaseDao { CommunityInfoResultDTO getCommunityInfo(OrgInfoPointFormDTO formDTO); + GridInfoByNameResultDTO getGridInfoByGridName(GridInfoVaccinePrarmeterFormDTO formDTO); + CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId); /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index bec4188167..e71189e0ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -327,6 +327,15 @@ public interface CustomerAgencyService extends BaseService **/ Result getCommunityInfo(OrgInfoPointFormDTO formDTO); + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据网格名称查询所属组织信息 + * @Date 2022/6/21 22:41 + **/ + Result getGridInfoByGridName(GridInfoVaccinePrarmeterFormDTO formDTO); + /** * @param userId * @return com.epmet.commons.tools.utils.Result diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index f2c0392dc7..760f9690ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1580,6 +1580,13 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl().ok(communityInfoResultDTO); } + @Override + public Result getGridInfoByGridName(GridInfoVaccinePrarmeterFormDTO formDTO) { + GridInfoByNameResultDTO gridInfoByNameResultDTO = baseDao.getGridInfoByGridName(formDTO); + + return new Result().ok(gridInfoByNameResultDTO); + } + @Override public Result getCommunityInfoByUserId(String userId) { CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfoByUserId(userId); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index acf894391f..42cb8d69dc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -916,6 +916,20 @@ limit 1 + + + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml index fe5a0ef73b..c46c387e01 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml @@ -59,5 +59,16 @@ and u.id=#{unitId} + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 8b900c90dd..6c8b094f67 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -549,5 +549,14 @@ and DOOR_NAME = #{doorName} + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 2f76bc1b7a..d1c0168b4e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -662,6 +662,16 @@ ORDER BY SORT, DOOR_NAME+0 + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 48574b4867..9ef386164e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -63,7 +63,8 @@ public class IcVaccinePrarmeterController { @RequestMapping("page") public Result> page(@RequestParam Map params){ - PageData page = icVaccinePrarmeterService.page(params); +// PageData page = icVaccinePrarmeterService.page(params); + PageData page = icVaccinePrarmeterService.getPhrasePage(params); return new Result>().ok(page); } @@ -174,4 +175,6 @@ public class IcVaccinePrarmeterController { + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java index cbe6c686b4..c5bdfcdbf7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java @@ -8,6 +8,7 @@ import com.epmet.entity.IcVaccinePrarmeterEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * 新冠病毒疫苗接种人员信息台账 @@ -20,4 +21,11 @@ public interface IcVaccinePrarmeterDao extends BaseDao List vaccineExport(VaccinePrarmeterListFormDTO formDTO); + /** + * 条件查询 + * @param params + * @return + */ + List getPhrasePage(Map params); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java index c259ba43c2..a298a3e165 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java @@ -28,6 +28,13 @@ public interface IcVaccinePrarmeterService extends BaseService page(Map params); + /** + * 分页条件查询 + * @param params + * @return + */ + PageData getPhrasePage(Map params); + /** * 默认查询 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 9b3ad7dc8e..2f5cdc2a83 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -83,6 +83,18 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { + IPage page = getPage(params); + List list = baseDao.getPhrasePage(params); + return new PageData<>(list, page.getTotal()); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 68fffc3f4b..b1eb484110 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -82,8 +82,93 @@ and MOBILE like CONCAT('%', #{mobile}, '%') - - and (AGENCY_ID = #{orgId} or PIDS like CONCAT('%',#{orgId},'%')) + + and ID_CARD like CONCAT('%', #{idCard}, '%') + + + and (IS_VACCINATION = #{isVaccination} + + + and (GRID_ID = #{gridId} + + + and (VILLAGE_ID = #{villageId} + + + and (BUILD_ID = #{buildId} + + + and (UNIT_ID = #{unitId} + + + and (HOME_ID = #{homeId} + + order by CREATED_TIME desc + + + From 8aa1a5cf149a9b1fb792c437d5e74776ec2d3a23 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 24 Aug 2022 15:20:02 +0800 Subject: [PATCH 11/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E5=AE=A1=E6=A0=B8=E5=89=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcHouseServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 385f90f60d..76df21476b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -343,7 +343,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Wed, 24 Aug 2022 17:45:55 +0800 Subject: [PATCH 12/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E6=B7=BB=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcVaccinePrarmeterDTO.java | 15 ++++++++++++++- .../epmet/entity/IcVaccinePrarmeterEntity.java | 10 ++++++++++ .../com/epmet/excel/IcVaccinePrarmeterExcel.java | 7 +++++++ .../impl/IcVaccinePrarmeterServiceImpl.java | 2 ++ .../resources/mapper/IcVaccinePrarmeterDao.xml | 11 +++++++++-- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index 08c5da3ce1..a7d56eeec7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -90,6 +90,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { * 户口性质：0户籍 1外来 */ private String householdType; + private String householdTypeName; /** * 姓名 @@ -110,6 +111,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { * 是否接种：0否1是 */ private String isVaccination; + private String isVaccinationName; /** * 第一次接种时间 @@ -181,4 +183,15 @@ public class IcVaccinePrarmeterDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file + /** + * 审核状态：0待审核 1审核不通过 2审核通过 + */ + private String checkState; + private String checkStateName; + + /** + * 审核理由 + */ + private String checkReason; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index c5dde0c103..c6b982f80d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -151,4 +151,14 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { */ private String note; + /** + * 审核状态：0待审核 1审核不通过 2审核通过 + */ + private String checkState; + + /** + * 审核理由 + */ + private String checkReason; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index 02f144d189..01200bb938 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -74,5 +74,12 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "备注") private String note; + @Excel(name = "审核状态", replace = {"待审核_0","审核不通过_1","审核通过_2"}) + private String checkState; + + @Excel(name = "审核理由") + private String checkReason; + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 2f5cdc2a83..44050f3a6e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -190,6 +190,8 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl { // 设置客户ID e.setCustomerId(tokenDto.getCustomerId()); + // 设置审核状态为待审核 + e.setCheckState("0"); }); insertBatch(entities); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index b1eb484110..3441859c38 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -73,7 +73,9 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + CHECK_STATE, + CHECK_REASON from ic_vaccine_prarmeter where DEL_FLAG = 0 @@ -123,10 +125,12 @@ HOME_ID, HOME_NAME, HOUSEHOLD_TYPE, + (case HOUSEHOLD_TYPE when '0' then '户籍' when '1' then '外来' else '' end) as householdTypeName, NAME, MOBILE, ID_CARD, IS_VACCINATION, + (case IS_VACCINATION when '0' then '否' when '1' then '是' else '' end) as isVaccinationName, FIRST_VAC_TIME, FIRST_VAC_SITE, SECOND_VAC_TIME, @@ -140,7 +144,10 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + CHECK_STATE, + (case CHECK_STATE when '0' then '待审核' when '1' then '审核不通过' when '2' then '审核通过' else '' end) as checkStateName, + CHECK_REASON from ic_vaccine_prarmeter where DEL_FLAG = 0 From f87604fbb3393e4ea9fd1f9f770be10f95f966eb Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 25 Aug 2022 13:50:30 +0800 Subject: [PATCH 13/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcVaccinePrarmeterDTO.java | 6 +- .../epmet/dto/form/IcVaccineCheckFormDTO.java | 79 ++++++ .../IcVaccinePrarmeterController.java | 19 +- .../entity/IcVaccinePrarmeterEntity.java | 6 +- .../epmet/excel/IcVaccinePrarmeterExcel.java | 12 +- .../excel/IcVaccinePrarmeterImportExcel.java | 18 +- .../IcVaccinePrarmeterImportErrorModel.java | 14 +- .../service/IcVaccinePrarmeterService.java | 9 + .../impl/IcVaccinePrarmeterServiceImpl.java | 237 +++++++++++++++++- 9 files changed, 365 insertions(+), 35 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index a7d56eeec7..55991fe87d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -116,7 +116,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第一次接种时间 */ - private String firstVacTime; + private Date firstVacTime; /** * 第一次接种地点 @@ -126,7 +126,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第二次接种时间 */ - private String secondVacTime; + private Date secondVacTime; /** * 第二次接种地点 @@ -136,7 +136,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第三次接种时间 */ - private String thirdVacTime; + private Date thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java new file mode 100644 index 0000000000..8edf20194d --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 新冠病毒疫苗接种人员信息台账-审核入参 + * + * @author wgf + * @since v1.0.0 2022-08-25 + */ +@Data +public class IcVaccineCheckFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @NotBlank(message = "Id不能为空") + private String id; + + /** + * 审核状态：0待审核 1未通过 2已通过 + */ + @NotBlank(message = "审核状态不能为空") + private String checkState; + + /** + * 审核原因 + */ + private String checkReason; + + /** + * 所属小区ID； + */ + private String villageId; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 单元号 + */ + private String unitId; + + /** + * 房间ID + */ + private String homeId; + + /** + * 房间号 + */ + private String doorName; + + /** + * 客户ID(审核人) + */ + private String customerId; + + /** + * 员工ID(审核人) + */ + private String userId; + + /** + * 员工姓名(审核人) + */ + private String realName; + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 9ef386164e..6627be1966 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -19,9 +19,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcVaccinePrarmeterDao; import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.IcVaccinePrarmeterDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.PointHSYMFormDTO; -import com.epmet.dto.form.VaccinePrarmeterListFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcPointNucleicMonitoringExcel; import com.epmet.excel.IcVaccinePrarmeterExcel; @@ -173,6 +171,21 @@ public class IcVaccinePrarmeterController { return new Result(); } + /** + * 信息采集-审核 + * @param formDTO + * @param tokenDto + * @return + */ + @PostMapping("vaccineCheck") + public Result vaccineCheck(@RequestBody IcVaccineCheckFormDTO formDTO, @LoginUser TokenDto tokenDto) { + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + icVaccinePrarmeterService.vaccineCheck(formDTO,tokenDto); + + return new Result(); + } + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index c6b982f80d..e0331229c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -114,7 +114,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第一次接种时间 */ - private String firstVacTime; + private Date firstVacTime; /** * 第一次接种地点 @@ -124,7 +124,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第二次接种时间 */ - private String secondVacTime; + private Date secondVacTime; /** * 第二次接种地点 @@ -134,7 +134,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第三次接种时间 */ - private String thirdVacTime; + private Date thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index 01200bb938..bb6b9c5d15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -50,20 +50,20 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "是否接种", replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间") - private String firstVacTime; + @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; - @Excel(name = "第二次接种时间") - private String secondVacTime; + @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; - @Excel(name = "第三次接种时间") - private String thirdVacTime; + @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index 4eb027872b..daecc97e0e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -4,6 +4,8 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.ExcelIgnore; import lombok.Data; +import java.util.Date; + /** * 新冠病毒疫苗接种人员信息台账 * @@ -43,20 +45,20 @@ public class IcVaccinePrarmeterImportExcel { @Excel(name = "是否接种", replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间") - private String firstVacTime; + @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; - @Excel(name = "第二次接种时间") - private String secondVacTime; + @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; - @Excel(name = "第三次接种时间") - private String thirdVacTime; + @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; @@ -80,10 +82,10 @@ public class IcVaccinePrarmeterImportExcel { private String gridId; /** - * 组织ID上级 + * 组织ID */ @ExcelIgnore - private String pid; + private String agencyId; /** * 组织ID所有上级 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index f720b878c9..04768bb90e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -3,6 +3,8 @@ package com.epmet.excel.error; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; +import java.util.Date; + /** * @Author wgf * @DateTime 2022/6/21 16:57 @@ -45,20 +47,20 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间",width = 30) - private String firstVacTime; + @Excel(name = "第一次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") + private Date firstVacTime; @Excel(name = "第一次接种地点",width = 30) private String firstVacSite; - @Excel(name = "第二次接种时间",width = 30) - private String secondVacTime; + @Excel(name = "第二次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") + private Date secondVacTime; @Excel(name = "第二次接种地点",width = 30) private String secondVacSite; - @Excel(name = "第三次接种时间",width = 30) - private String thirdVacTime; + @Excel(name = "第三次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") + private Date thirdVacTime; @Excel(name = "第三次接种地点",width = 30) private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java index a298a3e165..41137212df 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java @@ -4,6 +4,8 @@ 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.IcVaccinePrarmeterDTO; +import com.epmet.dto.form.IcResiCollectCheckFormDTO; +import com.epmet.dto.form.IcVaccineCheckFormDTO; import com.epmet.entity.IcVaccinePrarmeterEntity; import java.io.InputStream; @@ -93,4 +95,11 @@ public interface IcVaccinePrarmeterService extends BaseService page(Map params) { IPage page = baseDao.selectPage( @@ -279,7 +294,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId()); + if(userIdCardEntity != null){ + // 已存在人员 + if(userMap.containsKey(icResiCollectEntity.getIdCard())){ + // 人员房屋一致（只更新人员信息） + updateUserInfo(icResiCollectEntity,false,formDTO,userIdCardEntity); + }else{ + // 人员房屋不一致（更新人员信息和变更记录） + updateUserInfo(icResiCollectEntity,true,formDTO,userIdCardEntity); + } + }else{ + // 不存在人员 + insertUserInfo(icResiCollectEntity,formDTO); + } + } + } + } + + /** + * 更新新冠病毒疫苗接种人员信息台账表房屋ID + * @param icResiCollectEntity + * @param formDTO + * @return + */ + private IcVaccinePrarmeterEntity updateHomeId(IcVaccinePrarmeterEntity icResiCollectEntity,IcVaccineCheckFormDTO formDTO){ + + // fegin获取房屋信息 + GetHouseInfoToCollectFormDTO getHouseInfoToCollectFormDTO = new GetHouseInfoToCollectFormDTO(); + getHouseInfoToCollectFormDTO.setBuildingUnitId(formDTO.getUnitId()); + getHouseInfoToCollectFormDTO.setDoorName(formDTO.getDoorName()); + Result resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); + IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); + + // 新增房屋后需要collect更新上房屋ID + // log + icResiCollectEntity.setHomeId(icHouseInfoCollectResultDTO.getId()); + baseDao.updateById(icResiCollectEntity); + return icResiCollectEntity; + + } + + /** + * 更新房屋信息 + * @param icResiCollectEntity + */ + private void updateHouseInfo(IcVaccinePrarmeterEntity icResiCollectEntity){ + CollectHouseFormDTO collectHouseFormDTO = new CollectHouseFormDTO(); + collectHouseFormDTO.setId(icResiCollectEntity.getHomeId()); + + + // fegin获取房屋信息 + GetHouseInfoToCollectFormDTO getHouseInfoToCollectFormDTO = new GetHouseInfoToCollectFormDTO(); + getHouseInfoToCollectFormDTO.setBuildingUnitId(icResiCollectEntity.getUnitId()); + getHouseInfoToCollectFormDTO.setDoorName(icResiCollectEntity.getHomeName()); + Result resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); + IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); + + collectHouseFormDTO.setCustomerId(icResiCollectEntity.getCustomerId()); + collectHouseFormDTO.setResiNumber((icHouseInfoCollectResultDTO.getResiNumber() + 1)); + govOrgFeignClient.updateCollect(collectHouseFormDTO); + + } + + /** + * 获取人员信息 + * @param idCard + * @return + */ + private IcResiUserEntity queryOriginUserByIdCard(String idCard,String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiUserEntity::getIdCard, idCard); + query.eq(IcResiUserEntity::getCustomerId, customerId); + IcResiUserEntity originUser = icResiUserDao.selectOne(query); + return originUser; + } + + private Map queryOriginUserByHomeId(String homeId,String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiUserEntity::getHomeId, homeId); + query.eq(IcResiUserEntity::getCustomerId, customerId); + List originUserList = icResiUserDao.selectList(query); + Map memMap = originUserList.stream().collect(Collectors.toMap(IcResiUserEntity::getIdCard, Function.identity())); + return memMap; + } + + /** + * 更新人员信息 + * @param icResiCollectEntity 登记信息 + * @param isUpdateLog 是否更新记录 + * @param formDTO 入参 + * @param userEntity 根据身份证号查询到的user信息 + */ + private void updateUserInfo(IcVaccinePrarmeterEntity icResiCollectEntity,Boolean isUpdateLog, + IcVaccineCheckFormDTO formDTO,IcResiUserEntity userEntity){ + + userEntity.setPids(icResiCollectEntity.getPids()); // ic_resi_user表的组织的pids 含agencyId本身 + userEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + userEntity.setGridId(icResiCollectEntity.getGridId()); + userEntity.setVillageId(icResiCollectEntity.getVillageId()); + userEntity.setBuildId(icResiCollectEntity.getBuildId()); + userEntity.setUnitId(icResiCollectEntity.getUnitId()); + userEntity.setHomeId(icResiCollectEntity.getHomeId()); + userEntity.setName(icResiCollectEntity.getName()); + userEntity.setMobile(icResiCollectEntity.getMobile()); + userEntity.setIdCard(icResiCollectEntity.getIdCard()); + icResiUserDao.updateById(userEntity); + + // 判断是否需要更新记录 + if(isUpdateLog){ + //变更记录表 + IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); + changeRecordEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + changeRecordEntity.setOperatorId(formDTO.getUserId()); + changeRecordEntity.setIcUserId(userEntity.getId()); + changeRecordEntity.setOperatorName(formDTO.getRealName()); + changeRecordEntity.setIcUserName(userEntity.getName()); + changeRecordEntity.setType("update"); + changeRecordEntity.setTypeName("修改"); + changeRecordEntity.setBeforeChangeName("-"); + changeRecordEntity.setAfterChangeName("-"); + changeRecordEntity.setChangeTime(new java.util.Date()); + icUserChangeRecordService.insert(changeRecordEntity); + } + + } + + /** + * 新增人员信息 + * @param icResiCollectEntity + * @param formDTO + */ + private void insertUserInfo(IcVaccinePrarmeterEntity icResiCollectEntity,IcVaccineCheckFormDTO formDTO){ + + // 新增人员 + IcResiUserEntity userEntity = new IcResiUserEntity(); + userEntity.setPids(icResiCollectEntity.getPids()); // ic_resi_user表的组织的pids 含agencyId本身 + userEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + userEntity.setGridId(icResiCollectEntity.getGridId()); + userEntity.setVillageId(icResiCollectEntity.getVillageId()); + userEntity.setBuildId(icResiCollectEntity.getBuildId()); + userEntity.setUnitId(icResiCollectEntity.getUnitId()); + userEntity.setHomeId(icResiCollectEntity.getHomeId()); + userEntity.setName(icResiCollectEntity.getName()); + userEntity.setMobile(icResiCollectEntity.getMobile()); + userEntity.setIdCard(icResiCollectEntity.getIdCard()); + userEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icResiUserDao.insert(userEntity); + + //变更记录表 + IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); + changeRecordEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + changeRecordEntity.setOperatorId(formDTO.getUserId()); + changeRecordEntity.setIcUserId(userEntity.getId()); + changeRecordEntity.setOperatorName(formDTO.getRealName()); + changeRecordEntity.setIcUserName(userEntity.getName()); + changeRecordEntity.setType("add"); + changeRecordEntity.setTypeName("新增"); + changeRecordEntity.setBeforeChangeName("-"); + changeRecordEntity.setAfterChangeName("-"); + changeRecordEntity.setChangeTime(new java.util.Date()); + icUserChangeRecordService.insert(changeRecordEntity); + + } + } From 77872e57f04729755813ef8336aae0031505d896 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 25 Aug 2022 14:48:01 +0800 Subject: [PATCH 14/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcVaccinePrarmeterDTO.java | 6 +++--- .../com/epmet/entity/IcVaccinePrarmeterEntity.java | 6 +++--- .../com/epmet/excel/IcVaccinePrarmeterExcel.java | 10 +++++----- .../epmet/excel/IcVaccinePrarmeterImportExcel.java | 6 +++--- .../error/IcVaccinePrarmeterImportErrorModel.java | 12 ++++++------ .../service/impl/IcVaccinePrarmeterServiceImpl.java | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index 55991fe87d..a7d56eeec7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -116,7 +116,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第一次接种时间 */ - private Date firstVacTime; + private String firstVacTime; /** * 第一次接种地点 @@ -126,7 +126,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第二次接种时间 */ - private Date secondVacTime; + private String secondVacTime; /** * 第二次接种地点 @@ -136,7 +136,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第三次接种时间 */ - private Date thirdVacTime; + private String thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index e0331229c4..c6b982f80d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -114,7 +114,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第一次接种时间 */ - private Date firstVacTime; + private String firstVacTime; /** * 第一次接种地点 @@ -124,7 +124,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第二次接种时间 */ - private Date secondVacTime; + private String secondVacTime; /** * 第二次接种地点 @@ -134,7 +134,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第三次接种时间 */ - private Date thirdVacTime; + private String thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index bb6b9c5d15..fd95325e80 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -50,20 +50,20 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "是否接种", replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "第一次接种时间") private Date firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; - @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + @Excel(name = "第二次接种时间") + private String secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; - @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + @Excel(name = "第三次接种时间") + private String thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index daecc97e0e..893531a4d2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -46,19 +46,19 @@ public class IcVaccinePrarmeterImportExcel { private String isVaccination; @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date firstVacTime; + private String firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + private String secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + private String thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index 04768bb90e..7d34af62aa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -47,20 +47,20 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date firstVacTime; + @Excel(name = "第一次接种时间",width = 30) + private String firstVacTime; @Excel(name = "第一次接种地点",width = 30) private String firstVacSite; - @Excel(name = "第二次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + @Excel(name = "第二次接种时间",width = 30) + private String secondVacTime; @Excel(name = "第二次接种地点",width = 30) private String secondVacSite; - @Excel(name = "第三次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + @Excel(name = "第三次接种时间",width = 30) + private String thirdVacTime; @Excel(name = "第三次接种地点",width = 30) private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 28b8c65906..83cb4a4f29 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -294,7 +294,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 14:50:50 +0800 Subject: [PATCH 15/35] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcVaccinePrarmeterServiceImpl.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 83cb4a4f29..b7b681f6d1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.enums.RelationshipEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -17,7 +18,6 @@ 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.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; @@ -28,7 +28,6 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.GridInfoByNameResultDTO; import com.epmet.dto.result.IcHouseInfoCollectResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcResiCollectEntity; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcUserChangeRecordEntity; import com.epmet.entity.IcVaccinePrarmeterEntity; @@ -48,12 +47,12 @@ 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.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -71,22 +70,22 @@ import java.util.stream.Collectors; @Slf4j public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl implements IcVaccinePrarmeterService { - @Autowired + @Resource private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis; - @Autowired + @Resource private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; - @Autowired + @Resource private OssFeignClient ossFeignClient; - @Autowired + @Resource private GovOrgFeignClient govOrgFeignClient; - @Autowired + @Resource private IcResiUserDao icResiUserDao; - @Autowired + @Resource private IcUserChangeRecordService icUserChangeRecordService; @Override @@ -135,7 +134,14 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 16:13:12 +0800 Subject: [PATCH 16/35] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcVaccinePrarmeterController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 6627be1966..5edd0e0749 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -13,18 +13,17 @@ 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.commons.tools.validator.group.UpdateGroup; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcVaccinePrarmeterDao; -import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.IcVaccinePrarmeterDTO; -import com.epmet.dto.form.*; +import com.epmet.dto.form.IcVaccineCheckFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.VaccinePrarmeterListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; -import com.epmet.excel.IcPointNucleicMonitoringExcel; import com.epmet.excel.IcVaccinePrarmeterExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.service.IcPointNucleicMonitoringService; import com.epmet.service.IcVaccinePrarmeterService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; @@ -82,7 +81,7 @@ public class IcVaccinePrarmeterController { } @NoRepeatSubmit - @PutMapping("update") + @PostMapping("update") public Result update(@RequestBody IcVaccinePrarmeterDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); From 801909fac9e90cacce6cd63ba5931a3cfaa2390e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 25 Aug 2022 16:28:35 +0800 Subject: [PATCH 17/35] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcVaccinePrarmeterServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index b7b681f6d1..3bbc148588 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -16,6 +16,7 @@ import com.epmet.commons.tools.page.PageData; 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.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelPoiUtils; @@ -134,13 +135,13 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 17:01:49 +0800 Subject: [PATCH 18/35] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 3bbc148588..5858b4b9aa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -149,7 +149,12 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 17:14:54 +0800 Subject: [PATCH 19/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcVaccineDao.java | 8 + .../com/epmet/dao/IcVaccineRelationDao.java | 6 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 156 ++++++++++++++++-- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 19968 -> 19968 bytes .../main/resources/mapper/IcVaccineDao.xml | 9 + .../resources/mapper/IcVaccineRelationDao.xml | 7 +- 6 files changed, 172 insertions(+), 14 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java index d4db61ad5b..55b4591be3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java @@ -64,4 +64,12 @@ public interface IcVaccineDao extends BaseDao { IcVaccineDTO getVaccineDTO(@Param("customerId") String customerId, @Param("icVaccineId") String icVaccineId, @Param("idCard") String idCard, @Param("inoculateTime") String inoculateTime); + /** + * 根据身份证号以及接种时间查询接种信息 + * @param idCard + * @param time + * @return + */ + List getVaccineListByIdCard(@Param("idCard") String idCard,@Param("time") String time); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java index 60d80b3f61..6d087a1055 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java @@ -14,4 +14,8 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface IcVaccineRelationDao extends BaseDao { int delRelation(@Param("icVaccineId") String icNatId, @Param("agencyId") String agencyId); -} \ No newline at end of file + + void updateRelationInfoByVaccineId(IcVaccineRelationEntity icVaccineRelationEntity); + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 83cb4a4f29..6c68f85c19 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -22,16 +22,15 @@ import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcResiUserDao; +import com.epmet.dao.IcVaccineDao; import com.epmet.dao.IcVaccinePrarmeterDao; +import com.epmet.dao.IcVaccineRelationDao; import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.GridInfoByNameResultDTO; import com.epmet.dto.result.IcHouseInfoCollectResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcResiCollectEntity; -import com.epmet.entity.IcResiUserEntity; -import com.epmet.entity.IcUserChangeRecordEntity; -import com.epmet.entity.IcVaccinePrarmeterEntity; +import com.epmet.entity.*; import com.epmet.excel.IcVaccinePrarmeterImportExcel; import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -40,6 +39,7 @@ import com.epmet.feign.OssFeignClient; import com.epmet.redis.IcVaccinePrarmeterRedis; import com.epmet.service.IcUserChangeRecordService; import com.epmet.service.IcVaccinePrarmeterService; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.fileupload.FileItem; @@ -57,6 +57,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -89,6 +90,12 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -447,31 +454,31 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId()); if(userIdCardEntity != null){ + icResiUserId = userIdCardEntity.getId(); // 已存在人员 if(userMap.containsKey(icResiCollectEntity.getIdCard())){ // 人员房屋一致（只更新人员信息） @@ -482,12 +489,135 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(firstDate)); + if(icVaccineEntityFirstList.size() > 0){ + // 更新疫苗接种记录 and 疫苗接种记录关系 + for(IcVaccineEntity entity : icVaccineEntityFirstList){ + updateVaccineInfo(entity,icResiCollectEntity); + + } + + }else{ + // 新增疫苗接种记录 and 疫苗接种记录关系 + insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + + } + + // 查询第二次接种信息 + List icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(secondDate)); + if(icVaccineEntitySecondList.size() > 0){ + // 更新疫苗接种记录 and 疫苗接种记录关系 + for(IcVaccineEntity entity : icVaccineEntitySecondList){ + updateVaccineInfo(entity,icResiCollectEntity); + + } + + }else{ + // 新增疫苗接种记录 and 疫苗接种记录关系 + insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + + } + + // 查询第三次接种信息 + List icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(thirdDate)); + if(icVaccineEntityThirdList.size() > 0){ + // 更新疫苗接种记录 and 疫苗接种记录关系 + for(IcVaccineEntity entity : icVaccineEntityThirdList){ + updateVaccineInfo(entity,icResiCollectEntity); + + } + + }else{ + // 新增疫苗接种记录 and 疫苗接种记录关系 + insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + + } + } + + /** + * 更新疫苗接种记录 and 疫苗接种记录关系 + * @param entity + * @param icResiCollectEntity + */ + private void updateVaccineInfo(IcVaccineEntity entity,IcVaccinePrarmeterEntity icResiCollectEntity){ + // 更新疫苗接种记录 + entity.setInoculateAddress(icResiCollectEntity.getFirstVacSite()); + entity.setUserType("prarmeter"); + entity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineDao.updateById(entity); + + // 更新疫苗接种记录关系 + IcVaccineRelationEntity icVaccineRelationEntity = new IcVaccineRelationEntity(); + icVaccineRelationEntity.setIcVaccineId(entity.getId()); + icVaccineRelationEntity.setUserType("prarmeter"); + icVaccineRelationEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineRelationDao.updateRelationInfoByVaccineId(icVaccineRelationEntity); + + } + + /** + * 新增疫苗接种记录 and 疫苗接种记录关系 + * @param icResiCollectEntity + * @param icResiUserId + * @param time + */ + private void insertVaccineInfo(IcVaccinePrarmeterEntity icResiCollectEntity,String icResiUserId,Date time){ + IcVaccineEntity icVaccineEntity = new IcVaccineEntity(); + icVaccineEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineEntity.setName(icResiCollectEntity.getName()); + icVaccineEntity.setMobile(icResiCollectEntity.getMobile()); + icVaccineEntity.setIdCard(icResiCollectEntity.getIdCard()); + icVaccineEntity.setIsResiUser("1"); + icVaccineEntity.setUserType("prarmeter"); + icVaccineEntity.setUserId(icResiUserId); + icVaccineEntity.setInoculateTime(time); + icVaccineEntity.setInoculateAddress(icResiCollectEntity.getFirstVacSite()); + icVaccineDao.insert(icVaccineEntity); + + // 新增关系 + IcVaccineRelationEntity icVaccineRelationEntity = new IcVaccineRelationEntity(); + icVaccineRelationEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineRelationEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + icVaccineRelationEntity.setPids(icResiCollectEntity.getPids()); + icVaccineRelationEntity.setIcVaccineId(icVaccineEntity.getId()); + icVaccineRelationEntity.setUserType("prarmeter"); + icVaccineRelationDao.insert(icVaccineRelationEntity); + } + /** * 更新新冠病毒疫苗接种人员信息台账表房屋ID * @param icResiCollectEntity @@ -601,7 +731,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl3ZHAIrZ$6AzHG=Rk;+`?3HuM@5W#2+Px{$$=J9~id`Ia2M_Up{TXiHHMiSp%Kapj zpUDqrau)C)!E!_FTQ!}`$%n-=ap&KxS1=JRL$lOZ^l;fHqR_BM+yA-`|AHPMxS)sf zZa&G1qJclC@T-t=oRcPLLqnt?Ll&vHuzs9PD(A zMn8>9SJ!ABHP4Vw%{LTK3k-$SLPJ#&A9qk%M2bjXSYWj{Ddc3~`c&9Utr*6Yw^N+D zysv8iehGBh@+*tqE!j&q_giDSG^Ia(Jjz=6<<+ttWujiT-`y^k$6d}!uC1*~XYG@N Odv71N5AyW(q4gIUifv{9 delta 777 zcmX|Wq|#7ZM-?lfoO5prN5UMF0mCx|GB*jOckij_qM zMI^-u7IuCtTxsqKOA9MOtSoHwaIq6S}~Tm!7}a@*#9v9Wmf+>ZeKL2 zbB`J{!%=IvhO2z;;20jDg36Np)M&5$zy%b6pes>uf_V`+AVHz|s>$n8PS-hPgIU5o z#gy(ydGN5U&Qc#M7p^TW?yAIKsjfesw6*2m_R#64Hh<<+PYML~km0V-3eS#6lO$V2 z36kWG$dF7-Nm4QtIOm;098ibe&>*MI?gz)Qd1djZz^Ucy_^* zdm5QAQidR%OT>A~K`ye(*V0R!w^E|ogHc9}*t?4n$0)hI(4)fgq!}qp+MpK5zK#y| zp~T-J1+^fS>B=3Uak@6b!=!kH^2Dy7cmtZry0FX5dLbWXQ5+gI&-R-YBbVYoYko8D vR;oHx)i++P@3s8{owPQ8$79&VZpYqQtqoR;9dU;Aa7v6c@ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml index 0ed766fb77..b8113074cf 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml @@ -174,4 +174,13 @@ m.ID_CARD = t.ID_CARD AND m.DEL_FLAG = '0' + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml index 011c1c7de1..acaf54c95f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml @@ -12,5 +12,10 @@ AND AGENCY_ID = #{agencyId} + + update ic_vaccine_relation + set CUSTOMER_ID = #{customerId},USER_TYPE = #{userType} + where IC_VACCINE_ID = #{icVaccineId} + - \ No newline at end of file + From 814a52507546de50014f9eb331de3273fb7cd5ce Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 09:58:46 +0800 Subject: [PATCH 20/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index d0aef2f917..c87d9d58ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -349,7 +349,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 10:13:49 +0800 Subject: [PATCH 21/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 6c8b094f67..d08b68a8dc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -554,7 +554,7 @@ from ic_house where del_flag = '0' and CUSTOMER_ID = #{customerId} - and BUILDING_UNIT_ID = #{buildingUnitId} + and BUILDING_UNIT_ID = #{unitId} and DOOR_NAME = #{homeName} From cc4decc8061b2b9bbbd0ee438038955c9aec4944 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 16:21:34 +0800 Subject: [PATCH 22/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java | 2 +- .../com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java index 8edf20194d..7eb317b62e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java @@ -57,7 +57,7 @@ public class IcVaccineCheckFormDTO implements Serializable { /** * 房间号 */ - private String doorName; + private String homeName; /** * 客户ID(审核人) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index c87d9d58ac..61f838ec3a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -645,7 +645,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); From 0030c5e820c17be24de560314af47019d49cc947 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 18:12:14 +0800 Subject: [PATCH 23/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 19968 -> 19968 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls index 903b0091aeef39a3a972f194d0543d61f51e8258..638f6b57bb119a4980f8383bedf910a47422232e 100644 GIT binary patch delta 515 zcmYLFzb`{k6#mY8_qDGS)hZ$uB#1?56Thl{M1){sF^EJIgF(b1k*EZJfIDh1FcVEA zmSQyeI~Z;Z1`FSPtvEN|Ip=-%d*{c^7bIVhyKNQPxeYg_AN8&}bsk2G-|8kUbNXti zspVoAw2&-f3pt)W^y35#=*j4}p~>-gWKai~v{fNwn&};%u#u1oY~F!t6JEo)iL;n1%luh%kmR4O2aDU`1&IpJA3}BwA2We0>%{Ru#?>zqowebhrLZZpn9gS#s_olx zER-arFSE(^8s<%&46H320FBGJO5k!jT*;n^| RYSi<-u9NA<;^b^e{Q?yHPn7@w delta 179 zcmZpe!`Lu~aYGIZ+k}} Date: Fri, 26 Aug 2022 19:19:21 +0800 Subject: [PATCH 24/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcVaccinePrarmeterDao.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 3441859c38..7b7b6c4d95 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -88,22 +88,22 @@ and ID_CARD like CONCAT('%', #{idCard}, '%') - and (IS_VACCINATION = #{isVaccination} + and IS_VACCINATION = #{isVaccination} - and (GRID_ID = #{gridId} + and GRID_ID = #{gridId} - and (VILLAGE_ID = #{villageId} + and VILLAGE_ID = #{villageId} - and (BUILD_ID = #{buildId} + and BUILD_ID = #{buildId} - and (UNIT_ID = #{unitId} + and UNIT_ID = #{unitId} - and (HOME_ID = #{homeId} + and HOME_ID = #{homeId} order by CREATED_TIME desc @@ -160,22 +160,22 @@ and ID_CARD like CONCAT('%', #{idCard}, '%') - and (IS_VACCINATION = #{isVaccination} + and IS_VACCINATION = #{isVaccination} - and (GRID_ID = #{gridId} + and GRID_ID = #{gridId} - and (VILLAGE_ID = #{villageId} + and VILLAGE_ID = #{villageId} - and (BUILD_ID = #{buildId} + and BUILD_ID = #{buildId} - and (UNIT_ID = #{unitId} + and UNIT_ID = #{unitId} - and (HOME_ID = #{homeId} + and HOME_ID = #{homeId} order by CREATED_TIME desc From c07a650d80fb618fdb6c2e16edc61401096aa1b6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 19:20:30 +0800 Subject: [PATCH 25/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcVaccinePrarmeterDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 7b7b6c4d95..fe457a1225 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -177,6 +177,7 @@ and HOME_ID = #{homeId} + order by CREATED_TIME desc From 49ef464dfccb8d7361150c7efaa4aee66078cd0a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 20:10:34 +0800 Subject: [PATCH 26/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index fd95325e80..d98e8c5080 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -44,7 +44,7 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "联系电话") private String mobile; - @Excel(name = "身份证号") + @Excel(name = "证件号") private String idCard; @Excel(name = "是否接种", replace = {"否_0","是_1"}) From 893e078818020de765d4b3fded626d23c1e33c78 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 21:13:13 +0800 Subject: [PATCH 27/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/VaccinePrarmeterListFormDTO.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java index 6f77ae6b3b..4fbc71217b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java @@ -26,7 +26,17 @@ public class VaccinePrarmeterListFormDTO extends PageFormDTO implements Serializ private String name; /** - * user所属组织ID + * 证件号 */ - private String orgId; + private String idCard; + + private String isVaccination; + private String gridId; + private String villageId; + private String buildId; + private String unitId; + private String homeId; + + + } From 70c1645ea19492afda914b0f1d728fd7d174b1c5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 10:52:59 +0800 Subject: [PATCH 28/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcVaccinePrarmeterServiceImpl.java | 182 +++++++++--------- 1 file changed, 92 insertions(+), 90 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 61f838ec3a..60c17c8a0e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -455,17 +455,17 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId()); + Map userMap = queryOriginUserByHomeId(icVaccinePrarmeterEntity.getHomeId(),icVaccinePrarmeterEntity.getCustomerId()); if(userIdCardEntity != null){ icResiUserId = userIdCardEntity.getId(); // 已存在人员 - if(userMap.containsKey(icResiCollectEntity.getIdCard())){ + if(userMap.containsKey(icVaccinePrarmeterEntity.getIdCard())){ // 人员房屋一致（只更新人员信息） - updateUserInfo(icResiCollectEntity,false,formDTO,userIdCardEntity); + updateUserInfo(icVaccinePrarmeterEntity,false,formDTO,userIdCardEntity); }else{ // 人员房屋不一致（更新人员信息和变更记录） - updateUserInfo(icResiCollectEntity,true,formDTO,userIdCardEntity); + updateUserInfo(icVaccinePrarmeterEntity,true,formDTO,userIdCardEntity); } }else{ // 不存在人员 - icResiUserId = insertUserInfo(icResiCollectEntity,formDTO); + icResiUserId = insertUserInfo(icVaccinePrarmeterEntity,formDTO); } } // 同步接种记录 and 疫苗接种记录关系 - synchronizationVaccineInfo(icResiCollectEntity,icResiUserId); + synchronizationVaccineInfo(icVaccinePrarmeterEntity,icResiUserId); } @@ -518,68 +518,68 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(firstDate)); + List icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(firstDate)); if(icVaccineEntityFirstList.size() > 0){ // 更新疫苗接种记录 and 疫苗接种记录关系 for(IcVaccineEntity entity : icVaccineEntityFirstList){ - updateVaccineInfo(entity,icResiCollectEntity); + updateVaccineInfo(entity,icVaccinePrarmeterEntity); } }else{ // 新增疫苗接种记录 and 疫苗接种记录关系 - insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + insertVaccineInfo(icVaccinePrarmeterEntity,icResiUserId,firstDate); } // 查询第二次接种信息 - List icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(secondDate)); + List icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(secondDate)); if(icVaccineEntitySecondList.size() > 0){ // 更新疫苗接种记录 and 疫苗接种记录关系 for(IcVaccineEntity entity : icVaccineEntitySecondList){ - updateVaccineInfo(entity,icResiCollectEntity); + updateVaccineInfo(entity,icVaccinePrarmeterEntity); } }else{ // 新增疫苗接种记录 and 疫苗接种记录关系 - insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + insertVaccineInfo(icVaccinePrarmeterEntity,icResiUserId,firstDate); } // 查询第三次接种信息 - List icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(thirdDate)); + List icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(thirdDate)); if(icVaccineEntityThirdList.size() > 0){ // 更新疫苗接种记录 and 疫苗接种记录关系 for(IcVaccineEntity entity : icVaccineEntityThirdList){ - updateVaccineInfo(entity,icResiCollectEntity); + updateVaccineInfo(entity,icVaccinePrarmeterEntity); } }else{ // 新增疫苗接种记录 and 疫苗接种记录关系 - insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + insertVaccineInfo(icVaccinePrarmeterEntity,icResiUserId,firstDate); } } @@ -587,48 +587,48 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); - collectHouseFormDTO.setCustomerId(icResiCollectEntity.getCustomerId()); + collectHouseFormDTO.setCustomerId(icVaccinePrarmeterEntity.getCustomerId()); collectHouseFormDTO.setResiNumber((icHouseInfoCollectResultDTO.getResiNumber() + 1)); + collectHouseFormDTO.setRentFlag(icHouseInfoCollectResultDTO.getRentFlag()); + collectHouseFormDTO.setOwnerName(icHouseInfoCollectResultDTO.getOwnerName()); govOrgFeignClient.updateCollect(collectHouseFormDTO); } @@ -703,31 +705,31 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Mon, 29 Aug 2022 14:26:24 +0800 Subject: [PATCH 29/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/HouseServiceImpl.java | 4 ++- .../impl/IcVaccinePrarmeterServiceImpl.java | 29 +++++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index e8de32ecce..933a07daeb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -264,8 +264,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { houseChangeRecordCollect(formDTO.getId(), formDTO.getCustomerId(), icHouseDTO); icHouseDao.updateById(entity); + IcHouseDTO houseDTO = icHouseService.get(formDTO.getId()); + //删除房屋缓存 - icHouseRedis.delHouseInfo(formDTO.getId(), entity.getCustomerId()); + icHouseRedis.delHouseInfo(formDTO.getId(), houseDTO.getCustomerId()); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 60c17c8a0e..89dc8a65de 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -523,21 +523,18 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(firstDate)); if(icVaccineEntityFirstList.size() > 0){ @@ -553,6 +550,13 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(secondDate)); if(icVaccineEntitySecondList.size() > 0){ @@ -568,6 +572,13 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(thirdDate)); if(icVaccineEntityThirdList.size() > 0){ From 028105a50cb0719fefd9b54a78200b29e055dbf6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 14:56:39 +0800 Subject: [PATCH 30/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcVaccinePrarmeterController.java | 2 ++ .../src/main/resources/mapper/IcVaccinePrarmeterDao.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 5edd0e0749..674686ca73 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -2,6 +2,7 @@ package com.epmet.controller; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetException; @@ -59,6 +60,7 @@ public class IcVaccinePrarmeterController { private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @RequestMapping("page") +// @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params){ // PageData page = icVaccinePrarmeterService.page(params); PageData page = icVaccinePrarmeterService.getPhrasePage(params); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index fe457a1225..b06633761b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -127,8 +127,8 @@ HOUSEHOLD_TYPE, (case HOUSEHOLD_TYPE when '0' then '户籍' when '1' then '外来' else '' end) as householdTypeName, NAME, - MOBILE, - ID_CARD, + CONCAT(LEFT(MOBILE,3),'****',RIGHT(MOBILE ,4)) as MOBILE, + CONCAT(LEFT(ID_CARD,6),'********',RIGHT(ID_CARD ,4)) as ID_CARD, IS_VACCINATION, (case IS_VACCINATION when '0' then '否' when '1' then '是' else '' end) as isVaccinationName, FIRST_VAC_TIME, From ed7abb7ea52c27f502e8420bd367058f04a1be43 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 16:27:20 +0800 Subject: [PATCH 31/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/CustomerAgencyDao.xml | 1 + .../form/GridInfoVaccinePrarmeterFormDTO.java | 5 +++++ .../epmet/excel/IcVaccinePrarmeterExcel.java | 2 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 21 +++++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 42cb8d69dc..8493df5d81 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -926,6 +926,7 @@ from customer_grid where DEL_FLAG = '0' and GRID_NAME = #{gridName} + and PID = #{agencyId} and CUSTOMER_ID = #{customerId} limit 1 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java index c218212f37..18e124e529 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java @@ -26,6 +26,11 @@ public class GridInfoVaccinePrarmeterFormDTO implements Serializable { */ private String gridName; + /** + * 当前登录人组织ID + */ + private String agencyId; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index d98e8c5080..06cb0b9e15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -51,7 +51,7 @@ public class IcVaccinePrarmeterExcel { private String isVaccination; @Excel(name = "第一次接种时间") - private Date firstVacTime; + private String firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 89dc8a65de..79a65aa263 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -8,10 +8,12 @@ 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.ServiceConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; 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.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -30,6 +32,7 @@ import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.GridInfoByNameResultDTO; import com.epmet.dto.result.IcHouseInfoCollectResultDTO; +import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.*; import com.epmet.entity.IcResiUserEntity; @@ -38,6 +41,7 @@ import com.epmet.entity.IcVaccinePrarmeterEntity; import com.epmet.excel.IcVaccinePrarmeterImportExcel; import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.redis.IcVaccinePrarmeterRedis; @@ -52,6 +56,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.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -100,6 +105,12 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -252,6 +263,15 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl list, List errorInfo, TokenDto tokenDto){ + LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO(); + form.setUserId(tokenDto.getUserId()); + form.setClient(tokenDto.getClient()); + form.setApp(tokenDto.getApp()); + LoginUserDetailsResultDTO userDetailsResultDTO = resultDataResolver.getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(form), ServiceConstant.EPMET_USER_SERVER, + EpmetErrorCode.SERVER_ERROR.getCode(), + "获取当前登录人组织id失败", + null); + for (int i = 0; i < list.size(); i++) { list.get(i).setNum(i+1); if (StringUtils.isBlank(list.get(i).getGridName()) && !list.get(i).getAddStatus()){ @@ -353,6 +373,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getGridInfoByGridName(formDTO); GridInfoByNameResultDTO gridInfoByNameResultDTO = resultDTOResult.getData(); if(gridInfoByNameResultDTO == null && !list.get(i).getAddStatus()){ From a7692bf393888db483adca51757acaa072a316bc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 16:50:53 +0800 Subject: [PATCH 32/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.0.67__add_ic_vaccine_prarmeter.sql | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql new file mode 100644 index 0000000000..f009d72b0a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql @@ -0,0 +1,38 @@ +CREATE TABLE `ic_vaccine_prarmeter` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', + `GRID_ID` varchar(64) DEFAULT NULL COMMENT '网格ID', + `GRID_NAME` varchar(255) DEFAULT NULL COMMENT '网格名称', + `AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '组织Id', + `PIDS` varchar(255) DEFAULT NULL COMMENT '组织的pids', + `VILLAGE_ID` varchar(64) DEFAULT NULL COMMENT '所属小区ID；', + `VILLAGE_NAME` varchar(64) DEFAULT NULL COMMENT '所属小区名称', + `BUILD_ID` varchar(64) DEFAULT NULL COMMENT '所属楼宇Id', + `BUILD_NAME` varchar(64) DEFAULT NULL COMMENT '所属楼宇名称', + `UNIT_ID` varchar(64) DEFAULT NULL COMMENT '单元id', + `UNIT_NAME` varchar(64) DEFAULT NULL COMMENT '单元名', + `HOME_ID` varchar(64) DEFAULT NULL COMMENT '所属家庭Id', + `HOME_NAME` varchar(64) DEFAULT NULL COMMENT '房间名', + `HOUSEHOLD_TYPE` varchar(255) DEFAULT NULL COMMENT '户口性质：0户籍 1外来', + `NAME` varchar(64) NOT NULL COMMENT '姓名', + `MOBILE` varchar(15) DEFAULT NULL COMMENT '联系电话', + `ID_CARD` varchar(18) NOT NULL COMMENT '身份证号', + `IS_VACCINATION` varchar(1) DEFAULT NULL COMMENT '是否接种：0否1是', + `FIRST_VAC_TIME` varchar(64) DEFAULT NULL COMMENT '第一次接种时间', + `FIRST_VAC_SITE` varchar(10) DEFAULT NULL COMMENT '第一次接种地点', + `SECOND_VAC_TIME` varchar(64) DEFAULT NULL COMMENT '第二次接种时间', + `SECOND_VAC_SITE` varchar(10) DEFAULT NULL COMMENT '第二次接种地点', + `THIRD_VAC_TIME` varchar(64) DEFAULT NULL COMMENT '第三次接种时间', + `THIRD_VAC_SITE` varchar(10) DEFAULT NULL COMMENT '第三次接种地点', + `REASON` varchar(255) DEFAULT NULL COMMENT '原因：禁忌症/拒绝接种/其他原因', + `NOTE` varchar(255) DEFAULT NULL COMMENT '备注', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + `CHECK_STATE` varchar(1) DEFAULT NULL COMMENT '审核状态：0待审核 1审核不通过 2审核通过', + `CHECK_REASON` varchar(255) DEFAULT NULL COMMENT '审核理由', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='新冠病毒疫苗接种人员信息台账'; From efa3cc002e577d99990539d769bf5b6bc54d64a0 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 16:57:21 +0800 Subject: [PATCH 33/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 19968 -> 20480 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls index 638f6b57bb119a4980f8383bedf910a47422232e..52b29028aec920e29760ecac68f74fe93bb8a511 100644 GIT binary patch delta 430 zcmZpe!`QHZae@t_(nj0kjEt(2S(&N@6&V;9{{8>|AB0taY_-k3O!rBZgK65r);1FIc(; z1u*b4FnsU;DPdsypa7zH7#Ns=6cZ3LLNSOB1I`TGA0&XBMn*>l29EuV0t^BS2N)fI z?Ej1$3>*xTgRR~$7EgAtHfHLzm>l5rX>+=b2@@mJyzW?wKGbaBgB0VqgJ^LIB87Al^Pk{mB>YMJLNT$WFdsZ_bzr z;zbw(WyB>Ib<)E-f+w^FE=@jL$-rP0+!|OGc+C$a1``pB1c?}gTLnWzKt5(<`2U|9 x=l~GS%fJh!`GKLckI@-q_~rnI4a}1jd>;Vu{7o*ltgMrsnY8ZS?BuzR1pukXYM=lB delta 324 zcmZozz}PT{ae@t_;zrx!jEpLiS(&PN|NZ~}AB2?|7#LJHPh`qxoS48ei6w`#U_HB- z$<7;$N|Q@jnwhrQZvMrx)P&J{@&Ze7$$3^l)eLNm!3-G;sX$o5V8qbMAi|(E`GTdZ zoecv&1H%UskP-&A4-!C~ zu{LI^w3vL+>C@(F8xtl*#>pG(yn*B&J8fkFpcZx@76f9T$spDT5E;wh#vsZd1at`F zWH0+XU3LbLN=BesAWL8-$a>CAj6w`7AjMz+att#N?_)Hc?C&5tS=T{v@)LVwMrROj Z^F@aZ%$wY7Sy{g=5jEMl*~xn!3jk(aNZbGb From bb9b4f3ff53f22120f6f6e314b57deb3f219dad5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 17:24:29 +0800 Subject: [PATCH 34/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 79a65aa263..a5600b7f77 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -79,7 +79,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl implements IcVaccinePrarmeterService { +public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl implements IcVaccinePrarmeterService,ResultDataResolver { @Resource private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis; @@ -108,8 +108,6 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl page(Map params) { @@ -267,7 +265,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Mon, 29 Aug 2022 18:11:44 +0800 Subject: [PATCH 35/35] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/IcVaccinePrarmeterImportExcel.java | 2 +- .../IcVaccinePrarmeterImportErrorModel.java | 2 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 2 +- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 20480 -> 19968 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index 893531a4d2..3d9ed7a6a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -39,7 +39,7 @@ public class IcVaccinePrarmeterImportExcel { @Excel(name = "联系电话") private String mobile; - @Excel(name = "身份证号") + @Excel(name = "证件号") private String idCard; @Excel(name = "是否接种", replace = {"否_0","是_1"}) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index 7d34af62aa..8cce05d852 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -41,7 +41,7 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "联系电话",width = 30) private String mobile; - @Excel(name = "身份证号",width = 30) + @Excel(name = "证件号",width = 30) private String idCard; @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index a5600b7f77..08e03f063f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -303,7 +303,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl5TQC;K~yPS$l$WON3zE;{H>eq?Vt+0P++ XlcNXACO2DF7M(vl{hJ-V_p<;1j5p_9f|jrlRLXato)htfe@6od*6(Jl@u8afn3 zawj2!gHBHMErLUIa!n?k9lGdnaTGP4`;0x0^SBZ8Cex*aFt+{x2~9AEC!$Z=5I6rG2SxFbQO{$m3c1