Commit a5ddf7c9 authored by huyuchen's avatar huyuchen

hyc-项目余额调整

parent c7b11685
...@@ -10,7 +10,7 @@ import lombok.Data; ...@@ -10,7 +10,7 @@ import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 款项认领差额费导入 * 款项认领差额费导入
...@@ -96,7 +96,7 @@ public class ClaimRebackInfotVO implements Serializable { ...@@ -96,7 +96,7 @@ public class ClaimRebackInfotVO implements Serializable {
@ExcelAttribute(name = "入账日期") @ExcelAttribute(name = "入账日期")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="入账日期") @ExcelProperty(value ="入账日期")
private Date claimTime; private LocalDateTime claimTime;
/** /**
* 异常说明 * 异常说明
......
...@@ -334,10 +334,10 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E ...@@ -334,10 +334,10 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
money = excel.getMoney(); money = excel.getMoney();
deptName = excel.getDeptName(); deptName = excel.getDeptName();
ClaimRebackInfotVO backInfo = new ClaimRebackInfotVO(); ClaimRebackInfotVO backInfo = new ClaimRebackInfotVO();
//先找到彭超创建的款项认领明细
info = baseMapper.getClaimInfoByDeptNo(deptNo,"1");
//
if (money.compareTo(BigDecimal.ZERO) > 0) { if (money.compareTo(BigDecimal.ZERO) > 0) {
//先找到彭超创建的款项认领明细
info = baseMapper.getClaimInfoByDeptNo(deptNo,"1");
//调整金额大于零的先找到彭超创建的款项认领明细直接加 //调整金额大于零的先找到彭超创建的款项认领明细直接加
if (Optional.ofNullable(info).isPresent()) { if (Optional.ofNullable(info).isPresent()) {
info.setAdjustMoney(money); info.setAdjustMoney(money);
......
...@@ -191,6 +191,7 @@ ...@@ -191,6 +191,7 @@
where where
fd_3afb4689209aa2 = #{deptNo} fd_3afb4689209aa2 = #{deptNo}
and fd_3afb46d05d19ec > 0 and fd_3afb46d05d19ec > 0
and fd_3b2a70e26f520a != '1817fbe83899f5f34c1ee9b463bbf9c1'
order by fd_3b5f41db9fb154 asc order by fd_3b5f41db9fb154 asc
</select> </select>
......
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