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-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 af4142237d..440254e6a3 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,"请输入正确的身份证号或护照号"), DANGER_AREA_ERROR(8937,"风险地区已存在"), 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/** 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-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){ 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 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/IcEmployeeRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java new file mode 100644 index 0000000000..365cf14365 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java @@ -0,0 +1,97 @@ +package com.epmet.dto; + +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; +import javax.validation.constraints.NotNull; + + +/** + * 员工登记表 + * + * @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 + */ + @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}) + @JsonFormat(pattern="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/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..f3342f1177 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java @@ -0,0 +1,91 @@ +package com.epmet.dto; + +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; +import javax.validation.constraints.NotNull; + + +/** + * 受众群体登记表 + * + * @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 + */ + @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}) + @JsonFormat(pattern="yyyy-MM-dd") + private Date natTime; + + /** + * 受众人数 + */ + @NotNull(message = "szTotal不能为空",groups = {AddGroup.class}) + private Integer szTotal; + + /** + * 核酸检测人数 + */ + @NotNull(message = "customerId不能为空",groups = {AddGroup.class}) + 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-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; 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..7a2fb690e2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java @@ -0,0 +1,53 @@ +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; +import java.util.List; + +/** + * @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; + + public interface RegisterDetailList{} + + /** + * 人员详情列表使用 + */ + @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/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/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; /** * 场所名称 */ 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/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..98ddd2ab8c --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java @@ -0,0 +1,36 @@ +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 registerId; + + private String agencyId; + + public EmployeeRegisterListResultDTO() { + this.placeOrgName = ""; + this.name = ""; + this.mobile = ""; + this.idCard = ""; + this.ymjzCount = NumConstant.ZERO; + this.latestNatTime = ""; + this.registerId = ""; + this.agencyId = ""; + } +} 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-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..3fcb98125a --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java @@ -0,0 +1,21 @@ +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; + private String 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 d738d662f8..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 @@ -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-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/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..07c748ce67 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -0,0 +1,117 @@ +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.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.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.*; + +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); + } + + @PostMapping(value = "{id}") + public Result get(@PathVariable("id") String id){ + IcEmployeeRegisterDTO data = icEmployeeRegisterService.get(id); + return new Result().ok(data); + } + + /** + * @Description 新增 员工登记：http://yapi.elinkservice.cn/project/102/interface/api/8214 + * @param dto + * @Author zxc + * @Date 2022/10/27 08:57 + */ + @NoRepeatSubmit + @PostMapping("add") + 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(); + } + + /** + * @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(@LoginUser TokenDto tokenDto,@RequestBody List ids){ + icEmployeeRegisterService.delete(ids,tokenDto.getUserId()); + 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, 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/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/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/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..01b394c759 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -0,0 +1,99 @@ +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.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; +import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; +import com.epmet.service.IcGroupPeopleRegisterService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +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); + } + + @PostMapping(value = "{id}") + public Result get(@PathVariable("id") String id){ + IcGroupPeopleRegisterDTO data = icGroupPeopleRegisterService.get(id); + 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){ + //效验数据 + 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(); + } + + /** + * 受众群体管理删除 + * http://yapi.elinkservice.cn/project/102/interface/api/8250 + * @param ids + * @return + */ + @PostMapping("delete") + public Result delete(@LoginUser TokenDto tokenDto,@RequestBody List ids){ + icGroupPeopleRegisterService.delete(ids,tokenDto.getUserId()); + return new Result(); + } + + /** + * @Description 受众群体列表 http://yapi.elinkservice.cn/project/102/interface/api/8244 + * @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/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java new file mode 100644 index 0000000000..2211398af1 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -0,0 +1,55 @@ +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; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@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,@Param("operUserId")String operUserId); + + /** + * @Description 员工疫情管理列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:15 + */ + List employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + List employeeRegisterListNoCheck(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/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..f8dbd340e7 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java @@ -0,0 +1,22 @@ +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; + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@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/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/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/entity/IcEnterpriseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java index d022fabf3d..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 @@ -45,6 +45,12 @@ public class IcEnterpriseEntity extends BaseEpmetEntity { */ private String placeType; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + private String placeCategory; /** * 场所名称 */ @@ -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/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/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/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 8507192422..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; /** @@ -21,6 +22,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; @@ -46,10 +57,11 @@ public class EnterpriseImportExcelDTO { * 2:21-40人 * 3:41-100人 * 4:100人以上】 + * 改为手输数字了 */ - @NotBlank(message = "规模不能为空") + @NotNull(message = "规模不能为空") @ExcelProperty(value = "规模") - private String scaleName; + private Integer scaleTotal; /** * 场所负责人 @@ -72,6 +84,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; @@ -89,7 +110,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 ac55be4e46..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 originList=icEnterpriseServiceImpl.selectForUniqueName(enterpriseEntity.getGridId(),enterpriseEntity.getPlaceOrgName(),null); @@ -117,10 +124,11 @@ public class IcEnterpriseExcelImportListener implements ReadListener { + + /** + * 默认分页 + * + * @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..ebaa0a4d8b --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java @@ -0,0 +1,95 @@ +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; +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(List ids,String operUserId); + + /** + * @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/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/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java new file mode 100644 index 0000000000..9dcad3b267 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -0,0 +1,88 @@ +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; +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(List ids,String operUserId); + + /** + * @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/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..01f6f90e68 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -0,0 +1,195 @@ +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.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; +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.RegExUtils; +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.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Service +public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl implements IcEmployeeRegisterService { + + @Autowired + private IcEmployeeRegisterDetailService icEmployeeRegisterDetailService; + + @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); + } + + /** + * @Description 新增 + * @param dto + * @Author zxc + * @Date 2022/10/27 08:57 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcEmployeeRegisterDTO dto) { + if (!IdCardRegexUtils.validateIdCard(dto.getIdCard())) { + throw new EpmetException(EpmetErrorCode.ID_CARD_ERROR.getCode()); + } + IcEmployeeRegisterDetailEntity detailEntity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.class); + // 先看看存在不 + IcEmployeeRegisterEntity origin = baseDao.getEmployeeRegisterByIdCard(dto.getIdCard()); + if (null == origin){ + IcEmployeeRegisterEntity insertEntity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class); + insert(insertEntity); + detailEntity.setRegisterId(insertEntity.getId()); + }else { + if(!origin.getName().equals(dto.getName())||!origin.getMobile().equals(dto.getMobile())){ + origin.setMobile(dto.getMobile()); + origin.setName(dto.getName()); + origin.setUpdatedTime(new Date()); + updateById(origin); + } + detailEntity.setRegisterId(origin.getId()); + } + icEmployeeRegisterDetailService.insert(detailEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcEmployeeRegisterDTO dto) { + IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class); + updateById(entity); + } + + /** + * @Description 批量删除 + * @param ids + * @Author zxc + * @Date 2022/10/27 08:57 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(List ids,String operUserId) { + if (CollectionUtils.isNotEmpty(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); + } + } + + /** + * @Description 员工疫情管理列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:15 + */ + @Override + public PageData 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<>(); + // 未核酸检测的查询，根据所有企业下登记过的员工，筛出时间段内已检测的，剩下的就是未检测 + if (formDTO.getIsPage()){ + PageInfo pageInfo = new PageInfo<>(); + if (StringUtils.isNotBlank(formDTO.getCheckStatus()) && formDTO.getCheckStatus().equals(NumConstant.ZERO_STR)){ + // 已检测 + 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)); + } + }else { + pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); + } + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + } + return result; + } + + /** + * @Description 员工疫情管理详情列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:22 + */ + @Override + public PageData employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO) { + 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/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..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 @@ -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,7 @@ 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; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -23,14 +22,10 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.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.*; -import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.*; @@ -47,7 +42,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; @@ -60,12 +54,21 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; +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.service.impl.HouseServiceImpl.bufferedImageToInputStream; /** * 企事业单位表 @@ -251,15 +254,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; } @@ -303,13 +314,18 @@ 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)) { - //规模名称 - 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) { @@ -322,7 +338,14 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); @@ -339,8 +362,9 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl 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)) { @@ -508,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())) { @@ -536,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())); } @@ -560,6 +588,89 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl list = list(formDTO).getList(); + if (CollectionUtils.isEmpty(list)){ + log.error("根据条件未查询到企事业单位信息，登记码压缩包不能导出！"); + ServletOutputStream outputStream = response.getOutputStream(); + outputStream.write("{\"code\":9999,\"msg\":\"未查到企事业单位信息\",\"data\":{}}".getBytes()); + outputStream.flush(); + 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()); + + //不同环境的码，访问的地址不一样 + String jumpUrl=""; + EnvEnum currentEnv = EnvEnum.getCurrentEnv(); + if (EnvEnum.PROD.getCode().equals(currentEnv.getCode())) { + if ("1535072605621841922".equals(formDTO.getCustomerId())) { + // 烟台的客户id + jumpUrl = "https://epmet-yantai.elinkservice.cn"; + } else if ("3fdd0380deff5b30f45376cdf995d1c1".equals(formDTO.getCustomerId())) { + // 微笑崂山 + jumpUrl = "https://epmet-open.elinkservice.cn"; + } + } else if (EnvEnum.TEST.getCode().equals(currentEnv.getCode())) { + // 最美琴岛 + jumpUrl = "https://epmet-dev.elinkservice.cn/"; + } else { + // 其余统一走开发环境 + jumpUrl = "http://192.168.1.140"; + } + + for (EnterpriseDetailDTO l : list) { + try { + // CustomerAgencyConstant.JUMP_URL = "http://192.168.1.140/epmet-oper-gov/#/staffRegister?"; + // String content = JUMP_URL + "enterpriseId=" + l.getEnterpriseId() + "&customerId=" + formDTO.getCustomerId() + "&placeOrgName=" + l.getPlaceOrgName(); + String content = jumpUrl.concat("/epmet-oper-gov/#/staffRegister?") + "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 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..e0ca969f52 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -0,0 +1,133 @@ +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.dao.IcGroupPeopleRegisterDao; +import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; +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.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +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); + } + + /** + * 受众群体管理删除 + * http://yapi.elinkservice.cn/project/102/interface/api/8250 + * @param ids + * @param operUserId 当前操作人 + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(List ids,String operUserId) { + if (CollectionUtils.isNotEmpty(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); + } + } + + /** + * @Description 受众群体列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 10:51 + */ + @Override + public PageData 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/db/migration/V0.0.45__place_category.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.45__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.45__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; 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 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 283b41c095..6981727e9b 100644 Binary files a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx and b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx differ 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..5bb4bb0533 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -0,0 +1,152 @@ + + + + + + + + update ic_employee_register_detail + set del_flag = 1, + updated_time = NOW(), + UPDATED_BY = #{operUserId} + where REGISTER_ID in ( + + #{registerId} + + ) + + + + + + + + + + + + \ 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/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index 0a3d9a321a..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 @@ -43,11 +43,13 @@ ie.AGENCY_ID, ie.AGENCY_PIDS, ie.PLACE_TYPE, + ie.PLACE_CATEGORY, ie.PLACE_ORG_NAME, ie.ADDRESS, ie.LONGITUDE, ie.LATITUDE, ie.SCALE, + ie.SCALE_TOTAL, ie.PERSON_IN_CHARGE, ie.MOBILE, ie.SOURCE_TYPE, @@ -74,6 +76,9 @@ AND ie.PLACE_TYPE = #{placeType} + + AND ie.PLACE_CATEGORY = #{placeCategory} + AND ie.PLACE_ORG_NAME LIKE concat( '%', #{placeOrgName}, '%' ) 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..88e9d73f79 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml @@ -0,0 +1,29 @@ + + + + + + + \ No newline at end of file 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