From 169208b55df32e15d66ef7b32882143556a58adb Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:09:13 +0800
Subject: [PATCH] 更新检验下单操作
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 2 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java | 18 ++++++---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 3 +
inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java | 1
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 17 ++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 5 ++
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 48 +++++++++++++++++++-----
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 7 +--
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java | 2 +
9 files changed, 82 insertions(+), 21 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 97f0ff1..5d20623 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -138,4 +138,19 @@
public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
}
-}
+
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "鏇存柊鐘舵��")
+ @PutMapping("/updateStatus")
+ public Result<?> updateStatus(Integer id) {
+ insOrderService.updateStatus(id);
+ return Result.success();
+ }
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation("灏嗗緟妫�楠岀殑鐨勬挙閿�鏇存敼")
+ @PutMapping("/updateInspected")
+ public Result<?> updateInspected(Integer id){
+ insProductService.updateInspected(id);
+ return Result.success();
+ }
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
index 623ecc0..e2dd124 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
@@ -9,6 +9,7 @@
import com.yuanchu.mom.dto.SampleProductDto2;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -42,8 +43,6 @@
String getEnumLabelByValue(String value);
String getStandardMethodCode(Integer id);
-}
-
-
-
+ int updateStatus( Integer id);
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
index b56ef51..c482b6a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
@@ -3,6 +3,7 @@
import com.yuanchu.mom.dto.ProductResultDto2;
import com.yuanchu.mom.pojo.InsProduct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -21,6 +22,7 @@
List<ProductResultDto2> getProductAndResult(Integer sampleId);
+ int updateInspected(@Param("id") Integer id);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
index ccb2eab..b5da779 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
@@ -35,4 +35,6 @@
Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto);
Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber);
+
+ int updateStatus(Integer id);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java
index 3b34c9d..cdc5e91 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java
@@ -12,4 +12,5 @@
int selectOrderManDay(Integer orderId);
+ int updateInspected(Integer id);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 5514fe2..ee5067f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -187,6 +187,11 @@
map.put("total", aLong);
return map;
}
+
+ @Override
+ public int updateStatus(Integer id) {
+ return insOrderMapper.updateStatus(id);
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
index d3a347f..6b88b75 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
@@ -10,14 +10,20 @@
@Service
@AllArgsConstructor
public class InsProductServiceImpl extends ServiceImpl<InsProductMapper, InsProduct>
- implements InsProductService {
+ implements InsProductService {
- private InsProductMapper insProductMapper;
+ private InsProductMapper insProductMapper;
- @Override
- public int selectOrderManDay(Integer orderId) {
- return insProductMapper.selectOrderManDay(orderId);
- }
+ @Override
+ public int selectOrderManDay(Integer orderId) {
+ return insProductMapper.selectOrderManDay(orderId);
+ }
+
+ @Override
+ public int updateInspected(Integer id) {
+ insProductMapper.updateInspected(id);
+ return 0;
+ }
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 4c67745..57bb691 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -196,6 +196,9 @@
id=#{id}
</where>
</update>
+ <update id="updateStatus">
+ update ins_order set state=3 where id=#{id}
+ </update>
<select id="selectSampleDefects" resultMap="selectSampleDefectsMap">
SELECT io.entrust_code,sam.sample,ip.inspection_item,u.name,b.create_time, sam.id
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index 16284d3..e3b2e1e 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -39,24 +39,52 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="templateId" column="template_id" jdbcType="INTEGER"/>
</resultMap>
+ <update id="updateInspected">
+ UPDATE ins_product p
+ SET p.state=0
+ WHERE EXISTS(
+ SELECT 1
+ FROM ins_sample s
+ WHERE s.ins_order_id IN (
+ SELECT o.id
+ FROM ins_order o
+ WHERE o.id = #{id}
+ )
+ AND p.ins_sample_id = s.id
+ AND p.state = 1
+ AND p.ins_result IS NULL
+ );
+ </update>
<select id="selectOrderManDay" resultType="java.lang.Integer">
- select coalesce(max(ip.man_day), 0) from ins_order io
- left join ins_sample isa on io.id = isa.ins_order_id
- left join ins_product ip on isa.id = ip.ins_sample_id
+ select coalesce(max(ip.man_day), 0)
+ from ins_order io
+ left join ins_sample isa on io.id = isa.ins_order_id
+ left join ins_product ip on isa.id = ip.ins_sample_id
where io.id = #{orderId}
</select>
<select id="selectUserById" resultType="java.util.Map">
- select name,company,phone,address,name_en from user where id = #{userId}
+ select name, company, phone, address, name_en
+ from user
+ where id = #{userId}
</select>
<select id="getProductAndResult" resultType="com.yuanchu.mom.dto.ProductResultDto2">
- select ip.id,ip.inspection_item,ip.inspection_item_subclass,ip.laboratory,ip.unit,ipr.equip_value,io.entrust_code,ipr.update_time,ip.ins_result,u.name updateUserName
+ select ip.id,
+ ip.inspection_item,
+ ip.inspection_item_subclass,
+ ip.laboratory,
+ ip.unit,
+ ipr.equip_value,
+ io.entrust_code,
+ ipr.update_time,
+ ip.ins_result,
+ u.name updateUserName
from ins_product ip
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
- left join ins_sample isa on isa.id = ip.ins_sample_id
- left join ins_order io on io.id = isa.ins_order_id
- left join user u on u.id = ipr.update_user
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ left join ins_sample isa on isa.id = ip.ins_sample_id
+ left join ins_order io on io.id = isa.ins_order_id
+ left join user u on u.id = ipr.update_user
where ip.ins_sample_id = #{sampleId}
- and ip.ins_result is not null
+ and ip.ins_result is not null
</select>
</mapper>
--
Gitblit v1.9.3