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 0c92958083..200e985304 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,13 +1,18 @@ 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.*; @@ -70,4 +75,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