From 0f44078d297adcbaee7c9a16b4f4d3257d858491 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 07 三月 2025 17:35:14 +0800
Subject: [PATCH] 代码迁移bug解决
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 1 +
cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java | 1 -
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 1 +
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java | 4 +++-
basic-server/src/main/resources/mapper/CertificationMapper.xml | 3 ++-
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java | 4 ++--
basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java | 6 +++++-
cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java | 5 +++++
inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml | 2 +-
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 1 +
cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java | 2 +-
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java | 17 ++++++++++++-----
inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java | 3 ++-
13 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
index 7b5b735..15b0e68 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
@@ -34,7 +34,11 @@
//娣诲姞璧勮川鏄庣粏鍒楄〃
@Override
public int addCertificationDetail(Certification certification) {
- return certificationMapper.insert(certification);
+ if(null != certification.getId()){
+ return certificationMapper.updateById(certification);
+ }else {
+ return certificationMapper.insert(certification);
+ }
}
//鍒犻櫎璧勮川鏄庣粏鍒楄〃
diff --git a/basic-server/src/main/resources/mapper/CertificationMapper.xml b/basic-server/src/main/resources/mapper/CertificationMapper.xml
index 4926d05..bec4d63 100644
--- a/basic-server/src/main/resources/mapper/CertificationMapper.xml
+++ b/basic-server/src/main/resources/mapper/CertificationMapper.xml
@@ -3,7 +3,8 @@
<mapper namespace="com.ruoyi.basic.mapper.CertificationMapper">
<select id="getCertificationDetail" resultType="com.ruoyi.basic.pojo.Certification">
select b.*
- from ( select a.`name`, a.`code`,a.organization,a.explanation,a.first_issuance_date,a.latest_issuance_date,c.expire_time FROM
+ from ( select c.id,a.`name`, a.`code`,a.organization,a.explanation,a.first_issuance_date,a.latest_issuance_date,c.expire_time , c.image_url,
+ c.file_url FROM
(SELECT id,name,MIN(date_of_issuance) AS first_issuance_date,
MAX(date_of_issuance) AS latest_issuance_date,
c.`code`,c.organization,c.explanation
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 2b426b4..7eafed8 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -329,6 +329,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ ORDER BY declare_date DESC
</select>
<select id="selectIfsInventoryQuantity" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto">
SELECT * from ifs_inventory_quantity ifs
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
index a773397..fb79222 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
@@ -59,8 +59,8 @@
}
@ApiOperation(value = "瀵煎嚭妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃")
- @PostMapping("/exportProcessReport")
- public Result exportProcessReport(@RequestBody ProcessReportDto processReportDto) {
+ @GetMapping("/exportProcessReport")
+ public Result exportProcessReport(ProcessReportDto processReportDto) {
return Result.success(processReportService.exportProcessReport(processReportDto.getIds()));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java
index 5f54572..f415a46 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java
@@ -262,7 +262,7 @@
* @return
*/
@ApiOperation(value = "鍒犻櫎鐩戞帶璇勪环闄勪欢琛�")
- @GetMapping("/delVerifyEvaluateFileList")
+ @DeleteMapping("/delVerifyEvaluateFileList")
public Result delVerifyMethodFileList(Integer evaluateFileId) {
return Result.success(qualityMonitorDetailsEvaluateFileMapper.deleteById(evaluateFileId));
}
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 2144a7e..b19712c 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
@@ -57,7 +57,9 @@
String currentMonth = currentDate.format(formatter);
//鏌ヨ鍘嗗彶
ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectOne(Wrappers.<ProcessTotaldeal>lambdaQuery().eq(ProcessTotaldeal::getMonth, currentMonth));
- processDeal.setTotaldealId(processTotaldeal.getId());
+ if(ObjectUtils.isNotEmpty(processTotaldeal)){
+ processDeal.setTotaldealId(processTotaldeal.getId());
+ }
}
return processDealMapper.pageProcessDeal(page, QueryWrappers.queryWrappers(processDeal));
@@ -73,7 +75,9 @@
// 鏍煎紡鍖栧綋鍓嶆棩鏈�
String currentMonth = dealTime.format(formatter);
processTotaldeal= processTotaldealMapper.selectOne(Wrappers.<ProcessTotaldeal>lambdaQuery().eq(ProcessTotaldeal::getMonth,currentMonth));
- processDeal.setTotaldealId(processTotaldeal.getId());
+ if(ObjectUtils.isNotEmpty(processTotaldeal)){
+ processDeal.setTotaldealId(processTotaldeal.getId());
+ }
}else {
processTotaldeal= processTotaldealMapper.selectById(processDeal.getTotaldealId());
}
@@ -95,9 +99,12 @@
public int doProcessDeal(ProcessDeal processDeal) {
if (ObjectUtils.isNotEmpty(processDeal.getNum())) {
ProcessDeal oldProcessDeal = processDealMapper.selectById(processDeal.getId());
- ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
- processTotaldeal.setTotalNum(processTotaldeal.getTotalNum() - oldProcessDeal.getNum() + processDeal.getNum());
- processTotaldealMapper.updateById(processTotaldeal);
+ 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);
}
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java
index 0e5d823..36c9949 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java
@@ -81,7 +81,6 @@
@GetMapping("/exportFeStandardSubstanceAcceptance")
public Result exportFeStandardSubstanceAcceptance(HttpServletResponse response) {
feStandardSubstanceAcceptanceService.exportFeStandardSubstanceAcceptance(response);
-
return Result.success();
}
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java
index d6d10b0..8bd2483 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java
@@ -1,5 +1,6 @@
package com.ruoyi.require.pojo;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
@@ -72,15 +73,19 @@
@ExcelProperty("闄勪欢")
private String file;
+ @ExcelIgnore
@TableField(fill = FieldFill.INSERT)
private String createUser;
+ @ExcelIgnore
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
+ @ExcelIgnore
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
+ @ExcelIgnore
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
index 1f61c32..6e3acde 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.inspect.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -85,7 +86,7 @@
@ApiModelProperty("瀛愬疄楠屽")
private String sonLaboratory;
-
+ private String sampleStr;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
index 0725899..3c4cba3 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
@@ -6,6 +6,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDate;
@@ -85,7 +86,8 @@
@ApiModelProperty("涓嬪崟鏃堕棿")
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty("涓嬪彂鏃堕棿")
diff --git a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
index 82ede85..68c5a1b 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
@@ -9,7 +9,7 @@
when
io.type_source = 0
then io.sample_view
- else io.sample end sample,
+ else io.sample end sampleStr,
GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model
from ins_order io
LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index 0098974..f4b741e 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -54,6 +54,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ ORDER BY a.create_time DESC
</select>
<select id="getLaboratoryByName" resultType="java.lang.String">
select s.address from seal s
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 2f7423d..e80e958 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -250,6 +250,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ ORDER BY A.ins_time DESC
</select>
<select id="inspectionOrderDetailsTaskSwitching" resultType="com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo">
--
Gitblit v1.9.3