From 08cad817f057c4a10e1ea59e362fbb492f3381df Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 deletions(-)
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 7e55398..887f325 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
@@ -30,7 +30,6 @@
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.StandardTemplateService;
-import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.MatrixToImageWriter;
import com.yuanchu.mom.utils.QueryWrappers;
@@ -57,7 +56,6 @@
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
*/
@Service
-//@AllArgsConstructor
public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
@Resource
@@ -84,9 +82,6 @@
private String twoCode;
@Resource
- private GiveCode giveCode;
-
- @Resource
private InsReportMapper insReportMapper;
@Resource
@@ -97,6 +92,12 @@
@Resource
private InformationNotificationService informationNotificationService;
+
+ @Resource
+ private UserMapper userMapper;
+
+ @Value("${file.path}")
+ private String imgUrl;
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -295,7 +296,6 @@
Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
InsReport insReport = new InsReport();
-// insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
insReport.setCode(insOrder.getEntrustCode());
insReport.setInsOrderId(orderId);
Set<Integer> set = new HashSet<>();
@@ -308,10 +308,10 @@
String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
samples.forEach(a -> {
models.add(a.getModel());
+ standardMethod.add(baseMapper.getStandardMethodCode(a.getStandardMethodListId()));
Set<String> templateSet = new HashSet<>();
getTemplateThing(set, map2, a);
for (InsProduct b : a.getInsProduct()) {
- standardMethod.add(b.getMethodS());
productSize.set(productSize.get() + 1);
if (b.getInsProductResult() != null) {
List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
@@ -320,6 +320,9 @@
deviceSet.add(jsonObject.get("v") + "");
}
}
+ }
+ if(b.getTemplate()==null){
+ continue;
}
if (b.getTemplate().size() == 0) {
continue;
@@ -365,10 +368,15 @@
Set<String> delRSet = new HashSet<>();
for (JSONObject jo1 : temp) {
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
+ if(Integer.parseInt(jo1.get("c")+"") > 9){
+ delSet.add(jo1.get("c") + "");
+ continue;
+ }
if (v.get("ps") != null) {
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") + "")) {
+ String s = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
+ if ("妫�楠屽��".equals(s) || "璁惧鍚嶇О".equals(s) || "璁惧缂栫爜".equals(s) || "璇曢獙鏂规硶".equals(s) || "妫�娴嬫柟娉�".equals(s)) {
delSet.add(jo1.get("c") + "");
continue;
}
@@ -514,21 +522,9 @@
TableRenderData tableRenderData = new TableRenderData();
tableRenderData.setRows(rows);
TableStyle tableStyle = new TableStyle();
- /*JSONObject styleJo = JSON.parseObject(JSON.toJSONString(b.getStyle().get("columnlen")));
- List<Integer> colLen = new ArrayList<>();
- int colSize = rows.get(0).getCells().size();
- int colOne = Integer.parseInt(b.getTemplate().get(0).get("r") + "");
- for (int i = colOne; i < colSize + colOne; i++) {
- if (styleJo.get(i + "") == null) {
- colLen.add(pxToCm(100));
- } else {
- int i1 = Integer.parseInt(styleJo.get(i + "") + "");
- colLen.add(pxToCm(i1));
- }
- }*/
-// tableStyle.setColWidths(ArrayUtils.toPrimitive(colLen.toArray(new Integer[0])));
+ tableStyle.setColWidths(new int[]{650,1600,2000,750,2800,1100,1100});
+ tableStyle.setWidth("10000");
tableStyle.setAlign(TableRowAlign.CENTER);
- tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
BorderStyle borderStyle = new BorderStyle();
borderStyle.setColor("000000");
borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
@@ -587,9 +583,20 @@
String finalModelStr = modelStr;
String sampleEn = insSampleMapper.getSampleEn(insOrder.getSample());
String orderType = insOrderMapper.getEnumLabelByValue(insOrder.getOrderType());
+ String formType = insOrderMapper.getEnumLabelByValue(insOrder.getFormType());
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
List<Map<String, String>> finalDeviceList = deviceList;
+ Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery().eq(InsSampleUser::getInsSampleId, orderId).orderByDesc(InsSampleUser::getCreateTime).last("limit 1")).getUserId();
+ String signatureUrl;
+ try {
+ signatureUrl = userMapper.selectById(userId).getSignatureUrl();
+ }catch (Exception e){
+ throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
+ }
+ if(signatureUrl == null || "".equals(signatureUrl)){
+ throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
+ }
XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
put("order", insOrder);
@@ -608,20 +615,23 @@
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("insUrl", Pictures.ofLocal(imgUrl+"/"+signatureUrl).create());
put("examineUrl", null);
put("ratifyUrl", null);
put("sampleEn", sampleEn);
put("orderType", orderType);
put("getTime", insOrder.getExamineTime().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
put("getTimeEn", monthNames[insOrder.getExamineTime().getMonthValue() - 1] + " " + insOrder.getExamineTime().getDayOfMonth() + ", " + insOrder.getExamineTime().getYear());
+ put("seal1", null);
+ put("seal2", null);
+ put("formTypeCh", formType);
+ put("formTypeEn", insOrder.getFormType());
}});
try {
String name = insReport.getCode().replace("/", "") + ".docx";
template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
insReport.setUrl("/word/" + name);
insReportMapper.insert(insReport);
-// insOrder.setState(4);
insOrder.setInsState(5);
insOrderMapper.updateById(insOrder);
} catch (IOException e) {
@@ -671,7 +681,9 @@
for (int a = list.size() - 1; a >= 0; a--) {
Map<String, Integer> v = maps.get(list.get(a));
for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
- TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+ if (v.get("ec") > v.get("sc")) {
+ TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+ }
}
if (v.get("er") > v.get("sr")) {
TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
@@ -696,10 +708,12 @@
product.setTemplate(new ArrayList<>());
continue;
}
+ String thing = null;
if (product.getTemplateId() != null && set.add(product.getTemplateId())) {
map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
+ thing = map2.get(product.getTemplateId());
}
- String thing = map2.get(product.getTemplateId());
+// thing = map2.get(product.getTemplateId());
if (StrUtil.isNotEmpty(thing)) {
JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
@@ -738,7 +752,7 @@
info.setViewStatus(false);
info.setJumpPath("b1-inspect-order-plan");
informationNotificationService.addInformationNotification(info);
- upPlanUser(userId, orderId);
+ upPlanUser(verifyUser, orderId);
return 1;
}
--
Gitblit v1.9.3