产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
chenhj
2026-04-22 6518050093fe8f36b603a7fef9d4683813a91645 
 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java


@@ -12,12 +12,10 @@


import com.ruoyi.approve.pojo.ApproveProcess;


import com.ruoyi.approve.service.IApproveNodeService;


import com.ruoyi.approve.service.IApproveProcessService;


import com.ruoyi.approve.utils.DailyRedisCounter;


import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;


import com.ruoyi.approve.vo.ApproveProcessVO;


import com.ruoyi.common.enums.FileNameType;


import com.ruoyi.common.utils.OrderUtils;


import com.ruoyi.common.utils.SecurityUtils;


import com.ruoyi.other.service.impl.TempFileServiceImpl;


import com.ruoyi.project.system.domain.SysDept;


import com.ruoyi.project.system.domain.SysNotice;


@@ -32,53 +30,37 @@


import com.ruoyi.sales.pojo.CommonFile;


import com.ruoyi.sales.pojo.ShippingInfo;


import com.ruoyi.sales.service.impl.CommonFileServiceImpl;


import lombok.AllArgsConstructor;


import lombok.RequiredArgsConstructor;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.context.annotation.Lazy;


import org.springframework.data.redis.core.StringRedisTemplate;


import org.springframework.stereotype.Service;


import org.springframework.util.CollectionUtils;


import org.springframework.util.StringUtils;




import java.io.IOException;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.format.DateTimeFormatter;


import java.util.ArrayList;


import java.util.Arrays;


import java.util.Date;


import java.util.List;


import java.util.stream.Collectors;




@Service


//@RequiredArgsConstructor


@RequiredArgsConstructor


public class ApproveProcessServiceImpl extends ServiceImpl<ApproveProcessMapper, ApproveProcess> implements IApproveProcessService {


    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMdd");




    @Autowired


    private  StringRedisTemplate redisTemplate;


    @Autowired


    private  DailyRedisCounter dailyRedisCounter;


    @Autowired


    private  SysDeptMapper sysDeptMapper;


    @Autowired


    private  IApproveNodeService approveNodeService;


    @Autowired


    private  SysUserMapper sysUserMapper;


    @Autowired


    private  ApproveProcessMapper approveProcessMapper;


    @Autowired


    private  TempFileServiceImpl tempFileService;


    @Autowired


    private  CommonFileMapper commonFileMapper;


    @Autowired


    private  CommonFileServiceImpl commonFileService;


    @Autowired


    private  ISysNoticeService sysNoticeService;


    private final SysDeptMapper sysDeptMapper;


    private final IApproveNodeService approveNodeService;


    private final SysUserMapper sysUserMapper;


    private final ApproveProcessMapper approveProcessMapper;


    private final TempFileServiceImpl tempFileService;


    private final CommonFileMapper commonFileMapper;


    private final CommonFileServiceImpl commonFileService;


    private final ISysNoticeService sysNoticeService;


    private final PurchaseLedgerMapper purchaseLedgerMapper;


    private final ShippingInfoMapper shippingInfoMapper;


    private final ApproveNodeMapper approveNodeMapper;




    @Override


    public void addApprove(ApproveProcessVO approveProcessVO) throws Exception {


@@ -92,14 +74,15 @@


        if (CollectionUtils.isEmpty(sysUsers)) throw new RuntimeException("审核用户不存在");


        if (sysDept == null) throw new RuntimeException("部门不存在");


        if (sysUser == null) throw new RuntimeException("申请人不存在");


        String today = LocalDate.now().format(DATE_FORMAT);


        Long approveId = dailyRedisCounter.incrementAndGetByDb();


        String formattedCount = String.format("%03d", approveId);


        //流程 ID


        String approveID = today + formattedCount;


//        String today = LocalDate.now().format(DATE_FORMAT);


//        Long approveId = dailyRedisCounter.incrementAndGetByDb();


//        String formattedCount = String.format("%03d", approveId);


//        //流程 ID


//        String approveID = today + formattedCount;


        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");


        ApproveProcess approveProcess = new ApproveProcess();


        approveProcess.setApproveId(approveID);


        String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "","approve_id");


        approveProcess.setApproveId(no);


        approveProcess.setApproveUser(approveProcessVO.getApproveUser());


        approveProcess.setApproveUserName(sysUser.getNickName());


        approveProcess.setApproveDeptId(approveProcessVO.getApproveDeptId());


@@ -133,7 +116,7 @@


        }


        save(approveProcess);


        //初始化审批节点


        approveNodeService.initApproveNodes(approveProcessVO.getApproveUserIds(), approveID, approveProcessVO.getApproveDeptId());


        approveNodeService.initApproveNodes(approveProcessVO.getApproveUserIds(), no, approveProcessVO.getApproveDeptId());


        // 附件绑定


        tempFileService.migrateTempFilesToFormal(approveProcess.getId(), approveProcessVO.getTempFileIds(), FileNameType.ApproveProcess.getValue());


        /*消息通知*/


@@ -160,12 +143,6 @@


        }


        return sysDeptList;


    }




    @Autowired


    private PurchaseLedgerMapper purchaseLedgerMapper;




    @Autowired


    private ShippingInfoMapper shippingInfoMapper;




    @Override


    public IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess) {


@@ -304,8 +281,6 @@


        return one;


    }




    @Autowired


    private ApproveNodeMapper approveNodeMapper;




    // 报价审批编辑审核人


    public void updateApproveUser(ApproveGetAndUpdateVo approveGetAndUpdateVo) {