From e40795f918e871631e0d3cfddf6d9202128b9120 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 07 四月 2025 16:34:28 +0800
Subject: [PATCH] 成品下单检验项目人员分配
---
inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto2.java | 6 +++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java | 25 ++++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java | 9 ++++
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 5 ++
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsProductDto.java | 18 +++++++++
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 10 +++++
6 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 21a7226..d40d48f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -258,4 +258,14 @@
insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
}
+ @ApiOperation(value = "妫�鏌ラ」鐩壒閲忓垎閰嶆楠屼汉")
+ @PostMapping("/batchUpdateInsProductCheckUser")
+ public Result batchUpdateInsProductCheckUser(@RequestBody InsProductDto insProductDto){
+ try {
+ insProductService.batchUpdateInsProductCheckUser(insProductDto);
+ return Result.success();
+ }catch (Exception e){
+ return Result.fail(e.getMessage());
+ }
+ }
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsProductDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsProductDto.java
new file mode 100644
index 0000000..0f2f492
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsProductDto.java
@@ -0,0 +1,18 @@
+package com.ruoyi.inspect.dto;
+
+import com.ruoyi.inspect.pojo.InsProduct;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InsProductDto extends InsProduct {
+
+ private List<InsProductDto> insProductDtoList;
+
+ /**
+ * 妫�楠岄」鐩甶d
+ */
+ private Integer insProductId;
+
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto2.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto2.java
index aa371ce..d83b265 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto2.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto2.java
@@ -121,4 +121,10 @@
@ApiModelProperty("鐢电紗鏍囪瘑缁撴灉闆嗗悎")
private TreeMap<String, Integer> cableTagResultMap;
+ @ApiModelProperty("妫�楠屼汉鍛樺悕绉�")
+ private String checkUserName;
+
+ @ApiModelProperty("妫�楠屼汉鍛業D")
+ private Integer checkUserId;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java
index 487aef2..51fd6fe 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.inspect.dto.InsProductBindingDto;
+import com.ruoyi.inspect.dto.InsProductDto;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours;
@@ -50,4 +51,12 @@
* @return
*/
boolean removeBindingProductTree(Integer productId);
+
+ /**
+ * 妫�鏌ラ」鐩壒閲忓垎閰嶆楠屼汉
+ *
+ * @param insProductDto
+ * @return
+ */
+ int batchUpdateInsProductCheckUser(InsProductDto insProductDto);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
index 6654ad3..b94b604 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.InsProductBindingDto;
+import com.ruoyi.inspect.dto.InsProductDto;
import com.ruoyi.inspect.mapper.InsOrderMapper;
import com.ruoyi.inspect.mapper.InsProductMapper;
import com.ruoyi.inspect.mapper.InsSampleMapper;
@@ -21,6 +22,8 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
import java.util.*;
import java.util.stream.Collectors;
@@ -214,7 +217,27 @@
return false;
}
-
+ /**
+ * 妫�鏌ラ」鐩壒閲忓垎閰嶆楠屼汉
+ *
+ * @param insProductDto
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int batchUpdateInsProductCheckUser(InsProductDto insProductDto) {
+ if(ObjectUtils.isEmpty(insProductDto) || CollectionUtils.isEmpty(insProductDto.getInsProductDtoList())){
+ return 0;
+ }
+ List<InsProductDto> insProductDtoList = insProductDto.getInsProductDtoList();
+ for (InsProductDto productDto : insProductDtoList) {
+ InsProduct insProduct = new InsProduct();
+ insProduct.setId(productDto.getInsProductId());
+ insProduct.setCheckUserId(productDto.getCheckUserId());
+ insProductMapper.updateById(insProduct);
+ }
+ return insProductDtoList.size();
+ }
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 01a3ecf..bc998cb 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -166,10 +166,13 @@
i.order_type,
ip.sort,
ip.cable_tag,
- ip.radius
+ ip.radius,
+ ip.check_user_id,
+ ur.name AS checkUserName
from ins_sample isa
left join ins_order i on isa.ins_order_id = i.id
left join ins_product ip on isa.id = ip.ins_sample_id
+ left join user ur on ip.check_user_id = ur.id
where ip.state = 1
and i.id=#{id}
and ip.is_binding != 1
--
Gitblit v1.9.3