From 51ad03fcc8ffdb52469216558031a1bd31ed1fa6 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 23 七月 2024 09:57:47 +0800
Subject: [PATCH] 0723添加异常预警,消息推送,企业确认流程,企业自助建议反馈

---
 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 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 52e6bee..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,7 +108,7 @@
         List<OrderNodeVo> vos = new ArrayList<>();
         EnforceComplaintLog order = this.getById(id);
         if (order.getComplaintTime()!=null){
-            vos.add(new OrderNodeVo("鍙戣捣鎶曡瘔",order.getCompanyUser(),order.getCompanyName(),order.getComplaintTime(), null));
+            vos.add(new OrderNodeVo("鍙戣捣璇夋眰",order.getCompanyUser(),order.getCompanyName(),order.getComplaintTime(), null));
         }
         if (order.getInTime()!=null && StringUtils.isNotEmpty(order.getInUser())){
 
@@ -156,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