From b8bf9a10ca1c65e94d75a2db5550e6263b582512 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 十二月 2024 15:01:41 +0800
Subject: [PATCH] 调整结果项目状态判断结论增加非空判断
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 144 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 113 insertions(+), 31 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 c4e4d68..b7188ec 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
@@ -63,7 +63,7 @@
*/
@RestController
@RequestMapping ("/check")
-@Api (tags = "鎬绘鍖诲笀鐩稿叧鎺ュ彛")
+@Api (tags = "AAAAAAAAAAAA鎬绘鍖诲笀鐩稿叧鎺ュ彛")
@Slf4j
public class TjCheckController {
@Resource
@@ -120,28 +120,21 @@
private HisApiConfigService hisApiConfigService;
@Autowired
private RedissonClient redissonClient;
+ @Autowired
+ private ITjRulesService rulesService;
-// public void csdsrw() throws InterruptedException {
-// log.info("瀹氭椂浠诲姟寮�濮嬫墽琛�"+new Date());
-// Thread.sleep(1000*5);
-// log.info("瀹氭椂浠诲姟缁撴潫鎵ц"+new Date());
-// }
+ @GetMapping ("/ceshicc")
+ @ApiOperation (value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
+ @RepeatSubmit
+// @Transactional
+ public AjaxResult ceshicc(String s) {
- @GetMapping ("/getOperationPermissionsByTjNum")
- @ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
- public AjaxResult getOperationPermissionsByTjNum(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
- TjOrder order = orderService.getOrderByTjNum(tjNumber);
- if (null != order) {
- Integer status = order.getStatus();
- if (status < 300) {
- return AjaxResult.success(true);
- }
- if (status > 300) {
- return AjaxResult.success(false);
- }
- }
- return AjaxResult.success(false);
+ Map<String,Object> map=new HashMap<>();
+ List<List<?>> tjpled = testMapper.tjplUpdateDetatilByVi(map);
+ log.info(tjpled.toString());
+ Integer object = (Integer) map.get("total");
+ return AjaxResult.success(object);
}
@@ -171,6 +164,22 @@
log.info(list1.toString());
return AjaxResult.success(ccXZxYyPacsJgSt);
+ }
+
+ @GetMapping ("/getOperationPermissionsByTjNum")
+ @ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
+ public AjaxResult getOperationPermissionsByTjNum(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ Integer status = order.getStatus();
+ if (status < 300) {
+ return AjaxResult.success(true);
+ }
+ if (status > 300) {
+ return AjaxResult.success(false);
+ }
+ }
+ return AjaxResult.success(false);
}
@@ -312,7 +321,7 @@
public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) {
List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
list.sort(new Comparator<CsProVo>() {
@Override
public int compare(CsProVo o1, CsProVo o2) {
@@ -631,7 +640,7 @@
}
return AjaxResult.success("鍚屾鎴愬姛");
}
- else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equals("Y")){
+ else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber());
if(null != hysqdList && !hysqdList.isEmpty()){
for (LtkjHysqd hysqd : hysqdList) {
@@ -667,6 +676,7 @@
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
}
//妫�鏌�
+ orderService.tjLispacstongbujianyi(null,null,null,null);
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
@@ -1197,8 +1207,12 @@
@ApiParam (value = "鎬绘寤鸿") @RequestParam (required = false) String advice,
@ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
- int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if(null != config && config.equalsIgnoreCase("Y")){
+ int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ }
+
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -1368,14 +1382,14 @@
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber);
- if (null != remarkList && remarkList.size() > 0) {
+ if (null != remarkList && !remarkList.isEmpty()) {
for (TjOrderRemark remark : remarkList) {
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
parent.put("parent", remark.getProName());
parent.put("parentId", remark.getProId().toString());
List<TjOrderDetail> dels = new ArrayList<>();
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProId().equals(tjOrderDetail.getProId())) {
String ckfw = tjOrderDetail.getStanId();
@@ -1456,7 +1470,7 @@
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanAndCgTable(tjNumber);
- if (null != remarkList && remarkList.size() > 0) {
+ if (null != remarkList && !remarkList.isEmpty()) {
for (TjOrderRemark remark : remarkList) {
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
@@ -1465,7 +1479,7 @@
parent.put("xmlb", remark.getXmlb());
parent.put("", remark.getXmlb());
List<TjOrderDetail> dels = new ArrayList<>();
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
String ckfw = tjOrderDetail.getStanId();
@@ -1491,7 +1505,7 @@
}else {
tjOrderDetail.setYcbz("");
}
- if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
}
}else {
@@ -1503,7 +1517,6 @@
if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("鈫�");
}
} catch (NumberFormatException ignored) {
- ignored.printStackTrace();
}
}else {
tjOrderDetail.setYcbz("");
@@ -1520,7 +1533,7 @@
} else {
parent.put("parentAdvice", null);
}
- if (dels.size() == 0) {
+ if (dels.isEmpty()) {
continue;
}
parent.put("sons", dels);
@@ -1606,4 +1619,73 @@
return AjaxResult.success(map);
}
+
+
+ @GetMapping ("/getzongjianyishengchakanyichangxiangmu")
+ @ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
+ public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
+ if (StrUtil.isNotBlank(tjNum)) {
+ return zongjianyishengchakanyichangxiangmu(tjNum);
+ }
+ return AjaxResult.error();
+ }
+
+ private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
+// asyncService.updateCheckType(tjNumber);
+ TjOrder one = orderService.getOrderByTjNum(tjNumber);
+
+ if (one == null) {
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
+ List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<Map<String, Object>> list = new ArrayList<>();
+ if (null != remarkList && !remarkList.isEmpty()) {
+ for (TjOrderRemark remark : remarkList) {
+ Map<String, Object> parent = new HashMap<>();
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ List<TjOrderDetail> dels = new ArrayList<>();
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+ if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber);
+ if(null !=maps && !maps.isEmpty()){
+ tjOrderDetail.setAdvices(maps);
+ }
+ }
+
+ dels.add(tjOrderDetail);
+ }
+ }
+ if(!dels.isEmpty()){
+ parent.put("proName",remark.getProName());
+ parent.put("jyjc",remark.getJyjc());
+ parent.put("sone",dels);
+ list.add(parent);
+ }
+ } else {
+ return AjaxResult.success("璇ヤ汉鍛樻棤寮傚父椤圭洰");
+ }
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.success("璇ヤ汉鍛樻病鏈変綋妫�椤圭洰鏁版嵁锛�");
+ }
+
+ @GetMapping ("/chushenyemianchakanxiangmujieguo")
+ @ApiOperation (value = "鍒濆椤甸潰鏌ョ湅椤圭洰缁撴灉鎺ュ彛")
+ public AjaxResult chushenyemianchakanxiangmujieguo(@RequestParam String proId,@RequestParam String tjNum) {
+ List<Map<String,Object>> maps = projectService.tjCsXmjgcx(tjNum,proId);
+ return AjaxResult.success(maps);
+ }
+
+ @GetMapping ("/panduaniscunzaiweijian")
+ @ApiOperation (value = "鍒濆椤甸潰鏌ョ湅椤圭洰鍓嶅垽鏂槸鍚﹀叏閮ㄦ湭妫�鎺ュ彛")
+ public AjaxResult panduaniscunzaiweijian(@RequestParam String tjNum) {
+ int a = orderRemarkService.panduaniscunzaiweijian(tjNum);
+ return AjaxResult.success(a);
+ }
+
+
+
}
--
Gitblit v1.8.0