From 90d6a03c642d174475c63f136b4aa0a1a91902bf Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 25 二月 2025 16:45:09 +0800
Subject: [PATCH] 报告生成调整
---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java | 2
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java | 11 -
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotalSampleController.java | 11 +
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java | 2
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java | 1
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 2
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodVerifyController.java | 2
inspect-server/src/main/resources/static/report-template.docx | 0
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java | 4
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java | 11 +
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 333 +++++++++++++++++++++++------------------------
13 files changed, 190 insertions(+), 193 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java
index 5c060ec..c314bc8 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java
@@ -48,7 +48,7 @@
}
@ApiOperation(value = "鎶曡瘔璇︽儏")
- @PostMapping("/getProcessComplain")
+ @GetMapping("/getProcessComplain")
public Result getProcessComplain(Long id) {
return Result.success(processComplainService.getProcessComplain(id));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java
index a178f1b..15ac088 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java
@@ -29,7 +29,7 @@
private ProcessDealService processDealService;
@ApiOperation(value = "鏌ヨ妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃鎯�")
- @PostMapping("/pageProcessDeal")
+ @GetMapping("/pageProcessDeal")
public Result pageProcessDeal(ProcessDeal processDeal, Page page) throws Exception {
return Result.success(processDealService.pageProcessDeal(page, processDeal));
}
@@ -53,7 +53,7 @@
}
@ApiOperation(value = "鏌ョ湅妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
- @PostMapping("/getProcessDeal")
+ @GetMapping("/getProcessDeal")
public Result getProcessDeal(Integer id) {
return Result.success(processDealService.getById(id));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
index 9539d5a..7ba9d7d 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
@@ -78,7 +78,7 @@
* @return
*/
@ApiOperation(value = "瀵煎叆鏍囧噯鏌ユ柊")
- @GetMapping("/importMethodSearchNew")
+ @PostMapping("/importMethodSearchNew")
public Result importMethodSearchNew(MultipartFile file){
return Result.success(processMethodSearchNewService.importMethodSearchNew(file));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodVerifyController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodVerifyController.java
index 4fa44bc..d265511 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodVerifyController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodVerifyController.java
@@ -47,7 +47,7 @@
* @return
*/
@ApiOperation(value = "鏍囧噯鏂规硶鏇存柊楠岃瘉鍒楄〃")
- @PostMapping("/pagesMethodVerify")
+ @GetMapping("/pagesMethodVerify")
public Result<IPage<ProcessMethodVerify>> pagesMethodVerify(ProcessMethodVerifyDto methodVerifyDto,Page page) throws Exception {
return Result.success(processMethodVerifyService.pagesMethodVerify(page, methodVerifyDto));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
index a657183..a773397 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
@@ -7,10 +7,7 @@
import com.ruoyi.process.service.ProcessReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
@@ -32,7 +29,7 @@
private ProcessReportService processReportService;
@ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婂彂鏀剧櫥璁板垪琛�")
- @PostMapping("/pageProcessReport")
+ @GetMapping("/pageProcessReport")
public Result pageProcessReport(ProcessReport processReport , Page page) throws Exception {
return Result.success(processReportService.pageProcessReport(page, processReport));
}
@@ -44,13 +41,13 @@
}
@ApiOperation(value = "鍒犻櫎妫�楠屾姤鍛婂彂鏀剧櫥璁�")
- @PostMapping("/delProcessReport")
+ @DeleteMapping("/delProcessReport")
public Result delProcessReport(Long id) {
return Result.success(processReportService.removeById(id));
}
@ApiOperation(value = "鏌ョ湅妫�楠屾姤鍛婂彂鏀剧櫥璁拌鎯�")
- @PostMapping("/getProcessReport")
+ @GetMapping("/getProcessReport")
public Result getProcessReport(Long id) {
return Result.success(processReportService.getById(id));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotalSampleController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotalSampleController.java
index 8af7003..cf6b5a0 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotalSampleController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotalSampleController.java
@@ -35,19 +35,24 @@
@ApiOperation(value = "鎻愪氦鏍峰搧鎺ユ敹")
@PostMapping("/submitProcessTotalSample")
- public Result submitProcessTotalSample(Integer id) {
+ public Result submitProcessTotalSample(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
return Result.success(processTotalSampleService.submitProcessTotalSample(id));
}
@ApiOperation(value = "瀹℃牳鏍峰搧鎺ユ敹")
@PostMapping("/checkProcessTotalSample")
- public Result checkProcessTotalSample(Integer id, String state) {
+ public Result checkProcessTotalSample(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String state = (String) param.get("state");
return Result.success(processTotalSampleService.checkProcessTotalSample(id, state));
}
@ApiOperation(value = "鎵瑰噯鏍峰搧鎺ユ敹")
@PostMapping("/ratifyProcessTotalSample")
- public Result ratifyProcessTotalSample(Integer id,String state) {
+ public Result ratifyProcessTotalSample(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String state = (String) param.get("state");
return Result.success(processTotalSampleService.ratifyProcessTotalSample(id,state));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java
index 88826c0..6d3380d 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java
@@ -35,19 +35,24 @@
@ApiOperation(value = "鎻愪氦妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@PostMapping("/submitProcessTotaldeal")
- public Result submitProcessTotaldeal(Integer id) {
+ public Result submitProcessTotaldeal(@RequestBody Map<String, Integer> param) {
+ Integer id = param.get("id");
return Result.success(processTotaldealService.submitProcessTotaldeal(id));
}
@ApiOperation(value = "瀹℃牳妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@PostMapping("/checkProcessTotaldeal")
- public Result checkProcessTotaldeal(Integer id, String state) {
+ public Result checkProcessTotaldeal(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String state = (String) param.get("state");
return Result.success(processTotaldealService.checkProcessTotaldeal(id, state));
}
@ApiOperation(value = "鎵瑰噯妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@PostMapping("/ratifyProcessTotaldeal")
- public Result ratifyProcessTotaldeal(Integer id,String state) {
+ public Result ratifyProcessTotaldeal(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String state = (String) param.get("state");
return Result.success(processTotaldealService.ratifyProcessTotaldeal(id,state));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java
index 86e6aaf..f44efbf 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java
@@ -21,5 +21,5 @@
IPage<ProcessReport> pageProcessReport(Page page, @Param("ew") QueryWrapper<ProcessReport> queryWrappers);
- List<ProcessReport> getIds(List<Integer> ids);
+ List<ProcessReport> getIds(@Param("ids") List<Integer> ids);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
index 36ff9d0..96a5ca8 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
@@ -38,7 +38,7 @@
List<CostStatisticsDto> selectCostStatistics2(@Param("ew") QueryWrapper<CostStatisticsDto> ew);
- List<Map<String, String>> selectDeviceList(@Param("names") Set<String> names);
+ List<Map<String, String>> selectDeviceList(@Param("managementNumbers") Set<String> managementNumbers);
List<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
Long getCount(@Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
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 ca01fca..c33bb08 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
@@ -42,6 +42,7 @@
import com.ruoyi.inspect.mapper.*;
import com.ruoyi.inspect.pojo.*;
import com.ruoyi.inspect.service.*;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
import com.ruoyi.inspect.vo.InsOrderPlanVO;
import com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursMapper;
@@ -1880,6 +1881,8 @@
put("seal1", null);
}});
try {
+ // 淇敼鎹㈣鍜屽悎骞堕棶棰�
+ updaeMerge(template.getXWPFDocument(), true);
String name = insReport.getCode().replace("/", "") + "-J.docx";
template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
insReport.setUrl("/word/" + name);
@@ -1894,8 +1897,6 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
- // 淇敼鎹㈣鍜屽悎骞堕棶棰�
- updaeMerge(insReport, null, true);
}
/**
@@ -2263,10 +2264,19 @@
tables.forEach(table -> {
table.put("tableSize", tables.size() + 1);
});
+ // 璁惧淇℃伅
List<Map<String, String>> deviceList = null;
- if (deviceSet.size() != 0) {
+ if (CollectionUtils.isNotEmpty(deviceSet)) {
deviceList = insOrderMapper.selectDeviceList(deviceSet);
}
+ if (CollectionUtils.isNotEmpty(deviceList)) {
+ int count = 1;
+ for (Map<String, String> stringMap : deviceList) {
+ stringMap.put("index", String.valueOf(count));
+ count++;
+ }
+ }
+
Map<String, String> codeStr = new HashMap<>();
codeStr.put("鎶ュ憡缂栧彿", insReport.getCode());
codeStr.put("鏍峰搧鍚嶇О", insOrder.getSample());
@@ -2274,7 +2284,6 @@
codeStr.put("鍙戞斁鏃ユ湡", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
String modelStr = CollUtil.join(models, "\n");
- String finalModelStr = modelStr;
// 妫�娴嬬被鍨�
String orderType = null;
@@ -2288,11 +2297,10 @@
String formType = iSysDictTypeService.selectLabelByDict(DictDataConstants.FORM_TYPE, insOrder.getFormType());
// 鏍峰搧鐘舵��
- String sampleStatus = iSysDictTypeService.selectLabelByDict(DictDataConstants.SAMPLE_STATUS_LIST, insOrder.getSampleStatus());;
+ String sampleStatus = iSysDictTypeService.selectLabelByDict(DictDataConstants.SAMPLE_STATUS_LIST, insOrder.getSampleStatus());
+ ;
- ConfigureBuilder builder = Configure.builder();
- builder.useSpringEL(true);
- List<Map<String, String>> finalDeviceList = deviceList;
+ // 鍏徃淇℃伅
Custom custom = customMapper.selectById(insOrder.getCompanyId());
// 鏌ヨ鍒ゆ柇鏄惁鏈変笉鍒ゅ畾椤圭洰,鍜屽叏閮芥槸鍒ゅ畾椤�
@@ -2382,12 +2390,18 @@
environment = (ObjectUtils.isNotEmpty(insOrder.getTemperature()) ? insOrder.getTemperature() + "鈩� " : "") + (ObjectUtils.isNotEmpty(insOrder.getHumidity()) ? insOrder.getHumidity() + "%" : "");
String finalEnvironment = environment;
LocalDateTime finalSendTime = sendTime;
-
String finalResultCh = resultCh;
String finalResultEn = resultEn;
String finalOrderType = orderType;
+ List<Map<String, String>> finalDeviceList = deviceList;
+ String finalModelStr = modelStr;
+
InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
- XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
+ Configure configure = Configure.builder()
+ .bind("deviceList", new HackLoopTableRenderPolicy())
+ .build();
+
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
new HashMap<String, Object>() {{
put("order", insOrder);
put("report", insReport);
@@ -2422,6 +2436,8 @@
put("sampleStatus", sampleStatus);
}});
try {
+ // 淇敼鎹㈣鍜屽悎骞堕棶棰�
+ updaeMerge(template.getXWPFDocument(), false);
String name = insReport.getCode().replace("/", "") + ".docx";
template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
insReport.setUrl("/word/" + name);
@@ -2434,8 +2450,6 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
- // 淇敼鎹㈣鍜屽悎骞堕棶棰�
- updaeMerge(insReport, deviceList, false);
}
/**
@@ -2506,188 +2520,165 @@
/**
* 鍚堝苟鍗曞厓鏍�
- * @param insReport
- * @param deviceList
*/
- private void updaeMerge(InsReport insReport, List<Map<String, String>> deviceList, boolean isSmall) {
+ private void updaeMerge(XWPFDocument document, boolean isSmall) {
// 澶勭悊鍚堝苟鍗曞厓鏍肩殑闂
- String path = wordUrl + insReport.getUrl().replaceFirst("/word", "");
- try {
- // 鑾峰彇鏂囨。涓殑鎵�鏈夎〃鏍�
- FileInputStream stream = new FileInputStream(path);
- XWPFDocument document = new XWPFDocument(stream);
- List<XWPFTable> xwpfTables = document.getTables();
- // 閬嶅巻琛ㄦ牸锛屼絾璺宠繃绗竴涓〃鏍硷紙濡傛灉deviceList涓簄ull锛屽垯棰濆璺宠繃绗簩涓級
- for (int i = 1; i < xwpfTables.size() - (deviceList == null ? 1 : 2); i++) {
- // 鍒涘缓涓�涓狧ashSet鏉ュ瓨鍌ㄥ敮涓�鐨勫瓧绗︿覆锛堣繖閲屽熀浜�"鈭�"鍒嗗壊鍚庣殑绗簩閮ㄥ垎锛�
- Set<String> set1 = new HashSet<>();
- // 鍒涘缓涓�涓狧ashMap鏉ュ瓨鍌ㄦ瘡涓敮涓�瀛楃涓插強鍏跺搴旂殑鍗曞厓鏍间綅缃俊鎭�
- Map<String, Map<String, Integer>> maps = new HashMap<>();
- // 閬嶅巻褰撳墠琛ㄦ牸鐨勬墍鏈夎
- for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
- // 閬嶅巻褰撳墠琛岀殑鎵�鏈夊崟鍏冩牸
- for (int k = 0; k < xwpfTables.get(i).getRows().get(j).getTableCells().size(); k++) {
- // 妫�鏌ュ崟鍏冩牸鏂囨湰涓槸鍚﹀寘鍚�"鈭�"
- if (xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().indexOf("鈭�") > -1) {
- String[] split = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�");
- // 濡傛灉鍒嗗壊鍚庣殑绗簩閮ㄥ垎鏄柊鐨勶紙鍗充箣鍓嶆湭鍑虹幇杩囷級锛屽垯娣诲姞鍒皊et1骞跺垱寤轰綅缃俊鎭痬ap
- if (set1.add(split[1])) {
- Map<String, Integer> map = new HashMap<>();
- // 瀛樺偍璧峰琛屻�佽捣濮嬪垪銆佺粨鏉熻锛堝綋鍓嶈锛夈�佺粨鏉熷垪锛堝綋鍓嶅垪锛�
- map.put("sr", j);
- map.put("sc", k);
- map.put("er", j + 0);
- map.put("ec", k + 0);
- maps.put(split[1], map);
- } else {
- // 濡傛灉宸插瓨鍦紝鍒欐洿鏂扮粨鏉熻鎴栫粨鏉熷垪
- Map<String, Integer> map1 = maps.get(split[1]);
- if (j == map1.get("sr")) {
- map1.put("ec", map1.get("ec") + 1);
- } else if (k == map1.get("sc")) {
- map1.put("er", map1.get("er") + 1);
- }
+ // 鑾峰彇鏂囨。涓殑鎵�鏈夎〃鏍�
+ List<XWPFTable> xwpfTables = document.getTables();
+ // 閬嶅巻琛ㄦ牸
+ for (int i = 1; i < xwpfTables.size(); i++) {
+ // 鍒涘缓涓�涓狧ashSet鏉ュ瓨鍌ㄥ敮涓�鐨勫瓧绗︿覆锛堣繖閲屽熀浜�"鈭�"鍒嗗壊鍚庣殑绗簩閮ㄥ垎锛�
+ Set<String> set1 = new HashSet<>();
+ // 鍒涘缓涓�涓狧ashMap鏉ュ瓨鍌ㄦ瘡涓敮涓�瀛楃涓插強鍏跺搴旂殑鍗曞厓鏍间綅缃俊鎭�
+ Map<String, Map<String, Integer>> maps = new HashMap<>();
+ // 閬嶅巻褰撳墠琛ㄦ牸鐨勬墍鏈夎
+ for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
+ // 閬嶅巻褰撳墠琛岀殑鎵�鏈夊崟鍏冩牸
+ for (int k = 0; k < xwpfTables.get(i).getRows().get(j).getTableCells().size(); k++) {
+ // 妫�鏌ュ崟鍏冩牸鏂囨湰涓槸鍚﹀寘鍚�"鈭�"
+ if (xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().indexOf("鈭�") > -1) {
+ String[] split = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�");
+ // 濡傛灉鍒嗗壊鍚庣殑绗簩閮ㄥ垎鏄柊鐨勶紙鍗充箣鍓嶆湭鍑虹幇杩囷級锛屽垯娣诲姞鍒皊et1骞跺垱寤轰綅缃俊鎭痬ap
+ if (set1.add(split[1])) {
+ Map<String, Integer> map = new HashMap<>();
+ // 瀛樺偍璧峰琛屻�佽捣濮嬪垪銆佺粨鏉熻锛堝綋鍓嶈锛夈�佺粨鏉熷垪锛堝綋鍓嶅垪锛�
+ map.put("sr", j);
+ map.put("sc", k);
+ map.put("er", j + 0);
+ map.put("ec", k + 0);
+ maps.put(split[1], map);
+ } else {
+ // 濡傛灉宸插瓨鍦紝鍒欐洿鏂扮粨鏉熻鎴栫粨鏉熷垪
+ Map<String, Integer> map1 = maps.get(split[1]);
+ if (j == map1.get("sr")) {
+ map1.put("ec", map1.get("ec") + 1);
+ } else if (k == map1.get("sc")) {
+ map1.put("er", map1.get("er") + 1);
}
- // 鍒ゆ柇灏忛珮鎶ュ憡杩樻槸澶ф姤鍛�
- if (isSmall) {
- // 鑾峰彇鍗曞厓鏍�
- XWPFTableCell cell = xwpfTables.get(i).getRows().get(j).getTableCells().get(k);
- XWPFParagraph paragraph = cell.getParagraphArray(0);
- String originalText = paragraph.getText();
- String newText = originalText.split("鈭�")[0];
- List<XWPFRun> runs = paragraph.getRuns();
- for (XWPFRun run : runs) {
- run.setText("", 0); // 娓呯┖ run 涓殑鏂囨湰
- }
- if (!runs.isEmpty()) {
- XWPFRun run = runs.get(0);
- run.setText(newText);
-
- // 澶嶅埗鏍峰紡
- run.setFontFamily(paragraph.getRuns().get(0).getFontFamily());
- run.setFontSize(paragraph.getRuns().get(0).getFontSize());
- run.setBold(paragraph.getRuns().get(0).isBold());
- run.setItalic(paragraph.getRuns().get(0).isItalic());
- run.setUnderline(paragraph.getRuns().get(0).getUnderline());
- run.setColor(paragraph.getRuns().get(0).getColor());
- }
-
- cell.setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
- paragraph.setAlignment(ParagraphAlignment.CENTER);
- } else {
- // 绉婚櫎鍖呭惈"鈭�"鐨勬钀斤紝骞堕噸鏂拌缃崟鍏冩牸鏂囨湰鍜屾牱寮�
- String str = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�")[0];
- xwpfTables.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
- xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setText(str);
- xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
- xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getParagraphArray(0).setAlignment(ParagraphAlignment.CENTER);
+ }
+ // 鍒ゆ柇灏忛珮鎶ュ憡杩樻槸澶ф姤鍛�
+ if (isSmall) {
+ // 鑾峰彇鍗曞厓鏍�
+ XWPFTableCell cell = xwpfTables.get(i).getRows().get(j).getTableCells().get(k);
+ XWPFParagraph paragraph = cell.getParagraphArray(0);
+ String originalText = paragraph.getText();
+ String newText = originalText.split("鈭�")[0];
+ List<XWPFRun> runs = paragraph.getRuns();
+ for (XWPFRun run : runs) {
+ run.setText("", 0); // 娓呯┖ run 涓殑鏂囨湰
}
+ if (!runs.isEmpty()) {
+ XWPFRun run = runs.get(0);
+ run.setText(newText);
+
+ // 澶嶅埗鏍峰紡
+ run.setFontFamily(paragraph.getRuns().get(0).getFontFamily());
+ run.setFontSize(paragraph.getRuns().get(0).getFontSize());
+ run.setBold(paragraph.getRuns().get(0).isBold());
+ run.setItalic(paragraph.getRuns().get(0).isItalic());
+ run.setUnderline(paragraph.getRuns().get(0).getUnderline());
+ run.setColor(paragraph.getRuns().get(0).getColor());
+ }
+
+ cell.setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
+ paragraph.setAlignment(ParagraphAlignment.CENTER);
+ } else {
+ // 绉婚櫎鍖呭惈"鈭�"鐨勬钀斤紝骞堕噸鏂拌缃崟鍏冩牸鏂囨湰鍜屾牱寮�
+ String str = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�")[0];
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setText(str);
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getParagraphArray(0).setAlignment(ParagraphAlignment.CENTER);
}
}
}
+ }
- // 鍗曞厓鏍兼帓搴�, 閬垮厤鏍煎紡閿欎贡
- List<Map.Entry<String, Map<String, Integer>>> entries = new ArrayList<>(maps.entrySet());
- entries.sort((o1, o2) -> o1.getValue().get("sc") - o2.getValue().get("sc"));
+ // 鍗曞厓鏍兼帓搴�, 閬垮厤鏍煎紡閿欎贡
+ List<Map.Entry<String, Map<String, Integer>>> entries = new ArrayList<>(maps.entrySet());
+ entries.sort((o1, o2) -> o1.getValue().get("sc") - o2.getValue().get("sc"));
- // 鎸夌収椤哄簭娣诲姞杩涢泦鍚�
- List<String> list = new ArrayList<>();
- for (Map.Entry<String, Map<String, Integer>> entry : entries) {
- list.add(entry.getKey());
- }
+ // 鎸夌収椤哄簭娣诲姞杩涢泦鍚�
+ List<String> list = new ArrayList<>();
+ for (Map.Entry<String, Map<String, Integer>> entry : entries) {
+ list.add(entry.getKey());
+ }
- 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++) {
- if (v.get("ec") > v.get("sc")) {
- try {
- TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
- } catch (Exception e) {
- }
- }
- }
- if (v.get("er") > v.get("sr")) {
+ 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++) {
+ if (v.get("ec") > v.get("sc")) {
try {
- TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+ TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
} catch (Exception e) {
}
}
}
+ if (v.get("er") > v.get("sr")) {
+ try {
+ TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+ } catch (Exception e) {
+ }
+ }
}
- FileOutputStream fileOutputStream = new FileOutputStream(path);
- document.write(fileOutputStream);
- fileOutputStream.close();
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
}
+
//澶勭悊涓嫳鏂囨崲琛岀殑闂
- try {
- FileInputStream stream1 = new FileInputStream(path);
- XWPFDocument document1 = new XWPFDocument(stream1);
- List<XWPFTable> xwpfTables1 = document1.getTables();
- for (int i = 1; i < xwpfTables1.size() - (deviceList == null ? 1 : 2); i++) {
- for (int j = 0; j < xwpfTables1.get(i).getRows().size(); j++) {
- for (int k = 0; k < xwpfTables1.get(i).getRows().get(j).getTableCells().size(); k++) {
- if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("@")) {
- if (isSmall) {
- // 鑾峰彇鍘熸湁娈佃惤鐨勭涓�涓� XWPFRun
- String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
- XWPFParagraph oldParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getParagraphs().get(0);
- XWPFRun oldRun = oldParagraph.getRuns().get(0);
- // 淇濆瓨鍘熸湁鏍峰紡
- String fontFamily = oldRun.getFontFamily();
- int fontSize = oldRun.getFontSize();
- boolean isBold = oldRun.isBold();
- boolean isItalic = oldRun.isItalic();
- boolean isUnderline = oldRun.getUnderline() != UnderlinePatterns.NONE;
- // 鍒犻櫎鍘熸湁娈佃惤
- xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
- // 娣诲姞鏂版钀�
- XWPFParagraph newParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
- XWPFRun newRun = newParagraph.createRun();
- // 搴旂敤淇濆瓨鐨勬牱寮�
- newRun.setFontFamily(fontFamily);
- newRun.setFontSize(fontSize);
- newRun.setBold(isBold);
- newRun.setItalic(isItalic);
- if (isUnderline) {
- newRun.setUnderline(UnderlinePatterns.SINGLE);
- }
- // 璁剧疆鏂版枃鏈�
- String[] split = text.split("@");
- newRun.setText(split[0]);
- if (split.length > 1) {
- newRun.addBreak();
- newRun.setText(split[1]);
- }
- // 璁剧疆娈佃惤瀵归綈鏂瑰紡
- newParagraph.setAlignment(ParagraphAlignment.CENTER);
- } else {
- String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
- String[] split = text.split("@");
- xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
- XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
- XWPFRun run = xwpfParagraph.createRun();
- run.setText(split[0]);
- if (ObjectUtils.isNotNull(split[1])) {
- run.addBreak();
- run.setText(split[1]);
- }
- xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
+
+ List<XWPFTable> xwpfTables1 = document.getTables();
+ for (int i = 1; i < xwpfTables1.size(); i++) {
+ for (int j = 0; j < xwpfTables1.get(i).getRows().size(); j++) {
+ for (int k = 0; k < xwpfTables1.get(i).getRows().get(j).getTableCells().size(); k++) {
+ if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("@")) {
+ if (isSmall) {
+ // 鑾峰彇鍘熸湁娈佃惤鐨勭涓�涓� XWPFRun
+ String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
+ XWPFParagraph oldParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getParagraphs().get(0);
+ XWPFRun oldRun = oldParagraph.getRuns().get(0);
+ // 淇濆瓨鍘熸湁鏍峰紡
+ String fontFamily = oldRun.getFontFamily();
+ int fontSize = oldRun.getFontSize();
+ boolean isBold = oldRun.isBold();
+ boolean isItalic = oldRun.isItalic();
+ boolean isUnderline = oldRun.getUnderline() != UnderlinePatterns.NONE;
+ // 鍒犻櫎鍘熸湁娈佃惤
+ xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+ // 娣诲姞鏂版钀�
+ XWPFParagraph newParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
+ XWPFRun newRun = newParagraph.createRun();
+ // 搴旂敤淇濆瓨鐨勬牱寮�
+ newRun.setFontFamily(fontFamily);
+ newRun.setFontSize(fontSize);
+ newRun.setBold(isBold);
+ newRun.setItalic(isItalic);
+ if (isUnderline) {
+ newRun.setUnderline(UnderlinePatterns.SINGLE);
}
+ // 璁剧疆鏂版枃鏈�
+ String[] split = text.split("@");
+ newRun.setText(split[0]);
+ if (split.length > 1) {
+ newRun.addBreak();
+ newRun.setText(split[1]);
+ }
+ // 璁剧疆娈佃惤瀵归綈鏂瑰紡
+ newParagraph.setAlignment(ParagraphAlignment.CENTER);
+ } else {
+ String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
+ String[] split = text.split("@");
+ xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+ XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
+ XWPFRun run = xwpfParagraph.createRun();
+ run.setText(split[0]);
+ if (ObjectUtils.isNotNull(split[1])) {
+ run.addBreak();
+ run.setText(split[1]);
+ }
+ xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
}
}
}
}
- FileOutputStream fileOutputStream1 = new FileOutputStream(path);
- document1.write(fileOutputStream1);
- fileOutputStream1.close();
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
}
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 2cc6e8d..2eb8e88 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -241,7 +241,7 @@
latest_traceability
from device
where device.management_number in
- <foreach collection="names" index="index" open="(" separator="," close=")" item="val">
+ <foreach collection="managementNumbers" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
</select>
diff --git a/inspect-server/src/main/resources/static/report-template.docx b/inspect-server/src/main/resources/static/report-template.docx
index 999f810..9301eeb 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/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index 7a63aa3..6c93d4b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -14,7 +14,6 @@
{
public static void main(String[] args)
{
-// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
}
}
--
Gitblit v1.9.3