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

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/dao/IcNatDao.java

@@ -44,13 +44,6 @@ public interface IcNatDao extends BaseDao<IcNatEntity> {
      **/
     int delById(@Param("icNatId") String icNatId);
 
-    /**
-     * 插入或者更新
-     *
-     * @param e
-     */
-    void insertOrUpdate(IcNatEntity e);
-
     /**
      * @Author sun
      * @Description 按条件查询业务数据

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java

@@ -46,13 +46,6 @@ public interface IcVaccineDao extends BaseDao<IcVaccineEntity> {
      **/
     int delById(@Param("icNatId") String icNatId);
 
-    /**
-     * 插入或者更新
-     *
-     * @param e
-     */
-    void insertOrUpdate(IcVaccineEntity e);
-
     /**
      * @Author sun
      * @Description 按条件查询业务数据

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>

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

@@ -139,24 +139,6 @@
         DELETE FROM ic_nat WHERE id = #{icNatId}
     </delete>
 
-    <insert id="insertOrUpdate">
-        INSERT INTO epmet_user.ic_nat
-        (ID, CUSTOMER_ID, AGENCY_ID, PIDS, USER_ID,
-         USER_TYPE, NAME, MOBILE, ID_CARD, NAT_TIME, NAT_RESULT, NAT_ADDRESS, FILE_NAME, ATTACHMENT_TYPE, ATTACHMENT_URL,
-         DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME)
-        VALUES (#{id}, #{customerId}, #{agencyId}, #{pids}, #{userId},
-                #{userType}, #{name}, #{mobile}, #{idCard}, #{natTime},
-                #{natResult}, #{natAddress}, #{fileName}, #{attachmentType}, #{attachmentUrl},
-                #{delFlag}, #{revision}, #{createdBy}, #{createdTime}, #{updatedBy},
-                #{updatedTime})
-        ON DUPLICATE KEY update
-            NAME=#{name},
-            MOBILE=#{mobile},
-            NAT_ADDRESS=#{natAddress},
-            NAT_RESULT=#{natResult},
-            UPDATED_BY=#{updatedBy},
-            UPDATED_TIME=NOW()
-    </insert>
     <update id="updateIsResiFlag">
         UPDATE ic_nat m,
         (

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

@@ -130,24 +130,6 @@
         DELETE FROM ic_nat WHERE id = #{icNatId}
     </delete>
 
-    <insert id="insertOrUpdate">
-        INSERT INTO epmet_user.ic_nat
-        (ID, CUSTOMER_ID, AGENCY_ID, PIDS, USER_ID,
-         USER_TYPE, NAME, MOBILE, ID_CARD, NAT_TIME, NAT_RESULT, NAT_ADDRESS, FILE_NAME, ATTACHMENT_TYPE, ATTACHMENT_URL,
-         DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME)
-        VALUES (#{id}, #{customerId}, #{agencyId}, #{pids}, #{userId},
-                #{userType}, #{name}, #{mobile}, #{idCard}, #{natTime},
-                #{natResult}, #{natAddress}, #{fileName}, #{attachmentType}, #{attachmentUrl},
-                #{delFlag}, #{revision}, #{createdBy}, #{createdTime}, #{updatedBy},
-                #{updatedTime})
-        ON DUPLICATE KEY update
-            NAME=#{name},
-            MOBILE=#{mobile},
-            NAT_ADDRESS=#{natAddress},
-            NAT_RESULT=#{natResult},
-            UPDATED_BY=#{updatedBy},
-            UPDATED_TIME=NOW()
-    </insert>
     <update id="updateIsResiFlag">
         UPDATE ic_nat m,
         (