移除审核需求变动

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

@@ -167,11 +167,13 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
         if (null != result) {
             LambdaQueryWrapper<IcResiUserConfirmEntity> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(IcResiUserConfirmEntity::getIcResiUserId, dto.getIcResiUserId());
+            wrapper.eq(IcResiUserConfirmEntity::getHouseId, result.getHouseId());
             wrapper.in(IcResiUserConfirmEntity::getSubmitType, Arrays.asList("in", "out"));
             wrapper.orderByDesc(IcResiUserConfirmEntity::getCreatedTime);
             List<IcResiUserConfirmEntity> list = baseDao.selectList(wrapper);
             if (CollectionUtils.isNotEmpty(list)) {
-                result.setMoveOutStatus(list.get(NumConstant.ZERO).getConfirmResult());
+                result.setMoveOutStatus(NumConstant.ONE_STR.equals(list.get(NumConstant.ZERO).getConfirmResult())?
+                        NumConstant.THREE_STR:list.get(NumConstant.ZERO).getConfirmResult());
             } else {
                 result.setMoveOutStatus(NumConstant.THREE_STR);
             }

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

@@ -1099,9 +1099,11 @@
 			mz,
 			HJSZD,
 			yhzgx,
-			XJZD
+			XJZD,
+			HOME_ID AS houseId
     from ic_resi_user
     where DEL_FLAG='0'
+            and Status='0'
 		  and id=#{icResiUserId}
     </select>
     <select id="moveOutMember" resultType="com.epmet.dto.form.MoveOutMemberFormDTO">