疫苗接种关注名单取消关注

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

@@ -22,7 +22,7 @@ public class CancelAttentionPackageFormDTO implements Serializable {
     /**
      * 身份证
      */
-    @NotNull(message = "idCard不能为空",groups = CancelAttentionPackageForm.class)
+//    @NotNull(message = "idCard不能为空",groups = CancelAttentionPackageForm.class)
     private List<String> idCards;
 
     /**
@@ -30,4 +30,7 @@ public class CancelAttentionPackageFormDTO implements Serializable {
      */
     @NotNull(message = "attentionType不能为空",groups = CancelAttentionPackageForm.class)
     private Integer attentionType ;
+
+    @NotNull(message = "ids不能为空",groups = CancelAttentionPackageForm.class)
+    private List<String> ids;
 }

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

@@ -289,8 +289,8 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void cancelAttention(CancelAttentionPackageFormDTO formDTO) {
-        if (CollectionUtils.isNotEmpty(formDTO.getIdCards())){
-            baseDao.cancelAttention(formDTO.getIdCards(), formDTO.getAttentionType());
+        if (CollectionUtils.isNotEmpty(formDTO.getIds())){
+            baseDao.cancelAttention(formDTO.getIds(), formDTO.getAttentionType());
         }
     }
 

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

@@ -11,7 +11,7 @@
             del_flag = 1
         WHERE del_flag = 0
           AND attention_type = #{attentionType}
-          AND id_card IN (
+          AND id IN (
               <foreach collection="list" item="l" separator=",">
                   #{l}
               </foreach>