From cddc46a1ba318426cf01ae3fd354807c3b3b2465 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 17 四月 2024 13:44:14 +0800
Subject: [PATCH] 调整模板功能；生成检验人员的三层架构文件
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 462 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 398 insertions(+), 64 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 4f74f80..08ed607 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
@@ -11,49 +11,85 @@
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.config.Configure;
+import com.deepoove.poi.config.ConfigureBuilder;
+import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.Style;
+import com.deepoove.poi.data.style.TableStyle;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
+import com.yuanchu.mom.exception.ErrorException;
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;
import com.yuanchu.mom.vo.InsOrderPlanVO;
-import lombok.AllArgsConstructor;
+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 java.io.FileOutputStream;
+import javax.annotation.Resource;
+import java.io.FileNotFoundException;
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.*;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
*/
@Service
-@AllArgsConstructor
+//@AllArgsConstructor
public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
+ @Resource
private InsSampleMapper insSampleMapper;
-
+ @Resource
private InsSampleUserMapper insSampleUserMapper;
-
+ @Resource
private GetLook getLook;
-
+ @Resource
private InsOrderMapper insOrderMapper;
-
+ @Resource
private InsOrderService insOrderService;
-
+ @Resource
private StandardTemplateService standardTemplateService;
-
+ @Resource
private InsOrderStateMapper insOrderStateMapper;
-
+ @Resource
private InsProductMapper insProductMapper;
+
+ @Value("${wordUrl}")
+ private String wordUrl;
+
+ @Value("${twoCode}")
+ private String twoCode;
+
+ @Resource
+ private GiveCode giveCode;
+
+ @Resource
+ private InsReportMapper insReportMapper;
+
+ @Resource
+ private InsProductResultMapper insProductResultMapper;
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -97,53 +133,83 @@
List<SampleProductDto> list = JSON.parseArray(JSON.toJSONString(map.get("sampleProduct")), SampleProductDto.class);
for (SampleProductDto samples : list) {
if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
- for (InsProduct product : samples.getInsProduct()) {
- if (product.getTemplateId() == null) {
- product.setTemplate(new ArrayList<>());
- continue;
- }
- if (set.add(product.getTemplateId())) {
- map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
- }
- String 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")));
- List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
- List<JSONObject> tableData = new ArrayList<>();
- Map<String, Object> style = new HashMap<>();
-// style.put("borderInfo", config.get("borderInfo"));
- style.put("rowlen", config.get("rowlen"));
- style.put("columnlen", config.get("columnlen"));
- int r = -1;
- if (BeanUtil.isNotEmpty(cellData)) {
- for (JSONObject o : cellData) {
- JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
- if (BeanUtil.isNotEmpty(v.get("ps"))) {
- JSONObject ps = JSON.parseObject(JSON.toJSONString(v.get("ps")));
- if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())) {
- tableData.add(o);
- r = Integer.parseInt(o.get("r") + "");
- continue;
- }
- }
- if (tableData.size() > 0) {
- if (Integer.parseInt(o.get("r") + "") == r + 1 || Integer.parseInt(o.get("r") + "") == r) {
- r = Integer.parseInt(o.get("r") + "");
- tableData.add(o);
- } else {
- break;
- }
- }
- }
- }
- product.setTemplate(tableData);
- product.setStyle(style);
- }
- }
+ getTemplateThing(set, map2, samples);
}
map.put("sampleProduct", list);
return map;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveInsContext(Map<String, Object> insContext) {
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ CompletableFuture.supplyAsync(() -> {
+ AtomicInteger count = new AtomicInteger();
+ insContext.forEach((k, v) -> {
+ JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
+ InsProduct insProduct = new InsProduct();
+ insProduct.setId(Integer.parseInt(k));
+ InsProductResult result = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ if (BeanUtil.isEmpty(result)) {
+ result = new InsProductResult();
+ }
+ result.setInsProductId(Integer.parseInt(k));
+ JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
+ List<Map<String, Object>> iv = new ArrayList<>();
+ for (Object o : jsonArray) {
+ JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
+ if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
+ map.put("u", userId);
+ } else {
+ map.put("u", insValue.get("u"));
+ }
+ iv.add(map);
+ }
+ result.setInsValue(JSON.toJSONString(iv));
+ JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
+ List<Map<String, Object>> cv = new ArrayList<>();
+ for (Object o : jsonArray2) {
+ JSONObject comValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(comValue.get("v"))).get("v"));
+ cv.add(map);
+ }
+ result.setComValue(JSON.toJSONString(cv));
+ JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
+ insProduct.setLastValue(JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v") + "");
+ JSONObject equipValue = JSON.parseObject(JSON.toJSONString(jo.get("equipValue")));
+ try {
+ result.setEquipValue(JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v") + "");
+ } catch (Exception ignored) {
+ result.setEquipValue(null);
+ }
+ JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
+ insProduct.setInsResult(Integer.parseInt(JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + ""));
+ if (BeanUtil.isEmpty(result.getId())) {
+ result.setCreateUser(userId);
+ result.setUpdateUser(userId);
+ insProductResultMapper.insert(result);
+ } else {
+ result.setUpdateUser(userId);
+ result.setUpdateTime(LocalDateTime.now());
+ insProductResultMapper.updateById(result);
+ }
+ insProduct.setUpdateUser(userId);
+ insProductMapper.updateById(insProduct);
+ if (count.get() == 0) {
+ InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
+ insSample.setInsState(1);
+ count.addAndGet(1);
+ }
+ });
+ return null;
+ }).thenAccept(res -> {
+ }).exceptionally(e -> {
+ e.printStackTrace();
+ return null;
+ });
}
@Override
@@ -162,24 +228,288 @@
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")));
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()) {
- XWPFTemplate template = XWPFTemplate.compile("template.docx").render(
+ if (count == insOrderStates.size() && num == 5) {
+ InsOrder insOrder = insOrderMapper.selectById(orderId);
+ 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.setInsOrderId(orderId);
+ Set<Integer> set = new HashSet<>();
+ Map<Integer, String> map2 = new HashMap<>();
+ List<Map<String, Object>> tables = new ArrayList<>();
+ Set<String> standardMethod = new HashSet<>();
+ Set<String> deviceSet = new HashSet<>();
+ 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));
+ if(b.getInsProductResult()!=null){
+ if(b.getInsProductResult().getEquipValue()!=null&& !Objects.equals(b.getInsProductResult().getEquipValue(), "")){
+ deviceSet.add(b.getInsProductResult().getEquipValue());
+ }
+ }
+ if (b.getTemplate().size() == 0) {
+ return;
+ }
+ templateSet.add(JSON.toJSONString(b.getTemplate()));
+ });
+ AtomicInteger index = new AtomicInteger();
+ templateSet.forEach(tem->{
+ Set<Integer> set2 = new HashSet<>();
+ List<RowRenderData> rows = new ArrayList<>();
+ List<TextRenderData> text = new ArrayList<>();
+ RowRenderData rowRenderData;
+ Set<String> delSet = new HashSet<>();
+ List<JSONObject> temp = JSON.parseArray(tem, 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") + "")) {
+ delSet.add(jo1.get("c") + "");
+ }
+ if ("妫�楠屽瓙椤�".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+ int count2 = 0;
+ for (InsProduct p : a.getInsProduct()) {
+ if(v.get("v").equals(p.getInspectionItemSubclass())){
+ pMap.put(jo1.get("r")+"", p);
+ break;
+ }else{
+ count2++;
+ }
+ }
+ if(count2 == a.getInsProduct().size()){
+ delRSet.add(jo1.get("r")+"");
+ }
+ }
+ }
+ }
+ 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) {
+ TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+ rowRenderData = Rows.of(text2).center().rowAtleastHeight(1).create();
+ rows.add(rowRenderData);
+ text = new ArrayList<>();
+ }
+ }
+ JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
+ InsProduct p = pMap.get(jo1.get("r") + "");
+ if (p!=null && v.get("ps") != null) {
+ String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
+ if (value.equals("瑕佹眰鍊�")) {
+ textRenderData.setText(p.getAsk());
+ } else if (value.equals("鍗曚綅")) {
+ textRenderData.setText(p.getUnit());
+ } else if (value.equals("缁撹")) {
+ switch (p.getInsResult()) {
+ case 1:
+ textRenderData.setText("鈭�");
+ break;
+ case 0:
+ textRenderData.setText("脳");
+ break;
+ default:
+ textRenderData.setText("-");
+ break;
+ }
+ } else if (value.equals("搴忓彿")) {
+ index.getAndIncrement();
+ textRenderData.setText(index + "");
+ } else if (value.equals("璁＄畻鍊�")) {
+ JSONArray jsonArray = JSON.parseArray(p.getInsProductResult().getComValue());
+ textRenderData.setText((JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "").equals("") ? "/" : JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "");
+ } else if (value.equals("鏈�缁堝��")) {
+ textRenderData.setText(p.getLastValue());
+ } else if (value.equals("鏍峰搧缂栧彿")) {
+ textRenderData.setText(a.getSampleCode());
+ } else if (value.equals("鏍峰搧鍨嬪彿")) {
+ textRenderData.setText(a.getModel());
+ } else if (value.equals("鏍峰搧鍚嶇О")) {
+ textRenderData.setText(a.getSample());
+ } else {
+ textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+ }
+ } else if (p==null && v.get("ps") != null) {
+ String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
+ p = pMap.get(pMap.keySet().iterator().next());
+ if (value.equals("鏈�缁堝��")) {
+ textRenderData.setText(p.getLastValue());
+ } else if (value.equals("缁撹")) {
+ switch (p.getInsResult()) {
+ case 1:
+ textRenderData.setText("鉁�");
+ break;
+ case 0:
+ textRenderData.setText("鉁�");
+ break;
+ default:
+ textRenderData.setText("-");
+ break;
+ }
+ } else if (value.equals("鏍峰搧缂栧彿")) {
+ textRenderData.setText(a.getSampleCode());
+ } else if (value.equals("鏍峰搧鍨嬪彿")) {
+ textRenderData.setText(a.getModel());
+ } else if (value.equals("鏍峰搧鍚嶇О")) {
+ textRenderData.setText(a.getSample());
+ } else {
+ textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+ }
+ } else {
+ textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+ }
+ 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("#", ""));
+ textRenderData.setStyle(style);
+ text.add(textRenderData);
+ if (i == temp.size() - 1) {
+ TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+ rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
+ rows.add(rowRenderData);
+ text = new ArrayList<>();
+ }
+ }
+ 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.setAlign(TableRowAlign.CENTER);
+ tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+ tableRenderData.setTableStyle(tableStyle);
+ Map<String, Object> table = new HashMap<>();
+ table.put("table", tableRenderData);
+ table.put("report", insReport);
+ tables.add(table);
+ });
+ });
+ String url;
+ try {
+ url = ResourceUtils.getURL("classpath:static/report-template.docx").getPath();
+ } catch (FileNotFoundException e) {
+ throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
+ }
+ StringBuilder standardMethod2 = new StringBuilder();
+ for (String s : standardMethod) {
+ standardMethod2.append("銆�").append(s);
+ }
+ standardMethod2.replace(0, 1,"");
+ tables.forEach(table->{
+ table.put("tableSize", tables.size() + 1);
+ });
+ List<Map<String, String>> deviceList = insOrderMapper.selectDeviceList(deviceSet);
+ 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")));
+ String codePath;
+ try {
+ codePath = new MatrixToImageWriter().code(JackSonUtil.marshal(codeStr).replaceAll("\\{","")
+ .replaceAll("}","").replaceAll(",","").replaceAll("\"",""), twoCode);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ ConfigureBuilder builder = Configure.builder();
+ builder.useSpringEL(true);
+ XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
- put("title", "Hi, poi-tl Word妯℃澘寮曟搸");
+ put("order", insOrder);
+ put("report", insReport);
+ put("user", user);
+// put("samples", samples);
+ put("sampleSize", samples.size() + samples.get(0).getUnit());
+ put("tables", tables);
+ put("tableSize", tables.size() + 1);
+ put("standardMethod", standardMethod2);
+ put("deviceList", deviceList);
+ put("twoCode", Pictures.ofLocal(codePath).create());
}});
try {
- template.writeAndClose(new FileOutputStream("output.docx"));
+ String name = LocalDateTime.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);
+ insOrderMapper.updateById(insOrder);
} catch (IOException e) {
throw new RuntimeException(e);
}
- List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId));
- insSamples.forEach(a -> {
- System.out.println(a);
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, a.getId()));
- insProducts.forEach(System.out::println);
- });
}
return 1;
+ }
+
+ private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, SampleProductDto a) {
+ for (InsProduct product : a.getInsProduct()) {
+ if (product.getTemplateId() == null) {
+ product.setTemplate(new ArrayList<>());
+ continue;
+ }
+ if (set.add(product.getTemplateId())) {
+ map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
+ }
+ String 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")));
+ List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
+// List<JSONObject> tableData = new ArrayList<>();
+ Map<String, Object> style = new HashMap<>();
+ style.put("rowlen", config.get("rowlen"));
+ style.put("columnlen", config.get("columnlen"));
+ int r = -1;
+ /*if (BeanUtil.isNotEmpty(cellData)) {
+ for (JSONObject o : cellData) {
+ JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
+ tableData.add(o);
+ if (BeanUtil.isNotEmpty(v.get("ps"))) {
+ JSONObject ps = JSON.parseObject(JSON.toJSONString(v.get("ps")));
+ if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())) {
+ tableData.add(o);
+ r = Integer.parseInt(o.get("r") + "");
+ continue;
+ }
+ }
+ if (tableData.size() > 0) {
+ if ((Integer.parseInt(o.get("r") + "") == r + 1 || Integer.parseInt(o.get("r") + "") == r) && !(o.get("v") + "").equals("{\"ht\":\"0\"}")) {
+ r = Integer.parseInt(o.get("r") + "");
+ tableData.add(o);
+ } else {
+ break;
+ }
+ }
+ }
+ }*/
+ product.setTemplate(cellData);
+ product.setStyle(style);
+ }
+ }
}
@Override
@@ -193,4 +523,8 @@
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;
}
+
+ public int pxToCm(int px) {
+ return px / 9;
+ }
}
--
Gitblit v1.9.3