From f50ebfa99b322690788a3c5cb4e5d8337acdbc64 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 14 三月 2025 20:14:33 +0800
Subject: [PATCH] 检验任务代码迁移2
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 12 ++--
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java | 6 +-
inspect-server/src/main/java/com/ruoyi/inspect/dto/QueryResultDTO.java | 59 +++++++++++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java | 9 +--
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 46 ++++++--------
5 files changed, 91 insertions(+), 41 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 47db3aa..4a7b154 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -36,14 +36,14 @@
@ApiOperation(value = "鍔ㄦ�佽幏鍙杢ab琛ㄥご")
@GetMapping("/getTabHeader")
- public Result<?> getTabHeader(@RequestParam("sonLaboratory") String sonLaboratory, @RequestParam("samples") String samples) {
+ public Result<?> getTabHeader(@RequestParam("sonLaboratory") String sonLaboratory, String samples) {
return Result.success(insOrderPlanService.getTabHeader(sonLaboratory, samples));
}
@ApiOperation(value = "鏌ョ湅缁撴灉鎸夐挳")
- @GetMapping("/getInsOrderPlanList")
- public Result getInsOrderPlanList(@RequestBody Map<String, Object> data) {
- return Result.success(insOrderPlanService.getInsOrderPlanList(data));
+ @PostMapping("/getInsOrderPlanList")
+ public Result getInsOrderPlanList(@RequestBody QueryResultDTO queryResultDTO) {
+ return Result.success(insOrderPlanService.getInsOrderPlanList(queryResultDTO));
}
@ApiOperation(value = "瀵煎嚭濮旀墭璐圭敤")
@@ -59,8 +59,8 @@
}
@ApiOperation(value = "瀵煎嚭鏌ョ湅妫�楠岀粨鏋淓xcel")
- @GetMapping("/exportInsOrderPlanResult")
- public void exportInsOrderPlanResult(Map<String, Object> data, HttpServletResponse response) {
+ @PostMapping("/exportInsOrderPlanResult")
+ public void exportInsOrderPlanResult(@RequestBody QueryResultDTO data, HttpServletResponse response) {
insOrderPlanService.exportInsOrderPlanResult(data, response);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/QueryResultDTO.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/QueryResultDTO.java
new file mode 100644
index 0000000..03f28d2
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/QueryResultDTO.java
@@ -0,0 +1,59 @@
+package com.ruoyi.inspect.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 妫�楠屼换鍔�-鏌ョ湅缁撴灉鏌ヨ浼犺緭瀵硅薄dto
+ */
+@Data
+public class QueryResultDTO implements Serializable {
+
+ /**
+ * 妫�楠屼汉
+ */
+ @ApiModelProperty("妫�楠屼汉")
+ private String createUser;
+
+ /**
+ * 濮旀墭缂栧彿
+ */
+ @ApiModelProperty("濮旀墭缂栧彿")
+ private String entrustCode;
+
+ /**
+ * 琛ㄥご鏁版嵁
+ */
+ @ApiModelProperty("琛ㄥご鏁版嵁")
+ private String headerS;
+
+ /**
+ * 鏃堕棿鑼冨洿
+ */
+ @ApiModelProperty("鏃堕棿鑼冨洿")
+ private List<String> insTime;
+
+ /**
+ * 鏍峰搧缂栧彿
+ */
+ @ApiModelProperty("鏍峰搧缂栧彿")
+ private String sampleCode;
+
+ /**
+ * 鏍峰搧澶х被
+ */
+ @ApiModelProperty("鏍峰搧澶х被")
+ private String sampleType;
+
+ /**
+ * 瀛愯瘯楠屽
+ */
+ @ApiModelProperty("瀛愯瘯楠屽")
+ private String sonLaboratory;
+
+
+
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
index e491d44..1254755 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
@@ -30,15 +30,15 @@
int updateInspected(@Param("id") Integer id);
- List<InsProduct> selectFiberInsProduct(List<Integer> ids, String laboratory);
+ List<InsProduct> selectFiberInsProduct(@Param("ids")List<Integer> ids, @Param("laboratory")String laboratory);
IPage<InsProduct> selectNoProducts(Page page, Integer orderId);
int selectInsProductCountByOrderId(Integer orderId);
- List<InsProduct> findSagTemperatureProducts(Integer sampleId, String inspectionItem);
+ List<InsProduct> findSagTemperatureProducts(@Param("sampleId")Integer sampleId, @Param("inspectionItem")String inspectionItem);
- List<InsProductVO> selectProductByOrderId(Integer orderId,String sonLaboratory);
+ List<InsProductVO> selectProductByOrderId(@Param("orderId") Integer orderId,@Param("sonLaboratory")String sonLaboratory);
List<InsProductFiberVO> selectInsProductInsFiberList(Integer sampleId);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
index 2e7a8dd..1971033 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.dto.InsOrderPlanDTO;
-import com.ruoyi.inspect.dto.InsProductResultDTO;
-import com.ruoyi.inspect.dto.TasksShowDto;
-import com.ruoyi.inspect.dto.UnInsProductsDTO;
+import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.pojo.InsOrderFile;
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
@@ -22,9 +19,9 @@
*/
public interface InsOrderPlanService {
- void exportInsOrderPlanResult(Map<String, Object> data, HttpServletResponse response);
+ void exportInsOrderPlanResult(QueryResultDTO data, HttpServletResponse response);
- List<Map<String,Object>> getInsOrderPlanList(Map<String,Object> data);
+ List<Map<String,Object>> getInsOrderPlanList(QueryResultDTO queryResultDTO);
void exportCommissionFees(Map<String, Object> data,HttpServletResponse response);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 3059a02..133dc4c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -17,6 +17,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -193,24 +194,18 @@
@Autowired
private RabbitTemplate rabbitTemplate;
-
-
private ReentrantLock lock = new ReentrantLock();
- @Resource
- private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
@Override
- public void exportInsOrderPlanResult(Map<String, Object> data, HttpServletResponse response) {
+ public void exportInsOrderPlanResult(QueryResultDTO data, HttpServletResponse response) {
List<Map<String,Object>> dataList = new ArrayList<>();
ObjectMapper objectMapper = new ObjectMapper();
try {
- Object o = getTabHeader(data.get("sonLaboratory").toString(), data.get("samples").toString()).get("tableHeader");// 鑾峰彇鍔ㄦ�佽〃澶�
+ Object o = getTabHeader(data.getSonLaboratory(), data.getSampleType()).get("tableHeader");// 鑾峰彇鍔ㄦ�佽〃澶�
List<Map<String, Object>> tableHeader = objectMapper.readValue(JSONUtil.toJsonStr(o), new TypeReference<List<Map<String, Object>>>() {
- });// 琛ㄥご鏁版嵁
- Map<String, Object> table = objectMapper.readValue(JSONUtil.toJsonStr(data.get("trendsTable")), new TypeReference<Map<String, Object>>() {
});
- List<Map<String, Object>> trendsTable = getInsOrderPlanList(table); // 琛ㄦ牸鏁版嵁
+ // 琛ㄥご鏁版嵁
+ List<Map<String, Object>> trendsTable = getInsOrderPlanList(data); // 琛ㄦ牸鏁版嵁
for (Map<String, Object> trend : trendsTable) {
Map<String, Object> addMap = new HashMap<>();
addMap.put("濮旀墭鍗曞彿", trend.get("entrustCode"));
@@ -241,7 +236,7 @@
ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream())
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
- .registerWriteHandler(new SheetWriteHandlerUtil(data.get("samples").toString(),head.size()))
+ .registerWriteHandler(new SheetWriteHandlerUtil(data.getSampleType(),head.size()))
.useDefaultStyle(true).relativeHeadRowIndex(1)
.registerWriteHandler(horizontalCellStyleStrategy)
.build();
@@ -337,29 +332,28 @@
return headWriteCellStyle;
}
@Override
- public List<Map<String, Object>> getInsOrderPlanList(Map<String,Object> data) {
- String sampleType = data.get("sampleType").toString();
- String sonLaboratory = data.get("sonLaboratory").toString();
- String entrustCode = data.get("entrustCode").toString();
+ public List<Map<String, Object>> getInsOrderPlanList(QueryResultDTO data) {
+ String sampleType = data.getSampleType();
+ String sonLaboratory = data.getSonLaboratory();
+ String entrustCode = data.getEntrustCode();
Integer createUser = null;
String name = "";
- if(StringUtils.isNotBlank(data.get("createUser").toString())) {
- createUser = Integer.parseInt(data.get("createUser").toString());
+ if(StringUtils.isNotBlank(data.getCreateUser())) {
+ createUser = Integer.parseInt(data.getCreateUser());
name = userMapper.selectById(createUser).getName();
}
- String sampleCode = data.get("sampleCode").toString();
+ String sampleCode = data.getSampleCode();
String startTime = "";
String endTime = "";
List<Map<String, Object>> maps = new ArrayList<>();
ObjectMapper objectMapper = new ObjectMapper();
try {
- if(StringUtils.isNotBlank(data.get("insTime").toString()) && !Objects.isNull(data.get("insTime"))) {
- List insTime = objectMapper.readValue(JSONUtil.toJsonStr(data.get("insTime")), List.class);
- startTime = insTime.get(0).toString();
- endTime = insTime.get(1).toString();
+ if(CollectionUtils.isNotEmpty(data.getInsTime())) {
+ startTime = data.getInsTime().get(0);
+ endTime = data.getInsTime().get(1);
}
// 琛ㄥご淇℃伅
- List<Map<String, Object>> headerS = objectMapper.readValue(JSONUtil.toJsonStr(data.get("headerS")), new TypeReference<List<Map<String, Object>>>() {
+ List<Map<String, Object>> headerS = objectMapper.readValue(JSONUtil.toJsonStr(data.getHeaderS()), new TypeReference<List<Map<String, Object>>>() {
});
// 鍒ゆ柇鏄惁鏄俯搴﹀惊鐜�
if(sampleType.equals("娓╁害寰幆")) {
@@ -609,7 +603,7 @@
}
}
- if (samples.contains("娓╁害寰幆")){
+ if (Objects.nonNull(samples)&&samples.contains("娓╁害寰幆")){
addElementToMaps(maps, "寰幆娆℃暟", "inspectionItems");
addElementToMaps(maps, "娓╁害鐐�", "inspectionItemSubclass");
addElementToMaps(maps, "琛板噺绯绘暟1310", "attenuationCoefficient1310");
@@ -676,7 +670,7 @@
}
insOrderPlanDTO.setUserId(null);
}
-// QueryWrapper<InsOrderPlanDTO> wrappers = QueryWrappers.queryWrappers(planDTO);
+ QueryWrapper<InsOrderPlanDTO> wrappers = QueryWrappers.queryWrappers(new InsOrderPlanDTO());
IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(
page,
userName,
@@ -687,7 +681,7 @@
laboratory,
insOrderPlanDTO.getEntrustCode(),
insOrderPlanDTO.getInsState(),
- null,
+ wrappers,
insOrderPlanDTO.getSendTimeRange()
);
return insOrderPage;
--
Gitblit v1.9.3