From 58f63e3a124680d0b1f571f5d0a1e3ed308d43be Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 20 三月 2026 14:45:34 +0800
Subject: [PATCH] 质押合同页面重构
---
fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
index 63afee6..b75fd4d 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
@@ -5,6 +5,7 @@
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.mapper.InoutNoticeInMapper;
import com.fzzy.igds.mapper.InoutNoticeOutMapper;
+import com.fzzy.igds.service.InoutNoticeService;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
import com.fzzy.work.data.WorkNode;
@@ -35,9 +36,7 @@
@Resource
private WorkOrderMapper workOrderMapper;
@Resource
- private InoutNoticeInMapper noticeInMapper;
- @Resource
- private InoutNoticeOutMapper noticeOutMapper;
+ private InoutNoticeService noticeService;
public void addData(WorkOrder data) {
@@ -77,6 +76,7 @@
queryWrapper.lt("create_time", DateUtil.getCurZero(param.getEnd()));
}
+ queryWrapper.orderByDesc("id");
workOrderMapper.selectPage(page, queryWrapper);
}
@@ -177,8 +177,10 @@
selfTodo++;
}
if (null != work.getAssigneeId() && work.getAssigneeId().equals(user.getLoginName())) {
- selfTodo++;
- assignTodo++;
+ if(!WorkNode.NODE_END.getCode().equals(work.getNode())){
+ selfTodo++;
+ assignTodo++;
+ }
}
if (DateUtil.isToday(work.getCreateTime())) {
todayTodo++;
@@ -201,11 +203,6 @@
queryWrapper.eq("company_id", user.getCompanyId());
- //濡傛灉鏄釜浜哄伐鍗曪紝澶勭悊浜轰负绌烘垨鑰呬负褰撳墠浜�
- if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
- queryWrapper.isNull("assignee_id").or().eq("assignee_id", user.getLoginName());
- }
-
//鐩戠鐢ㄦ埛-鏌ョ湅鎵�鏈夊簱鍖哄拰寰呭姙
if (Constant.USER_TYPE_10.equals(user.getUserType())) {
if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
@@ -215,26 +212,32 @@
//搴撳尯鐢ㄦ埛锛屽鏋滄槸鍏徃鐢ㄦ埛鍙互鏌ョ湅鍏徃涓嬪睘鎵�鏈夊簱鍖猴紝濡傛灉涓哄綋鍓嶅簱鍖哄彧鏌ヨ褰撳墠搴撳尯
if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
+ queryWrapper.eq("node", WorkNode.NODE1.getCode());
+ }
+
if (ContextUtil.isDepotUser(user.getDeptId() + "")) {
queryWrapper.eq("dept_id", user.getDeptId() + "");
} else {
queryWrapper.likeRight("dept_id", user.getDeptId() + "");
}
- if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
- queryWrapper.eq("node", WorkNode.NODE1.getCode());
- }
-
}
//閾惰鐢ㄦ埛锛屾牴鎹悎鍚屾煡璇㈤摱琛屼笅鎵�鏈夊簱鍖�
if (Constant.USER_TYPE_20.equals(user.getUserType())) {
//濡傛灉娌℃湁閰嶇疆閾惰锛岃缃竴涓笉瀛樺湪鐨勯摱琛屽彿
if (StringUtils.isBlank(user.getUserData())) user.setUserData("9");
- queryWrapper.eq("bank_id", user.getUserData());
+
+ queryWrapper.eq("bank_id", user.getUserData());
if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
queryWrapper.eq("node", WorkNode.NODE3.getCode());
}
}
+ //濡傛灉鏄釜浜哄伐鍗曪紝澶勭悊浜轰负绌烘垨鑰呬负褰撳墠浜�
+ if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
+ queryWrapper.isNull("assignee_id").or().eq("assignee_id", user.getLoginName());
+ }
+
}
@@ -249,12 +252,12 @@
//鏇存柊鍏ュ簱閫氱煡鍗曠姸鎬�
if (work.getBizType().equals(WorkBizType.TYPE_10.getCode())) {
- noticeInMapper.auditComplete(work.getBusinessId(), work.getStatus());
+ noticeService.updateNoticeInStatus(work.getBusinessId(), work.getStatus());
}
- //鏇存柊鍏ュ簱閫氱煡鍗曠姸鎬�
+ //鏇存柊鍑哄簱閫氱煡鍗曠姸鎬�
if (work.getBizType().equals(WorkBizType.TYPE_20.getCode())) {
- noticeOutMapper.auditComplete(work.getBusinessId(), work.getStatus());
+ noticeService.updateNoticeOutStatus(work.getBusinessId(), work.getStatus());
}
}
--
Gitblit v1.9.3