From ac544c1d85c53e7f51e4ea76aa2489a14aef03d9 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 六月 2025 18:57:45 +0800
Subject: [PATCH] zjh20250620
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 156 ++++++++++++++++++++++++++-------------------------
1 files changed, 79 insertions(+), 77 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 7587c82..b5915c4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -614,86 +614,88 @@
wq.eq(TjOrderYcxm::getJcxm, detail.getProName());
ycxmService.remove(wq);
if (detail.getExceptionDesc() == 1) {
- String replacedAll = detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
+ if(tjProject.getSfcyyc()==0){
+ String replacedAll = detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
- if(!detail.getProName().contains("鑸掑紶鍘�") && !detail.getProName().contains("鏀剁缉鍘�")){
+ if(!detail.getProName().contains("鑸掑紶鍘�") && !detail.getProName().contains("鏀剁缉鍘�")){
- List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString(), replacedAll, "", order.getTjNumber()
- , replacedAll, detail.getProResult());
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString(), replacedAll, "", order.getTjNumber()
+ , replacedAll, detail.getProResult());
- String[] split = detail.getProResult().split("銆倈,|锛�");
- List<Map<String, Object>> mapList = new ArrayList<>();
- for (String s : split) {
- s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");;
- // Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
- if (null != mapss && !mapss.isEmpty()) {
- Object bt = mapss.get("bt");
- Object nr = mapss.get("nr");
- if (null != bt || null != nr) {
+ String[] split = detail.getProResult().split("[銆�,锛�:锛�.\\s]+");
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ for (String s : split) {
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll(" ","")
+ .replaceAll("鐥�","").replaceAll("[0-9]", "");
+ Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
+ if (null != mapss && !mapss.isEmpty()) {
+ Object bt = mapss.get("bt");
+ Object nr = mapss.get("nr");
+ if (null != bt || null != nr) {
- }
- mapList.add(mapss);
- }
- }
- TjOrderYcxm ycxm = ycxmService.getOne(wq);
- if (null != ycxm) {
- ycxm.setJcjg(detail.getProResult());
- if (null != maps && !maps.isEmpty()) {
- ycxm.setJynr(JSONUtil.toJsonStr(maps));
- }
- if (!mapList.isEmpty()) {
- ycxm.setJynr(JSONUtil.toJsonStr(mapList));
- }
- ycxmService.updateById(ycxm);
- }else {
- TjOrderYcxm orderYcxm =new TjOrderYcxm();
- orderYcxm.setTjh(order.getTjNumber());
- orderYcxm.setParentName(tjProject.getProName());
- orderYcxm.setJcxm(detail.getProName());
- orderYcxm.setJcjg(detail.getProResult());
- if (null != maps && !maps.isEmpty()) {
- orderYcxm.setJynr(JSONUtil.toJsonStr(maps));
- }
- if (!mapList.isEmpty()) {
- orderYcxm.setJynr(JSONUtil.toJsonStr(mapList));
- }
- orderYcxm.setJyjc("0");
- ycxmService.save(orderYcxm);
- }
- }else {
+ }
+ mapList.add(mapss);
+ }
+ }
+ TjOrderYcxm ycxm = ycxmService.getOne(wq);
+ if (null != ycxm) {
+ ycxm.setJcjg(detail.getProResult());
+ if (null != maps && !maps.isEmpty()) {
+ ycxm.setJynr(JSONUtil.toJsonStr(maps));
+ }
+ if (!mapList.isEmpty()) {
+ ycxm.setJynr(JSONUtil.toJsonStr(mapList));
+ }
+ ycxmService.updateById(ycxm);
+ }else {
+ TjOrderYcxm orderYcxm =new TjOrderYcxm();
+ orderYcxm.setTjh(order.getTjNumber());
+ orderYcxm.setParentName(tjProject.getProName());
+ orderYcxm.setJcxm(detail.getProName());
+ orderYcxm.setJcjg(detail.getProResult());
+ if (null != maps && !maps.isEmpty()) {
+ orderYcxm.setJynr(JSONUtil.toJsonStr(maps));
+ }
+ if (!mapList.isEmpty()) {
+ orderYcxm.setJynr(JSONUtil.toJsonStr(mapList));
+ }
+ orderYcxm.setJyjc("0");
+ ycxmService.save(orderYcxm);
+ }
+ }else {
- List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
- , replacedAll, "", order.getTjNumber(), replacedAll, detail.getProResult());
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
+ , replacedAll, "", order.getTjNumber(), replacedAll, detail.getProResult());
- String[] split = detail.getProResult().split("銆倈,|锛�");
- List<Map<String, Object>> mapList = new ArrayList<>();
- for (String s : split) {
- s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");;
- // Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
- if (null != mapss && !mapss.isEmpty()) {
- Object bt = mapss.get("bt");
- Object nr = mapss.get("nr");
- if (null != bt || null != nr) {
+ String[] split = detail.getProResult().split("[銆�,锛�:锛�.\\s]+");
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ for (String s : split) {
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");;
+ // Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+ Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
+ if (null != mapss && !mapss.isEmpty()) {
+ Object bt = mapss.get("bt");
+ Object nr = mapss.get("nr");
+ if (null != bt || null != nr) {
- }
- mapList.add(mapss);
- }
- }
+ }
+ mapList.add(mapss);
+ }
+ }
- if (null != maps && !maps.isEmpty()) {
- jianyilis.addAll(maps);
- }
- if (!mapList.isEmpty()) {
- jianyilis.addAll(mapList);
- }
- ssyszys.append(detail.getProName()).append("/");
- ssyszyjgs.append(detail.getProResult()).append("/");
- }
+ if (null != maps && !maps.isEmpty()) {
+ jianyilis.addAll(maps);
+ }
+ if (!mapList.isEmpty()) {
+ jianyilis.addAll(mapList);
+ }
+ ssyszys.append(detail.getProName()).append("/");
+ ssyszyjgs.append(detail.getProResult()).append("/");
+ }
+ }
} else {
if(detail.getProName().contains("鑸掑紶鍘�") || detail.getProName().contains("鏀剁缉鍘�")){
ssyszys.append(detail.getProName()).append("/");
@@ -2474,7 +2476,7 @@
wq2.eq(TjSampling::getTjNum, tjNum);
wq2.eq(TjSampling::getProId, refundPro.getProId());
samplingService.remove(wq2);
- redisCache.deleteCacheMapValue("getOrderDetailByProParentId" + tjNum, String.valueOf(refundPro.getProId()));
+ redisCache.deleteCacheMapValue("getOrderDetailByProParentId:" + tjNum, String.valueOf(refundPro.getProId()));
}
}
@@ -2509,7 +2511,7 @@
td.setCreateId(String.valueOf(sysUser.getUserId()));
td.setUpdateId(String.valueOf(sysUser.getUserId()));
discardInspectionService.save(td);
- redisCache.deleteCacheMapValue("getOrderDetailByProParentId" + domainVo.getTjNumber(), String.valueOf(remark.getProId()));
+ redisCache.deleteCacheMapValue("getOrderDetailByProParentId:" + domainVo.getTjNumber(), String.valueOf(remark.getProId()));
}
LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
@@ -2725,8 +2727,8 @@
@Override
//@Async("async")
public void updateCheckType(String tjNum) {
- redisCache.setCacheMapValue("updateCheckType" + tjNum, tjNum, getAjaxResult(tjNum));
- redisCache.setHashKeyExpireTime("updateCheckType" + tjNum, 7L, TimeUnit.DAYS);
+ redisCache.setCacheMapValue("updateCheckType:" + tjNum, tjNum, getAjaxResult(tjNum));
+ redisCache.setHashKeyExpireTime("updateCheckType:" + tjNum, 7L, TimeUnit.DAYS);
}
@Override
@@ -2749,11 +2751,11 @@
//@Async("async")
public void getOrderDetailByProParentId(String tjNumber, Map<String, Object> map, String proParentId) {
if (null != map && !map.isEmpty()) {
- redisCache.setCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId, map);
+ redisCache.setCacheMapValue("getOrderDetailByProParentId:" + tjNumber, proParentId, map);
} else {
- redisCache.setCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId, getOrderDetailByProParentId(proParentId, tjNumber));
+ redisCache.setCacheMapValue("getOrderDetailByProParentId:" + tjNumber, proParentId, getOrderDetailByProParentId(proParentId, tjNumber));
}
- redisCache.setHashKeyExpireTime("getOrderDetailByProParentId" + tjNumber, 7L, TimeUnit.DAYS);
+ redisCache.setHashKeyExpireTime("getOrderDetailByProParentId:" + tjNumber, 7L, TimeUnit.DAYS);
}
--
Gitblit v1.8.0