diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java index 94e991c94a..02ce0b34c8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java +++ b/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; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java index 80669119dd..3a59bbc3e5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java +++ b/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; @@ -61,7 +62,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl getWrapper(Map params){ + private QueryWrapper getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); String name = (String) params.get("name"); String idCard = (String) params.get("idCard"); @@ -128,7 +129,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl 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(); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml index 496518260b..423c38d57e 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml +++ b/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' + + AND ID = #{id} + + + AND ID_CARD = #{idCard} +