From d3af03b82eb1707b59007857c56b913d447805db Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 29 十一月 2022 16:37:40 +0800
Subject: [PATCH] bug修改

---
 ycl-platform/src/main/java/com/ycl/vo/MyBacklogVO.java                                    |    9 ++++
 ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml                               |   47 +++++++++++------------
 ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java                   |    2 +
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java |    9 ++--
 ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml                |    4 +
 5 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
index cccc442..80434cf 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -17,15 +17,15 @@
 
     <select id="getMenuList" resultType="com.ycl.entity.user.UmsMenu">
         SELECT distinct m.id,
-               m.parent_id   parentId,
-               m.create_time createTime,
-               m.title,
-               m.url,
-               m.level,
-               m.sort,
-               m.name,
-               m.icon,
-               m.hidden
+                        m.parent_id   parentId,
+                        m.create_time createTime,
+                        m.title,
+                        m.url,
+                        m.level,
+                        m.sort,
+                        m.name,
+                        m.icon,
+                        m.hidden
         FROM ums_admin_role_relation arr
                  LEFT JOIN ums_role r ON arr.role_id = r.id
                  LEFT JOIN ums_role_menu_relation rmr ON r.id = rmr.role_id
@@ -52,21 +52,20 @@
     </select>
 
     <select id="adminMenuRelation" resultType="com.ycl.entity.user.vo.UmsMenuVo">
-        SELECT amr.id        AS relationId,
-               amr.is_start  AS isStart,
-               amr.sort,
-               m.id,
-               m.parent_id   AS parentId,
-               m.title,
-               m.url,
-               m.`level`,
-               m.description,
-               m.create_time as createTime,
-               m.hidden,
-               m.icon
-        FROM `ums_admin_menu_relation` AS amr
-                 JOIN ums_menu AS m ON amr.menu_id = m.id
-        WHERE amr.admin_id = #{id}
+        SELECT distinct m.id,
+                        m.parent_id   AS parentId,
+                        m.title,
+                        m.url,
+                        m.`level`,
+                        m.description,
+                        m.create_time as createTime,
+                        m.hidden,
+                        m.icon
+        FROM ums_admin_role_relation arr
+                 INNER JOIN `ums_role_menu_relation` AS rmr on rmr.role_id = arr.role_id
+                 JOIN ums_menu AS m ON rmr.menu_id = m.id
+        WHERE arr.admin_id = #{id}
+        order by m.id
     </select>
 
 </mapper>
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index 7889f19..fd0fc7a 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -74,7 +74,7 @@
     public Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
         AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         ArrivalSituation arrivalSituationed = iArrivalSituationService.getOne(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
-        if (arrivalSituationed != null || arrivalSituationed.getId() != null) {
+        if (arrivalSituationed != null) {
             //褰撲簨浜�
             PartyInfo partyInfo = new PartyInfo();
             if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
@@ -166,9 +166,10 @@
                 writ.setIllegalBuildingId(uploadDisposingResultParam.getCaseId());
                 writ.setCreateTime(LocalDateTime.now());
                 writ.setCreateUser(user.getUserId());
-                writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
-                writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
-                writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
+                DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), dtf));
+                writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), dtf));
+                writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), dtf));
                 iWritService.save(writ);
                 imageResources.setUrl(StringUtils
                         .joinWith(",", uploadDisposingResultParam.getPic()
diff --git a/ycl-platform/src/main/java/com/ycl/vo/MyBacklogVO.java b/ycl-platform/src/main/java/com/ycl/vo/MyBacklogVO.java
index 30a938f..0a190ce 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/MyBacklogVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/MyBacklogVO.java
@@ -1,5 +1,6 @@
 package com.ycl.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +10,11 @@
 @Data
 @ApiModel(value = "鎴戠殑寰呭姙")
 public class MyBacklogVO {
-
+    /**
+     * 浜嬩欢id
+     */
+    @ApiModelProperty(value = "浜嬩欢id")
+    private Integer caseId;
     /**
      * 浜嬩欢缂栧彿
      */
@@ -38,11 +43,13 @@
      * 鍒涘缓鏃堕棿
      */
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
      * 鍓╀綑鏃堕棿
      */
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime limitTime;
 }
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
index 7486b32..c539ca0 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
@@ -1,5 +1,6 @@
 package com.ycl.vo.casePool;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -42,6 +43,7 @@
      * 鎶ヨ鏃堕棿
      */
     @ApiModelProperty(value = "鎶ヨ鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private LocalDateTime alarmTime;
 
 
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
index c47e565..d4c54ff 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
@@ -28,6 +28,7 @@
         t3.event_source,
         t3.category,
         t2.step_name,
+        t3.`id` caseId,
         t3.`code`,
         t2.create_time,
         t2.limit_time
@@ -36,7 +37,7 @@
         left JOIN ums_dispose_record t2 ON t1.role_id = t2.handler_role_id
         left JOIN ums_base_case t3 ON t2.base_case_id=t3.id
         <where>
-            t1.admin_id = #{id}
+            t1.admin_id = #{id} and t3.`code` is not null
             AND ISNULL( t2.end_time )
             <if test="code!='' and code!=null">
                 and t3.`code` LIKE CONCAT('%',#{code},'%')
@@ -47,6 +48,7 @@
         t3.event_source,
         t3.category,
         t2.step_name,
+        t3.`id` caseId,
         t3.`code`,
         t2.create_time,
         t2.limit_time

--
Gitblit v1.8.0