广告无形资产广告字段简写修改

mitao

5 天以前 45e035bfb4c196fd8c58946d560da69006de6689

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java

@@ -21,7 +21,7 @@
import com.ruoyi.system.dto.AddReimbursementDTO;
import com.ruoyi.system.emums.ApprovalStatusEnum;
import com.ruoyi.system.emums.ApprovalTypeEnum;
import com.ruoyi.system.model.OaApprovalApplicationAdvertisement;
import com.ruoyi.system.model.OaApprovalApplicationAd;
import com.ruoyi.system.model.OaApprovalApplicationAttendance;
import com.ruoyi.system.model.OaApprovalApplicationContact;
import com.ruoyi.system.model.OaApprovalApplicationContract;
@@ -32,7 +32,7 @@
import com.ruoyi.system.model.OaApprovalApplications;
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.OaApprovalApplicationAdvertisementService;
import com.ruoyi.system.service.OaApprovalApplicationAdService;
import com.ruoyi.system.service.OaApprovalApplicationAttendanceService;
import com.ruoyi.system.service.OaApprovalApplicationContactService;
import com.ruoyi.system.service.OaApprovalApplicationContractService;
@@ -80,7 +80,7 @@
    @Resource
    private OaApprovalApplicationsService approvalApplicationsService;
    @Resource
    private OaApprovalApplicationAdvertisementService approvalApplicationAdvertisementService;
    private OaApprovalApplicationAdService approvalApplicationAdvertisementService;
    @Resource
    private OaApprovalApplicationContactService approvalApplicationContactService;
    @Resource
@@ -412,9 +412,10 @@
        approvalApplicationReimbursementService.save(oaApprovalApplicationReimbursement);
        BigDecimal total = new BigDecimal(0);
        List<OaApprovalApplicationReimbursementItem> oaApprovalApplicationReimbursementItems = new ArrayList<>();
        for (OaApprovalApplicationReimbursementItem oaApprovalApplicationReimbursementItem : oaApprovalApplicationReimbursementItems) {
            oaApprovalApplicationReimbursementItem.setApprovalApplicationId(oaApprovalApplicationReimbursement.getId());
        for (OaApprovalApplicationReimbursementItem oaApprovalApplicationReimbursementItem : dto.getItems()) {
            oaApprovalApplicationReimbursementItem.setApprovalApplicationId(oaApprovalApplications.getId());
            total = total.add(oaApprovalApplicationReimbursementItem.getAmount());
            oaApprovalApplicationReimbursementItems.add(oaApprovalApplicationReimbursementItem);
        }
        oaApprovalApplicationReimbursement.setReimbursementAmount(total);
        approvalApplicationReimbursementService.updateById(oaApprovalApplicationReimbursement);
@@ -600,15 +601,15 @@
                .one();
        oaApprovalApplications.setCurrentFlowNodeId(approvalFlowNode.getId());
        approvalApplicationsService.save(oaApprovalApplications);
        OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = new OaApprovalApplicationAdvertisement();
        oaApprovalApplicationAdvertisement.setApprovalApplicationId(oaApprovalApplications.getId());
        oaApprovalApplicationAdvertisement.setTitle(dto.getTitle());
        oaApprovalApplicationAdvertisement.setContent(dto.getContent());
        oaApprovalApplicationAdvertisement.setNumber(dto.getNumber());
        oaApprovalApplicationAdvertisement.setTotalAmount(dto.getTotalAmount());
        oaApprovalApplicationAdvertisement.setSpec(dto.getSpec());
        oaApprovalApplicationAdvertisement.setStatus(false);
        approvalApplicationAdvertisementService.save(oaApprovalApplicationAdvertisement);
        OaApprovalApplicationAd oaApprovalApplicationAd = new OaApprovalApplicationAd();
        oaApprovalApplicationAd.setApprovalApplicationId(oaApprovalApplications.getId());
        oaApprovalApplicationAd.setTitle(dto.getTitle());
        oaApprovalApplicationAd.setContent(dto.getContent());
        oaApprovalApplicationAd.setNumber(dto.getNumber());
        oaApprovalApplicationAd.setTotalAmount(dto.getTotalAmount());
        oaApprovalApplicationAd.setSpec(dto.getSpec());
        oaApprovalApplicationAd.setStatus(false);
        approvalApplicationAdvertisementService.save(oaApprovalApplicationAd);
        // 根据节点类型 生成代办
        oaApprovalTodoService.createApprovalTodos(oaApprovalApplications.getId(), code, approvalFlowNode,
                Integer.valueOf(sysUser.getDeptId()));