Commit 0ee61b86 authored by hongguangwu's avatar hongguangwu

稿酬

parent fa31b382
...@@ -100,7 +100,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -100,7 +100,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
@Override @Override
public TSettleDomainSelectVo getSettleDomainVoById(String id) { public TSettleDomainSelectVo getSettleDomainVoById(String id) {
return baseMapper.selectSettleDomainSelectVosById(id); return baseMapper.getSettleDomainVoById(id);
} }
@Override @Override
......
...@@ -186,7 +186,8 @@ ...@@ -186,7 +186,8 @@
c.customerId, c.customerId,
c.CUSTOMER_NAME as 'customerName', c.CUSTOMER_NAME as 'customerName',
c.CUSTOMER_CODE as 'customerCode', c.CUSTOMER_CODE as 'customerCode',
c.INDUSTRY_BELONG as 'industryBelong' c.INDUSTRY_BELONG as 'industryBelong',
t.COVER_NAME as 'businessSubjectName'
FROM FROM
t_settle_domain a t_settle_domain a
LEFT JOIN ( LEFT JOIN (
...@@ -195,6 +196,7 @@ ...@@ -195,6 +196,7 @@
INDUSTRY_BELONG, INDUSTRY_BELONG,
CUSTOMER_CODE from t_customer_info CUSTOMER_CODE from t_customer_info
) c ON a.CUSTOMER_ID = c.customerId ) c ON a.CUSTOMER_ID = c.customerId
LEFT JOIN t_table_head_salary_cover t on a.id=t.DEPART_ID and t.type = 0
WHERE a.id=#{id} GROUP BY a.id WHERE a.id=#{id} GROUP BY a.id
</select> </select>
......
...@@ -227,6 +227,17 @@ public class TSalaryStandard extends BaseEntity { ...@@ -227,6 +227,17 @@ public class TSalaryStandard extends BaseEntity {
@ExcelAttribute(name = "含有特殊金额的强行提交的备注") @ExcelAttribute(name = "含有特殊金额的强行提交的备注")
private String haveSpecialRemark; private String haveSpecialRemark;
/**
* 本月是否重复金额0:否;1:是重复导入的
*/
@ExcelAttribute(name = "本月是否重复金额0:否;1:是重复导入的")
@ExcelProperty("本月是否重复金额0:否;1:是重复导入的")
private Integer isRepeat;
@Schema(description = "本月重复金额的备注", name = "repeatRemark")
@ExcelAttribute(name = "本月重复金额的备注")
private String repeatRemark;
/** /**
* 提交备注 * 提交备注
*/ */
......
...@@ -501,6 +501,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -501,6 +501,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
boolean haveSalaryFlag = false; boolean haveSalaryFlag = false;
// 是否含有特殊金额false:否;true:是 // 是否含有特殊金额false:否;true:是
boolean haveSpecialFlag = false; boolean haveSpecialFlag = false;
// 是否重复金额false:否;true:是
boolean repeatFlag = false;
// 年终奖错误信息合计: // 年终奖错误信息合计:
StringBuilder yearEndInfo = new StringBuilder(); StringBuilder yearEndInfo = new StringBuilder();
List<String> idCardList = new ArrayList<>(); List<String> idCardList = new ArrayList<>();
...@@ -539,6 +541,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -539,6 +541,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
if (!haveSpecialFlag && a.getHaveSpecialFlag() != null && a.getHaveSpecialFlag() == CommonConstants.ONE_INT) { if (!haveSpecialFlag && a.getHaveSpecialFlag() != null && a.getHaveSpecialFlag() == CommonConstants.ONE_INT) {
haveSpecialFlag = true; haveSpecialFlag = true;
} }
if (!repeatFlag && a.getIsRepeat() != null && a.getIsRepeat() == CommonConstants.ONE_INT) {
repeatFlag = true;
}
checkYearFinalStyle = a.getAnnualBonusType(); checkYearFinalStyle = a.getAnnualBonusType();
if (Common.isNotNull(a.getTaxMonth())) { if (Common.isNotNull(a.getTaxMonth())) {
maxYearMonth = DateUtil.getMaxYearMonth(a.getTaxMonth()); maxYearMonth = DateUtil.getMaxYearMonth(a.getTaxMonth());
...@@ -775,7 +780,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -775,7 +780,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
salary.setSettlementAmount(relaySalarySum); salary.setSettlementAmount(relaySalarySum);
salary.setHaveSalaryFlag(CommonConstants.ZERO_INT); salary.setHaveSalaryFlag(CommonConstants.ZERO_INT);
salary.setHaveSpecialFlag(CommonConstants.ZERO_INT); salary.setHaveSpecialFlag(CommonConstants.ZERO_INT);
if (haveSalaryFlag || haveSpecialFlag || ownNum>0) { salary.setIsRepeat(CommonConstants.ZERO_INT);
if (haveSalaryFlag || haveSpecialFlag || ownNum>0 || repeatFlag) {
salary.setStatus(SalaryConstants.AUDIT_STATUS[0]); salary.setStatus(SalaryConstants.AUDIT_STATUS[0]);
if (haveSalaryFlag) { if (haveSalaryFlag) {
salary.setHaveSalaryFlag(CommonConstants.ONE_INT); salary.setHaveSalaryFlag(CommonConstants.ONE_INT);
...@@ -783,6 +789,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -783,6 +789,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
if (haveSpecialFlag) { if (haveSpecialFlag) {
salary.setHaveSpecialFlag(CommonConstants.ONE_INT); salary.setHaveSpecialFlag(CommonConstants.ONE_INT);
} }
if (repeatFlag) {
salary.setIsRepeat(CommonConstants.ONE_INT);
}
} else { } else {
salary.setStatus(SalaryConstants.AUDIT_STATUS[2]); salary.setStatus(SalaryConstants.AUDIT_STATUS[2]);
} }
......
...@@ -274,6 +274,11 @@ public class SalaryAccountUtil implements Serializable { ...@@ -274,6 +274,11 @@ public class SalaryAccountUtil implements Serializable {
errorList.add(new ErrorMessage((i + 2), error)); errorList.add(new ErrorMessage((i + 2), error));
continue; continue;
} }
if ("4".equals(salaryType) && actualSalarySum == null) {
error = "第" + (i + 2) + "行:【稿酬】列_不可缺少";
errorList.add(new ErrorMessage((i + 2), error));
continue;
}
// 应发、实发、实发劳务费不可都为空 // 应发、实发、实发劳务费不可都为空
if (relaySalary == null && actualSalarySum == null) { if (relaySalary == null && actualSalarySum == null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment