From 47a4eaba095726f1610b606527c871333e4cf46b Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sun, 22 Sep 2024 22:30:34 +0800
Subject: [PATCH] 调整静态文件读取位置
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
index f8ecdc4..e330cb4 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
@@ -258,7 +258,7 @@
if (ObjectUtils.isNotEmpty(caseReturn)) {
Map<String, Object> term = new HashMap<>();
term.put("mainId", caseReturn.getCaseId());
- term.put("ownerIds", caseReturn.getId());
+ term.put("ownerIds", "'" + caseReturn.getId() + "'");
List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term);
if (CollectionUtils.isNotEmpty(fileInfoList)) {
caseReturn.setFileInfoList(fileInfoList.get(0).getFileList().get(0).getFileList());
@@ -932,6 +932,7 @@
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
Page<CaseSupervise> caseSupervisePage = null;
if(StringUtils.isNotBlank(loginUser.getUnitId())){
+ terms.put("type", status);
if(3 != status){
terms.put("quiltUnitId",loginUser.getUnitId());
terms.put("supStatus", status);
@@ -965,13 +966,12 @@
* @url {ctx}/api/web/caseTask/pageMyTaskYb
* @param page 页码
* @param size 每页数量
- * @param sortColmn 排序字段（1：办理时间；2：事项等级；3：督办次数）
- * @param sortType 排序方式（1：正序；2：倒序）
+ * sortColmn 排序字段（1：办理时间；2：事项等级；3：督办次数）
+ * sortType 排序方式（1：正序；2：倒序）
* @return
*/
@GetMapping("/pageMyTaskYb")
public Object pageMyTaskYb(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
- @RequestParam(value = "sortColmn") int sortColmn, @RequestParam(value = "sortType") int sortType,
@CurrentUser String userId) {
try {
// 条件
@@ -1025,6 +1025,16 @@
// 排序
Sort sort = null;
String sortName = null;
+ String sortColmnStr = request.getParameter("sortColmn");
+ String sortTypeStr = request.getParameter("sortType");
+ int sortColmn = 1;
+ int sortType = 1;
+ if(StringUtils.isNotBlank(sortColmnStr)){
+ sortColmn = Integer.valueOf(sortColmnStr);
+ }
+ if(StringUtils.isNotBlank(sortTypeStr)){
+ sortType = Integer.valueOf(sortTypeStr);
+ }
switch (sortColmn){
case 1:
sortName = "t1.handle_time";
--
Gitblit v1.8.0