Merge remote-tracking branch 'origin/develop' into develop

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

@@ -60,6 +60,8 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
 	 **/
 	List<TDispatchAuditExportVo> exportAuditDispatch(@Param("tDispatchInfo") TDispatchInfoSearchVo tDispatchInfo);
 
+	long selectExportCount(@Param("tDispatchInfo") TDispatchInfoSearchVo tDispatchInfo);
+
 	/**
 	 * 导出社保花名册数据查询
 	 * @Author fxj

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

@@ -198,7 +198,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		String fileName = "派单审核导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
 		//获取要导出的列表
 		List<TDispatchAuditExportVo> list = new ArrayList<>();
-		long count = noPageCountDiy(searchVo);
+		long count = baseMapper.selectExportCount(searchVo);
 		ServletOutputStream out = null;
 		try {
 			out = response.getOutputStream();

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

@@ -517,10 +517,10 @@
 				AND a.CREATE_NAME = #{tDispatchInfo.createName}
 			</if>
 			<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
-				AND a.SOCIAL_HOUSEHOLD_NAME like CONCAT(CONCAT(#{tDispatchInfo.socialHouseholdName}), '%')
+				AND a.SOCIAL_HOUSEHOLD_NAME like CONCAT(#{tDispatchInfo.settleDomainName}, '%')
 			</if>
 			<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
-				AND a.PROVIDENT_HOUSEHOLD_NAME like CONCAT(CONCAT(#{tDispatchInfo.providentHouseholdName}), '%')
+				AND a.PROVIDENT_HOUSEHOLD_NAME like CONCAT(#{tDispatchInfo.providentHouseholdName}, '%')
 			</if>
 			<if test="tDispatchInfo.createTimeStart != null">
 				AND a.CREATE_TIME <![CDATA[ >= ]]> #{tDispatchInfo.createTimeStart}
@@ -650,8 +650,8 @@
 		left join t_social_info b on a.SOCIAL_ID = b.ID
 		left join t_provident_fund c on a.FUND_ID = C.ID
 		<where>
-			a.DELETE_FLAG = '0'
-			<include refid="tDispatchInfo_where"/>
+			a.DELETE_FLAG = '0' and a.STATUS = '1'
+			<include refid="tDispatchInfoAudit_where"/>
 		</where>
 		order by a.CREATE_TIME desc
 		<if test="tDispatchInfo.limitStart != null">
@@ -659,6 +659,16 @@
 		</if>
 	</select>
 
+	<select id="selectExportCount" resultType="java.lang.Long">
+		SELECT
+		count(1)
+		from t_dispatch_info a
+		<where>
+			a.DELETE_FLAG = '0' and a.STATUS = '1'
+			<include refid="tDispatchInfoAudit_where"/>
+		</where>
+	</select>
+
 	<resultMap id="socialHandleExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleExportVo">
 		<result property="empName" column="EMP_NAME"/>
 		<result property="empIdcard" column="EMP_IDCARD"/>