申报修改

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsDeclarer.java

@@ -89,14 +89,14 @@ public class TStatisticsDeclarer {
 	 * 任职受雇从业类型
 	 */
 	@Length(max = 2, message = "任职受雇从业类型不能超过2个字符")
-	@ExcelIgnore
+	@ExcelAttribute(name = "任职受雇从业类型", maxLength = 2,readConverterExp = "0=雇员,1=其他")
+	@ExcelProperty("任职受雇从业类型")
 	private String occupationType;
 	/**
 	 * 任职受雇从业日期
 	 */
-	@ExcelAttribute(name = "任职受雇从业日期", maxLength = 20)
 	@Length(max = 20, message = "任职受雇从业日期不能超过20个字符")
-	@ExcelProperty("任职受雇从业日期")
+	@ExcelIgnore
 	private String occupationMonth;
 	/**
 	 * 本月是否申报 0 是 1 否

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

@@ -201,7 +201,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 			if (sdr != null && sdr.getData() != null) {
 				dept = sdr.getData();
 			}
-			if (dept == null || dept.getId() == null) {
+			if (dept != null && dept.getId() != null) {
 				invoiceTitle = dept.getBusinessSubjectName();
 			}
 
@@ -273,10 +273,11 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 					finalSalaryNoSalary = calculationSalary(annousTax,infoVo.getAnnualBonus());
 					//年终奖合并扣税
 					if (isSend) {
+						wSalary = infoVo.getAnnualBonus();
 						finalSalaryWithSalary = finalSalaryNoSalary;
 					} else {
-						finalSalaryWithSalary = calculationSalary(annousTax, BigDecimalUtils.safeAdd(infoVo.getAnnualBonus(),
-								infoVo.getAnnualTSalary()));
+						wSalary = BigDecimalUtils.safeAdd(infoVo.getAnnualBonus(), infoVo.getAnnualTSalary());
+						finalSalaryWithSalary = calculationSalary(annousTax, wSalary);
 					}
 
 					if (BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ySalary, wSalary), sumDeductSalary).
@@ -471,8 +472,12 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 			zySalary.add(BigDecimalUtils.safeAdd(res,anRes));
 			map.put(BigDecimalUtils.safeAdd(res,anRes).toString(),i);
 		}
+		BigDecimal salary = BigDecimal.ZERO;
+		if (Common.isNotNull(zySalary)) {
+			salary = Collections.min(zySalary);
+		}
 		jsonObject.put("anRes",map);
-		jsonObject.put("zySalary",Collections.max(zySalary));
+		jsonObject.put("zySalary",salary);
 		return jsonObject;
 	}
 

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

@@ -95,12 +95,15 @@
 
 	<!--统计-->
 	<select id="doStatisticsTaxDeclarer" resultMap="tStatisticsDeclarerMap">
-		select
-			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,a.INVOICE_TITLE DECLARE_UNIT,
-			if(a.FORM_TYPE=0,'0',if(a.FORM_TYPE=3 or a.FORM_TYPE=4,'1','-')) OCCUPATION_TYPE
-		from t_salary_account a
-	    left join t_salary_employee b on b.id = a.EMP_ID
-		where a.DELETE_FLAG = '0' and a.SETTLEMENT_MONTH = #{lastMonth}
-		GROUP BY a.EMP_IDCARD,OCCUPATION_TYPE,DECLARE_UNIT,a.SETTLEMENT_MONTH
+		SELECT
+		#{nowMonth} DECLARE_MONTH,c.EMP_NAME,c.EMP_IDCARD,c.EMP_PHONE,c.INVOICE_TITLE DECLARE_UNIT,
+			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}
+			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
+			AND s.SETTLEMENT_MONTH = b.SETTLEMENT_MONTH AND s.FORM_TYPE = b.FORM_TYPE ) c
 	</select>
 </mapper>