移除福利的逻辑

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java

@@ -112,4 +112,8 @@ public class ChangeWelfareDTO implements Serializable {
      */
 	private String customerId;
 
+    /**
+     * 是否享受福利，1是 0否 空是
+     */
+    private String isWelfare;
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -139,18 +140,22 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
     @Override
     public Boolean checkWelfareByIdCard(CheckWelfareByIdCardDTO dto) {
         ChangeWelfareEntity entity = baseDao.selectByIdCard(dto.getIdCard());
-        return entity == null? false: true;
+        return entity != null;
     }
 
     @Override
     public Result saveWelfareInfo(ChangeWelfareDTO dto) {
+        dto.setId(StringUtils.EMPTY);
+        if (NumConstant.ZERO_STR.equals(dto.getIsWelfare())) {
+            removeWelfare(dto);
+            return new Result();
+        }
         Map<String, Object> params = new HashMap<>(4);
         params.put("idCard", dto.getIdCard());
         if (!list(params).isEmpty()) {
             return new Result().error("该人员已经迁入福利人口");
         }
         dto.setJoinDate(DateUtils.format(new Date()));
-        dto.setId(StringUtils.EMPTY);
         ChangeWelfareEntity entity = ConvertUtils.sourceToTarget(dto, ChangeWelfareEntity.class);
         insert(entity);
         return new Result();

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

@@ -34,7 +34,13 @@
             set REMOVE_DATE=#{removeDate},
                 REMOVE_REASON=#{removeReason},
                 del_flag='1'
-            where id=#{id}
+            where del_flag='0'
+        <if test="id != null and id != ''">
+            AND ID = #{id}
+        </if>
+        <if test="idCard != null and idCard != ''">
+            AND ID_CARD = #{idCard}
+        </if>
     </update>