From 23ea9d4b546819f4b888e029daf29c93f11e2a74 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期日, 26 五月 2024 23:55:44 +0800
Subject: [PATCH] 2024-5-23 小需求调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 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 84b4fc7..2952551 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,10 +30,10 @@
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.InsOrderPlanTaskSwitchVo;
import com.yuanchu.mom.vo.InsOrderPlanVO;
import org.apache.commons.io.IOUtils;
import org.apache.poi.xwpf.usermodel.*;
@@ -57,7 +57,6 @@
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
*/
@Service
-//@AllArgsConstructor
public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
@Resource
@@ -82,9 +81,6 @@
@Value("${twoCode}")
private String twoCode;
-
- @Resource
- private GiveCode giveCode;
@Resource
private InsReportMapper insReportMapper;
@@ -114,6 +110,20 @@
insOrderPlanDTO.setUserId(userId.longValue());
}
IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
+ map.put("body", insOrderPage);
+ return map;
+ }
+
+ @Override
+ public Map<String, Object> inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(InsOrderPlanTaskSwitchVo.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
+ Integer userId = map1.get("userId");
+ if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
+ insOrderPlanDTO.setUserId(userId.longValue());
+ }
+ IPage<InsOrderPlanTaskSwitchVo> insOrderPage = insSampleMapper.inspectionOrderDetailsTaskSwitching(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
map.put("body", insOrderPage);
return map;
}
@@ -415,8 +425,6 @@
delRSet.add(jo1.get("r") + "");
}
}
- } else {
- if ("鍙傛暟".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
}
}
for (int i = 0; i < temp.size(); i++) {
@@ -509,7 +517,6 @@
}
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")+""));
if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
} else {
@@ -517,16 +524,12 @@
}
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<>();
- }
}
+ TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+ rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
+ rows.add(rowRenderData);
TableRenderData tableRenderData = new TableRenderData();
tableRenderData.setRows(rows);
- System.out.println(rows.size());
TableStyle tableStyle = new TableStyle();
tableStyle.setColWidths(new int[]{650,1600,2000,750,2800,1100,1100});
tableStyle.setWidth("10000");
@@ -589,6 +592,7 @@
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;
@@ -597,6 +601,9 @@
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(
@@ -626,6 +633,8 @@
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";
--
Gitblit v1.9.3