From be649a182a10a25a834f137576b28c3f7de03c64 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 03 九月 2024 11:08:52 +0800
Subject: [PATCH] 审批企业状态
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
index 691350c..f74e35d 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
@@ -49,6 +49,23 @@
return Convert.toList(EnforceComplaintLogVo.class , list);
}
+ @Override//鍒楄〃鏌ヨ
+ public List<EnforceComplaintLogVo> complaintList(EnforceComplaintLogQueryBo bo)
+ {
+ QueryWrapper<EnforceComplaintLog> qw = getQw(bo);
+ qw.ne("complaint_type","-1");
+ List<EnforceComplaintLog> list = this.list(qw);
+ return Convert.toList(EnforceComplaintLogVo.class , list);
+ }
+
+ @Override
+ public List<EnforceComplaintLogVo> queryPleaseList(EnforceComplaintLogQueryBo bo) {
+ QueryWrapper<EnforceComplaintLog> qw = getQw(bo);
+ qw.eq("complaint_type","-1");
+ List<EnforceComplaintLog> list = this.list(qw);
+ return Convert.toList(EnforceComplaintLogVo.class , list);
+ }
+
@Override//id鏌ヨ
public EnforceComplaintLogVo queryById(Long id)
{
@@ -91,16 +108,17 @@
List<OrderNodeVo> vos = new ArrayList<>();
EnforceComplaintLog order = this.getById(id);
if (order.getComplaintTime()!=null){
- vos.add(new OrderNodeVo("鍙戣捣鎶曡瘔",order.getCompanyUser(),order.getComplaintTime(), null));
+ vos.add(new OrderNodeVo("鍙戣捣璇夋眰",order.getCompanyUser(),order.getCompanyName(),order.getComplaintTime(), null));
}
- if (order.getInTime()!=null){
- vos.add(new OrderNodeVo("澶勭悊涓�",order.getInUser(),order.getInTime(), null));
+ if (order.getInTime()!=null && StringUtils.isNotEmpty(order.getInUser())){
+
+ vos.add(new OrderNodeVo("澶勭悊涓�",order.getInUser(), userService.getDeptNameByUserId(order.getInId()), order.getInTime(), null));
}
if (order.getResultTime()!=null){
if (order.getComplaintStatus()==-1){
- vos.add(new OrderNodeVo("宸查┏鍥�",order.getExecuteUser(),order.getResultTime(), order.getComplaintResult()));
+ vos.add(new OrderNodeVo("宸查┏鍥�",order.getResultUser(),userService.getDeptNameByUserId(order.getResultId()),order.getResultTime(), order.getComplaintResult()));
} else {
- vos.add(new OrderNodeVo("宸插姙缁�",order.getExecuteUser(),order.getResultTime(), order.getComplaintResult()));
+ vos.add(new OrderNodeVo("宸插姙缁�",order.getResultUser(),userService.getDeptNameByUserId(order.getResultId()),order.getResultTime(), order.getComplaintResult()));
}
}
return vos;
@@ -155,11 +173,11 @@
){
throw new BaseException("鎶曡瘔浼佷笟涓嶈兘涓虹┖锛�");
}
- if (entity.getExecuteDeptId() == null
- || StringUtils.isEmpty(entity.getExecuteDeptName())
- ){
- throw new BaseException("鎶曡瘔鍗曚綅涓嶈兘涓虹┖锛�");
- }
+// if (entity.getExecuteDeptId() == null
+// || StringUtils.isEmpty(entity.getExecuteDeptName())
+// ){
+// throw new BaseException("鎶曡瘔鍗曚綅涓嶈兘涓虹┖锛�");
+// }
if (StringUtils.isEmpty(entity.getComplaintType())){
throw new BaseException("璇烽�夋嫨瑕佹姇璇夌被鍨嬶紒");
}
--
Gitblit v1.9.1