Commit 2fbc76ef by liyanlin

fix

parent deb3f087
......@@ -155,7 +155,9 @@ public abstract class AbstractCostService implements CostService {
@Transactional(rollbackFor = Exception.class)
@Override
public UpdateCostResp updateCost(CostDomain costDomain) {
public UpdateCostResp updateCost(CostDomain input) {
CostDomain costDomain = new CostDomain();
BeanUtils.copyProperties(input, costDomain, "id", "createUserid", "createUsername", "createUsercode", "createTime");
UpdateCostResp resp = new UpdateCostResp();
if (null != costDomain.getCompanyNo()) {
......@@ -315,8 +317,8 @@ public abstract class AbstractCostService implements CostService {
}
@Override
public IPage<CostDto> checkCostAllList(AllCheckCostListReq req){
if(req.getCostForm() != null) {
public IPage<CostDto> checkCostAllList(AllCheckCostListReq req) {
if (req.getCostForm() != null) {
if (req.getCostForm().equals(3)) {
req.setIsLend(1);
}
......@@ -325,11 +327,11 @@ public abstract class AbstractCostService implements CostService {
req.setIsLend(2);
}
}
if(req.getCostStatusList()!=null && !req.getCostStatusList().isEmpty()){
req.setCostStatusStr(StringUtils.join(req.getCostStatusList(),','));
if (req.getCostStatusList() != null && !req.getCostStatusList().isEmpty()) {
req.setCostStatusStr(StringUtils.join(req.getCostStatusList(), ','));
}
IPage<CostDomain> page = new Page<>(req.getPageNum(), req.getPageSize());
return costDao.allCheckCostList(page,req).convert(CostDomain::castToDto);
return costDao.allCheckCostList(page, req).convert(CostDomain::castToDto);
}
@Resource
......@@ -408,7 +410,7 @@ public abstract class AbstractCostService implements CostService {
}
void saveNetsuiteJob(CostDomain costDomain, CostCashiercallbackDomain costCashiercallbackDomain) {
if(costDomain==null){
if (costDomain == null) {
return;
}
//只保存香港百伦
......@@ -420,9 +422,9 @@ public abstract class AbstractCostService implements CostService {
String nsAccountingSubjectId = costCashiercallbackDomain.getErpAccountingType();
if(costCashiercallbackDomain.getCashierbankcardname().equals("Hang Seng Bank Limited")
&& costCashiercallbackDomain.getCashierbankcard().equals("774-515290-883")){
switch (costCashiercallbackDomain.getCashierunitcode().toUpperCase()){
if (costCashiercallbackDomain.getCashierbankcardname().equals("Hang Seng Bank Limited")
&& costCashiercallbackDomain.getCashierbankcard().equals("774-515290-883")) {
switch (costCashiercallbackDomain.getCashierunitcode().toUpperCase()) {
case "HKD":
nsAccountingSubjectId = "10020201";
break;
......
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