节假日配置表及社保医疗截止配置表

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/AutoFlagVo.java

+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author fxj
+ * @Date 2024/5/10
+ * @Description
+ * @Version 1.0
+ */
+@Data
+public class AutoFlagVo implements Serializable {
+	// 派单ID
+	private String dispatchId;
+	// 自动化标识 0
+	private String autoFlag;
+}

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

@@ -251,5 +251,5 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
 
 	HouseNameConfigVo getFundSumExportVoTwo(@Param("houseName") String houseName,@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
 
-	Map<String, String> getAutoFlag(@Param("idsList")List<String> idsList);
+	List<AutoFlagVo> 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

@@ -3324,10 +3324,8 @@ 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<>();
-		}
+		Map<String,String> autoFlagMap  = new HashMap<>();
+		autoFlagMap = getAutoFlagMap(idsList, autoFlagMap);
 		if (Common.isNotNull(dispatchs)) {
 			// 获取所有派单查询信息
 			Map<String,TSocialFundInfo>  socialFundMap = initSocialFundMap(dispatchs);
@@ -3646,6 +3644,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		return errorList;
 	}
 
+	private Map<String, String> getAutoFlagMap(List<String> idsList, Map<String, String> autoFlagMap) {
+		List<AutoFlagVo> autoFlagList =  baseMapper.getAutoFlag(idsList);
+		if (Common.isNotNull(autoFlagList)){
+			if (Common.isNotNull(autoFlagMap)){
+				autoFlagMap = new HashMap<>();
+			}
+			for (AutoFlagVo flagVo:autoFlagList){
+				autoFlagMap.put(flagVo.getDispatchId(),flagVo.getAutoFlag());
+			}
+		}
+		return autoFlagMap;
+	}
+
 	private void initReduceStatus(TSocialFundInfo sf, TSocialInfo socialInfo) {
 		// 各个明细项的可派减项为待办理
 		if (CommonConstants.ONE_STRING.equals(sf.getPensionHandle()) || CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())){

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

@@ -2224,14 +2224,19 @@
 		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
+	<resultMap id="autoFlagMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.AutoFlagVo">
+		<result property="dispatchId" column="dispatchId"/>
+		<result property="autoFlag" column="autoFlag"/>
+	</resultMap>
+	<select id="getAutoFlag" resultMap="autoFlagMap">
+		select a.id as "dispatchId",
+		       b.AUTO_STATUS as 'autoFlag'
 		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}
+			#{item}
 		</foreach>
 	</select>
 </mapper>