社保公积金办理导出标识

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

@@ -628,11 +628,12 @@ public class TDispatchInfoController {
 	@Operation(summary = "社保花名册导出标识变更为否", description = "社保花名册导出标识变更为否")
 	@SysLog("社保花名册导出标识变更为否" )
 	@PostMapping("/updateExportSocialFlagById")
-	public R<Boolean> updateExportSocialFlagById(@RequestParam(value = "id") String id) {
-		if (Common.isEmpty(id)){
+	public R<Boolean> updateExportSocialFlagById(@RequestParam(value = "id",required = true) String id
+			,@RequestParam(value = "status",required = true) String status) {
+		if (!CommonConstants.ZERO_STRING.equals(status)&& !CommonConstants.ONE_STRING.equals(status)){
 			return R.failed(CommonConstants.PARAM_IS_NOT_EMPTY);
 		}
-		return tDispatchInfoService.updateExportSocialFlagById(id);
+		return tDispatchInfoService.updateExportSocialFlagById(id,status);
 	}
 	/**
 	 * 公积金变更清册导出标识变更为否
@@ -642,10 +643,11 @@ public class TDispatchInfoController {
 	@Operation(summary = "公积金变更清册导出标识变更为否", description = "公积金变更清册导出标识变更为否")
 	@SysLog("公积金变更清册导出标识变更为否" )
 	@PostMapping("/updateExportFundFlagById")
-	public R<Boolean> updateExportFundFlagById(@RequestParam(value = "id") String id) {
-		if (Common.isEmpty(id)){
+	public R<Boolean> updateExportFundFlagById(@RequestParam(value = "id",required = true) String id
+			,@RequestParam(value = "status",required = true) String status) {
+		if (!CommonConstants.ZERO_STRING.equals(status)&& !CommonConstants.ONE_STRING.equals(status)){
 			return R.failed(CommonConstants.PARAM_IS_NOT_EMPTY);
 		}
-		return tDispatchInfoService.updateExportFundFlagById(id);
+		return tDispatchInfoService.updateExportFundFlagById(id,status);
 	}
 }

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

@@ -158,8 +158,8 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
 
 	String getMaxDispatchCode();
 
-	int updateExportSocialFlagById(@Param("id")String id);
+	int updateExportSocialFlagById(@Param("id")String id,@Param("status")String status);
 
-	int updateExportFundFlagById(@Param("id")String id);
+	int updateExportFundFlagById(@Param("id")String id,@Param("status")String status);
 
 }

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

@@ -111,7 +111,7 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
 
 	R<List<ErrorMessage>> fundImportHandle(InputStream inputStream);
 
-	R<Boolean> updateExportSocialFlagById(String id);
+	R<Boolean> updateExportSocialFlagById(String id,String status);
 
-	R<Boolean> updateExportFundFlagById(String id);
+	R<Boolean> updateExportFundFlagById(String id,String status);
 }

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

@@ -5102,12 +5102,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	}
 
 	@Override
-	public R<Boolean> updateExportSocialFlagById(String id) {
-		return R.ok(baseMapper.updateExportSocialFlagById(id) >= 0);
+	public R<Boolean> updateExportSocialFlagById(String id,String status) {
+		return R.ok(baseMapper.updateExportSocialFlagById(id,status) >= 0);
 	}
 	@Override
-	public R<Boolean> updateExportFundFlagById(String id) {
-		return R.ok(baseMapper.updateExportFundFlagById(id) >= 0);
+	public R<Boolean> updateExportFundFlagById(String id,String status) {
+		return R.ok(baseMapper.updateExportFundFlagById(id,status) >= 0);
 	}
 
 }

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

@@ -1034,9 +1034,9 @@
 
 	<update id="updateSocialRecords">
 		update
-		FROM t_dispatch_info a
+		t_dispatch_info a
 		left join t_social_info s on a.SOCIAL_ID = s.id
-		set a.EXPORT_FUND_FLAG = 1
+		set a.EXPORT_SOCIAL_FLAG = 1
 		<include refid="where_getSocialRecordRoster"/>
 	</update>
 
@@ -1136,7 +1136,8 @@
 		f.FUND_TOWN,
 		a.TRUST_REMARK,
 		a.LEAVE_DATE,
-		a.REDUCE_REASON
+		a.REDUCE_REASON,
+		a.EXPORT_FUND_FLAG
 		FROM t_dispatch_info a
 		left join t_provident_fund f on a.FUND_ID = f.id
 		<where>
@@ -1148,11 +1149,9 @@
 	<update id="updateFundRecords">
 		update  t_dispatch_info a
 		left join t_provident_fund f on a.FUND_ID = f.id
-		set a.EXPORT_SOCIAL_FLAG = 1
+		set a.EXPORT_FUND_FLAG = 1
 		<where>
 			<include refid="where_getFundRecord"/>
-			group by a.id
-			order by a.APPLY_NO desc
 		</where>
 	</update>
 	<!--tDispatchInfo 公积金补交清册-->
@@ -1292,8 +1291,6 @@
 					AND a.EXPORT_SOCIAL_FLAG = ${tDispatchInfo.exportSocialFlag}
 				</if>
 			</if>
-			group by a.id
-			order by a.APPLY_NO desc
 		</where>
 	</sql>
 
@@ -1423,9 +1420,9 @@
 	</select>
 
 	<update id="updateExportSocialFlagById">
-	update  t_dispatch_info a set a.EXPORT_SOCIAL_FLAG = 1 WHERE a.id = #{id}
+	update  t_dispatch_info a set a.EXPORT_SOCIAL_FLAG = #{status} WHERE a.id = #{id}
 	</update>
 	<update id="updateExportFundFlagById">
-		update  t_dispatch_info a set a.EXPORT_FUND_FLAG = 1 WHERE a.id = #{id}
+		update  t_dispatch_info a set a.EXPORT_FUND_FLAG = #{status} WHERE a.id = #{id}
 	</update>
 </mapper>