From 7caeae303d4a93d0af2dc2d2f546987dd192be3c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 21 一月 2025 19:34:34 +0800
Subject: [PATCH] zjh20250121
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 84 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 4 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 f185fb7..1333268 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
@@ -56,6 +56,7 @@
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;
/**
* @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞�
@@ -122,6 +123,10 @@
private RedissonClient redissonClient;
@Autowired
private ITjRulesService rulesService;
+ @Autowired
+ private ITjProAdvicerulesService tjProAdvicerulesService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
@GetMapping ("/ceshicc")
@@ -1634,7 +1639,53 @@
@ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
if (StrUtil.isNotBlank(tjNum)) {
+ 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.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);
+ }
+ return AjaxResult.success(maps);
+ }else {
return zongjianyishengchakanyichangxiangmu(tjNum);
+ }
+
+// return zongjianyishengchakanyichangxiangmu(tjNum);
}
return AjaxResult.error();
}
@@ -1658,19 +1709,25 @@
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
if(!tjOrderDetail.getDeptId().equals("2")){
- List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber);
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ ,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
+ ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇","")
+ ,tjOrderDetail.getProResult());
if(null !=maps && !maps.isEmpty()){
tjOrderDetail.setAdvices(maps);
}
}else {
- String[] split = tjOrderDetail.getProResult().split("銆�");
+ String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
List<Map<String,Object>> mapList=new ArrayList<>();
for (String s : split) {
- Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+ s = s.replaceAll("\n", "");
+// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+ Map<String,Object> maps= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(),s,"0");
if(null !=maps && !maps.isEmpty()){
Object bt = maps.get("bt");
Object nr = maps.get("nr");
- if(null !=bt && null !=nr) mapList.add(maps);
+ if(null !=bt || null !=nr) mapList.add(maps);
}
}
tjOrderDetail.setAdvices(mapList);
@@ -1711,5 +1768,24 @@
}
+ @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()));
+ }
+ ycxmService.saveBatch(ycxms);
+ return AjaxResult.success();
+ }
+ }
+ return AjaxResult.error();
+ }
+
+
}
--
Gitblit v1.8.0