Merge branch 'develop' into feature-licancan

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsBonusServiceImpl.java

@@ -394,8 +394,13 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 					infoVo.setBestPlanTSalary(map.get(res.toString()));
 					infoVo.setBestPlanBonus(BigDecimalUtils.safeSubtract(wSalary,map.get(res.toString())));
 				}
+				if (Common.isNotNull(list)) {
+					WriteSheet writeSheet = EasyExcel.writerSheet("全年一次性奖金测算").build();
+					excelWriter.write(list, writeSheet);
+				}
+
 			}else {
-				WriteSheet writeSheet = EasyExcel.writerSheet("全年一次性奖金测算"+index).build();
+				WriteSheet writeSheet = EasyExcel.writerSheet("全年一次性奖金测算").build();
 				excelWriter.write(list,writeSheet);
 			}
 			if (Common.isNotNull(list)){
@@ -435,7 +440,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 		BigDecimal anRes;
 		List<BigDecimal> zySalary = new ArrayList<>();
 		Map<String,BigDecimal> map = new HashMap<>();
-		for (BigDecimal i = minSalary; i.compareTo(maxAnualSalary) <= 0; BigDecimalUtils.safeAdd(i,new BigDecimal(100)) ) {
+		for (BigDecimal i = minSalary; i.compareTo(maxAnualSalary) <= 0; i = BigDecimalUtils.safeAdd(i,new BigDecimal(100)) ) {
 			//本次薪资纳税额
 			BigDecimal res = BigDecimal.ZERO;
 			//本次年终奖纳税额

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsDeclarerMapper.xml

@@ -100,7 +100,7 @@
 			if(c.FORM_TYPE=0,'0',if(c.FORM_TYPE=3 or c.FORM_TYPE=4,'1','-')) OCCUPATION_TYPE FROM
 		(SELECT s.* FROM t_salary_account s,
 		(SELECT a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,a.INVOICE_TITLE,a.FORM_TYPE,MAX(CREATE_TIME) max_day,a.SETTLEMENT_MONTH
-			FROM t_salary_account a WHERE a.DELETE_FLAG = '0' AND a.SETTLEMENT_MONTH = #{lastYear}
+			FROM t_salary_account a WHERE a.DELETE_FLAG = '0' AND a.SETTLEMENT_MONTH = #{lastMonth}
 			GROUP BY a.EMP_IDCARD,a.INVOICE_TITLE,a.FORM_TYPE,a.SETTLEMENT_MONTH) b
 			WHERE s.DELETE_FLAG = '0' AND b.max_day = s.CREATE_TIME
 			AND s.EMP_IDCARD = b.EMP_IDCARD AND s.INVOICE_TITLE = b.INVOICE_TITLE

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

@@ -262,7 +262,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			for (TPaymentInfo paymentInfo : list) {
 				if ((!user.getId().equals(paymentInfo.getCreateBy()) &&
 						!CommonConstants.ONE_STRING.equals(user.getId())) ||
-						CommonConstants.ZERO_STRING.equals(paymentInfo.getPushStatus())) {
+						CommonConstants.ZERO_STRING.equals(paymentInfo.getPushStatus()) ||
+						CommonConstants.ONE_STRING.equals(paymentInfo.getSalaryFundFlag()) ||
+						CommonConstants.ONE_STRING.equals(paymentInfo.getSalarySocialFlag())) {
 					delFlag = true;
 				} else {
 					idList.add(paymentInfo.getId());