Merge branch 'hxsj' of http://114.132.189.42:9002/r/product-inventory-manag...

chenhj

5 天以前 f8e79ecd973b35e98bc189328c7efa3f88f10f02

 src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.mapper.ApproveNodeMapper;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
@@ -15,8 +16,12 @@
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +44,12 @@
    private ApproveProcessMapper approveProcessMapper;
    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private SalesLedgerMapper salesLedgerMapper;

    @Autowired
    private PurchaseLedgerMapper purchaseLedgerMapper;

    @Autowired
    private TempFileServiceImpl tempFileService;
@@ -145,16 +156,26 @@
        }
        approveProcessMapper.updateById(approveProcess);

        DeviceRepair deviceRepair = deviceRepairMapper.selectById(approveProcess.getDeviceRepairId());
        if(deviceRepair == null) throw new RuntimeException("设备报修不存在");
        if(approveProcess.getApproveStatus().equals(2)){
            // 同意
            deviceRepair.setStatus(1);
        }else if(approveProcess.getApproveStatus().equals(3)){
            // 拒绝
            deviceRepair.setStatus(2);
        //如果是6销售审批,对应销售关联的表需要更新
        if (approveProcess.getApproveType()==6){
            List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(Wrappers.
                    <SalesLedger>lambdaQuery().eq(SalesLedger::getSalesContractNo, approveProcess.getApproveReason()));
            if (!CollectionUtils.isEmpty(salesLedgers)){
                SalesLedger salesLedger = salesLedgers.get(0);
                salesLedger.setApprovalStatus(status);
                salesLedgerMapper.updateById(salesLedger);
            }
        }
        deviceRepairMapper.updateById(deviceRepair);
        //如果是5采购审批,对应采购关联的表需要更新
        if (approveProcess.getApproveType()==5){
            List<PurchaseLedger> purchaseLedgers = purchaseLedgerMapper.selectList(Wrappers.<PurchaseLedger>lambdaQuery().eq(PurchaseLedger::getPurchaseContractNumber, approveProcess.getApproveReason()));
            if (!CollectionUtils.isEmpty(purchaseLedgers)){
                PurchaseLedger purchaseLedger = purchaseLedgers.get(0);
                purchaseLedger.setApprovalStatus(status);
                purchaseLedgerMapper.updateById(purchaseLedger);
            }
        }

        // 绑定附件
        if(!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1){
            tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue());