From 2c785c3d4513daea9deb5c7edbb17a9f17111d25 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 21 二月 2025 17:49:03 +0800
Subject: [PATCH] zjh20250221
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 133 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 118 insertions(+), 15 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 839c23c..efa6950 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -49,6 +49,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.text.Collator;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -56,6 +57,8 @@
import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.setClipRect;
+import static org.jeecg.modules.jmreport.dyndb.util.b.a;
+import static org.jeecg.modules.jmreport.dyndb.util.b.e;
/**
* @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞�
@@ -124,6 +127,8 @@
private ITjRulesService rulesService;
@Autowired
private ITjProAdvicerulesService tjProAdvicerulesService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
@GetMapping ("/ceshicc")
@@ -1534,7 +1539,9 @@
tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
- dels.add(tjOrderDetail);
+ if(remark.getOrgType().equals(tjOrderDetail.getOrgType())){
+ dels.add(tjOrderDetail);
+ }
}
}
String summary = remark.getSummary();
@@ -1547,6 +1554,12 @@
if (dels.isEmpty()) {
continue;
}
+ dels=dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+ dels = dels.stream()
+ .sorted(Comparator.comparingInt(
+ tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+ ))
+ .collect(Collectors.toList());
parent.put("sons", dels);
parent.put("remark", remark.getRemark());
parent.put("jgbx", remark.getJgbx());
@@ -1580,7 +1593,7 @@
@PostMapping ("/checkUpdateOrderRemark")
@ApiOperation (value = "鎬绘淇敼澶囨敞鎺ュ彛")
public AjaxResult checkUpdateOrderRemark(@RequestBody List<UpdateOrderRemarkVo> updateOrderRemarkVos) {
- if (null != updateOrderRemarkVos && updateOrderRemarkVos.size() > 0) {
+ if (null != updateOrderRemarkVos && !updateOrderRemarkVos.isEmpty()) {
for (UpdateOrderRemarkVo remarkVo : updateOrderRemarkVos) {
LambdaQueryWrapper<TjOrderRemark> wqm = new LambdaQueryWrapper<>();
wqm.eq(TjOrderRemark::getTjNumber, remarkVo.getTjNumber());
@@ -1636,18 +1649,90 @@
@ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
if (StrUtil.isNotBlank(tjNum)) {
- return zongjianyishengchakanyichangxiangmu(tjNum);
+ TjOrder one = orderService.getOrderByTjNum(tjNum);
+
+ if (one == null) {
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
+
+ LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh,tjNum);
+ List<TjOrderYcxm> list = ycxmService.list(wq);
+ if(null !=list && !list.isEmpty()){
+ Collections.reverse(list);
+ Map<String, List<TjOrderYcxm>> map = list.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
+ List<Map<String, Object>> maps = new ArrayList<>();
+ for (Map.Entry<String, List<TjOrderYcxm>> entry : map.entrySet()) {
+ Map<String, Object> parent = new HashMap<>();
+ List<TjOrderDetail> dels = new ArrayList<>();
+ for (TjOrderYcxm ycxm : entry.getValue()) {
+ TjOrderDetail detail=new TjOrderDetail();
+ detail.setOrderDetailId(Long.valueOf(ycxm.getId()));
+ detail.setProName(ycxm.getJcxm());
+ detail.setProResult(ycxm.getJcjg());
+ detail.setStanId(ycxm.getCkfw());
+ detail.setProAdvice(ycxm.getDw());
+ List<Map<String,Object>> btnrlist=new ArrayList<>();
+ String jynr = ycxm.getJynr();
+ JSONArray array = JSONUtil.parseArray(jynr);
+ for (Object object : array) {
+ Map<String,Object> objectMap=new HashMap<>();
+ JSONObject jsonObject = (JSONObject) object;
+ String bt = jsonObject.getStr("bt");
+ String nr = jsonObject.getStr("nr");
+ objectMap.put("bt",bt);
+ objectMap.put("nr",nr);
+ if(null !=bt || null !=nr) btnrlist.add(objectMap);
+ }
+ detail.setAdvices(btnrlist);
+ dels.add(detail);
+ }
+
+ parent.put("proName",entry.getKey());
+ parent.put("jyjc",entry.getValue().get(0).getJyjc());
+ parent.put("sone",dels);
+ maps.add(parent);
+ }
+ List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
+
+
+ List<Map<String, Object>> collect = mapList.stream()
+ .filter(b -> maps.stream()
+ .noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌
+ .collect(Collectors.toList());
+ if(!collect.isEmpty()){
+ maps.addAll(collect);
+ }
+ if(!maps.isEmpty()){
+ List<Map<String, Object>> collect1 = maps.stream()
+ .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
+ .collect(Collectors.toList());
+ return AjaxResult.success(collect1);
+ }
+ return AjaxResult.success(maps);
+ }else {
+ List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
+// if(mapList.isEmpty()){
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
+ return AjaxResult.success(mapList);
+ }
+
+// return zongjianyishengchakanyichangxiangmu(tjNum);
}
return AjaxResult.error();
}
- private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
-// asyncService.updateCheckType(tjNumber);
- TjOrder one = orderService.getOrderByTjNum(tjNumber);
+ @GetMapping ("/delzongjianyishengchakanyichangxiangmu")
+ @ApiOperation (value = "鎬绘鍒犻櫎寮傚父椤圭洰鎺ュ彛")
+ public AjaxResult delzongjianyishengchakanyichangxiangmu(@RequestParam String id) {
+ ycxmService.removeById(id);
+ return AjaxResult.success();
+ }
- if (one == null) {
- return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
- }
+ private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
+// asyncService.updateCheckType(tjNumber);
+
List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
List<Map<String, Object>> list = new ArrayList<>();
@@ -1662,8 +1747,8 @@
if(!tjOrderDetail.getDeptId().equals("2")){
List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
- ,tjOrderDetail.getProName().replaceAll("\\锛圼^\\锛塢*\\锛�", "")
- .replaceAll("[ 娴嬪畾]","")
+ ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇","")
,tjOrderDetail.getProResult());
if(null !=maps && !maps.isEmpty()){
tjOrderDetail.setAdvices(maps);
@@ -1695,13 +1780,11 @@
parent.put("sone",dels);
list.add(parent);
}
- } else {
- return AjaxResult.success("璇ヤ汉鍛樻棤寮傚父椤圭洰");
}
}
- return AjaxResult.success(list);
+
}
- return AjaxResult.success("璇ヤ汉鍛樻病鏈変綋妫�椤圭洰鏁版嵁锛�");
+ return list;
}
@GetMapping ("/chushenyemianchakanxiangmujieguo")
@@ -1719,5 +1802,25 @@
}
+ @PostMapping ("/addOrderYcXmByTjh")
+ @ApiOperation (value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿")
+ public AjaxResult addOrderYcXmJyByTjh(@RequestBody List<TjOrderYcxm> ycxms) {
+ if(null !=ycxms && !ycxms.isEmpty()){
+ String tjh = ycxms.get(0).getTjh();
+ if(StringUtils.isNotBlank(tjh)){
+ ycxmService.delOrderYcXmJyByTjh(tjh);
+
+ for (TjOrderYcxm ycxm : ycxms) {
+ ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
+ }
+// List<TjOrderYcxm> collect = ycxms.stream().distinct().collect(Collectors.toList());
+ ycxmService.saveBatch(ycxms);
+ return AjaxResult.success();
+ }
+ }
+ return AjaxResult.success();
+ }
+
+
}
--
Gitblit v1.8.0