调整

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LingShanSpecialCrowdListResultDTO.java

@@ -16,10 +16,10 @@ public class LingShanSpecialCrowdListResultDTO {
     private String idCard;
     private String address;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createdTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date updatedTime;
 
 }

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

@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
@@ -173,6 +174,8 @@ public class LingShanSpecialCrowdController {
      * @date: 2023/4/20 5:42 PM
      */
     @GetMapping("listSpecialCrowd")
+    @MaskResponse(fieldNames = {"name", "mobile", "idCard"},
+            fieldsMaskType = { MaskResponse.MASK_TYPE_CHINESE_NAME, MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     public Result<PageData<LingShanSpecialCrowdListResultDTO>> listSpecialCrowds(@RequestParam(value = "orgId", required = false) String orgId,
                                     @RequestParam(value = "orgType", required = false) String orgType,
                                     @RequestParam(value = "specialType", required = false) String specialType,

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java

@@ -250,7 +250,7 @@ public abstract class AbstractLingShanSpecialCrowdExcelImportListener<T extends
      * @date: 2023/4/18 3:42 PM
      */
     protected void saveBatch() {
-        String orgIdPath = PidUtils.convertPid2OrgIdPath(currentStaffInfo.getFromOrgId(), currentStaffInfo.getAgencyPIds());
+        String orgIdPath = PidUtils.convertPid2OrgIdPath(currentStaffInfo.getAgencyId(), currentStaffInfo.getAgencyPIds());
         String customerId = EpmetRequestHolder.getLoginUserCustomerId();
         Date now = new Date();
         Iterator<T> it = getOriginDatas().iterator();

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

@@ -64,6 +64,7 @@
                 and r.MOBILE like CONCAT('%', mobile, '%')
             </if>
         </where>
+        order by t.UPDATED_TIME desc
     </select>