Commit b634ee16 by huluobin

# 更新

parent ece74f03
...@@ -4,6 +4,7 @@ import com.bailuntec.api.bailuntec.cw.CwApi; ...@@ -4,6 +4,7 @@ import com.bailuntec.api.bailuntec.cw.CwApi;
import com.bailuntec.common.JsonUtilByFsJson; import com.bailuntec.common.JsonUtilByFsJson;
import com.bailuntec.common.JsonUtilByJackson; import com.bailuntec.common.JsonUtilByJackson;
import com.bailuntec.common.ListUtil; import com.bailuntec.common.ListUtil;
import com.bailuntec.common.StringUtils;
import com.bailuntec.cost.api.dto.CostDto; import com.bailuntec.cost.api.dto.CostDto;
import com.bailuntec.cost.api.dto.CostListPrintDto; import com.bailuntec.cost.api.dto.CostListPrintDto;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...@@ -15,22 +16,17 @@ import com.blt.other.common.util.CurUtils; ...@@ -15,22 +16,17 @@ import com.blt.other.common.util.CurUtils;
import com.blt.other.common.util.SessionUtils; import com.blt.other.common.util.SessionUtils;
import com.blt.other.database.model.CostApplycallbackDomain; import com.blt.other.database.model.CostApplycallbackDomain;
import com.blt.other.database.model.CostCashiercallbackDomain; import com.blt.other.database.model.CostCashiercallbackDomain;
import com.blt.other.database.model.CostTypeDomain;
import com.blt.other.database.model.UserDomain; import com.blt.other.database.model.UserDomain;
import com.blt.other.module.auth.dao.OaDepartmentMapper; import com.blt.other.module.auth.dao.OaDepartmentMapper;
import com.blt.other.module.auth.dao.OaUserMapper; import com.blt.other.module.auth.dao.OaUserMapper;
import com.blt.other.module.auth.model.OaDepartment; import com.blt.other.module.auth.model.OaDepartment;
import com.blt.other.module.auth.model.OaUser; import com.blt.other.module.auth.model.OaUser;
import com.blt.other.module.cost.dao.CostCompanyDao; import com.blt.other.module.cost.dao.*;
import com.blt.other.module.cost.dao.CostDao;
import com.blt.other.module.cost.dao.CostDetailDao;
import com.blt.other.module.cost.dao.CostTemplateBaseColMapper;
import com.blt.other.module.cost.dto.request.CheckCostListReq; import com.blt.other.module.cost.dto.request.CheckCostListReq;
import com.blt.other.module.cost.dto.request.CostQueryPageReq; import com.blt.other.module.cost.dto.request.CostQueryPageReq;
import com.blt.other.module.cost.dto.response.UpdateCostResp; import com.blt.other.module.cost.dto.response.UpdateCostResp;
import com.blt.other.module.cost.model.CostCurrentReviewer; import com.blt.other.module.cost.model.*;
import com.blt.other.module.cost.model.CostDetailDomain;
import com.blt.other.module.cost.model.CostDomain;
import com.blt.other.module.cost.model.CostTemplateBaseCol;
import com.blt.other.module.cost.service.*; import com.blt.other.module.cost.service.*;
import com.blt.other.module.cost.vo.ApplyCallbackUrlDataDataVo; import com.blt.other.module.cost.vo.ApplyCallbackUrlDataDataVo;
import com.blt.other.module.cost.vo.ApplyCallbackUrlVo; import com.blt.other.module.cost.vo.ApplyCallbackUrlVo;
...@@ -144,7 +140,8 @@ public abstract class AbstractCostService implements CostService { ...@@ -144,7 +140,8 @@ public abstract class AbstractCostService implements CostService {
@Resource @Resource
CostTemplateBaseColMapper costTemplateBaseColMapper; CostTemplateBaseColMapper costTemplateBaseColMapper;
@Resource
AccountingSubjectMapper accountingSubjectMapper;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
...@@ -167,6 +164,16 @@ public abstract class AbstractCostService implements CostService { ...@@ -167,6 +164,16 @@ public abstract class AbstractCostService implements CostService {
costDomain.setToRmbRate(toRmbRate); costDomain.setToRmbRate(toRmbRate);
costDomain.setAmountRmb(costDomain.getAmount().multiply(toRmbRate).setScale(2, BigDecimal.ROUND_HALF_UP)); costDomain.setAmountRmb(costDomain.getAmount().multiply(toRmbRate).setScale(2, BigDecimal.ROUND_HALF_UP));
if (StringUtils.isNotEmpty(costDomain.getTypeNo())) {
CostTypeDomain costTypeDomain = new CostTypeDomain();
AccountingSubject accountingSubject = accountingSubjectMapper.selectById(costTypeDomain.getAccountingSubjectId());
costDomain.setTypeNo(costDomain.getTypeNo());
costDomain.setTypeName(costTypeDomain.getTypeName());
costDomain.setAccountingSubjectNo(accountingSubject.getSubjectNo());
costDomain.setAccountingSubjectName(accountingSubject.getName());
}
Integer update = costDao.update(costDomain, new LambdaQueryWrapper<CostDomain>() Integer update = costDao.update(costDomain, new LambdaQueryWrapper<CostDomain>()
.eq(CostDomain::getCostNo, costDomain.getCostNo())); .eq(CostDomain::getCostNo, costDomain.getCostNo()));
......
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