From 82ce59218139d9fefeae7b9e5fbc88b499ff023f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 13:35:06 +0800
Subject: [PATCH] feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 - 增加文件上传大小限制至200MB，请求大小限制至400MB - 在设备信息中新增出厂编号字段显示 - 优化温湿度处理逻辑，报告中仅显示温度信息 - 新增印章管理功能，支持MA标志章、报告章和骑缝章配置 - 完善检验报告生成流程，增加多种报告类型常量定义 - 优化附件上传功能，增加空值检查和返回值处理 - 调整委托编号生成逻辑，完善新聚订单可编辑性判断 - 更新CNAS流程中报告编号使用正式报告编号替代委托编号
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java | 77 --------------------------------------
1 files changed, 1 insertions(+), 76 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
index 741b4fb..89dc84b 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
@@ -26,86 +26,11 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃� 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author
+ * @author
* @since 2024-11-02 02:50:19
*/
@Service
@Transactional(rollbackFor = Exception.class)
public class ProcessDealServiceImpl extends ServiceImpl<ProcessDealMapper, ProcessDeal> implements ProcessDealService {
- @Resource
- private ProcessDealMapper processDealMapper;
-
-
- @Autowired
- private UserMapper userMapper;
-
- @Resource
- private ProcessTotaldealMapper processTotaldealMapper;
-
- @Override
- public IPage<ProcessDeal> pageProcessDeal(Page page, ProcessDeal processDeal) {
- Integer userId = SecurityUtils.getUserId().intValue();
- processDeal.setCreateUser(userId);
-
- if (ObjectUtils.isEmpty(processDeal.getTotaldealId())) {
- //鑾峰彇褰撳墠鏈堜唤
- LocalDate currentDate = LocalDate.now();
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
- // 鏍煎紡鍖栧綋鍓嶆棩鏈�
- String currentMonth = currentDate.format(formatter);
- //鏌ヨ鍘嗗彶
- ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectOne(Wrappers.<ProcessTotaldeal>lambdaQuery().eq(ProcessTotaldeal::getMonth, currentMonth));
- if(ObjectUtils.isNotEmpty(processTotaldeal)){
- processDeal.setTotaldealId(processTotaldeal.getId());
- }
- }
-
- return processDealMapper.pageProcessDeal(page, QueryWrappers.queryWrappers(processDeal));
- }
-
- @Override
- public int addProcessDeal(ProcessDeal processDeal) {
- ProcessTotaldeal processTotaldeal;
- if (ObjectUtils.isEmpty(processDeal.getTotaldealId())){
- LocalDate dealTime = LocalDate.now();
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
- // 鏍煎紡鍖栧綋鍓嶆棩鏈�
- String currentMonth = dealTime.format(formatter);
- processTotaldeal= processTotaldealMapper.selectOne(Wrappers.<ProcessTotaldeal>lambdaQuery().eq(ProcessTotaldeal::getMonth,currentMonth));
- if(ObjectUtils.isNotEmpty(processTotaldeal)){
- processDeal.setTotaldealId(processTotaldeal.getId());
- }
- }else {
- processTotaldeal= processTotaldealMapper.selectById(processDeal.getTotaldealId());
- }
- processDealMapper.insert(processDeal);
- processTotaldeal.setTotalNum(processDeal.getNum()+processTotaldeal.getTotalNum());
- return processTotaldealMapper.updateById(processTotaldeal);
- }
-
- @Override
- public int delProcessDeal(Integer id) {
- ProcessDeal processDeal = processDealMapper.selectById(id);
- processDealMapper.deleteById(id);
- ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
- processTotaldeal.setTotalNum(processTotaldeal.getTotalNum()-processDeal.getNum());
- return processTotaldealMapper.updateById(processTotaldeal);
- }
-
- @Override
- public int doProcessDeal(ProcessDeal processDeal) {
- if (ObjectUtils.isNotEmpty(processDeal.getNum())) {
- ProcessDeal oldProcessDeal = processDealMapper.selectById(processDeal.getId());
- if(null != processDeal.getTotaldealId()){
- ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
- int totalNum = ObjectUtils.isEmpty(processTotaldeal) ? 0 : processTotaldeal.getTotalNum();
- processTotaldeal.setTotalNum(totalNum - oldProcessDeal.getNum() + processDeal.getNum());
- processTotaldealMapper.updateById(processTotaldeal);
- }
- }
- return processDealMapper.updateById(processDeal);
- }
}
--
Gitblit v1.9.3