From 68578f08ee58224af3195cc2972deb134ea67413 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 13:48:15 +0800 Subject: [PATCH 01/47] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=9C=BA=E6=89=80=E7=B1=BB?= =?UTF-8?q?=E5=88=ABplace=5Fcategory=E3=80=81=E8=A7=84=E6=A8=A1scale=5Ftot?= =?UTF-8?q?al?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/entity/IcEnterpriseEntity.java | 15 +++++++++++- .../db/migration/V0.0.44__place_category.sql | 24 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java index d022fabf3d..e0377272f7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java @@ -45,6 +45,12 @@ public class IcEnterpriseEntity extends BaseEpmetEntity { */ private String placeType; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + private String PLACE_CATEGORY; /** * 场所名称 */ @@ -66,7 +72,8 @@ public class IcEnterpriseEntity extends BaseEpmetEntity { private String latitude; /** - * 字典value,场所规模【 + * 10.26需求：此列就不再用了 + * 字典value,场所规模【 0:10人以下 1:10-20人 2:21-40人 @@ -75,6 +82,12 @@ public class IcEnterpriseEntity extends BaseEpmetEntity { */ private String scale; + /** + * 10.26需求： + * 规模，手输数字 + */ + private Integer scaleTotal; + /** * 场所负责人 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql new file mode 100644 index 0000000000..cc1680ef63 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql @@ -0,0 +1,24 @@ +alter table ic_enterprise MODIFY COLUMN `SCALE` varchar(128) NOT NULL DEFAULT'-1' COMMENT '已弃用该字段，字典value,场所规模【\r\n0:10人以下\r\n1:10-20人\r\n2:21-40人\r\n3:41-100人\r\n4:100人以上】'; +alter table ic_enterprise ADD COLUMN `SCALE_TOTAL` int(11) NOT NULL COMMENT '规模，手输数字' AFTER SCALE; +alter table ic_enterprise add COLUMN PLACE_CATEGORY varchar(32) NOT NULL DEFAULT '0' COMMENT '场所类别：0九小场所、1企事业单位' after PLACE_TYPE; + + +update ic_enterprise e +set e.SCALE_TOTAL=5 +where e.SCALE=0; + +update ic_enterprise e +set e.SCALE_TOTAL=15 +where e.SCALE=1; + +update ic_enterprise e +set e.SCALE_TOTAL=30 +where e.SCALE=2; + +update ic_enterprise e +set e.SCALE_TOTAL=70 +where e.SCALE=3; + +update ic_enterprise e +set e.SCALE_TOTAL=100 +where e.SCALE=4; From 4702a8f222e2f98f727dfa37440519020c79619e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 13:49:55 +0800 Subject: [PATCH 02/47] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=9C=BA=E6=89=80=E7=B1=BB?= =?UTF-8?q?=E5=88=ABplace=5Fcategory=E3=80=81=E8=A7=84=E6=A8=A1scale=5Ftot?= =?UTF-8?q?al=20=2045?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{V0.0.44__place_category.sql => V0.0.45__place_category.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/{V0.0.44__place_category.sql => V0.0.45__place_category.sql} (100%) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.45__place_category.sql similarity index 100% rename from epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql rename to epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.45__place_category.sql From 9568c67928944559ad10cffb6b2518b57bc1af7a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 14:42:01 +0800 Subject: [PATCH 03/47] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/template/Controller.java.vm | 10 --- .../resources/template/ServiceImpl.java.vm | 4 - .../com/epmet/dto/IcEmployeeRegisterDTO.java | 79 ++++++++++++++++++ .../dto/IcEmployeeRegisterDetailDTO.java | 74 +++++++++++++++++ .../epmet/dto/IcGroupPeopleRegisterDTO.java | 79 ++++++++++++++++++ .../IcEmployeeRegisterController.java | 71 ++++++++++++++++ .../IcEmployeeRegisterDetailController.java | 72 ++++++++++++++++ .../IcGroupPeopleRegisterController.java | 72 ++++++++++++++++ .../com/epmet/dao/IcEmployeeRegisterDao.java | 16 ++++ .../dao/IcEmployeeRegisterDetailDao.java | 16 ++++ .../epmet/dao/IcGroupPeopleRegisterDao.java | 16 ++++ .../IcEmployeeRegisterDetailEntity.java | 44 ++++++++++ .../entity/IcEmployeeRegisterEntity.java | 49 +++++++++++ .../entity/IcGroupPeopleRegisterEntity.java | 49 +++++++++++ .../IcEmployeeRegisterDetailService.java | 78 +++++++++++++++++ .../service/IcEmployeeRegisterService.java | 78 +++++++++++++++++ .../service/IcGroupPeopleRegisterService.java | 78 +++++++++++++++++ .../IcEmployeeRegisterDetailServiceImpl.java | 83 +++++++++++++++++++ .../impl/IcEmployeeRegisterServiceImpl.java | 83 +++++++++++++++++++ .../IcGroupPeopleRegisterServiceImpl.java | 83 +++++++++++++++++++ .../mapper/IcEmployeeRegisterDao.xml | 6 ++ .../mapper/IcEmployeeRegisterDetailDao.xml | 6 ++ .../mapper/IcGroupPeopleRegisterDao.xml | 6 ++ 23 files changed, 1138 insertions(+), 14 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml diff --git a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm index 1e489dca52..c26eeb8447 100644 --- a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm +++ b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm @@ -2,7 +2,6 @@ package ${package}.controller; import ${main}.commons.tools.aop.NoRepeatSubmit; import ${main}.commons.tools.page.PageData; -import ${main}.commons.tools.utils.ExcelUtils; import ${main}.commons.tools.utils.Result; import ${main}.commons.tools.validator.AssertUtils; import ${main}.commons.tools.validator.ValidatorUtils; @@ -10,7 +9,6 @@ import ${main}.commons.tools.validator.group.AddGroup; import ${main}.commons.tools.validator.group.UpdateGroup; import ${main}.commons.tools.validator.group.DefaultGroup; import ${package}.dto.${className}DTO; -import ${package}.excel.${className}Excel; import ${package}.service.${className}Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -71,12 +69,4 @@ public class ${className}Controller { return new Result(); } - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List<${className}DTO> list = ${classname}Service.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ${className}Excel.class); - } - - - } diff --git a/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm b/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm index f0bcfe2a7e..de6efd193d 100644 --- a/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm +++ b/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm @@ -9,7 +9,6 @@ import ${package}.commons.tools.constant.FieldConstant; import ${package}.dao.${className}Dao; import ${package}.dto.${className}DTO; import ${package}.entity.${className}Entity; -import ${package}.redis.${className}Redis; import ${package}.service.${className}Service; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -29,9 +28,6 @@ import java.util.Map; @Service public class ${className}ServiceImpl extends BaseServiceImpl<${className}Dao, ${className}Entity> implements ${className}Service { - @Autowired - private ${className}Redis ${classname}Redis; - @Override public PageData<${className}DTO> page(Map params) { IPage<${className}Entity> page = baseDao.selectPage( diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java new file mode 100644 index 0000000000..16ec39997f --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +public class IcEmployeeRegisterDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号或护照号 + */ + private String idCard; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java new file mode 100644 index 0000000000..40d12c1fd4 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java @@ -0,0 +1,74 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +public class IcEmployeeRegisterDetailDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * ic_employee_register.ID + */ + private String registerId; + + /** + * 疫苗接种次数：0,1,2,3 + */ + private Integer ymjzCount; + + /** + * 最近一次核酸检测时间：yyyy-MM-dd 日期 + */ + private Date latestNatTime; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java new file mode 100644 index 0000000000..bc4e876b7c --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +public class IcGroupPeopleRegisterDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 核酸检测时间：yyyy-MM-dd 日期 + */ + private Date natTime; + + /** + * 受众人数 + */ + private Integer szTotal; + + /** + * 核酸检测人数 + */ + private Integer hsjcTotal; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java new file mode 100644 index 0000000000..270d3c7f9b --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -0,0 +1,71 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.service.IcEmployeeRegisterService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@RestController +@RequestMapping("icEmployeeRegister") +public class IcEmployeeRegisterController { + + @Autowired + private IcEmployeeRegisterService icEmployeeRegisterService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icEmployeeRegisterService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcEmployeeRegisterDTO data = icEmployeeRegisterService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcEmployeeRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icEmployeeRegisterService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcEmployeeRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icEmployeeRegisterService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icEmployeeRegisterService.delete(ids); + return new Result(); + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java new file mode 100644 index 0000000000..6b23562985 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcEmployeeRegisterDetailDTO; +import com.epmet.service.IcEmployeeRegisterDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@RestController +@RequestMapping("icEmployeeRegisterDetail") +public class IcEmployeeRegisterDetailController { + + @Autowired + private IcEmployeeRegisterDetailService icEmployeeRegisterDetailService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icEmployeeRegisterDetailService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcEmployeeRegisterDetailDTO data = icEmployeeRegisterDetailService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcEmployeeRegisterDetailDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icEmployeeRegisterDetailService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcEmployeeRegisterDetailDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icEmployeeRegisterDetailService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icEmployeeRegisterDetailService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java new file mode 100644 index 0000000000..ffc54df114 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.service.IcGroupPeopleRegisterService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@RestController +@RequestMapping("icGroupPeopleRegister") +public class IcGroupPeopleRegisterController { + + @Autowired + private IcGroupPeopleRegisterService icGroupPeopleRegisterService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icGroupPeopleRegisterService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcGroupPeopleRegisterDTO data = icGroupPeopleRegisterService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icGroupPeopleRegisterService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcGroupPeopleRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icGroupPeopleRegisterService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icGroupPeopleRegisterService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java new file mode 100644 index 0000000000..87bcce87fa --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcEmployeeRegisterEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Mapper +public interface IcEmployeeRegisterDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java new file mode 100644 index 0000000000..a9d0408825 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Mapper +public interface IcEmployeeRegisterDetailDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java new file mode 100644 index 0000000000..b60b0155c0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcGroupPeopleRegisterEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Mapper +public interface IcGroupPeopleRegisterDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java new file mode 100644 index 0000000000..14f90935c5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java @@ -0,0 +1,44 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_employee_register_detail") +public class IcEmployeeRegisterDetailEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * ic_employee_register.ID + */ + private String registerId; + + /** + * 疫苗接种次数：0,1,2,3 + */ + private Integer ymjzCount; + + /** + * 最近一次核酸检测时间：yyyy-MM-dd 日期 + */ + private Date latestNatTime; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java new file mode 100644 index 0000000000..dcae1e3c2d --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java @@ -0,0 +1,49 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_employee_register") +public class IcEmployeeRegisterEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号或护照号 + */ + private String idCard; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java new file mode 100644 index 0000000000..3f4dffc18e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java @@ -0,0 +1,49 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_group_people_register") +public class IcGroupPeopleRegisterEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 核酸检测时间：yyyy-MM-dd 日期 + */ + private Date natTime; + + /** + * 受众人数 + */ + private Integer szTotal; + + /** + * 核酸检测人数 + */ + private Integer hsjcTotal; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java new file mode 100644 index 0000000000..658dc475bf --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcEmployeeRegisterDetailDTO; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; + +import java.util.List; +import java.util.Map; + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +public interface IcEmployeeRegisterDetailService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-26 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcEmployeeRegisterDetailDTO + * @author generator + * @date 2022-10-26 + */ + IcEmployeeRegisterDetailDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void save(IcEmployeeRegisterDetailDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void update(IcEmployeeRegisterDetailDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-26 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java new file mode 100644 index 0000000000..1ccb4a8b5c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.entity.IcEmployeeRegisterEntity; + +import java.util.List; +import java.util.Map; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +public interface IcEmployeeRegisterService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-26 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcEmployeeRegisterDTO + * @author generator + * @date 2022-10-26 + */ + IcEmployeeRegisterDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void save(IcEmployeeRegisterDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void update(IcEmployeeRegisterDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-26 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java new file mode 100644 index 0000000000..d38ba6d9e9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.entity.IcGroupPeopleRegisterEntity; + +import java.util.List; +import java.util.Map; + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +public interface IcGroupPeopleRegisterService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-26 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcGroupPeopleRegisterDTO + * @author generator + * @date 2022-10-26 + */ + IcGroupPeopleRegisterDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void save(IcGroupPeopleRegisterDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void update(IcGroupPeopleRegisterDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-26 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java new file mode 100644 index 0000000000..76c2e52a1f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcEmployeeRegisterDetailDao; +import com.epmet.dto.IcEmployeeRegisterDetailDTO; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; +import com.epmet.service.IcEmployeeRegisterDetailService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Service +public class IcEmployeeRegisterDetailServiceImpl extends BaseServiceImpl implements IcEmployeeRegisterDetailService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcEmployeeRegisterDetailDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcEmployeeRegisterDetailDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcEmployeeRegisterDetailDTO get(String id) { + IcEmployeeRegisterDetailEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcEmployeeRegisterDetailDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcEmployeeRegisterDetailDTO dto) { + IcEmployeeRegisterDetailEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcEmployeeRegisterDetailDTO dto) { + IcEmployeeRegisterDetailEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java new file mode 100644 index 0000000000..57cd680a61 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcEmployeeRegisterDao; +import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.entity.IcEmployeeRegisterEntity; +import com.epmet.service.IcEmployeeRegisterService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Service +public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl implements IcEmployeeRegisterService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcEmployeeRegisterDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcEmployeeRegisterDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcEmployeeRegisterDTO get(String id) { + IcEmployeeRegisterEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcEmployeeRegisterDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcEmployeeRegisterDTO dto) { + IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcEmployeeRegisterDTO dto) { + IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java new file mode 100644 index 0000000000..8f3cd6e4b6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcGroupPeopleRegisterDao; +import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.entity.IcGroupPeopleRegisterEntity; +import com.epmet.service.IcGroupPeopleRegisterService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Service +public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl implements IcGroupPeopleRegisterService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcGroupPeopleRegisterDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcGroupPeopleRegisterDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcGroupPeopleRegisterDTO get(String id) { + IcGroupPeopleRegisterEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcGroupPeopleRegisterDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcGroupPeopleRegisterDTO dto) { + IcGroupPeopleRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcGroupPeopleRegisterEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcGroupPeopleRegisterDTO dto) { + IcGroupPeopleRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcGroupPeopleRegisterEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml new file mode 100644 index 0000000000..d71375c8b1 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml new file mode 100644 index 0000000000..2ca17eecfd --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml new file mode 100644 index 0000000000..5b4d514d4c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 19faf7b2a9184a15d8bbdd9cc2feb244ad1696b8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 15:11:52 +0800 Subject: [PATCH 04/47] placeCategory --- .../src/main/java/com/epmet/entity/IcEnterpriseEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java index e0377272f7..931756bbac 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java @@ -50,7 +50,7 @@ public class IcEnterpriseEntity extends BaseEpmetEntity { * 场所类别：0九小场所、1企事业单位 * 默认0 */ - private String PLACE_CATEGORY; + private String placeCategory; /** * 场所名称 */ From 8b53d5c31053cbaa8200e38206753b553135f0d6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 15:43:24 +0800 Subject: [PATCH 05/47] emm --- .../com/epmet/dto/IcEmployeeRegisterDTO.java | 16 ++++++++++++++++ .../controller/IcEmployeeRegisterController.java | 8 +++----- .../IcGroupPeopleRegisterController.java | 7 +++---- .../epmet/service/IcEmployeeRegisterService.java | 3 +-- .../service/IcGroupPeopleRegisterService.java | 3 +-- .../impl/IcEmployeeRegisterServiceImpl.java | 9 ++++++--- .../impl/IcGroupPeopleRegisterServiceImpl.java | 8 +++++--- 7 files changed, 35 insertions(+), 19 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java index 16ec39997f..4a77649bdd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java @@ -2,8 +2,13 @@ package com.epmet.dto; import java.io.Serializable; import java.util.Date; + +import com.epmet.commons.tools.validator.group.AddGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * 员工登记表 @@ -24,28 +29,39 @@ public class IcEmployeeRegisterDTO implements Serializable { /** * 客户id */ + @NotBlank(message = "customerId不能为空",groups = {AddGroup.class}) private String customerId; /** * 场所id */ + @NotBlank(message = "enterpriseId不能为空",groups = {AddGroup.class}) private String enterpriseId; /** * 姓名 */ + @NotBlank(message = "name不能为空",groups = {AddGroup.class}) private String name; /** * 手机号 */ + @NotBlank(message = "mobile不能为空",groups = {AddGroup.class}) private String mobile; /** * 身份证号或护照号 */ + @NotBlank(message = "idCard不能为空",groups = {AddGroup.class}) private String idCard; + @NotNull(message = "ymjzCount不能为空",groups = {AddGroup.class}) + private Integer ymjzCount; + + @NotNull(message = "latestNatTime不能为空",groups = {AddGroup.class}) + private Date latestNatTime; + /** * 删除标识：0.未删除 1.已删除 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index 270d3c7f9b..7e5e6d1e38 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -37,14 +37,14 @@ public class IcEmployeeRegisterController { return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @PostMapping(value = "{id}") public Result get(@PathVariable("id") String id){ IcEmployeeRegisterDTO data = icEmployeeRegisterService.get(id); return new Result().ok(data); } @NoRepeatSubmit - @PostMapping("save") + @PostMapping("add") public Result save(@RequestBody IcEmployeeRegisterDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -62,9 +62,7 @@ public class IcEmployeeRegisterController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); + public Result delete(@RequestBody List ids){ icEmployeeRegisterService.delete(ids); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index ffc54df114..601c1688e8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcGroupPeopleRegisterDTO; import com.epmet.service.IcGroupPeopleRegisterService; +import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,7 +38,7 @@ public class IcGroupPeopleRegisterController { return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @PostMapping(value = "{id}") public Result get(@PathVariable("id") String id){ IcGroupPeopleRegisterDTO data = icGroupPeopleRegisterService.get(id); return new Result().ok(data); @@ -62,9 +63,7 @@ public class IcGroupPeopleRegisterController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); + public Result delete(@RequestBody List ids){ icGroupPeopleRegisterService.delete(ids); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java index 1ccb4a8b5c..bf7f89162f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java @@ -68,11 +68,10 @@ public interface IcEmployeeRegisterService extends BaseService ids); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java index d38ba6d9e9..818c92f448 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -68,11 +68,10 @@ public interface IcGroupPeopleRegisterService extends BaseService ids); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 57cd680a61..073fb7af2d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.entity.IcEmployeeRegisterEntity; import com.epmet.service.IcEmployeeRegisterService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -63,6 +64,7 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl ids) { + if (CollectionUtils.isNotEmpty(ids)){ + baseDao.deleteBatchIds(ids); + } } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java index 8f3cd6e4b6..8f4920bdee 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.dao.IcGroupPeopleRegisterDao; import com.epmet.dto.IcGroupPeopleRegisterDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import com.epmet.service.IcGroupPeopleRegisterService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -75,9 +76,10 @@ public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl ids) { + if (CollectionUtils.isNotEmpty(ids)){ + baseDao.deleteBatchIds(ids); + } } } \ No newline at end of file From 03e2defded6bfa2a78e59bcaaa8ec4ff56d10913 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 16:52:38 +0800 Subject: [PATCH 06/47] =?UTF-8?q?=E7=99=BB=E8=AE=B0=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/CustomerAgencyConstant.java | 3 + .../controller/IcEnterpriseController.java | 16 +++++ .../epmet/service/IcEnterpriseService.java | 12 ++++ .../service/impl/IcEnterpriseServiceImpl.java | 71 +++++++++++++++++-- 4 files changed, 96 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java index d738d662f8..c41372e2a7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java @@ -89,4 +89,7 @@ public interface CustomerAgencyConstant { String AREA_CODE_SWITCH_CLOSED="closed"; String AREA_CODE_SWITCH_OPEN="open"; + + String JUMP_URL = "http://192.168.1.140/epmet-oper/#/staffRegister?"; +// String JUMP_URL = "https://epmet-open.elinkservice.cn/epmet-oper-gov/#/staffRegister?"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java index 01e3778203..7d9afd1a83 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java @@ -343,4 +343,20 @@ public class IcEnterpriseController implements ResultDataResolver { icEnterpriseService.sendEnterprisePatrolRemindMessage(); return new Result(); } + + /** + * @Description 登记码导出 + * @param formDTO + * @param tokenDto + * @Author zxc + * @Date 2022/10/26 15:55 + */ + @PostMapping("qrCodeExport") + public void qrCodeExport(@RequestBody EnterprisePageFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setCurrentStaffId(tokenDto.getUserId()); + formDTO.setPageFlag(false); + icEnterpriseService.qrCodeExport(formDTO,response); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java index 23790b5caa..e141e008e3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java @@ -10,7 +10,11 @@ import com.epmet.dto.result.EnterpriseDetailDTO; import com.epmet.dto.result.EnterprisePatrolResultDTO; import com.epmet.entity.IcEnterpriseEntity; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.nio.file.Path; +import java.util.List; import java.util.Map; /** @@ -91,4 +95,12 @@ public interface IcEnterpriseService extends BaseService { */ PageData page(Map params); + /** + * @Description 登记码导出 + * @param formDTO + * @Author zxc + * @Date 2022/10/26 15:55 + */ + void qrCodeExport(EnterprisePageFormDTO formDTO, HttpServletResponse response) throws IOException; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index d0f5a1ba08..2de6c29e74 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -23,10 +23,7 @@ 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.user.LoginUserUtil; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.FileUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.constant.SmsTemplateConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.*; @@ -60,12 +57,22 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +import static com.epmet.constant.CustomerAgencyConstant.JUMP_URL; +import static com.epmet.service.impl.HouseServiceImpl.bufferedImageToInputStream; /** * 企事业单位表 @@ -303,8 +310,13 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl list = baseDao.selectList(formDTO); + List list = new ArrayList<>(); + if (formDTO.getPageFlag()){ + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getPageFlag()); + list = baseDao.selectList(formDTO); + }else { + list = baseDao.selectList(formDTO); + } PageInfo pageInfo = new PageInfo<>(list); if (!org.springframework.util.CollectionUtils.isEmpty(list)) { //规模名称 @@ -562,4 +574,51 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl list = list(formDTO).getList(); + if (CollectionUtils.isEmpty(list)){ + return; + } + response.reset(); + //文件的名称 + String downloadFilename = "登记码压缩包.zip"; + //转换中文否则可能会产生乱码 + downloadFilename = URLEncoder.encode(downloadFilename, "UTF-8"); + // 指明response的返回对象是文件流 + response.setContentType("application/octet-stream; charset=UTF-8"); + //设置下载格式和名称 + response.setHeader("Content-Disposition", "attachment;filename=" + downloadFilename); + ZipOutputStream zip = new ZipOutputStream(response.getOutputStream()); + for (EnterpriseDetailDTO l : list) { + try { + String content = JUMP_URL + "enterpriseId=" + l.getEnterpriseId() + "&customerId=" + formDTO.getCustomerId() + "&placeOrgName=" + l.getPlaceOrgName(); + BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(l.getPlaceOrgName(), content); + byte[] buf = new byte[8192]; + int len; + //添加到zip + zip.putNextEntry(new ZipEntry(l.getPlaceOrgName()+l.getEnterpriseId()+".png")); + InputStream inputStream = bufferedImageToInputStream(image); + //输出压缩包 + while ((len = inputStream.read(buf)) > 0) { + zip.write(buf, 0, len); + } + inputStream.close(); + } catch (IOException e) { + log.error(e.getMessage()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "组装zip信息有误", "组装zip信息有误"); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + zip.close(); + } + } \ No newline at end of file From 5c5f6112355aa6000ca55d05df8c1bc59073f8c2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 16:53:59 +0800 Subject: [PATCH 07/47] emm --- .../java/com/epmet/service/impl/IcEnterpriseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 2de6c29e74..934c387f1d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -604,7 +604,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl 0) { From 631abd8412b0ada88a422c537f49d135b2dd559c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 17:06:51 +0800 Subject: [PATCH 08/47] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcGroupPeopleRegisterDTO.java | 10 ++++++++++ .../controller/IcGroupPeopleRegisterController.java | 2 +- .../service/impl/IcEmployeeRegisterServiceImpl.java | 9 ++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java index bc4e876b7c..f55ddf7420 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java @@ -2,8 +2,13 @@ package com.epmet.dto; import java.io.Serializable; import java.util.Date; + +import com.epmet.commons.tools.validator.group.AddGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * 受众群体登记表 @@ -24,26 +29,31 @@ public class IcGroupPeopleRegisterDTO implements Serializable { /** * 客户id */ + @NotBlank(message = "customerId不能为空",groups = {AddGroup.class}) private String customerId; /** * 场所id */ + @NotBlank(message = "enterpriseId不能为空",groups = {AddGroup.class}) private String enterpriseId; /** * 核酸检测时间：yyyy-MM-dd 日期 */ + @NotNull(message = "natTime不能为空",groups = {AddGroup.class}) private Date natTime; /** * 受众人数 */ + @NotNull(message = "szTotal不能为空",groups = {AddGroup.class}) private Integer szTotal; /** * 核酸检测人数 */ + @NotNull(message = "customerId不能为空",groups = {AddGroup.class}) private Integer hsjcTotal; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index 601c1688e8..31d6189892 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -45,7 +45,7 @@ public class IcGroupPeopleRegisterController { } @NoRepeatSubmit - @PostMapping("save") + @PostMapping("add") public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 073fb7af2d..3f72e7261d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -8,7 +8,9 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; import com.epmet.entity.IcEmployeeRegisterEntity; +import com.epmet.service.IcEmployeeRegisterDetailService; import com.epmet.service.IcEmployeeRegisterService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -29,6 +31,9 @@ import java.util.Map; @Service public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl implements IcEmployeeRegisterService { + @Autowired + private IcEmployeeRegisterDetailService icEmployeeRegisterDetailService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -64,8 +69,10 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl Date: Wed, 26 Oct 2022 17:23:42 +0800 Subject: [PATCH 09/47] emm --- .../src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java | 2 ++ .../src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java index 4a77649bdd..365cf14365 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.epmet.commons.tools.validator.group.AddGroup; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -60,6 +61,7 @@ public class IcEmployeeRegisterDTO implements Serializable { private Integer ymjzCount; @NotNull(message = "latestNatTime不能为空",groups = {AddGroup.class}) + @JsonFormat(pattern="yyyy-MM-dd") private Date latestNatTime; /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java index f55ddf7420..f3342f1177 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.epmet.commons.tools.validator.group.AddGroup; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -42,6 +43,7 @@ public class IcGroupPeopleRegisterDTO implements Serializable { * 核酸检测时间：yyyy-MM-dd 日期 */ @NotNull(message = "natTime不能为空",groups = {AddGroup.class}) + @JsonFormat(pattern="yyyy-MM-dd") private Date natTime; /** From 5c8f7be43e8cb91f1aea34cba2559363b2f0b0d1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 17:23:59 +0800 Subject: [PATCH 10/47] =?UTF-8?q?=E5=B7=AE=E5=AF=BC=E5=85=A5=E4=BA=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/EnterpriseFormDTO.java | 14 ++++++++- .../epmet/dto/result/EnterpriseDetailDTO.java | 13 ++++++++ .../epmet/excel/EnterpriseExportExcelDTO.java | 16 ++++++++++ .../service/impl/IcEnterpriseServiceImpl.java | 31 +++++++++++++------ .../main/resources/mapper/IcEnterpriseDao.xml | 1 + 5 files changed, 65 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterpriseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterpriseFormDTO.java index 61f8470c60..eebdaa319d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterpriseFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterpriseFormDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -44,6 +45,14 @@ public class EnterpriseFormDTO implements Serializable { @NotBlank(message = "场所类型不能为空", groups = {AddShow.class}) private String placeType; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + @NotBlank(message = "场所类别不能为空", groups = {AddShow.class}) + private String placeCategory; + /** * 场所名称 */ @@ -77,9 +86,12 @@ public class EnterpriseFormDTO implements Serializable { 3:41-100人 4:100人以上】 */ - @NotBlank(message = "规模不能为空", groups = {AddShow.class}) + // @NotBlank(message = "规模不能为空", groups = {AddShow.class}) private String scale; + @NotNull(message = "规模不能为空",groups ={AddShow.class} ) + private Integer scaleTotal; + /** * 场所负责人 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java index 2d787ab00f..001066cade 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java @@ -37,7 +37,19 @@ public class EnterpriseDetailDTO implements Serializable { * 场所类型：来源于ic_coverage_category_dict */ private String placeType; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + private String placeCategory; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + private String placeCategoryName; /** * 场所类型名称 */ @@ -73,6 +85,7 @@ public class EnterpriseDetailDTO implements Serializable { */ private String scale; + private Integer scaleTotal; /** * 规模名称 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java index 213e0c294b..9188b748b7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java @@ -22,7 +22,22 @@ public class EnterpriseExportExcelDTO { @ExcelProperty(value = "场所类型") @ColumnWidth(25) private String placeTypeName; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + @ExcelIgnore + private String placeCategory; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + @ExcelProperty(value = "场所类别") + @ColumnWidth(25) + private String placeCategoryName; /** * 网格所属的组织Id @@ -70,6 +85,7 @@ public class EnterpriseExportExcelDTO { @ExcelIgnore private String scale; + private Integer scaleTotal; /** * 规模名称 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 934c387f1d..a06d5c9d48 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -44,7 +44,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.MapUtils; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; @@ -62,7 +61,6 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Path; @@ -258,15 +256,23 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); + // Map dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>(); + // resultDto.setScaleName(dictMap.containsKey(resultDto.getScale()) ? dictMap.get(resultDto.getScale()) : StrConstant.EPMETY_STR); //规模名称 - Result> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); - Map dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>(); - resultDto.setScaleName(dictMap.containsKey(resultDto.getScale()) ? dictMap.get(resultDto.getScale()) : StrConstant.EPMETY_STR); + resultDto.setScaleName(resultDto.getScaleTotal()+"人"); if (StringUtils.isNotBlank(enterpriseEntity.getLatestResult()) && "0".equals(enterpriseEntity.getLatestResult())) { resultDto.setLatestResultName("合格"); } else if (StringUtils.isNotBlank(enterpriseEntity.getLatestResult()) && "1".equals(enterpriseEntity.getLatestResult())) { resultDto.setLatestResultName("不合格"); } + if ("0".equals(resultDto.getPlaceCategory())) { + // 0九小场所、1企事业单位 + resultDto.setPlaceCategoryName("九小场所"); + } else if ("1".equals(resultDto.getPlaceCategory())) { + resultDto.setPlaceCategoryName("企事业单位"); + } return resultDto; } @@ -319,9 +325,9 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(list); if (!org.springframework.util.CollectionUtils.isEmpty(list)) { - //规模名称 - Result> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); - Map dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>(); + //规模名称 已废弃用字典表，改为手动输入数字了 + // Result> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); + // Map dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>(); for (EnterpriseDetailDTO detailDTO : list) { GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(detailDTO.getGridId()); if (null != gridInfoCache) { @@ -334,7 +340,14 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index 0a3d9a321a..bc7c954052 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -43,6 +43,7 @@ ie.AGENCY_ID, ie.AGENCY_PIDS, ie.PLACE_TYPE, + ie.PLACE_CATEGORY, ie.PLACE_ORG_NAME, ie.ADDRESS, ie.LONGITUDE, From f1aa2c8dafac984b4f4a82550fca9e64853b9874 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 17:38:46 +0800 Subject: [PATCH 11/47] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dao/IcEmployeeRegisterDao.java | 21 ++++++++++++++++++- .../impl/IcEmployeeRegisterServiceImpl.java | 12 +++++++++-- .../mapper/IcEmployeeRegisterDao.xml | 16 ++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index 87bcce87fa..d287c78231 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -3,6 +3,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcEmployeeRegisterEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 员工登记表 @@ -12,5 +15,21 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcEmployeeRegisterDao extends BaseDao { - + + /** + * @Description 根据身份证查询是否存在 + * @param idCard + * @Author zxc + * @Date 2022/10/26 17:34 + */ + IcEmployeeRegisterEntity getEmployeeRegisterByIdCard(@Param("idCard")String idCard); + + /** + * @Description 根据主表ID删除子表 + * @param registerIds + * @Author zxc + * @Date 2022/10/26 17:34 + */ + void delRegisterDetail(@Param("registerIds")List registerIds); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 3f72e7261d..792ea69b5b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -68,8 +68,15 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl ids) { if (CollectionUtils.isNotEmpty(ids)){ baseDao.deleteBatchIds(ids); + baseDao.delRegisterDetail(ids); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index d71375c8b1..0509004b8e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -3,4 +3,20 @@ + + + update ic_employee_register_detail + set del_flag = 1, + updated_time = NOW() + where REGISTER_ID in ( + + #{registerId} + + ) + + + \ No newline at end of file From f0940203c90801091c2664ade739c667e2f327f6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 18:27:35 +0800 Subject: [PATCH 12/47] daoru --- .../epmet/excel/EnterpriseImportExcelDTO.java | 19 ++++++++++++++++++ .../IcEnterpriseExcelImportListener.java | 3 ++- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9284 -> 9302 bytes 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 8507192422..64c847d684 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -21,6 +21,16 @@ public class EnterpriseImportExcelDTO { private String placeTypeName; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + @NotBlank(message = "场所类别不能为空") + @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + private String placeCategoryName; + + @NotBlank(message = "场所区域不能为空") @ExcelProperty(value = "场所区域") private String gridName; @@ -72,6 +82,15 @@ public class EnterpriseImportExcelDTO { @ExcelProperty(value = "场所类型") private String placeTypeName; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + @ColumnWidth(20) + @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + private String placeCategoryName; + @ColumnWidth(20) @ExcelProperty(value = "场所区域") private String gridName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java index ac55be4e46..7ace7c5c5f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java @@ -86,7 +86,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener originList=icEnterpriseServiceImpl.selectForUniqueName(enterpriseEntity.getGridId(),enterpriseEntity.getPlaceOrgName(),null); @@ -117,6 +117,7 @@ public class IcEnterpriseExcelImportListener implements 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 bOu+xxGuS97)c^IW7D>j;i7CqXPx5~NM{eDn delta 5283 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 Date: Thu, 27 Oct 2022 10:43:07 +0800 Subject: [PATCH 13/47] =?UTF-8?q?=E6=9A=82=E6=8F=90=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmployeeRegisterListFormDTO.java | 41 +++++++++++++ .../result/EmployeeRegisterListResultDTO.java | 37 ++++++++++++ .../IcEmployeeRegisterController.java | 50 ++++++++++++++++ .../com/epmet/dao/IcEmployeeRegisterDao.java | 10 ++++ .../service/IcEmployeeRegisterService.java | 18 ++++++ .../impl/IcEmployeeRegisterServiceImpl.java | 59 +++++++++++++++++++ .../mapper/IcEmployeeRegisterDao.xml | 56 ++++++++++++++++++ 7 files changed, 271 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java new file mode 100644 index 0000000000..d1bac85f97 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/27 09:01 + */ +@Data +public class EmployeeRegisterListFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = -5327830228503748858L; + + private String customerId; + private String staffId; + private String agencyId; + + /** + * 核酸检测开始、结束日期，eg：2022-02-02 + */ + private String natStartDate; + private String natEndDate; + + /** + * 检查状态，1：已检测；0：未检测 + */ + private String checkStatus; + + private String placeOrgName; + + /** + * 场所类别：0九小场所、1企事业单位 + */ + private String placeCategory; + + private String name; + private String mobile; + private String idCard; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java new file mode 100644 index 0000000000..2411cb228b --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/27 09:10 + */ +@Data +public class EmployeeRegisterListResultDTO implements Serializable { + private static final long serialVersionUID = -7966608283208846072L; + + private String placeOrgName; + private String name; + private String mobile; + private String idCard; + private Integer ymjzCount; + private String latestNatTime; + private String dbCompare; + private String dbCompareName; + private String registerId; + + public EmployeeRegisterListResultDTO() { + this.placeOrgName = ""; + this.name = ""; + this.mobile = ""; + this.idCard = ""; + this.ymjzCount = NumConstant.ZERO; + this.latestNatTime = ""; + this.dbCompare = ""; + this.dbCompareName = ""; + this.registerId = ""; + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index 7e5e6d1e38..4b6672909e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -1,7 +1,11 @@ package com.epmet.controller; +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.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -9,6 +13,8 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.dto.form.EmployeeRegisterListFormDTO; +import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.service.IcEmployeeRegisterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,6 +49,12 @@ public class IcEmployeeRegisterController { return new Result().ok(data); } + /** + * @Description 新增 + * @param dto + * @Author zxc + * @Date 2022/10/27 08:57 + */ @NoRepeatSubmit @PostMapping("add") public Result save(@RequestBody IcEmployeeRegisterDTO dto){ @@ -61,9 +73,47 @@ public class IcEmployeeRegisterController { return new Result(); } + /** + * @Description 批量删除 + * @param ids + * @Author zxc + * @Date 2022/10/27 08:57 + */ @PostMapping("delete") public Result delete(@RequestBody List ids){ icEmployeeRegisterService.delete(ids); return new Result(); } + + /** + * @Description 员工疫情管理列表 + * @param formDTO + * @param tokenDto + * @Author zxc + * @Date 2022/10/27 09:15 + */ + @PostMapping("list") + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) + public Result> employeeRegisterList(@RequestBody EmployeeRegisterListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icEmployeeRegisterService.employeeRegisterList(formDTO)); + } + + /** + * @Description 员工疫情管理详情列表 + * @param formDTO + * @param tokenDto + * @Author zxc + * @Date 2022/10/27 09:22 + */ + @PostMapping("detailList") + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) + public Result> employeeRegisterDetailList(@RequestBody EmployeeRegisterListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icEmployeeRegisterService.employeeRegisterDetailList(formDTO)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index d287c78231..e5756c7a2b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -1,6 +1,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.EmployeeRegisterListFormDTO; +import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.entity.IcEmployeeRegisterEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,4 +34,12 @@ public interface IcEmployeeRegisterDao extends BaseDao */ void delRegisterDetail(@Param("registerIds")List registerIds); + /** + * @Description 员工疫情管理列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:15 + */ + List employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java index bf7f89162f..fdcbcc1b2a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java @@ -3,6 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.dto.form.EmployeeRegisterListFormDTO; +import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.entity.IcEmployeeRegisterEntity; import java.util.List; @@ -74,4 +76,20 @@ public interface IcEmployeeRegisterService extends BaseService ids); + + /** + * @Description 员工疫情管理列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:15 + */ + PageData employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + + /** + * @Description 员工疫情管理详情列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:22 + */ + PageData employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 792ea69b5b..f9d8b66383 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -3,15 +3,22 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.dto.form.EmployeeRegisterListFormDTO; +import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.entity.IcEmployeeRegisterDetailEntity; import com.epmet.entity.IcEmployeeRegisterEntity; import com.epmet.service.IcEmployeeRegisterDetailService; import com.epmet.service.IcEmployeeRegisterService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +72,12 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl ids) { @@ -98,4 +117,44 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl employeeRegisterList(EmployeeRegisterListFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + PageData result = new PageData<>(); + List list; + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + list = baseDao.employeeRegisterList(formDTO); + result.setList(list); + result.setTotal(list.size()); + } + // 数据库比对 + + return result; + } + + /** + * @Description 员工疫情管理详情列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:22 + */ + @Override + public PageData employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO) { + return null; + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 0509004b8e..b1bf72b8dc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -19,4 +19,60 @@ select * from ic_employee_register where del_flag = 0 and id_card = #{idCard} + + + \ No newline at end of file From 0f2a1e08be89040e170e76e7c94da6d28d0f2ac4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 11:16:00 +0800 Subject: [PATCH 14/47] =?UTF-8?q?=E5=8F=97=E4=BC=97=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/GroupPeopleRegisterListFormDTO.java | 27 ++++++++++++++ .../GroupPeopleRegisterListResultDTO.java | 20 +++++++++++ .../IcGroupPeopleRegisterController.java | 20 +++++++++++ .../epmet/dao/IcGroupPeopleRegisterDao.java | 8 ++++- .../service/IcGroupPeopleRegisterService.java | 11 ++++++ .../IcGroupPeopleRegisterServiceImpl.java | 35 +++++++++++++++++++ .../mapper/IcEmployeeRegisterDao.xml | 2 +- .../mapper/IcGroupPeopleRegisterDao.xml | 22 ++++++++++++ 8 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupPeopleRegisterListFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupPeopleRegisterListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupPeopleRegisterListFormDTO.java new file mode 100644 index 0000000000..d9c82abb2b --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupPeopleRegisterListFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/27 10:47 + */ +@Data +public class GroupPeopleRegisterListFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = 6837328932168590069L; + + private String customerId; + private String staffId; + private String agencyId; + + /** + * 核酸检测开始、结束日期，eg：2022-02-02 + */ + private String natStartDate; + private String natEndDate; + + private String placeOrgName; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java new file mode 100644 index 0000000000..172d875f03 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/27 10:53 + */ +@Data +public class GroupPeopleRegisterListResultDTO implements Serializable { + private static final long serialVersionUID = -3000826126115218664L; + + private String placeOrgName; + private String natTime; + private String szTotal; + private String hsjcTotal; + private String id; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index 31d6189892..60b4d04d47 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.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.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -9,6 +12,8 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; +import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.service.IcGroupPeopleRegisterService; import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; @@ -68,4 +73,19 @@ public class IcGroupPeopleRegisterController { return new Result(); } + /** + * @Description 受众群体列表 + * @param tokenDto + * @param formDTO + * @Author zxc + * @Date 2022/10/27 10:51 + */ + @PostMapping("list") + public Result> groupPeopleRegisterList(@LoginUser TokenDto tokenDto, @RequestBody GroupPeopleRegisterListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icGroupPeopleRegisterService.groupPeopleRegisterList(formDTO)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java index b60b0155c0..f8dbd340e7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; +import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 受众群体登记表 * @@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcGroupPeopleRegisterDao extends BaseDao { - + + List groupPeopleRegisterList(GroupPeopleRegisterListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java index 818c92f448..bf9da45602 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -3,6 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; +import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import java.util.List; @@ -74,4 +76,13 @@ public interface IcGroupPeopleRegisterService extends BaseService ids); + + /** + * @Description 受众群体列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 10:51 + */ + PageData groupPeopleRegisterList(GroupPeopleRegisterListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java index 8f4920bdee..abb40f2269 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -3,13 +3,21 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcGroupPeopleRegisterDao; import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; +import com.epmet.dto.result.EmployeeRegisterListResultDTO; +import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import com.epmet.service.IcGroupPeopleRegisterService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -82,4 +90,31 @@ public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl groupPeopleRegisterList(GroupPeopleRegisterListFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + PageData result = new PageData<>(); + List list; + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.groupPeopleRegisterList(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + list = baseDao.groupPeopleRegisterList(formDTO); + result.setList(list); + result.setTotal(list.size()); + } + return result; + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index b1bf72b8dc..cc07dec0d6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -37,7 +37,7 @@ ie.PLACE_ORG_NAME, ie.PLACE_CATEGORY FROM ic_enterprise ie - left join JOIN ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 + left join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml index 5b4d514d4c..6e1d642ad1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml @@ -3,4 +3,26 @@ + \ No newline at end of file From 860fd66421d61f9581c3b5f69f76f9f83d35ec33 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 12:35:37 +0800 Subject: [PATCH 15/47] test --- .../IcEmployeeRegisterController.java | 6 ++---- .../IcGroupPeopleRegisterController.java | 10 +++++---- .../impl/IcEmployeeRegisterServiceImpl.java | 21 ++++++++++--------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index 4b6672909e..b31e4f7b7a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -7,11 +7,10 @@ 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.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.dto.IcEmployeeRegisterDTO; import com.epmet.dto.form.EmployeeRegisterListFormDTO; import com.epmet.dto.result.EmployeeRegisterListResultDTO; @@ -19,7 +18,6 @@ import com.epmet.service.IcEmployeeRegisterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -50,7 +48,7 @@ public class IcEmployeeRegisterController { } /** - * @Description 新增 + * @Description 新增 员工登记：http://yapi.elinkservice.cn/project/102/interface/api/8214 * @param dto * @Author zxc * @Date 2022/10/27 08:57 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index 31d6189892..0c92958083 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -3,18 +3,15 @@ package com.epmet.controller; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; 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.dto.IcGroupPeopleRegisterDTO; import com.epmet.service.IcGroupPeopleRegisterService; -import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -44,6 +41,11 @@ public class IcGroupPeopleRegisterController { return new Result().ok(data); } + /** + * 受众群体登记 http://yapi.elinkservice.cn/project/102/interface/api/8220 + * @param dto + * @return + */ @NoRepeatSubmit @PostMapping("add") public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index f9d8b66383..9e4d1b5058 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -3,12 +3,12 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.dto.form.EmployeeRegisterListFormDTO; @@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; import java.util.List; import java.util.Map; @@ -81,17 +80,19 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl Date: Thu, 27 Oct 2022 12:40:17 +0800 Subject: [PATCH 16/47] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E3=80=81=E5=8F=97=E4=BC=97=E7=BE=A4=E4=BD=93=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E9=99=90=E5=88=B6token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 0aeca8950b..3fa85a8919 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -522,6 +522,9 @@ epmet: - /gov/org/ichouse/houseoption - /epmetuser/icresicollect/save - /gov/org/customergrid/gridoption + # 员工登记、受众群体登记 + - /gov/org/icEmployeeRegister/add + - /gov/org/icGroupPeopleRegister/add # 外部应用认证，使用AccessToken等头进行认证 externalOpenUrls: - /data/report/** From ad10113dba736a3d226462cbec3042c079ec537b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 13:04:50 +0800 Subject: [PATCH 17/47] =?UTF-8?q?=E4=B8=8D=E5=81=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/EmployeeRegisterListResultDTO.java | 4 ---- .../com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java | 2 -- 2 files changed, 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java index 2411cb228b..047c5374dd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java @@ -19,8 +19,6 @@ public class EmployeeRegisterListResultDTO implements Serializable { private String idCard; private Integer ymjzCount; private String latestNatTime; - private String dbCompare; - private String dbCompareName; private String registerId; public EmployeeRegisterListResultDTO() { @@ -30,8 +28,6 @@ public class EmployeeRegisterListResultDTO implements Serializable { this.idCard = ""; this.ymjzCount = NumConstant.ZERO; this.latestNatTime = ""; - this.dbCompare = ""; - this.dbCompareName = ""; this.registerId = ""; } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 9e4d1b5058..64086e6e90 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -142,8 +142,6 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl Date: Thu, 27 Oct 2022 13:07:09 +0800 Subject: [PATCH 18/47] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=99=BB=E8=AE=B0=EF=BC=8C=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E5=94=AF=E4=B8=80=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEmployeeRegisterServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 64086e6e90..aecf01c5ca 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.Map; @@ -88,9 +89,12 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl Date: Thu, 27 Oct 2022 13:30:51 +0800 Subject: [PATCH 19/47] =?UTF-8?q?/gov/issue/issuevotedetail/joinvote?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IssueVoteDetailServiceImpl.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java index eedfd2bb77..e0c4f58193 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -46,6 +47,7 @@ import com.epmet.redis.IssueVoteDetailRedis; import com.epmet.service.IssueService; import com.epmet.service.IssueVoteDetailService; import com.epmet.utils.ModuleConstants; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -207,10 +209,21 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(IssueVoteDetailEntity::getIssueId,checkVoteFormDTO.getIssueId()) + .eq(IssueVoteDetailEntity::getCreatedBy,checkVoteFormDTO.getUserId()) + .orderByDesc(IssueVoteDetailEntity::getCreatedTime); + List list=baseDao.selectList(queryWrapper); + if(CollectionUtils.isNotEmpty(list)){ resultDTO.setJoinVote(true); - resultDTO.setAttitude(issueVoteDetailDTO.getAttitude()); + resultDTO.setAttitude(list.get(0).getAttitude()); return resultDTO; } if (issuePublisher > NumConstant.ZERO || publisherResult.getCheckTopicPublisher() > NumConstant.ZERO){ From d66b524f1f318b4f7be184d108b576176c13a076 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 13:33:45 +0800 Subject: [PATCH 20/47] /gov/issue/issuevotestatistical/votecount --- .../src/main/resources/mapper/IssueVoteStatisticalDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml index fa89630a63..8026d7b5ed 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml @@ -39,6 +39,7 @@ del_flag = 0 AND issue_id = #{issueId} AND created_by = #{userId} + order by CREATED_TIME desc limit 1 From bf479207d7fa619d3d7009d2609d6f0211fda95f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 13:49:45 +0800 Subject: [PATCH 21/47] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmployeeRegisterListFormDTO.java | 9 +++++++ .../IcEmployeeRegisterController.java | 2 +- .../com/epmet/dao/IcEmployeeRegisterDao.java | 8 ++++++ .../impl/IcEmployeeRegisterServiceImpl.java | 13 +++++++++- .../mapper/IcEmployeeRegisterDao.xml | 26 ++++++++++++++++++- 5 files changed, 55 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java index d1bac85f97..85f2da1d18 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -38,4 +39,12 @@ public class EmployeeRegisterListFormDTO extends PageFormDTO implements Serializ private String name; private String mobile; private String idCard; + + public interface RegisterDetailList{} + + /** + * 人员详情列表使用 + */ + @NotBlank(message = "registerId不能为空",groups = RegisterDetailList.class) + private String registerId; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index b31e4f7b7a..4df78f16b3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -109,7 +109,7 @@ public class IcEmployeeRegisterController { @PostMapping("detailList") @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) public Result> employeeRegisterDetailList(@RequestBody EmployeeRegisterListFormDTO formDTO, @LoginUser TokenDto tokenDto){ - ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class, EmployeeRegisterListFormDTO.RegisterDetailList.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icEmployeeRegisterService.employeeRegisterDetailList(formDTO)); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index e5756c7a2b..56843e67c7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -42,4 +42,12 @@ public interface IcEmployeeRegisterDao extends BaseDao */ List employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + /** + * @Description 员工疫情管理详情列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 13:24 + */ + List employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index aecf01c5ca..5748cde435 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -157,7 +157,18 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO) { - return null; + PageData result = new PageData<>(); + List list; + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterDetailList(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + list = baseDao.employeeRegisterDetailList(formDTO); + result.setTotal(list.size()); + result.setList(list); + } + return result; } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index cc07dec0d6..177aae0e96 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -37,7 +37,7 @@ ie.PLACE_ORG_NAME, ie.PLACE_CATEGORY FROM ic_enterprise ie - left join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 + INNER join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') @@ -75,4 +75,28 @@ GROUP BY t.registerId ORDER BY LATEST_NAT_TIME desc + + + \ No newline at end of file From 0fe5fce924a28eeecf4319285005860129186efc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 13:51:37 +0800 Subject: [PATCH 22/47] 1 --- .../controller/IcEmployeeRegisterController.java | 6 +++--- .../controller/IcGroupPeopleRegisterController.java | 2 +- .../java/com/epmet/dao/IcEmployeeRegisterDao.java | 2 +- .../epmet/service/IcEmployeeRegisterService.java | 2 +- .../service/impl/IcEmployeeRegisterServiceImpl.java | 13 ++++++++++--- .../main/resources/mapper/IcEmployeeRegisterDao.xml | 3 ++- .../resources/mapper/IcGroupPeopleRegisterDao.xml | 4 ++-- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index b31e4f7b7a..9ebbfef654 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -72,14 +72,14 @@ public class IcEmployeeRegisterController { } /** - * @Description 批量删除 + * @Description 批量删除 http://yapi.elinkservice.cn/project/102/interface/api/8238 * @param ids * @Author zxc * @Date 2022/10/27 08:57 */ @PostMapping("delete") - public Result delete(@RequestBody List ids){ - icEmployeeRegisterService.delete(ids); + public Result delete(@LoginUser TokenDto tokenDto,@RequestBody List ids){ + icEmployeeRegisterService.delete(ids,tokenDto.getUserId()); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index 200e985304..f618805920 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -76,7 +76,7 @@ public class IcGroupPeopleRegisterController { } /** - * @Description 受众群体列表 + * @Description 受众群体列表 http://yapi.elinkservice.cn/project/102/interface/api/8244 * @param tokenDto * @param formDTO * @Author zxc diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index e5756c7a2b..06ad450b4a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -32,7 +32,7 @@ public interface IcEmployeeRegisterDao extends BaseDao * @Author zxc * @Date 2022/10/26 17:34 */ - void delRegisterDetail(@Param("registerIds")List registerIds); + void delRegisterDetail(@Param("registerIds")List registerIds,@Param("operUserId")String operUserId); /** * @Description 员工疫情管理列表 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java index fdcbcc1b2a..ebaa0a4d8b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java @@ -75,7 +75,7 @@ public interface IcEmployeeRegisterService extends BaseService ids); + void delete(List ids,String operUserId); /** * @Description 员工疫情管理列表 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index aecf01c5ca..43b383d283 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -1,9 +1,11 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -115,10 +117,15 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl ids) { + public void delete(List ids,String operUserId) { if (CollectionUtils.isNotEmpty(ids)){ - baseDao.deleteBatchIds(ids); - baseDao.delRegisterDetail(ids); + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.in(IcEmployeeRegisterEntity::getId,ids); + updateWrapper.set(IcEmployeeRegisterEntity::getDelFlag, NumConstant.ONE_STR) + .set(IcEmployeeRegisterEntity::getUpdatedBy,operUserId) + .set(IcEmployeeRegisterEntity::getUpdatedTime,new Date()); + baseDao.update(null,updateWrapper); + baseDao.delRegisterDetail(ids,operUserId); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index cc07dec0d6..0be6f12084 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -7,7 +7,8 @@ update ic_employee_register_detail set del_flag = 1, - updated_time = NOW() + updated_time = NOW(), + UPDATED_BY = #{operUserId} where REGISTER_ID in ( #{registerId} diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml index 6e1d642ad1..ea2a031caa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml @@ -13,7 +13,7 @@ FROM ic_enterprise ie INNER JOIN ic_group_people_register pr ON pr.ENTERPRISE_ID = ie.ID AND pr.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 - AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') AND ie.PLACE_ORG_NAME LIKE CONCAT('%',#{placeOrgName},'%') @@ -23,6 +23,6 @@ AND DATE_FORMAT(pr.NAT_TIME,'%Y-%m-%d') >= #{natEndDate} - ORDER BY pr.NAT_TIME DESC + ORDER BY pr.NAT_TIME DESC,pr.CREATED_TIME desc \ No newline at end of file From 7a3cc5a0deca1f33ac76e58d6b39017e07621151 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 14:09:40 +0800 Subject: [PATCH 23/47] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=84=B1=E6=95=8F?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dao/govorg/CustomerAgencyDao.java | 9 +++++++++ .../epmetuser/impl/EpmetUserServiceImpl.java | 8 ++++++++ .../dataaggre/service/govorg/GovOrgService.java | 9 +++++++++ .../service/govorg/impl/GovOrgServiceImpl.java | 11 +++++++++++ .../resources/mapper/govorg/CustomerAgencyDao.xml | 5 +++++ .../com/epmet/constant/NeighborhoodConstant.java | 5 +++++ .../com/epmet/dto/form/DetailByTypeFormDTO.java | 13 +++++++++++++ 7 files changed, 60 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index 7c3bbfd838..3e80bbf9ba 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -26,6 +26,7 @@ import org.apache.ibatis.annotations.Param; import java.util.LinkedList; import java.util.List; +import java.util.Map; /** * 机关单位信息表 @@ -110,4 +111,12 @@ public interface CustomerAgencyDao extends BaseDao { List getSubAgencyList(@Param("agencyId") String agencyId); List getSubAgencyListByAgency(@Param("customerId") String customerId, @Param("agencyId") String agencyId); + + /** + * @Description 查询员工的证件号和手机号 + * @param registerId + * @Author zxc + * @Date 2022/10/27 14:03 + */ + Map getEmployeeRegisterMobileAndIdCard(@Param("registerId") String registerId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index bbde669a5c..f6de7bd634 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -1095,6 +1095,14 @@ public class EpmetUserServiceImpl implements EpmetUserService { result.setIdCard(info.get(NeighborhoodConstant.ID_CARD)); result.setMobile(info.get(NeighborhoodConstant.MOBILE)); msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(核酸检测信息)"); + }else if (formDTO.getType().equals(NeighborhoodConstant.EMPLOYEE_EPIDEMIC_MANAGE_DETAIL)){ + Map info = govOrgService.getEmployeeRegisterMobileAndIdCard(formDTO.getId()); + if (null == info){ + throw new EpmetException("未查询到员工登记信息："+formDTO.getId()); + } + result.setIdCard(info.get(NeighborhoodConstant.ID_CARD)); + result.setMobile(info.get(NeighborhoodConstant.MOBILE)); + msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(员工登记信息)"); } // 发送mq消息 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 8c92a4004e..7464db5e2b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -17,6 +17,7 @@ import com.epmet.dto.IcNeighborHoodDTO; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; /** * @Author zxc @@ -292,4 +293,12 @@ public interface GovOrgService { ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid); + /** + * @Description 查询员工的证件号和手机号 + * @param registerId + * @Author zxc + * @Date 2022/10/27 14:03 + */ + Map getEmployeeRegisterMobileAndIdCard(String registerId); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 7265e9bcae..196126509c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1523,4 +1523,15 @@ public class GovOrgServiceImpl implements GovOrgService { return resultDTO; } + /** + * @Description 查询员工的证件号和手机号 + * @param registerId + * @Author zxc + * @Date 2022/10/27 14:03 + */ + @Override + public Map getEmployeeRegisterMobileAndIdCard(String registerId) { + return customerAgencyDao.getEmployeeRegisterMobileAndIdCard(registerId); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 9af0849b72..90f40009c2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -326,4 +326,9 @@ AND pid = #{agencyId} + + + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java index 261b951496..9a8a2a145d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java @@ -63,4 +63,9 @@ public interface NeighborhoodConstant { */ String FOCUS_GROUP_SPECIAL_ATTENTION_HISTORY = "focusGroupSpecialAttentionHistory"; + /** + * 员工疫情管理详情 + */ + String EMPLOYEE_EPIDEMIC_MANAGE_DETAIL = "employeeEpidemicManageDetail"; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java index 45fc98f517..8a2d6c0444 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java @@ -17,6 +17,19 @@ public class DetailByTypeFormDTO implements Serializable { public interface DetailByTypeForm{} + /** + * 房屋：checkHouse + * 居民：checkIcResiUser + * 居民防疫信息：JMFYXX + * 行程随访：routeFollow + * 疫苗接种记录：vaccinationRecord + * 疫苗接种关注名单：vaccineSpecialAttention + * 未做核酸比对：noNatCompare + * 核酸检测记录：natRecord + * 重点人群关注名单【防疫隔离】：focusGroupSpecialAttentionQuarantine + * 重点人群关注名单【历史记录】：focusGroupSpecialAttentionHistory + * 员工疫情管理详情：employeeEpidemicManageDetail + */ @NotBlank(message = "type不能为空",groups = DetailByTypeForm.class) private String type; From 6242f3fd2880fd1139f14ebcbc849de6b7443270 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 14:13:25 +0800 Subject: [PATCH 24/47] 2 --- .../IcGroupPeopleRegisterController.java | 10 ++++++-- .../service/IcGroupPeopleRegisterService.java | 2 +- .../IcGroupPeopleRegisterServiceImpl.java | 25 ++++++++++++++----- .../mapper/IcEmployeeRegisterDao.xml | 2 +- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index f618805920..01b394c759 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -69,9 +69,15 @@ public class IcGroupPeopleRegisterController { return new Result(); } + /** + * 受众群体管理删除 + * http://yapi.elinkservice.cn/project/102/interface/api/8250 + * @param ids + * @return + */ @PostMapping("delete") - public Result delete(@RequestBody List ids){ - icGroupPeopleRegisterService.delete(ids); + public Result delete(@LoginUser TokenDto tokenDto,@RequestBody List ids){ + icGroupPeopleRegisterService.delete(ids,tokenDto.getUserId()); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java index bf9da45602..9dcad3b267 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -75,7 +75,7 @@ public interface IcGroupPeopleRegisterService extends BaseService ids); + void delete(List ids,String operUserId); /** * @Description 受众群体列表 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java index abb40f2269..e0ca969f52 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -1,18 +1,19 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcGroupPeopleRegisterDao; import com.epmet.dto.IcGroupPeopleRegisterDTO; import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; -import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import com.epmet.service.IcGroupPeopleRegisterService; @@ -20,11 +21,10 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -82,11 +82,24 @@ public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl ids) { + public void delete(List ids,String operUserId) { if (CollectionUtils.isNotEmpty(ids)){ - baseDao.deleteBatchIds(ids); + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.in(IcGroupPeopleRegisterEntity::getId,ids) + .set(IcGroupPeopleRegisterEntity::getUpdatedBy,operUserId) + .set(IcGroupPeopleRegisterEntity::getUpdatedTime,new Date()) + .set(IcGroupPeopleRegisterEntity::getDelFlag, NumConstant.ONE_STR); + baseDao.update(null,updateWrapper); + // baseDao.deleteBatchIds(ids); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 62e0750a54..fcb029f4e1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -98,6 +98,6 @@ AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} - ORDER BY LATEST_NAT_TIME DESC + ORDER BY rd.LATEST_NAT_TIME DESC,rd.CREATED_TIME desc \ No newline at end of file From 1865752ec3dec9e0befd2c9de9d4d2709a5029b8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 14:31:57 +0800 Subject: [PATCH 25/47] SCALE_TOTAL --- .../gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index bc7c954052..ea64f9507d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -49,6 +49,7 @@ ie.LONGITUDE, ie.LATITUDE, ie.SCALE, + ie.SCALE_TOTAL, ie.PERSON_IN_CHARGE, ie.MOBILE, ie.SOURCE_TYPE, From 93948c6ceae6c6addb9140b1bfb35784f84c6efb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 14:38:54 +0800 Subject: [PATCH 26/47] employeeRegisterList --- .../resources/mapper/IcEmployeeRegisterDao.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index fcb029f4e1..4d0404334d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -41,7 +41,13 @@ INNER join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 - AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} + + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + ORDER BY rd.CREATED_TIME DESC )t where 1=1 @@ -54,6 +60,14 @@ AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + + + AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natStartDate} + + + AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natEndDate} + + From 28220074b437770561feb98c2a7af4590f80483e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 14:47:43 +0800 Subject: [PATCH 27/47] =?UTF-8?q?checkStatus=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcEmployeeRegisterDao.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 4d0404334d..dbda4a3d7b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -42,11 +42,13 @@ left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} - - - AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} + + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + ORDER BY rd.CREATED_TIME DESC )t From aa5c2aaccf6786a4ac2b6d5393952e7063439a4d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 15:48:43 +0800 Subject: [PATCH 28/47] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmployeeRegisterListFormDTO.java | 3 + .../result/EmployeeRegisterListResultDTO.java | 3 + .../constant/CustomerAgencyConstant.java | 2 +- .../com/epmet/dao/IcEmployeeRegisterDao.java | 2 + .../impl/IcEmployeeRegisterServiceImpl.java | 18 ++-- .../mapper/IcEmployeeRegisterDao.xml | 87 ++++++++++++------- 6 files changed, 79 insertions(+), 36 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java index 85f2da1d18..7a2fb690e2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.List; /** * @Author zxc @@ -47,4 +48,6 @@ public class EmployeeRegisterListFormDTO extends PageFormDTO implements Serializ */ @NotBlank(message = "registerId不能为空",groups = RegisterDetailList.class) private String registerId; + + private List registerIds; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java index 047c5374dd..98ddd2ab8c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java @@ -21,6 +21,8 @@ public class EmployeeRegisterListResultDTO implements Serializable { private String latestNatTime; private String registerId; + private String agencyId; + public EmployeeRegisterListResultDTO() { this.placeOrgName = ""; this.name = ""; @@ -29,5 +31,6 @@ public class EmployeeRegisterListResultDTO implements Serializable { this.ymjzCount = NumConstant.ZERO; this.latestNatTime = ""; this.registerId = ""; + this.agencyId = ""; } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java index c41372e2a7..aede67b81e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java @@ -90,6 +90,6 @@ public interface CustomerAgencyConstant { String AREA_CODE_SWITCH_OPEN="open"; - String JUMP_URL = "http://192.168.1.140/epmet-oper/#/staffRegister?"; + String JUMP_URL = "http://192.168.1.140/epmet-oper-gov/#/staffRegister?"; // String JUMP_URL = "https://epmet-open.elinkservice.cn/epmet-oper-gov/#/staffRegister?"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index a0752de3bd..2211398af1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.dto.form.EmployeeRegisterListFormDTO; import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.entity.IcEmployeeRegisterEntity; @@ -41,6 +42,7 @@ public interface IcEmployeeRegisterDao extends BaseDao * @Date 2022/10/27 09:15 */ List employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + List employeeRegisterListNoCheck(EmployeeRegisterListFormDTO formDTO); /** * @Description 员工疫情管理详情列表 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index d10f34ec98..621e7e29fc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 员工登记表 @@ -144,14 +145,21 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl result = new PageData<>(); List list; + // 未核酸检测的查询，根据所有企业下登记过的员工，筛出时间段内已检测的，剩下的就是未检测 if (formDTO.getIsPage()){ - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); + PageInfo pageInfo = new PageInfo<>(); + if (formDTO.getCheckStatus().equals(NumConstant.ONE_STR)){ + pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); + }else { + // 已检测 + List checked = baseDao.employeeRegisterList(formDTO); + if (CollectionUtils.isNotEmpty(checked)){ + formDTO.setRegisterIds(checked.stream().map(m -> m.getRegisterId()).collect(Collectors.toList())); + pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterListNoCheck(formDTO)); + } + } result.setList(pageInfo.getList()); result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); - }else { - list = baseDao.employeeRegisterList(formDTO); - result.setList(list); - result.setTotal(list.size()); } return result; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index dbda4a3d7b..148c22758d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -36,44 +36,22 @@ ier.ID_CARD, ier.ENTERPRISE_ID, ie.PLACE_ORG_NAME, - ie.PLACE_CATEGORY + ie.PLACE_CATEGORY, + ie.AGENCY_ID FROM ic_enterprise ie INNER join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - - AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} - - - AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} - - ORDER BY rd.CREATED_TIME DESC )t where 1=1 - - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} - - - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natStartDate} - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natEndDate} - - - - - - + + AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} + + + AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + AND PLACE_ORG_NAME LIKE CONCAT('%',#{placeOrgName},'%') @@ -102,6 +80,7 @@ rd.YMJZ_COUNT, rd.LATEST_NAT_TIME, ie.PLACE_ORG_NAME, + ie.AGENCY_ID, ier.ID AS registerId FROM ic_employee_register ier LEFT JOIN ic_enterprise ie ON ie.ID = ier.ENTERPRISE_ID AND ie.DEL_FLAG = 0 @@ -116,4 +95,52 @@ ORDER BY rd.LATEST_NAT_TIME DESC,rd.CREATED_TIME desc + + \ No newline at end of file From 1a74189caa9b9eadbc20ececcbd775cf3673a897 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 16:24:13 +0800 Subject: [PATCH 29/47] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcEmployeeRegisterDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 148c22758d..21be167f64 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -120,9 +120,9 @@ ORDER BY rd.CREATED_TIME DESC )t where 1=1 - AND registerId NOT IN ( - - #{id} + AND ( + + registerId != #{id} ) From db7ac81a2eb4fe63d3eb22f1b6c4f955a97ee196 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 17:34:53 +0800 Subject: [PATCH 30/47] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcEmployeeRegisterDao.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 21be167f64..5bb4bb0533 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -42,7 +42,13 @@ INNER join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 - AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} + + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + ORDER BY rd.CREATED_TIME DESC )t where 1=1 From 1afa6cd9130ae9ff7373fd65004b01a75e599688 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 28 Oct 2022 10:14:25 +0800 Subject: [PATCH 31/47] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E3=80=81=E5=91=98=E5=B7=A5=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E8=A1=A8=E3=80=81=E6=89=8B=E4=B8=AD=E7=BE=A4=E4=BD=93?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.46__ic_employee.sql | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.46__ic_employee.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.46__ic_employee.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.46__ic_employee.sql new file mode 100644 index 0000000000..cb637f8d03 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.46__ic_employee.sql @@ -0,0 +1,48 @@ +CREATE TABLE `ic_employee_register` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `ENTERPRISE_ID` varchar(64) NOT NULL COMMENT '场所id', + `NAME` varchar(64) NOT NULL COMMENT '姓名', + `MOBILE` varchar(32) NOT NULL COMMENT '手机号', + `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号或护照号', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + KEY `IDX_ENTERPRISE_ID` (`ENTERPRISE_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='员工登记表'; + +CREATE TABLE `ic_employee_register_detail` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `REGISTER_ID` varchar(64) NOT NULL COMMENT 'ic_employee_register.ID', + `YMJZ_COUNT` int(11) NOT NULL COMMENT '疫苗接种次数：0,1,2,3', + `LATEST_NAT_TIME` date NOT NULL COMMENT '最近一次核酸检测时间：yyyy-MM-dd 日期', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + KEY `IDX_REGISTER_ID` (`REGISTER_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='员工登记明细表'; + +CREATE TABLE `ic_group_people_register` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `ENTERPRISE_ID` varchar(64) NOT NULL COMMENT '场所id', + `NAT_TIME` date NOT NULL COMMENT '核酸检测时间：yyyy-MM-dd 日期', + `SZ_TOTAL` int(11) NOT NULL COMMENT '受众人数', + `HSJC_TOTAL` int(11) NOT NULL COMMENT '核酸检测人数', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='受众群体登记表'; \ No newline at end of file From 64258a109119c3abb0dc7f18fcc779e8fbc6b97b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 28 Oct 2022 10:29:31 +0800 Subject: [PATCH 32/47] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcEnterpriseServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index a06d5c9d48..e565219ed6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -598,6 +598,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl list = list(formDTO).getList(); if (CollectionUtils.isEmpty(list)){ + log.error("根据条件未查询到企事业单位信息，登记码压缩包不能导出！"); return; } response.reset(); From b26072e40ae49fb222c1927f5acaf1cd2f73c917 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 28 Oct 2022 11:43:16 +0800 Subject: [PATCH 33/47] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=9C=BA=E6=89=80?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEnterpriseServiceImpl.java | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index e565219ed6..bb74a15548 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -14,6 +14,7 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.CommonOperateTypeEnum; import com.epmet.commons.tools.enums.CoveragePlaceTypeEnum; import com.epmet.commons.tools.enums.DictTypeEnum; +import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -69,7 +70,6 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import static com.epmet.constant.CustomerAgencyConstant.JUMP_URL; import static com.epmet.service.impl.HouseServiceImpl.bufferedImageToInputStream; /** @@ -590,12 +590,21 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl list = list(formDTO).getList(); if (CollectionUtils.isEmpty(list)){ log.error("根据条件未查询到企事业单位信息，登记码压缩包不能导出！"); @@ -611,9 +620,31 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl Date: Fri, 28 Oct 2022 17:15:13 +0800 Subject: [PATCH 36/47] emm --- .../com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index ef4b424c63..daf6e7d1f5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -144,7 +144,6 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl result = new PageData<>(); - List list; // 未核酸检测的查询，根据所有企业下登记过的员工，筛出时间段内已检测的，剩下的就是未检测 if (formDTO.getIsPage()){ PageInfo pageInfo = new PageInfo<>(); From 34b9a4cceb3b37f23f27bfa2b640b5afe476ffd8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 10:11:50 +0800 Subject: [PATCH 37/47] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/EnterpriseImportExcelDTO.java | 7 +++--- .../IcEnterpriseExcelImportListener.java | 21 +++++++++--------- .../service/impl/IcEnterpriseServiceImpl.java | 6 ++--- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9302 -> 9306 bytes 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 64c847d684..2622dfccda 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -27,7 +27,7 @@ public class EnterpriseImportExcelDTO { * 默认0 */ @NotBlank(message = "场所类别不能为空") - @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + @ExcelProperty(value = "场所类别") private String placeCategoryName; @@ -56,10 +56,11 @@ public class EnterpriseImportExcelDTO { * 2:21-40人 * 3:41-100人 * 4:100人以上】 + * 改为手输数字了 */ @NotBlank(message = "规模不能为空") @ExcelProperty(value = "规模") - private String scaleName; + private Integer scaleTotal; /** * 场所负责人 @@ -108,7 +109,7 @@ public class EnterpriseImportExcelDTO { @ColumnWidth(20) @ExcelProperty(value = "规模") - private String scaleName; + private Integer scaleTotal; @ColumnWidth(20) @ExcelProperty(value = "负责人") diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java index 7ace7c5c5f..5495dd6ff6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java @@ -54,6 +54,12 @@ public class IcEnterpriseExcelImportListener implements ReadListener dictList = coverageService.dictMap(customerId, CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode()); Map placeTypeMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); //2、规模名称 - Result> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode()); - Map scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>(); + // Result> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode()); + // Map scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>(); + Map scaleMap=new HashMap<>(); //3、当前工作人员所属组织下的网格列表 List gridList = customerGridDao.selectGridList(staffInfo.getAgencyId()); if (CollectionUtils.isEmpty(gridList)) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx index 4be3184e6c178ac5b260efa8ebeef20baada39a5..8a3e054eaa4fec430d85d648d20b8728c9529b0d 100644 GIT binary patch delta 1545 zcmV+k2KM>ZNZLrSlK})zoAJ|BM^HK| zWsH1}AO|EbMJAUqx=v^A1UcF;DOg@gh|vZ#nkL6b5w9pO6KQt{A^(OTYmkV_bk?f*FPzpj-7sv_lHsBdZ6Mw*bL0 z;OutHU;i&F|ye`NdT` zs+-AXR~%3h2~N2JW=fTOy}x~IU+szTpxSIOXWGo|vKJYM(@pZZefoHQiSTd5;@b2b z6NF>)&@TO6xe3qC(-}$v5(F+8yZ$5%0y-)>p@iHujSt>8`MN@}YyTh7CvNDcB%owO z!*D>{1CloP;h#vp0Z>Z=1e2j58nY?`l>rH(?3|g>0{{T^lgI=gf5lcyj~hi0z9aD; zMt$I9&uhK5*VvABy)lVIq=-j2_s+EK(e_MFdfJ}dTR0Fw9R)kkTY{DfgkOJ&F zgkLk`;D15&yfTAf*-Jzp+}+h*Ree=mUE}VBJ(nso!UKnSJ!GglQix|U+wsOd^!|Ip zdK)Q$z@CjM^GFZvf0F=R=)eA2H)MP_m=Gcqu;2wfG!eq@Xj))Rh>HW2`NV^h5#ufv zu;pVd@HxSDqU2J|)b*z3V#hnD0*gIvDmL zxE+T&Vm}EtCq%?cJ7E~Ap&zK0m$4`%$Y^Oq45oo#?lu+}^}ERpT;*E7YderddG!h> zqaNBcI+qLt@&s|sAz@HjD+2GlODM4fv7uCuB1>S0v0Vwg3?g0HP5{y(wuCby143yJ z4c4HFt|vZVe+dq>!b5qTdmAQ2bCoML8R01v14ch^Y%%Gfw%RU_4U|LPVc{j>j3)w^ zHPi-D*i=x*BX5%#p`hPGE$P={6r8}X;ySY4k>cXLG?>(ZX{e3zK#G;5F7uycr%*RD zb%-v^)OB^OJkC@HmWg+mGj*e_wn_uu-WlH4Gj*7AfA5BBmdBau%}gEUT)n9p<#DEZ zD^mxKIr)wMPMwxsKyv%C8v9+&LIqwb+=RTlHRwNS$i;0!<@i`O7^BmM0<$D~6W~&U z6wnDkI_v9QZ3eYuWr(d+gi%EdRuN_uvAv2|t0FG0A{tf1FhxM66inBvh__M%)KGzF zRuS+fe`T~~M5{n(kih&6r5Uv$uh%ejV3ti$vDnm;sf9FEj})=*LrbSlAdrG7W#JaZ z-foiDV8X)7o<9{=ND$yLz$6I}UgVtdiZFfGTPE0--F`~3(SPIml!-T^)34*7K8wGa zFFv_Zi+=wwn%|C29>jO=N6+u3h^|(sbhRqGe^<(O)9h>-dZWGGYOc~={&287I?iY> zp4|EK<8R_0e~wNMGSQ3YpT`G}Ys)Wxjqe@D_ix7Y!`h2KK8=r07f%ltzdX%h_r8th zkKC@Fx#y@smf3hu_uWJI|J1d|z7}ezbga^Z!l6(CiHVH4%m$&F9gxqv+&z zS3 zn4eVP4ioS#OO_M(KS7`$=qi9mjEQ^$tv)>)CPMkeDgLnZ{{oO6v$hDq5DCFR9{BM9 z004KBfEmj`*yWz~?0PzXJ`TAFz0a3#z#%th!_&D9=yETXw>(?15JPm!{1;mmKiRbl zL!xoY^Ub@TPucon{al2cJ}}_yv#1)o1p%d#WFSBU4IBUflRhFAlfEDt0Wp)=Ad>`7 zoZz3%l!9X7P@c;k-cL4wZ6aWAK000000RSKX004@Uw<19S v?34K-Isv(pG$S?v;FD`3Kmo0jtRr3tqwJiS(gOeh^^+4MJqA4>000006j#;! delta 1536 zcmV+b2LJimNY+TOlK}){oZpU@luhjr<9%FW>HJe{J15=wnC^22dTDH|r9FhcH{#s}}4d|jc~w*QY95}%IJkT5!6 z!*Gwd10-$k!#|OH1G5YRvjGVtYO|oR0{{R=lgI=gf3;RkkK05Tz9aD;tT}K>{I%I6 z8X?5(h4(EFc4P zNCdhte|-C`e$4p3m=Yp2kPwIgno1e=3`00m;$xw+kOXiuX57aTwtQlUkQ3}Gl1~lW zG~0%cy#Qqrdi*>x*m&$YWS2RSPXd_<;e=ud_KT?(ibC3fdoFn{$1(U?*i$iaH@hk2 zS*t1ddTQxs@XHC#Qe+0|Nd_M}CAUFi)_B`szL*;H^5Rre& ziQ`z0L!moCZbcvT6ClZqRyI5j0?5hl1=f<$_dJx4l^%^JR0ot~Dmn{V63USLL zv8b#yiT7?2N*qaCC>5loC9ucXehRz-M`kKp0aA(Bk=~5#5K0H=BA~@>r303rz$i6T zf7gY!kt&+&Tyx17M^x@G`l08_=>T>0Zgp&-0&;`Jmx(u-O0cY@w~)pnNxgtvB{M>S zKR}&Sufr%PfnUw{(t1alj}J0uG6lA!x2gkajtX6_Um0K0?VP>=vB>GBzEK@#(!oll z9p;>Fb@fhVz}q`R`({puxzKLuc6FRde{bh>m1=5BjTzLElOt5c z)e%-5v9m72t|NBW5gT>HrFBHBju>SKsFc#u%{t<}3;{J%BHDEXyvfwtDxy;&e+&p< z@rJU9x)9e}n0hd$O;K}L6o6-nM17x|^LgC`#LYM6oq|=XS*8yQ?3LRwt*)*YoA4A2pWG z?*IA8H_4AbEnXhwN3VZ>kQ_a2f2_XxC3$$7Ji43Aj~lQ5_&hm%xqN=S{P}qSd-&~Q z{xrGwIQjKt@!Q9X7hg7#XHS-oziTA-U#-6QzOg*MvwCtj)7dvlBlbO z*9gH72}E$vEe-(y0F{%W8OvQ7Pj=3Ix}hJUT>r_Q#wWYFpX`|Rw0G*0y}g>)bw2Ic z^>qGx9C8zSpD*8lLvGH7r*j+7xaV9UPO8A`lxyaL_Fd0RRA%0RR9L000000000103ZMW0BMuEB0&Mmll>w(0hp6G mBQ^oQlW!wH0jZO)BVGw4YO|oR0{{R=lNTgC200)A0001*ztFk> From 33be9d1dac0ca6004b8d5efc44611c511f42f626 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 10:39:31 +0800 Subject: [PATCH 38/47] =?UTF-8?q?=E8=A7=84=E6=A8=A1=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9306 -> 9242 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx index 8a3e054eaa4fec430d85d648d20b8728c9529b0d..6981727e9b23f266ebb7d0b0eff797a54175ec81 100644 GIT binary patch delta 4127 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 IAOHXW06s+zz5oCK From c4630fed5f16b9663ae4a3f3a1667c5cc2e4f10e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 10:58:29 +0800 Subject: [PATCH 39/47] NotNull --- .../main/java/com/epmet/excel/EnterpriseImportExcelDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 2622dfccda..91dfa20ed9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** @@ -58,7 +59,7 @@ public class EnterpriseImportExcelDTO { * 4:100人以上】 * 改为手输数字了 */ - @NotBlank(message = "规模不能为空") + @NotNull(message = "规模不能为空") @ExcelProperty(value = "规模") private Integer scaleTotal; From 5047e5e2b12ed2c3cadd1a1b90726042e247a16f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 11:17:32 +0800 Subject: [PATCH 40/47] =?UTF-8?q?ic=5Fepidemic=5Fspecial=5Fattention?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E9=95=BF=E5=BA=A6=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.79__epidemic_special_attention_idcard.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__epidemic_special_attention_idcard.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__epidemic_special_attention_idcard.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__epidemic_special_attention_idcard.sql new file mode 100644 index 0000000000..e7d3515689 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__epidemic_special_attention_idcard.sql @@ -0,0 +1 @@ +alter table ic_epidemic_special_attention MODIFY COLUMN ID_CARD VARCHAR(32) not null comment '身份证号'; \ No newline at end of file From 6947799849c956909b1de50d9f5e2283a009ae06 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 13:55:28 +0800 Subject: [PATCH 41/47] log(IcEnterpri --- .../entity/IcEnterpriseChangeRecordEntity.java | 4 ++++ .../service/impl/IcEnterpriseServiceImpl.java | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java index 119362360c..bdeca2e352 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java @@ -76,6 +76,10 @@ public class IcEnterpriseChangeRecordEntity extends BaseEpmetEntity { */ private String scale; + /** + * 规模，手输数字 + */ + private Integer scaleTotal; /** * 场所负责人 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 3633b40e6e..124cb7f02b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -1,7 +1,6 @@ package com.epmet.service.impl; import com.alibaba.excel.EasyExcel; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -13,7 +12,6 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.CommonOperateTypeEnum; import com.epmet.commons.tools.enums.CoveragePlaceTypeEnum; -import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -534,13 +532,13 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl scaleMap; + /*Map scaleMap; Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); if (!result.success() || null == result.getData()) { throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); } else { scaleMap = result.getData(); - } + }*/ if (formDTO != null) { if (!origin.getPlaceType().equals(formDTO.getPlaceType())) { @@ -562,12 +560,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl").concat(formDTO.getPlaceOrgName())); } - if (!origin.getScale().equals(formDTO.getScale())) { + /*if (!origin.getScale().equals(formDTO.getScale())) { record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); } else { record.setScale(scaleMap.get(origin.getScale())); + }*/ + if (origin.getScaleTotal() != formDTO.getScaleTotal()) { + record.setScale(origin.getScaleTotal().toString().concat("->").concat(formDTO.getScaleTotal().toString())); + } else { + record.setScale(origin.getScaleTotal().toString()); } - if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) { record.setPersonInCharge(origin.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); } @@ -586,6 +588,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl Date: Mon, 31 Oct 2022 14:31:42 +0800 Subject: [PATCH 42/47] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 1 + .../epmet/service/impl/IcEmployeeRegisterServiceImpl.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index ec9ee8c209..d7cb3ccd64 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -267,6 +267,7 @@ public enum EpmetErrorCode { NAT_RESULT_IS_NULL_ERROR(8932,"检测结果不能为空"), SAMPLE_TIME_IS_NULL_ERROR(8933,"采样时间不能为空"), SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"), + ID_CARD_ERROR(8935,"请输入正确的证件号"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index daf6e7d1f5..01f6f90e68 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -7,10 +7,13 @@ 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.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.dto.form.EmployeeRegisterListFormDTO; @@ -22,6 +25,7 @@ import com.epmet.service.IcEmployeeRegisterService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,6 +88,9 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl Date: Mon, 31 Oct 2022 16:52:37 +0800 Subject: [PATCH 43/47] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/exception/EpmetErrorCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index d7cb3ccd64..d0ebe0bf6d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -267,7 +267,7 @@ public enum EpmetErrorCode { NAT_RESULT_IS_NULL_ERROR(8932,"检测结果不能为空"), SAMPLE_TIME_IS_NULL_ERROR(8933,"采样时间不能为空"), SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"), - ID_CARD_ERROR(8935,"请输入正确的证件号"), + ID_CARD_ERROR(8935,"请输入正确的身份证号和护照号"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), From 0b93b6d0dde4dd8b4610683a9dc113e0b06cf18c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 31 Oct 2022 16:53:38 +0800 Subject: [PATCH 44/47] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/exception/EpmetErrorCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index d0ebe0bf6d..0bf690a8ea 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -267,7 +267,7 @@ public enum EpmetErrorCode { NAT_RESULT_IS_NULL_ERROR(8932,"检测结果不能为空"), SAMPLE_TIME_IS_NULL_ERROR(8933,"采样时间不能为空"), SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"), - ID_CARD_ERROR(8935,"请输入正确的身份证号和护照号"), + ID_CARD_ERROR(8935,"请输入正确的身份证号或护照号"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), From ffc956afccfab8a60c97e51b20fb45aa8b62a6fb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 17:34:58 +0800 Subject: [PATCH 45/47] placeCategory --- .../src/main/resources/mapper/IcEnterpriseDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index ea64f9507d..2b14cedbbb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -76,6 +76,9 @@ AND ie.PLACE_TYPE = #{placeType} + + AND ie.PLACE_CATEGORY = #{placeCategory} + AND ie.PLACE_ORG_NAME LIKE concat( '%', #{placeOrgName}, '%' ) From d52b927efe04d8151f524ebf72e1b4603ff5eb74 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 17:43:57 +0800 Subject: [PATCH 46/47] placeCategory --- .../src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java index 3c6c45d445..15bf7a402a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java @@ -18,7 +18,7 @@ public class EnterprisePageFormDTO implements Serializable { * 场所类型 */ private String placeType; - + private String placeCategory; /** * 场所名称 */ From 88d05d7a3958a20b53d5a634db074a484cbc3903 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 1 Nov 2022 08:59:11 +0800 Subject: [PATCH 47/47] url --- .../java/com/epmet/service/impl/IcEnterpriseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 124cb7f02b..679dde5615 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -637,7 +637,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl