feature-wzb :公积金表格修改

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

@@ -240,11 +240,11 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
 
 	List<TDispatchFundPersionExportVo> getFundPersionExportVo(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
 
-	List<TDispatchFundSupplementaryExportVo> getFundSupplementarynExportVo(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo,@Param("companyPro") Double companyPro);
+	List<TDispatchFundSupplementaryExportVo> getFundSupplementarynExportVo(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
 
 	TDispatchFundSumExportVo getFundSumExportVo(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
 
-	TDispatchFundSumVo getFundSumExportVoOne(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo,@Param("companyPro") Double companyPro);
+	TDispatchFundSumVo getFundSumExportVoOne(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
 
 	CompanyProVo getFundPersionExportVoOne(@Param("houseName") String houseName);
 

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

@@ -5438,15 +5438,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		return baseMapper.getFundPersionExportVo(searchVo);
 	}
 
-	private List<TDispatchFundSupplementaryExportVo> getDispatchFundSupplementary(SocialHandleSearchVo  searchVo,Double companyPro) {
-		return baseMapper.getFundSupplementarynExportVo(searchVo,companyPro);
+	private List<TDispatchFundSupplementaryExportVo> getDispatchFundSupplementary(SocialHandleSearchVo  searchVo) {
+		return baseMapper.getFundSupplementarynExportVo(searchVo);
 	}
 	private TDispatchFundSumExportVo  getFundSumExportVo(SocialHandleSearchVo searchVo) {
 		return baseMapper.getFundSumExportVo(searchVo);
 	}
 
-	private TDispatchFundSumVo  getFundSumVo(SocialHandleSearchVo searchVo,Double companyPro ) {
-		return baseMapper.getFundSumExportVoOne(searchVo,companyPro);
+	private TDispatchFundSumVo  getFundSumVo(SocialHandleSearchVo searchVo ) {
+		return baseMapper.getFundSumExportVoOne(searchVo);
 	}
 	private CompanyProVo  companyProVo(String houseName) {
 		return baseMapper.getFundPersionExportVoOne(houseName);
@@ -6297,8 +6297,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			long count = getFCount(searchVo);
 			if (count >  CommonConstants.ZERO_INT){
 				HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(searchVo.getProvidentHouseholdName());
-				Double companyPro=houseNameConfigVo.getCompanyPro();
-				list = getDispatchFundSupplementary(searchVo,companyPro);
+				list = getDispatchFundSupplementary(searchVo);
 				if (Common.isNotNull(list)) {
 					//判断list的大小是否大于10
 					if (list.size() < 10) {
@@ -6308,6 +6307,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							vo = new TDispatchFundSupplementaryExportVo();
 							vo.setNum(num);
 							num ++;
+
 							list.add(vo);
 						}
 					}
@@ -6869,10 +6869,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		String c = "本月减少汇款";
 		String d = "本月汇款";
 		//第一列
-     HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(houseName);
 		list.add(Lists.newArrayList("单位名称（公章）", "单位名称（公章）"));
 
 		//第二列
+		if(houseName==null){
+			houseName="";
+
+		}
 		list.add(Lists.newArrayList(houseName, houseName));
 
 		list.add(Lists.newArrayList(houseName, houseName));
@@ -6903,6 +6906,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		String c = "本月减少汇款";
 		String d = "本月汇款";
 		//第一列
+		if(houseNameConfigVo.getFundBank()==null){
+			houseNameConfigVo.setFundBank("");
+
+		}
 		list.add(Lists.newArrayList("公积金承办银行", "公积金承办银行"));
 		list.add(Lists.newArrayList(houseNameConfigVo.getFundBank(), houseNameConfigVo.getFundBank()));
 		list.add(Lists.newArrayList(houseNameConfigVo.getFundBank(), houseNameConfigVo.getFundBank()));
@@ -6916,9 +6923,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			houseNameConfigVo.setCustomerNo("");
 
 		}
-		list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), houseNameConfigVo.getCompanyPro().toString()+"%"));
+         String k=houseNameConfigVo.getCompanyPro().toString();
+		String m=houseNameConfigVo.getCompanyPro().toString();
+		list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), k+"%"));
 
-		list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), houseNameConfigVo.getCompanyPro().toString()+"%"));
+		list.add(Lists.newArrayList(houseNameConfigVo.getCustomerNo(), m+"%"));
 
 
 		return list;
