From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
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