MVP1.5.4-派单委托备注（合同起缴日期等）

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

@@ -187,8 +187,8 @@ public class TDispatchInfoExportVo {
 	@ExcelProperty("公积金停缴日期" )
 	private Date fundReduceDate;
 
-	@ExcelAttribute(name = "社保审核状态", readConverterExp = "0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结")
-	@Schema(description = "社保审核状态：1待审核2审核通过3审核不通过4已办结")
+	@ExcelAttribute(name = "社保审核状态", readConverterExp = "0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结,5=待SSC审核")
+	@Schema(description = "社保审核状态：1待审核2审核通过3审核不通过4已办结5待SSC审核")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("社保审核状态")
 	private String auditStatus;
@@ -231,7 +231,7 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 审核状态（0待审核/1已审核）
 	 */
-	@ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结")
+	@ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结,5=待SSC审核")
 	@Schema(description = "公积金审核状态:（0待审核/1已审核）" )
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("公积金审核状态" )

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

@@ -897,7 +897,15 @@
 		count(1)
 		from t_dispatch_info a
 		<where>
-			a.DELETE_FLAG = '0' and a.STATUS = '1'
+			a.DELETE_FLAG = '0'
+			<if test="tDispatchInfo != null">
+				<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''">
+					AND a.STATUS = #{tDispatchInfo.status}
+				</if>
+				<if test="tDispatchInfo.status == null or tDispatchInfo.status.trim() == ''">
+					AND a.STATUS = '1'
+				</if>
+			</if>
 			<include refid="tDispatchInfoAudit_where"/>
 		</where>
 	</select>

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

@@ -540,7 +540,7 @@
 					#{idStr}
 				</foreach>
 			</if>
-			<if test="tSocialFundInfo.empTypeList != null ">
+			<if test="tSocialFundInfo.empTypeList != null and tSocialFundInfo.empTypeList.length>0">
 				AND a.EMP_TYPE IN
 				<foreach collection="tSocialFundInfo.empTypeList" item="item" index="index" open="(" separator="," close=")">
 					#{item}