From 112a87d32e19b47b9c92534900d9cdd02846bdb3 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 24 四月 2024 18:17:25 +0800
Subject: [PATCH] 完善检验流程
---
framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java | 1
cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java | 2
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 7
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 30 ++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 156 ++++++++++++++++++++-----
inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelMc.java | 16 ++
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 2
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 31 ++++
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 2
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 2
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 16 +-
inspect-server/src/main/resources/static/report-template.docx | 0
inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelPs.java | 9 +
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 4
inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelDto.java | 19 +++
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 1
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java | 2
inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelV.java | 22 +++
inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java | 2
19 files changed, 272 insertions(+), 52 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index d4ca573..4110274 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -117,14 +117,18 @@
return Result.success(deviceService.selectDevicePrincipal());
}
- @ApiOperation(value = "閫氳繃璁惧鍒嗙被鑾峰彇璁惧鍒楄〃")
+ @ApiOperation(value = "閫氳繃椤圭洰鑾峰彇璁惧鍒楄〃")
@PostMapping("/selectDeviceByCategory")
@ValueAuth
- @ApiImplicitParams({
- @ApiImplicitParam(name = "category", value = "璁惧鍒嗙被", dataTypeClass = String.class),
- })
- public Result selectDeviceByCategory(String category) {
- return Result.success(deviceService.selectDeviceByCategory(category));
+ public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass) {
+ return Result.success(deviceService.selectDeviceByCategory(inspectionItem, inspectionItemSubclass));
+ }
+
+ @ApiOperation(value = "閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃")
+ @PostMapping("/selectDeviceByCode")
+ @ValueAuth
+ public Result selectDeviceByCode(String code) {
+ return Result.success(deviceService.selectDeviceByCode(code));
}
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index 7ade738..5769b30 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -28,7 +28,9 @@
List<Device> selectDevicePrincipal();
- List<Device> selectDeviceByCategory(String category);
+ List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);
+
+ Device selectDeviceByCode(String code);
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index c833734..3286e6b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -1,17 +1,21 @@
package com.yuanchu.mom.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.mapper.DeviceMapper;
+import com.yuanchu.mom.mapper.StructureItemParameterMapper;
import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -26,6 +30,8 @@
private GetLook getLook;
private DeviceMapper deviceMapper;
+
+ private StructureItemParameterMapper structureItemParameterMapper;
@Override
public Map<String, Object> selectDeviceParameter(Page page, Device itemParameter) {
@@ -73,8 +79,29 @@
}
@Override
- public List<Device> selectDeviceByCategory(String category) {
- return deviceMapper.selectList(Wrappers.<Device>lambdaQuery().eq(Device::getLargeCategory, category).eq(Device::getDeviceStatus, 0));
+ public List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass) {
+ Integer id;
+ try {
+ id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery().eq(StructureItemParameter::getInspectionItem, inspectionItem).eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass).last("limit 1").select(StructureItemParameter::getId)).getId();
+ } catch (Exception e) {
+ return null;
+ }
+ List<Device> devices = deviceMapper.selectList(Wrappers.<Device>lambdaQuery().eq(Device::getDeviceStatus, 0).isNotNull(Device::getInsProductIds));
+ List<Device> devices2 = new ArrayList<>();
+ for (Device device : devices) {
+ List<Integer> ids = JSON.parseArray(device.getInsProductIds(), Integer.class);
+ for (Integer i : ids) {
+ if (i == id) {
+ devices2.add(device);
+ }
+ }
+ }
+ return devices2;
+ }
+
+ @Override
+ public Device selectDeviceByCode(String code) {
+ return deviceMapper.selectOne(Wrappers.<Device>lambdaQuery().eq(Device::getFactoryNo, code).last("limit 1"));
}
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
index 621fe7c..c048f49 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
@@ -54,7 +54,7 @@
@Override
public List<Laboratory> obtainItemParameterList() {
- return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName));
+ return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName, Laboratory::getId));
}
diff --git a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
index 50d28d4..ec032d3 100644
--- a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
+++ b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
@@ -72,7 +72,6 @@
// 鍏ㄥ眬鏍煎紡鍖栧鐞�
@Override
protected void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
- // 杩斿洖缁欏墠绔幓闄ull
Jackson2ObjectMapperBuilder json = Jackson2ObjectMapperBuilder.json();
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index 41cf322..3bd4dbc 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -31,6 +31,7 @@
@PostMapping("/selectInsOrderPlanList")
public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ page.setOptimizeCountSql(false);
InsOrderPlanDTO insOrderPlanDTO = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrderPlanDTO.class);
return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelDto.java
new file mode 100644
index 0000000..6f9f9ef
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelDto.java
@@ -0,0 +1,19 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ExcelDto implements Serializable {
+
+ Integer r;
+
+ Integer c;
+
+ Integer mc;
+
+ ExcelV v;
+
+}
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelMc.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelMc.java
new file mode 100644
index 0000000..0313510
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelMc.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+@Data
+public class ExcelMc {
+
+ Integer r;
+
+ Integer c;
+
+ Integer rs;
+
+ Integer cs;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelPs.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelPs.java
new file mode 100644
index 0000000..edf0cdd
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelPs.java
@@ -0,0 +1,9 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+@Data
+public class ExcelPs {
+ String value;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelV.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelV.java
new file mode 100644
index 0000000..28e5eec
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ExcelV.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+@Data
+public class ExcelV {
+
+ String v;
+
+ String ff;
+
+ String fc;
+
+ String fs;
+
+ String ht;
+
+ ExcelMc mc;
+
+ ExcelPs ps;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
index 41f1913..4e1cbe6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -5,11 +5,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
-import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.vo.InsOrderPlanVO;
-import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java
index a62590e..2ccace9 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java
@@ -43,6 +43,8 @@
*/
private String equipValue;
+ private String equipName;
+
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
index fefb514..77fdf99 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
@@ -31,4 +31,6 @@
//鎵瑰噯
int ratifyReport(Integer id, Integer isRatify, String ratifyTell);
+
+ int wordInsertUrl(Map<String, Object> map, String url);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index a8ba372..15ca9f6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -18,6 +18,7 @@
import com.deepoove.poi.data.style.TableStyle;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.ExcelDto;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.mapper.*;
@@ -31,16 +32,15 @@
import com.yuanchu.mom.utils.MatrixToImageWriter;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.InsOrderPlanVO;
+import org.apache.commons.io.IOUtils;
import org.apache.poi.xwpf.usermodel.TableRowAlign;
import org.apache.poi.xwpf.usermodel.XWPFTable;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ResourceUtils;
import javax.annotation.Resource;
-import java.io.FileNotFoundException;
-import java.io.IOException;
+import java.io.*;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.LocalDateTime;
@@ -50,7 +50,6 @@
import java.util.stream.Collectors;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Stream;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
@@ -125,11 +124,10 @@
insOrder.setId(id);
InsOrder order = insOrderMapper.selectById(id);
if (BeanUtil.isEmpty(order.getInsTime())) {
- insOrder.setInsState(1);
insOrder.setInsTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 1));
}
- insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 1));
Map<String, Object> map = insOrderService.getInsOrderAndSample(id, laboratory);
Set<Integer> set = new HashSet<>();
Map<Integer, String> map2 = new HashMap<>();
@@ -201,6 +199,17 @@
}
result.setEquipValue(JSON.toJSONString(ev));
}
+ if (jo.get("equipName") != null) {
+ JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipName")));
+ List<Map<String, Object>> ev = new ArrayList<>();
+ for (Object o : jsonArray2) {
+ JSONObject equipValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v"));
+ ev.add(map);
+ }
+ result.setEquipName(JSON.toJSONString(ev));
+ }
try {
JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
String ir = JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + "";
@@ -251,7 +260,8 @@
@Transactional(rollbackFor = Exception.class)
public int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
Integer num = (type == 1 ? 5 : 4);
- insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell).set(InsOrderState::getVerifyUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+ LocalDateTime now = LocalDateTime.now();
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, now).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell).set(InsOrderState::getVerifyUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, orderId));
long count = insOrderStates.stream().filter(a -> a.getInsState() == 5).count();
if (count == insOrderStates.size() && num == 5) {
@@ -266,22 +276,29 @@
List<Map<String, Object>> tables = new ArrayList<>();
Set<String> standardMethod = new HashSet<>();
Set<String> deviceSet = new HashSet<>();
+ AtomicReference<String> models = new AtomicReference<>("");
+ AtomicReference<Integer> productSize = new AtomicReference<>(0);
+ String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
samples.forEach(a -> {
Set<String> templateSet = new HashSet<>();
getTemplateThing(set, map2, a);
- a.getInsProduct().forEach(b -> {
- String[] split = b.getMethod().replaceAll("]", "").replaceAll("\\[", "").replaceAll("\"", "").split(",");
- standardMethod.addAll(Arrays.asList(split));
+ for (InsProduct b : a.getInsProduct()) {
+ models.set(models.get()+b.getModel());
+ standardMethod.add(b.getMethodS());
+ productSize.set(productSize.get()+1);
if (b.getInsProductResult() != null) {
- if (b.getInsProductResult().getEquipValue() != null && !Objects.equals(b.getInsProductResult().getEquipValue(), "")) {
- deviceSet.add(b.getInsProductResult().getEquipValue());
+ List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
+ for (JSONObject jsonObject : jsonObjects) {
+ if (!"".equals(jsonObject.get("v") + "")) {
+ deviceSet.add(jsonObject.get("v") + "");
+ }
}
}
if (b.getTemplate().size() == 0) {
- return;
+ continue;
}
templateSet.add(JSON.toJSONString(b.getTemplate()));
- });
+ }
AtomicInteger index = new AtomicInteger();
templateSet.forEach(tem -> {
Set<Integer> set2 = new HashSet<>();
@@ -289,20 +306,66 @@
List<TextRenderData> text = new ArrayList<>();
RowRenderData rowRenderData;
Set<String> delSet = new HashSet<>();
- List<JSONObject> temp = JSON.parseArray(tem, JSONObject.class);
+ List<ExcelDto> excelDtos = JSON.parseArray(tem, ExcelDto.class);
+ List<ExcelDto> mcList = new ArrayList<>();
+ excelDtos.forEach(b -> {
+ if (b.getV().getMc() != null && b.getV().getMc().getCs() != null && b.getV().getMc().getRs() != null) {
+ mcList.add(b);
+ }
+ });
+ int count5 = 0;
+ for (ExcelDto b : mcList) {
+ for (ExcelDto excelDto : excelDtos) {
+ for (int i = 0; i < b.getV().getMc().getCs(); i++) {
+ for (int i2 = 0; i2 < b.getV().getMc().getRs(); i2++) {
+ if (excelDto.getC() == b.getC() + i && excelDto.getR() == b.getR() + i2) {
+ ExcelDto bb = JSON.parseObject(JSON.toJSONString(b), ExcelDto.class);
+ excelDto.getV().setV(bb.getV().getV());
+ excelDto.getV().setPs(bb.getV().getPs());
+ excelDto.getV().setFc(bb.getV().getFc());
+ excelDto.getV().setFs(bb.getV().getFs());
+ excelDto.getV().setHt(bb.getV().getHt());
+ excelDto.setMc(count5);
+ break;
+ }
+ }
+ }
+ }
+ count5++;
+ }
+ List<JSONObject> temp = JSON.parseArray(JSON.toJSONString(excelDtos), JSONObject.class);
Map<String, InsProduct> pMap = new HashMap<>();
Set<String> delRSet = new HashSet<>();
for (JSONObject jo1 : temp) {
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
if (v.get("ps") != null) {
- if ("妫�楠屽��".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+ int count3 = 0;
+ String str = "";
+ if ("妫�楠屽��".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧鍚嶇О".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧缂栫爜".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
delSet.add(jo1.get("c") + "");
+ continue;
}
- if ("妫�楠屽瓙椤�".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+ for (JSONObject jo2 : temp) {
+ JSONObject v2 = JSON.parseObject(JSON.toJSONString(jo2.get("v")));
+ if (jo1.get("r").equals(jo2.get("r"))) {
+ if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").equals("妫�楠岄」")) {
+ if (count3 == 0) {
+ str += v2.get("v");
+ count3 += 1;
+ }
+ } else if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").equals("妫�楠屽瓙椤�")) {
+ if (count3 == 1) {
+ str += v2.get("v");
+ count3 += 1;
+ }
+ }
+ }
+ }
+ if (!str.equals("")) {
int count2 = 0;
- for (InsProduct p : a.getInsProduct()) {
- if (v.get("v").equals(p.getInspectionItemSubclass())) {
- pMap.put(jo1.get("r") + "", p);
+ for (InsProduct product : a.getInsProduct()) {
+ if ((product.getInspectionItem() + product.getInspectionItemSubclass()).equals(str)) {
+ pMap.put(jo1.get("r") + "", product);
break;
} else {
count2++;
@@ -312,16 +375,12 @@
delRSet.add(jo1.get("r") + "");
}
}
+ } else {
+ if ("鍙傛暟".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
}
}
for (int i = 0; i < temp.size(); i++) {
JSONObject jo1 = temp.get(i);
- if (delRSet.stream().anyMatch(e -> e.equals(jo1.get("r") + ""))) {
- continue;
- }
- if (delSet.stream().anyMatch(e -> e.equals(jo1.get("c") + ""))) {
- continue;
- }
TextRenderData textRenderData = new TextRenderData();
if (set2.add(Integer.parseInt(jo1.get("r") + ""))) {
if (text.size() > 0) {
@@ -330,6 +389,12 @@
rows.add(rowRenderData);
text = new ArrayList<>();
}
+ }
+ if (delRSet.stream().anyMatch(e -> e.equals(jo1.get("r") + ""))) {
+ continue;
+ }
+ if (delSet.stream().anyMatch(e -> e.equals(jo1.get("c") + ""))) {
+ continue;
}
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
InsProduct p = pMap.get(jo1.get("r") + "");
@@ -365,6 +430,8 @@
textRenderData.setText(a.getModel());
} else if (value.equals("鏍峰搧鍚嶇О")) {
textRenderData.setText(a.getSample());
+ } else if (value.equals("璇曢獙鏂规硶")) {
+ textRenderData.setText(p.getMethodS());
} else {
textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
}
@@ -400,7 +467,11 @@
Style style = new Style();
style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
// style.setFontSize(v.get("fs")==null?14:Integer.parseInt(v.get("fs")+""));
- style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
+ if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
+ style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
+ } else {
+ style.setColor("000000");
+ }
textRenderData.setStyle(style);
text.add(textRenderData);
if (i == temp.size() - 1) {
@@ -437,9 +508,14 @@
});
String url;
try {
- url = ResourceUtils.getURL("classpath:static/report-template.docx").getPath();
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
+ File file = File.createTempFile("temp", ".tmp");OutputStream outputStream = new FileOutputStream(file);
+ IOUtils.copy(inputStream, outputStream);
+ url = file.getAbsolutePath();
} catch (FileNotFoundException e) {
throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
StringBuilder standardMethod2 = new StringBuilder();
for (String s : standardMethod) {
@@ -449,12 +525,13 @@
tables.forEach(table -> {
table.put("tableSize", tables.size() + 1);
});
- List<Map<String, String>> deviceList = insOrderMapper.selectDeviceList(deviceSet);
+// List<Map<String, String>> deviceList = insOrderMapper.selectDeviceList(deviceSet);
+ List<Map<String, String>> deviceList = new ArrayList<>();
Map<String, String> codeStr = new HashMap<>();
codeStr.put("鎶ュ憡缂栧彿", insReport.getCode());
codeStr.put("鏍峰搧鍚嶇О", insOrder.getSample());
codeStr.put("瑙勬牸鍨嬪彿", samples.get(0).getModel());
- codeStr.put("鍙戞斁鏃ユ湡", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ codeStr.put("鍙戞斁鏃ユ湡", now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
String codePath;
try {
codePath = new MatrixToImageWriter().code(JackSonUtil.marshal(codeStr).replaceAll("\\{", "")
@@ -476,13 +553,24 @@
put("standardMethod", standardMethod2);
put("deviceList", deviceList);
put("twoCode", Pictures.ofLocal(codePath).create());
+ put("models", models);
+ put("productSize", productSize);
+ put("createTime", now.format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
+ put("createTimeEn", monthNames[now.getMonthValue()-1]+" "+now.getDayOfMonth()+", "+now.getYear());
+ put("insTime", insOrder.getInsTime().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
+ put("insTimeEn", monthNames[insOrder.getInsTime().getMonthValue()-1]+" "+now.getDayOfMonth()+", "+now.getYear());
+ put("writeUrl", null);
+ put("insUrl", null);
+ put("examineUrl", null);
+ put("ratifyUrl", null);
}});
try {
- String name = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yy_MM_dd&HH_mm_ss")) + ".docx";
+ String name = now.format(DateTimeFormatter.ofPattern("yy_MM_dd&HH_mm_ss")) + ".docx";
template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
insReport.setUrl("/word/" + name);
insReportMapper.insert(insReport);
- insOrder.setState(4);
+// insOrder.setState(4);
+ insOrder.setInsState(5);
insOrderMapper.updateById(insOrder);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -522,9 +610,9 @@
if (insProducts.size() > 0) {
String str = "";
for (InsProduct product : insProducts) {
- str += product.getInspectionItem()+product.getInspectionItemSubclass()+"锛�";
+ str += product.getInspectionItem() + product.getInspectionItemSubclass() + "锛�";
}
- throw new ErrorException("浠ヤ笅鏄湭妫�楠岀殑椤圭洰锛�"+str);
+ throw new ErrorException("浠ヤ笅鏄湭妫�楠岀殑椤圭洰锛�" + str);
}
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3));
return 1;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
index 4195719..ee1ad15 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.data.Pictures;
import com.spire.doc.Document;
import com.spire.doc.FileFormat;
import com.yuanchu.mom.common.GetLook;
@@ -26,7 +28,10 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
@@ -50,6 +55,9 @@
@Value("${wordUrl}")
private String wordUrl;
+
+ @Value("${file.path}")
+ private String imgUrl;
@Override
public Map<String, Object> pageInsReport(Page page, ReportPageDto reportPageDto) {
@@ -100,6 +108,9 @@
String url = insReport.getUrl();
//鎵嬪姩涓婁紶鎶ュ憡鍦板潃
String urlS = insReport.getUrlS();
+ wordInsertUrl(new HashMap<String, Object>(){{
+ put("writeUrl", Pictures.ofLocal(imgUrl+"/"+signatureUrl).create());
+ }}, (urlS==null?url:urlS).replace("/word", wordUrl));
return insReportMapper.updateById(insReport);
}
@@ -123,7 +134,9 @@
String url = insReport.getUrl();
//鎵嬪姩涓婁紶鎶ュ憡鍦板潃
String urlS = insReport.getUrlS();
-
+ wordInsertUrl(new HashMap<String, Object>(){{
+ put("examineUrl", Pictures.ofLocal(imgUrl+"/"+signatureUrl).create());
+ }}, (urlS==null?url:urlS).replace("/word", wordUrl));
return insReportMapper.updateById(insReport);
}
@@ -147,9 +160,22 @@
String url = insReport.getUrl();
//鎵嬪姩涓婁紶鎶ュ憡鍦板潃
String urlS = insReport.getUrlS();
-
+ wordInsertUrl(new HashMap<String, Object>(){{
+ put("ratifyUrl", Pictures.ofLocal(imgUrl+"/"+signatureUrl).create());
+ }}, (urlS==null?url:urlS).replace("/word", wordUrl));
return insReportMapper.updateById(insReport);
}
+
+ @Override
+ public int wordInsertUrl(Map<String, Object> map, String url) {
+ XWPFTemplate template = XWPFTemplate.compile(url).render(map);
+ try {
+ template.writeAndClose(Files.newOutputStream(Paths.get(url)));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return 1;
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index b87db93..cad79b6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -38,4 +38,6 @@
private String sonLaboratory;
+ private Integer orderUserId;
+
}
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 1e5bee5..37aec35 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -29,7 +29,7 @@
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
select * from(
SELECT
- a.*,ios.ins_state,ios.verify_tell
+ a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id
FROM
(
SELECT
@@ -49,7 +49,7 @@
LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
WHERE
io.state = 1
- AND io.ins_state != 5
+# AND io.ins_state != 5
and send_time is not null
and (isu.user_id = #{userId} OR isu.user_id is NULL)
GROUP BY
@@ -57,6 +57,7 @@
io.id
) a
LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
+ left join (SELECT c.user_id order_user_id, c.ins_sample_id from (SELECT * FROM ins_sample_user ORDER BY id DESC) c GROUP BY ins_sample_id having order_user_id = #{userId}) isu2 on isu2.ins_sample_id = a.id
ORDER BY
a.user_id DESC,
a.type DESC,
@@ -150,6 +151,7 @@
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
+ ipr.equip_name,
ip.method_s
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
@@ -226,5 +228,6 @@
<result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
<result property="comValue" column="com_value" jdbcType="VARCHAR"/>
<result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
+ <result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
</resultMap>
</mapper>
diff --git a/inspect-server/src/main/resources/static/report-template.docx b/inspect-server/src/main/resources/static/report-template.docx
index 451e7e9..1bae07a 100644
--- a/inspect-server/src/main/resources/static/report-template.docx
+++ b/inspect-server/src/main/resources/static/report-template.docx
Binary files differ
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index fb036d2..01d4637 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -110,7 +110,7 @@
/**
* 缁勭粐
*/
- @ValueTableShow(value = 14,name = "缁勭粐")
+// @ValueTableShow(value = 14,name = "缁勭粐")
@ApiModelProperty(value = "鍏宠仈鐨勯儴闂╥d")
private String departId;
--
Gitblit v1.9.3