社保优化修改

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

@@ -63,6 +63,8 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> {
 
 	List<TSocialFundInfoExportVo> exportList(@Param("tSocialFundInfo") TSocialFundInfoSearchVo tSocialFundInfo);
 
+	Integer exportListCount(@Param("tSocialFundInfo") TSocialFundInfoSearchVo tSocialFundInfo);
+
 	void updateSocialAndFoundInfo(@Param("infoVo") UpdateSocialFoundVo infoVo);
 
 	void updateSocialAndFoundInfoF(@Param("infoVo") UpdateSocialFoundVo infoVo);

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

@@ -1710,7 +1710,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 									.eq(TProvidentFund::getFundCity, infoVo.getSocialCity()));
 							if (!fundlist.isEmpty()) {
 								for (TProvidentFund providentFund : fundlist) {
-									if ((Common.isEmpty(infoVo.getSocialTown()) || (Common.isNotNull(infoVo.getSocialTown()) &&
+									if ((Common.isEmpty(infoVo.getFundTown()) || (Common.isNotNull(infoVo.getFundTown()) &&
 											infoVo.getFundTown().equals(providentFund.getFundTown()))) &&
 											DateUtil.dateToString(providentFund.getProvidentStart(), "yyyyMM").compareTo(infoVo.getProvidentPayMonth()) <= 0 &&
 											(Common.isEmpty(providentFund.getFundReduceDate()) || (Common.isNotNull(providentFund.getFundReduceDate()) &&
@@ -1727,6 +1727,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 										+ "的公积金数据(请查验公积金缴纳地)！"));
 								continue;
 							}
+						} else {
+							tProvidentFund = null;
 						}
 						//计算公积金合计，个人金额和单位金额一致
 						infoVo.setProvidentSum(BigDecimalUtils.safeAdd(infoVo.getUnitProvidentSum(), infoVo.getUnitProvidentSum()));
@@ -2657,18 +2659,18 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		if (areaArray.length >= CommonConstants.TWO_INT) {
 			temp = areaMap2.get(areaArray[0] + CommonConstants.DOWN_LINE_STRING + "null");
 			if (Common.isNotNull(temp)) {
-				infoVo.setSocialProvince(temp);
+				infoVo.setFundProvince(temp);
 			}
-			temp = areaMap2.get(areaArray[1] + CommonConstants.DOWN_LINE_STRING + (null == infoVo.getSocialProvince()
-					? "null" : infoVo.getSocialProvince()));
+			temp = areaMap2.get(areaArray[1] + CommonConstants.DOWN_LINE_STRING + (null == infoVo.getFundProvince()
+					? "null" : infoVo.getFundProvince()));
 			if (Common.isNotNull(temp)) {
-				infoVo.setSocialCity(temp);
+				infoVo.setFundCity(temp);
 			}
 			if (areaArray.length >= CommonConstants.THREE_INT) {
-				temp = areaMap2.get(areaArray[2] + CommonConstants.DOWN_LINE_STRING + (null == infoVo.getSocialCity()
-						? "null" : infoVo.getSocialCity()));
+				temp = areaMap2.get(areaArray[2] + CommonConstants.DOWN_LINE_STRING + (null == infoVo.getFundCity()
+						? "null" : infoVo.getFundCity()));
 				if (Common.isNotNull(temp)) {
-					infoVo.setSocialTown(temp);
+					infoVo.setFundTown(temp);
 				}
 			}
 			if (null != s.getFundProvince()) {

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

@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeExportVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
@@ -103,7 +102,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 		String fileName = "社保公积金批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
 		//获取要导出的列表
 		List<TSocialFundInfoExportVo> list = new ArrayList<>();
-		long count = noPageCountDiy(searchVo);
+		long count = baseMapper.exportListCount(searchVo);
 		ServletOutputStream out = null;
 		try {
 			out = response.getOutputStream();

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

@@ -941,6 +941,17 @@
 		</where>
 	</select>
 
+	<!--导出-->
+	<select id="exportListCount" resultType="java.lang.Integer">
+		select
+		count(1)
+		from t_social_fund_info a
+		<where>
+			1=1
+			<include refid="tSocialFundInfo_where"/>
+		</where>
+	</select>
+
 	<!--导出-->
 	<select id="exportList" resultMap="exportMap">
 		select
@@ -1111,9 +1122,9 @@
 		LEFT JOIN sys_area s1 on a.SOCIAL_PROVINCE=s1.id
 		LEFT JOIN sys_area s2 on a.SOCIAL_CITY=s2.id
 		LEFT JOIN sys_area s3 on a.SOCIAL_TOWN=s3.id
-		LEFT JOIN sys_area f1 on d.FUND_PROVINCE=f1.id
-		LEFT JOIN sys_area f2 on d.FUND_CITY=f2.id
-		LEFT JOIN sys_area f3 on d.FUND_TOWN=f3.id
+		LEFT JOIN sys_area f1 on a.FUND_PROVINCE=f1.id
+		LEFT JOIN sys_area f2 on a.FUND_CITY=f2.id
+		LEFT JOIN sys_area f3 on a.FUND_TOWN=f3.id
 		LEFT JOIN sys_area d1 on d.FILE_PROVINCE=d1.id
 		LEFT JOIN sys_area d2 on d.FILE_CITY=d2.id
 		LEFT JOIN sys_area d3 on d.FILE_TOWN=d3.id