Merge remote-tracking branch 'origin/master'

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java

@@ -30,6 +30,15 @@ public class VaccinePrarmeterListFormDTO extends PageFormDTO implements Serializ
      */
     private String idCard;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+    /**
+     * 部门ID
+     */
+    private String agencyId;
+
     private String isVaccination;
     private String gridId;
     private String villageId;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java

@@ -5,8 +5,10 @@ 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.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.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelPoiUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -61,9 +63,9 @@ public class IcVaccinePrarmeterController {
 
     @RequestMapping("page")
 //    @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
-    public Result<PageData<IcVaccinePrarmeterDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IcVaccinePrarmeterDTO>> page(@RequestParam Map<String, Object> params, @LoginUser TokenDto tokenDto){
 //        PageData<IcVaccinePrarmeterDTO> page = icVaccinePrarmeterService.page(params);
-        PageData<IcVaccinePrarmeterDTO> page = icVaccinePrarmeterService.getPhrasePage(params);
+        PageData<IcVaccinePrarmeterDTO> page = icVaccinePrarmeterService.getPhrasePage(params,tokenDto);
         return new Result<PageData<IcVaccinePrarmeterDTO>>().ok(page);
     }
 
@@ -75,7 +77,7 @@ public class IcVaccinePrarmeterController {
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody IcVaccinePrarmeterDTO dto){
+    public Result save(@RequestBody IcVaccinePrarmeterDTO dto, @LoginUser TokenDto tokenDto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         icVaccinePrarmeterService.save(dto);
@@ -116,6 +118,13 @@ public class IcVaccinePrarmeterController {
     @PostMapping("vaccine-export")
     public void vaccineExport(HttpServletResponse response, @RequestBody VaccinePrarmeterListFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception {
         ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        // 获取工作人员缓存信息
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo) {
+            throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", tokenDto.getUserId()));
+        }
+        formDTO.setAgencyId(staffInfo.getAgencyId());
         List<IcVaccinePrarmeterDTO> list = icVaccinePrarmeterDao.vaccineExport(formDTO);
         ExcelUtils.exportExcelToTarget(response, null, list, IcVaccinePrarmeterExcel.class);
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java

@@ -35,7 +35,7 @@ public interface IcVaccinePrarmeterService extends BaseService<IcVaccinePrarmete
      * @param params
      * @return
      */
-    PageData<IcVaccinePrarmeterDTO> getPhrasePage(Map<String, Object> params);
+    PageData<IcVaccinePrarmeterDTO> getPhrasePage(Map<String, Object> params, TokenDto tokenDto);
 
     /**
      * 默认查询

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java

@@ -124,7 +124,14 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
      * @return
      */
     @Override
-    public PageData<IcVaccinePrarmeterDTO> getPhrasePage(Map<String, Object> params) {
+    public PageData<IcVaccinePrarmeterDTO> getPhrasePage(Map<String, Object> params, TokenDto tokenDto) {
+        params.put("customerId",tokenDto.getCustomerId());
+        // 获取工作人员缓存信息
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo) {
+            throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", tokenDto.getUserId()));
+        }
+        params.put("agencyId",staffInfo.getAgencyId());
         IPage<IcVaccinePrarmeterDTO> page = getPage(params);
         List<IcVaccinePrarmeterDTO> list = baseDao.getPhrasePage(params);
         return new PageData<>(list, page.getTotal());

epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml

@@ -78,6 +78,8 @@
             CHECK_REASON
         from ic_vaccine_prarmeter
         where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
+        AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%'))
         <if test="name != null and name != ''">
             and NAME like CONCAT('%' ,#{name}, '%')
         </if>
@@ -150,6 +152,8 @@
             CHECK_REASON
         from ic_vaccine_prarmeter
         where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
+        AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%'))
         <if test="name != null and name != ''">
             and NAME like CONCAT('%' ,#{name}, '%')
         </if>