项目档案无岗位更新岗位fxj 2024-04-17

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysHouseHoldInfoController.java

@@ -205,9 +205,9 @@ public class SysHouseHoldInfoController {
 		}
 		houseHoldInfo = sysHouseHoldInfoService.getOne(wrapper);
 		if (Common.isNotNull(houseHoldInfo) && CommonConstants.ZERO_STRING.equals(houseHoldInfo.getAutoStatus())){
-			return R.ok(1);
+			return R.ok(0);
 		}
-		return R.ok(0);
+		return R.ok(1);
 	}
 
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java

@@ -26,6 +26,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 派单信息记录表
@@ -249,4 +250,6 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
 	CompanyProVo getFundPersionExportVoOne(@Param("houseName") String houseName,@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
 
 	HouseNameConfigVo getFundSumExportVoTwo(@Param("houseName") String houseName,@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
+
+	Map<String, String> getAutoFlag(@Param("idsList")List<String> idsList);
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -3323,6 +3323,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 		// 获取所有派单信息
 		List<TDispatchInfo> dispatchs = baseMapper.selectList(Wrappers.<TDispatchInfo>query().lambda().in(TDispatchInfo::getId, idsList));
+		// 获取所有派单对应的自动化配置信息
+		Map<String,String> autoFlagMap  = baseMapper.getAutoFlag(idsList);
+		if (Common.isNotNull(autoFlagMap)){
+			autoFlagMap = new HashMap<>();
+		}
 		if (Common.isNotNull(dispatchs)) {
 			// 获取所有派单查询信息
 			Map<String,TSocialFundInfo>  socialFundMap = initSocialFundMap(dispatchs);
@@ -3337,9 +3342,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				int forecastFlag;
 				// 是否SSC，true是
 				boolean isSSC;
-
+				String autoFlag ="0";
 				TDispatchSocialFundInfo socialFundInfo;
 				for (TDispatchInfo dis : dispatchs) {
+					autoFlag = autoFlagMap.get(dis.getId());
 					isSSC = CommonConstants.FIVE_STRING.equals(dis.getStatus());
 					forecastFlag = getForecastFlag(dis);
 					auditInfo = new TAuditInfo();
@@ -3570,8 +3576,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					dis.setAuditUser(user.getId());
 					dis.setAuditUserName(user.getNickname());
 					dis.setAuditTime(now);
+					//人工处理
+					if (CommonConstants.ONE_STRING.equals(auditStatus)){
+						dis.setAutoFlag("1");
+					}
+					//自动化处理，如果未配置还是人工处理
+					if (CommonConstants.THREE_STRING.equals(auditStatus)){
+						dis.setAutoFlag(Common.isEmpty(autoFlag)?"1":autoFlag);
+					}
 					baseMapper.updateById(dis);
-
 					socialFundMapper.updateById(sf);
 
 					//派减的申请审核完更新社保公积金查询快照表
@@ -3686,7 +3699,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				return R.failed(DispatchConstants.DISPATCH_ID_NOT_EMPTY);
 			}
 			int flag;
-			if (CommonConstants.ONE_STRING.equals(auditStatus)) {
+			if (CommonConstants.ONE_STRING.equals(auditStatus) || CommonConstants.THREE_STRING.equals(auditStatus)) {
 				//审核通过
 				flag = CommonConstants.ZERO_INT;
 			} else if (CommonConstants.TWO_STRING.equals(auditStatus)) {

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -2224,5 +2224,14 @@
 		OR ( APPLY_END_DATE IS NULL OR APPLY_END_DATE = '' ))
 		GROUP BY A.`NAME`
 	</select>
-
+	<select id="getAutoFlag" resultType="java.util.Map">
+		select a.id,b.AUTO_STATUS
+		FROM  t_dispatch_info a
+		LEFT JOIN sys_house_hold_info b  on a.SOCIAL_HOUSEHOLD_NAME=b.`NAME` and b.TYPE='0'
+		where a.SOCIAL_HOUSEHOLD_NAME is not null
+		and a.id in
+		<foreach item="item" index="index" collection="idsList" open="(" separator="," close=")">
+			#{item.id}
+		</foreach>
+	</select>
 </mapper>