@@ -6977,8 +6986,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		String a="";
 		HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(searchVo.getProvidentHouseholdName());
 		if(houseNameConfigVo!=null) {
-			TDispatchFundSumVo tDispatchFundSumVo = getFundSumVo(searchVo, houseNameConfigVo.getCompanyPro());
-			if (tDispatchFundSumVo.getSupplementaryAmountSum()!= null&&tDispatchFundSumVo.getNumber()!="0") {
+			TDispatchFundSumVo tDispatchFundSumVo = getFundSumVo(searchVo);
+			if (tDispatchFundSumVo.getSupplementaryAmountSum()!= null) {
 				a = tDispatchFundSumVo.getSupplementaryAmountSum().toString();
 			} else {
 				a = "0";
@@ -7010,8 +7019,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		List<List<String>> list = new ArrayList<>();
 		//表头数据
 		//第一列
-		HouseNameConfigVo houseNameConfigVo=getFundSumExportVoTwo(searchVo.getProvidentHouseholdName());
-		TDispatchFundSumVo dispatchFundSumVo=getFundSumVo(searchVo,houseNameConfigVo.getCompanyPro());
+
+		TDispatchFundSumVo dispatchFundSumVo=getFundSumVo(searchVo);
 		String F=dispatchFundSumVo.getNumber();
 		list.add(Lists.newArrayList("单位申请\n" +"补缴意见"));
 
@@ -7024,9 +7033,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		//第三列
 
 		list.add(Lists.newArrayList("补缴合计", "补缴合计","补缴合计","补缴原因","补缴原因","补缴原因"));
-
-		list.add(Lists.newArrayList("此次申请补缴共有"+dispatchFundSumVo.getNumber()+"人", "补缴总额"+dispatchFundSumVo.getSupplementaryAmountSum().toString(),""));
-		list.add(Lists.newArrayList("此次申请补缴共有"+dispatchFundSumVo.getNumber()+"人", "补缴总额"+dispatchFundSumVo.getSupplementaryAmountSum().toString(),""));
+		if(dispatchFundSumVo.getNumber()==null){
+			dispatchFundSumVo.setNumber("0");
+		}
+		if(dispatchFundSumVo.getSupplementaryAmountSum()==null){
+			dispatchFundSumVo.setSupplementaryAmountSum(BigDecimal.ZERO );
+		}
+		list.add(Lists.newArrayList("此次申请补缴共有"+dispatchFundSumVo.getNumber()+"人", "补缴总额"+dispatchFundSumVo.getSupplementaryAmountSum().toString()+"元",""));
+		list.add(Lists.newArrayList("此次申请补缴共有"+dispatchFundSumVo.getNumber()+"人", "补缴总额"+dispatchFundSumVo.getSupplementaryAmountSum().toString()+"元",""));
 		//第四列
 
 

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

@@ -1978,6 +1978,7 @@
 		a.DELETE_FLAG = 0
 		AND a.fund_id is not null
 		AND a.STATUS in ('2','4')
+		AND ((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))+1)>=0
 		AND a.DISPATCH_ITEM like concat('%','公积金','%')
 		<if test="tDispatchInfo != null">
 			<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
@@ -2081,7 +2082,6 @@
 	<!--tDispatchInfo 社保医疗花名册派单数据-->
 	<select id="getFundSupplementarynExportVo" resultMap="FundSupplementaryExport">
 
-
 		SELECT
 		( @i := @i + 1 ) AS NUM,
 		a.EMP_NAME,
@@ -2089,7 +2089,7 @@
 		s.UNIT_PROVIDENG_CARDINAL AS DEPOSIT_BASE,
 		REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' ) AS ORIGINATE,
 		#{tDispatchInfo.disMonth} AS END,
-		ROUND((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))*#{companyPro}*s.UNIT_PROVIDENG_CARDINAL*0.01 ) AS SUPPLEMENTART_AMOUNT
+		ROUND(((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))+1)*s.UNIT_PROVIDENT_FEE*2 ) AS SUPPLEMENTART_AMOUNT
 		FROM
 		t_dispatch_info a
 		LEFT JOIN t_provident_fund s ON s.id = a.FUND_ID,(
@@ -2115,7 +2115,7 @@
 	<select id="getFundSumExportVoOne" resultMap="FundSupplementary">
 		SELECT
 		count(a.EMP_IDCARD) as NUMBER,
-		SUM(ROUND((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE (DATE_FORMAT( DATE_ADD(s.PROVIDENT_START,INTERVAL 1 MONTH), "%Y-%m" ), '-', '' )))*#{companyPro}*s.UNIT_PROVIDENG_CARDINAL*0.01 )) AS SUPPLEMENTART_AMOUNT_SUM
+		SUM(ROUND(((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))+1)*s.UNIT_PROVIDENT_FEE*2 ))  AS SUPPLEMENTART_AMOUNT_SUM
 		FROM t_dispatch_info a
 				 left join t_provident_fund s on s.id = a.FUND_ID
 		<where>