Merge remote-tracking branch 'origin/dev_dengjima' into dev_dengjima

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;
+}

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;
+}

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<PageData<GroupPeopleRegisterListResultDTO>> groupPeopleRegisterList(@LoginUser TokenDto tokenDto, @RequestBody GroupPeopleRegisterListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        return new Result<PageData<GroupPeopleRegisterListResultDTO>>().ok(icGroupPeopleRegisterService.groupPeopleRegisterList(formDTO));
+    }
+
 }

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<IcGroupPeopleRegisterEntity> {
-	
+
+    List<GroupPeopleRegisterListResultDTO> groupPeopleRegisterList(GroupPeopleRegisterListFormDTO formDTO);
+
 }

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<IcGroupPeopleR
      * @date 2022-10-26
      */
     void delete(List<String> ids);
+
+    /**
+     * @Description 受众群体列表
+     * @param formDTO
+     * @Author zxc
+     * @Date 2022/10/27 10:51
+     */
+    PageData<GroupPeopleRegisterListResultDTO> groupPeopleRegisterList(GroupPeopleRegisterListFormDTO formDTO);
+
 }

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<IcGroupPeo
         }
     }
 
+    /**
+     * @Description 受众群体列表
+     * @param formDTO
+     * @Author zxc
+     * @Date 2022/10/27 10:51
+     */
+    @Override
+    public PageData<GroupPeopleRegisterListResultDTO> groupPeopleRegisterList(GroupPeopleRegisterListFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null == staffInfo){
+            throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId());
+        }
+        formDTO.setAgencyId(staffInfo.getAgencyId());
+        PageData<GroupPeopleRegisterListResultDTO> result = new PageData<>();
+        List<GroupPeopleRegisterListResultDTO> list;
+        if (formDTO.getIsPage()){
+            PageInfo<GroupPeopleRegisterListResultDTO> 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;
+    }
+
 }

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},'%')

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml

@@ -3,4 +3,26 @@
 
 <mapper namespace="com.epmet.dao.IcGroupPeopleRegisterDao">
 
+    <select id="groupPeopleRegisterList" resultType="com.epmet.dto.result.GroupPeopleRegisterListResultDTO">
+        SELECT
+            ie.PLACE_ORG_NAME,
+            pr.ID,
+            pr.NAT_TIME,
+            pr.SZ_TOTAL,
+            pr.HSJC_TOTAL
+        FROM ic_enterprise ie
+        INNER JOIN ic_group_people_register pr ON pr.ENTERPRISE_ID = ie.ID AND pr.DEL_FLAG = 0
+        WHERE ie.DEL_FLAG = 0
+          AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
+          <if test='null != placeOrgName and placeOrgName != "" '>
+              AND ie.PLACE_ORG_NAME LIKE CONCAT('%',#{placeOrgName},'%')
+          </if>
+          <if test='null != natStartDate and natStartDate != "" '>
+              AND DATE_FORMAT(pr.NAT_TIME,'%Y-%m-%d') >= #{natStartDate}
+          </if>
+          <if test='null != natEndDate and natEndDate != "" '>
+              AND DATE_FORMAT(pr.NAT_TIME,'%Y-%m-%d') >= #{natEndDate}
+          </if>
+        ORDER BY pr.NAT_TIME DESC
+    </select>
 </mapper>