Commit f247ea9a by huluobin

# update

parent e601a04d
...@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.blt.other.common.util.PathUtil; import com.blt.other.common.util.PathUtil;
import com.blt.other.module.cost.dao.CostTypeDao; import com.blt.other.module.cost.dao.CostTypeDao;
import com.blt.other.module.cost.model.AccountingSubject;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -48,6 +47,7 @@ public class CostPlanTempDomain { ...@@ -48,6 +47,7 @@ public class CostPlanTempDomain {
// @TableField(exist = false) // @TableField(exist = false)
// private CostTypeDomain costType; // private CostTypeDomain costType;
@TableField(exist = false)
private Integer accountingSubjectId; private Integer accountingSubjectId;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty("会计一级科目") @ApiModelProperty("会计一级科目")
......
package com.blt.other.module.cost.service.impl.costplan; package com.blt.other.module.cost.service.impl.costplan;
import com.bailuntec.common.ListUtil; import com.bailuntec.common.ListUtil;
import com.bailuntec.common.StringUtils;
import com.bailuntec.cost.api.dto.CostPlanDto; import com.bailuntec.cost.api.dto.CostPlanDto;
import com.blt.other.common.exception.BizRuntimeException; import com.blt.other.common.exception.BizRuntimeException;
import com.blt.other.database.model.*; import com.blt.other.database.model.*;
...@@ -116,8 +117,10 @@ public abstract class AbstractCostPlanService implements CostPlanService { ...@@ -116,8 +117,10 @@ public abstract class AbstractCostPlanService implements CostPlanService {
}); });
} }
CostTypeDomain costTypeDomain = costTypeDao.selectByNo(costPlanDomain.getTypeNo()); if (StringUtils.isNotEmpty(costPlanDomain.getTypeNo())) {
costPlanDomain.setAccountingSubjectId(costTypeDomain.getAccountingSubjectId()); CostTypeDomain costTypeDomain = costTypeDao.selectByNo(costPlanDomain.getTypeNo());
costPlanDomain.setAccountingSubjectId(costTypeDomain.getAccountingSubjectId());
}
} }
......
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