From f4634091d71bc3e99df179d5976b9c59a24ca5f7 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 24 一月 2024 12:00:46 +0800
Subject: [PATCH] 报告
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 30 ++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 34 ++++++++---------
2 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index caee526..7399842 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -446,21 +446,20 @@
SysPost byId = postService.getById(one.getPostId());
if (byId.getPostName().equals("褰曞叆鍛�")) {
ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
-
}
}
}
} else {
ksproList = projectService.getKsTjProjectIdList();
}
-
+ if (ksproList == null || ksproList.size() == 0) {
+ return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
+ }
//绛涢�夊寲楠岀殑椤圭洰銆�
ksproList = ksproList.stream()
.filter(element -> element ==1633660948860522629L)
.collect(Collectors.toList());
- if (ksproList == null || ksproList.size() == 0) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
+
List<TjCustomer> customerLis = new ArrayList<>();
//鏍规嵁浣撴鍙锋煡
@@ -655,6 +654,9 @@
ksproList = projectService.getKsTjProjectIdList();
}
//绛涢�夊奖鍍忕殑椤圭洰銆�
+ if (ksproList.size() == 0) {
+ return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
+ }
ksproList = ksproList.stream()
.filter(element -> element ==1633660948860522589L
// || element ==1633660948860522504L
@@ -670,10 +672,6 @@
// element ==1633660948860522531L|| element ==1633660948860522533L
)
.collect(Collectors.toList());
-
- if (ksproList.size() == 0) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
List<TjCustomer> customerLis = new ArrayList<>();
//鏍规嵁浣撴鍙锋煡
@@ -820,18 +818,18 @@
// customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj");
}
// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
- if (customerLists.size() > 0) {
- Collections.reverse(customerLists);
- List<TjCustomer> customerList = customerLists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- Map<String, Object> map = new HashMap<>();
- map.put("date", customerList);
- map.put("total", customerLists.size());
- return AjaxResult.success(map);
- } else {
+// if (customerLists.size() > 0) {
+// Collections.reverse(customerLists);
+// List<TjCustomer> customerList = customerLists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// Map<String, Object> map = new HashMap<>();
+// map.put("date", customerList);
+// map.put("total", customerLists.size());
+// return AjaxResult.success(map);
+// } else {
AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
if (map != null) return map;
return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
- }
+// }
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index bb05d00..f18f962 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -91,6 +91,9 @@
@Resource
private ITbTransitionService transitionService;
+ @Autowired
+ private ITjBigPositiveService tjBigPositiveService;
+
@GetMapping("/savePdf")
@ApiOperation(value = "浠庢湰鍦板瓨鍌ㄦā鏉垮埌鏁版嵁搴�")
public AjaxResult savePdf() {
@@ -409,8 +412,33 @@
// "銆�5銆懳�-饩曟皑閰拌浆绉婚叾澧炩炯锛涘ぉ饣斿啲姘ㄩ吀姘ㄥ熀杞Щ閰跺饩硷紱涓欐皑閰告皑鍩鸿浆绉婚叾澧炩炯\n" +
// "銆�6銆戣交饩勪腑搴﹁剛鑲倽");
+ //鎷兼帴閲嶅ぇ闃虫�х粨鏋�
+ StringBuffer str=new StringBuffer();
+ str.append("銆愰噸澶ч槼鎬ч」鐩�慭n");
+ LambdaQueryWrapper<TjBigPositive> bigPositiveLambdaQueryWrapper=new LambdaQueryWrapper<>();
+ bigPositiveLambdaQueryWrapper.eq(TjBigPositive::getTjNumber,tjNumber);
+ final List<TjBigPositive> list1 = tjBigPositiveService.list(bigPositiveLambdaQueryWrapper);
+ if(list1!=null&&list1.size()>0){
+ for (int i = 0; i < list1.size(); i++) {
+ str.append((i+1)+"銆�"+list1.get(i).getProName()+";\n");
+ }
+ }else {
+ str.append(" 鏃狅紱\n");
+ }
+ //鎷兼帴寮傚父椤圭洰
+ str.append("銆愬紓甯告儏鍐甸」鐩�慭n");
+ if(list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).getExceptionDesc()==1){
+ str.append((i+1)+"銆�"+projectService.getById(list.get(i).getProId()).getProName()+";\n");
+ }
+ }
+ }else {
+ str.append(" 鏃狅紱\n");
+ }
+
//寮傚父椤圭洰
- data.put("yichang", "");
+ data.put("yichang", str.toString());
// 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
for (String key : data.keySet()) {
--
Gitblit v1.8.0