Merge remote-tracking branch 'origin/MVP1.5.8' into MVP1.5.8

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

@@ -119,4 +119,12 @@ public class SocialHandleSearchVo extends TDispatchInfo {
 
 	@Schema(description = "导出的表头的Set")
 	private Set<String> exportFields;
+
+	/**
+	 * 审核状态 0 通过 1 不通过
+	 */
+	@ExcelAttribute(name = "审核状态")
+	@ExcelIgnore
+	@Schema(description = "审核状态")
+	private String auditStatus;
 }

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

@@ -774,6 +774,10 @@ public class TDispatchInfoController {
 			searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
 		}
 		searchVo.setCreateBy(user.getId());
+		// 默认审核通过的数据 fxj 20230904
+		if (Common.isEmpty(searchVo.getAuditStatus())){
+			searchVo.setAuditStatus(CommonConstants.ZERO_STRING);
+		}
 		tDispatchInfoService.doexportSocialRecordNew(response,searchVo);
 	}
 
@@ -796,6 +800,7 @@ public class TDispatchInfoController {
 			searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
 		}
 		searchVo.setCreateBy(user.getId());
+		// 默认审核通过的数据 fxj 20230904
 		tDispatchInfoService.doexportSocialPensionRecord(response,searchVo);
 	}
 

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

@@ -1915,7 +1915,13 @@
 	<sql id="where_getSocialDisRecord">
 		a.DELETE_FLAG = 0
 		AND a.social_id is not null
-		AND a.STATUS in ('2','4')
+		<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
+		<if test="tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == '0'">
+			AND a.STATUS in ('2','4')
+		</if>
+		<if test="tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == '1'">
+			AND a.STATUS ='1'
+		</if>
 		AND a.DISPATCH_ITEM like concat('%','医疗','%')
 		<if test="tDispatchInfo != null">
 			<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
@@ -1993,7 +1999,14 @@
 	<sql id="where_getSocialPersionDisRecord">
 		a.DELETE_FLAG = 0
 		AND a.social_id is not null
-		AND a.STATUS in ('2','4')
+		<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
+		<if test="tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == '0'">
+			AND a.STATUS in ('2','4')
+		</if>
+		<if test="tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == '1'">
+			AND a.STATUS ='1'
+		</if>
+
 		AND (a.DISPATCH_ITEM like concat('%','工伤','%') or a.DISPATCH_ITEM like concat('%','养老','%') or a.DISPATCH_ITEM like concat('%','失业','%'))
 		<if test="tDispatchInfo != null">
 			<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">