Merge branch 'dev_epidemic_situation' into develop

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

@@ -14,8 +14,6 @@ import javax.validation.constraints.NotBlank;
 public class MyNatListFormDTO extends PageFormDTO {
     private static final long serialVersionUID = 9156247659994638103L;
 
-    public interface MyNat extends CustomerClientShowGroup {
-    }
     public interface Detail extends CustomerClientShowGroup {
     }
     public interface Del extends CustomerClientShowGroup {
@@ -26,7 +24,6 @@ public class MyNatListFormDTO extends PageFormDTO {
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = MyNat.class)
     private String idCard;
     /**
      * 当前组织:current 根组织：all

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

@@ -87,8 +87,8 @@ public class IcNatController implements ResultDataResolver {
     @NoRepeatSubmit
     @PostMapping("mynatlist")
     public Result<List<MyNatListResultDTO>> myNatList(@LoginUser TokenDto tokenDto, @RequestBody MyNatListFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, MyNatListFormDTO.MyNat.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
         return new Result<List<MyNatListResultDTO>>().ok(icNucleinService.myNatList(formDTO));
     }
 

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

@@ -20,6 +20,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcNatDao;
+import com.epmet.dao.UserBaseInfoDao;
 import com.epmet.dto.IcNatDTO;
 import com.epmet.dto.IcNoticeDTO;
 import com.epmet.dto.form.*;
@@ -78,6 +79,9 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
     @Autowired
     private OssFeignClient ossFeignClient;
 
+    @Autowired
+    private UserBaseInfoDao userBaseInfoDao;
+
     /**
      * @Author sun
      * @Description 核酸检测-上报核酸记录
@@ -117,7 +121,10 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
      **/
     @Override
     public List<MyNatListResultDTO> myNatList(MyNatListFormDTO formDTO) {
-        //1.根据身份证号查询该人员所有核酸记录(居民端录入、数字平台录入、数字平台导入)
+        //1.根据token信息查询居民身份证号
+        UserBaseInfoResultDTO dto = userBaseInfoDao.selectListByUserIdList(formDTO.getUserId());
+        formDTO.setIdCard(dto.getIdNum());
+        //2.查询当前人员创建的或该身份证号录入的核算检测数据(居民端录入、数字平台录入、数字平台导入)
         List<MyNatListResultDTO> resultList = baseDao.getMyNatList(formDTO);
         return resultList;
     }

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

@@ -21,7 +21,12 @@
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        AND id_card = #{idCard}
+        AND (
+            CREATED_BY = #{userId}
+        <if test='null != idCard and "" != idCard'>
+            OR id_card = #{idCard}
+        </if>
+            )
         ORDER BY nat_time DESC
     </select>