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 | 74 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 30 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 4b3b8d6..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
@@ -124,26 +124,17 @@
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);
}
@@ -173,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);
}
@@ -314,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) {
@@ -1375,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();
@@ -1652,6 +1659,7 @@
}
if(!dels.isEmpty()){
parent.put("proName",remark.getProName());
+ parent.put("jyjc",remark.getJyjc());
parent.put("sone",dels);
list.add(parent);
}
@@ -1664,14 +1672,20 @@
return AjaxResult.success("璇ヤ汉鍛樻病鏈変綋妫�椤圭洰鏁版嵁锛�");
}
- @GetMapping ("/getyichangxiangmujianyiguize")
- @ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰寤鸿瑙勫垯鎺ュ彛")
- public AjaxResult getyichangxiangmujianyiguize(@RequestParam String proId,@RequestParam String ycbz) {
- if (StrUtil.isNotBlank(proId) && StrUtil.isNotBlank(ycbz)) {
- List<Map<String,Object>> map= rulesService.getyichangxiangmujianyiguize(proId,"",ycbz,"");
- return AjaxResult.success(map);
- }
- return AjaxResult.error();
+ @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