From a8b2b318c1e6bb1ae155aa9ca6043eeb47bbfe7a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 29 九月 2022 17:48:48 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java                   |   12 +
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java        |   59 +++++++
 ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java                     |   24 +++
 ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java                  |   28 +-
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java             |   12 +
 ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java         |    9 +
 ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java            |    9 +
 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java    |   19 ++
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java            |   50 ++++++
 ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java  |   15 +
 ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java                     |   34 ++++
 ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java                     |   25 +++
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java |  111 ++++++++++++-
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java              |   16 +
 ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java            |   30 +-
 15 files changed, 412 insertions(+), 41 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java
new file mode 100644
index 0000000..7609027
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java
@@ -0,0 +1,34 @@
+package com.ycl.bo.casePool;
+
+import com.ycl.entity.caseHandler.ArrivalSituation;
+import com.ycl.entity.caseHandler.Investigation;
+import com.ycl.entity.caseHandler.Writ;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ *  鐜板満鎯呭喌 绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-09-29
+ */
+@Data
+public class CurrentSitVo {
+    /**
+     * 鍒拌揪鐜板満鎯呭喌
+     */
+    @ApiModelProperty(value = "鍒拌揪鐜板満鎯呭喌",dataType = "ArrivalSituation")
+    private ArrivalSituation arrivalSituation;
+    /**
+     * 璋冩煡鍙栬瘉
+     */
+    @ApiModelProperty(value = "璋冩煡鍙栬瘉",dataType = "Investigation")
+    private Investigation investigation;
+    /**
+     * 鍛婄煡杩濇硶
+     */
+    @ApiModelProperty(value = "鍛婄煡杩濇硶",dataType = "Writ")
+    private Writ writ;
+}
diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java
new file mode 100644
index 0000000..b087bd6
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java
@@ -0,0 +1,12 @@
+package com.ycl.bo.casePool;
+
+/**
+ * <p>
+ *  妗堝嵎鍥剧墖 绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-09-29
+ */
+public class FilesPictureVo {
+}
diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java
new file mode 100644
index 0000000..0e6c662
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java
@@ -0,0 +1,25 @@
+package com.ycl.bo.casePool;
+
+import com.ycl.entity.caseHandler.WorkflowConfigStep;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鍔炵悊缁忚繃绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-09-29
+ */
+@Data
+public class HandlePassVo {
+
+    /**
+     * 娴佺▼鐜妭鍒楄〃
+     */
+    @ApiModelProperty(value = "娴佺▼鐜妭鍒楄〃",dataType = "ArrivalSituation")
+    private List<WorkflowConfigStep> workflowConfigSteps;
+}
diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java
new file mode 100644
index 0000000..d6e4b0e
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java
@@ -0,0 +1,24 @@
+package com.ycl.bo.casePool;
+
+import com.ycl.entity.caseHandler.WorkflowConfigStep;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 闂澶勭悊 绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-09-29
+ */
+@Data
+public class ProblemProVo {
+    /**
+     * 娴佺▼鐜妭鍒楄〃
+     */
+    @ApiModelProperty(value = "娴佺▼鐜妭鍒楄〃",dataType = "ArrivalSituation")
+    private List<WorkflowConfigStep> workflowConfigSteps;
+}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index fd638a9..337cb17 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -172,4 +172,23 @@
         baseCaseService.save(baseCase);
         return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
     }
+
+
+    @ApiOperation(value = "妗堜欢璇︽儏")
+    @GetMapping("/baseCaseDetail/{code}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "浜嬩欢缂栧彿")
+    })
+    public CommonResult baseCaseDetail(@PathVariable(value = "code") String code) {
+        return CommonResult.success(baseCaseService.baseCaseDetail(code));
+    }
+
+    @ApiOperation("浜哄伐璺緞妗堜欢鍥剧墖灞曠ず")
+    @GetMapping("/hand_work_case_images")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
+    })
+    public CommonResult queryCaseImages(@RequestParam Integer id,@RequestParam Integer type){
+        return CommonResult.success(baseCaseService.listCaseImages(id,type));
+    }
 }
diff --git a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
index dcf9484..ffb38b1 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
@@ -1,6 +1,7 @@
 package com.ycl.dto.caseHandler;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -16,41 +17,49 @@
      * 鎵ф硶浜哄憳
      */
     @JsonProperty("lawEnforcer")
+    @ApiModelProperty(value = "鎵ф硶浜哄憳",dataType = "Integer")
     private Integer lawEnforcer;
     /**
      * 鎵ф硶浜哄憳濮撳悕
      */
     @JsonProperty("lawEnforcerName")
+    @ApiModelProperty(value = "鎵ф硶浜哄憳濮撳悕",dataType = "String")
     private String lawEnforcerName;
     /**
      * 鎵ф硶杞�
      */
     @JsonProperty("enforcementCar")
+    @ApiModelProperty(value = "鎵ф硶杞�",dataType = "Integer")
     private Integer enforcementCar;
     /**
      * 鎵ф硶闃熶紞
      */
     @JsonProperty("enforcementTeam")
+    @ApiModelProperty(value = "鎵ф硶闃熶紞",dataType = "String")
     private String enforcementTeam;
     /**
      * 鑱旂郴鏂瑰紡
      */
     @JsonProperty("contactWay")
+    @ApiModelProperty(value = "鑱旂郴鏂瑰紡",dataType = "String")
     private String contactWay;
     /**
      * 璺濈
      */
     @JsonProperty("distance")
+    @ApiModelProperty(value = "璺濈",dataType = "Integer")
     private Integer distance;
     /**
      * 澶勭疆鏃ユ湡
      */
     @JsonProperty("disposeDate")
+    @ApiModelProperty(value = "澶勭疆鏃ユ湡",dataType = "String")
     private String disposeDate;
     /**
      * 娲鹃仯鎰忚
      */
     @JsonProperty("dispatchOpinion")
+    @ApiModelProperty(value = "娲鹃仯鎰忚",dataType = "String")
     private String dispatchOpinion;
 
 }
diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
index 893e947..e946f92 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
@@ -11,14 +11,14 @@
     /**
      * 闂绫诲埆锛�1-杩濊 2-杩濆缓锛�
      */
-    @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓", dataType = "Integer")
+    @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓")
     @NotNull(message = "涓嶅厑璁搁棶棰樼被鍨嬩负绌�")
     private Integer category;
 
     /**
      * 杩濆缓绫诲埆
      */
-    @ApiModelProperty(value = "杩濆缓绫诲埆", dataType = "Integer")
+    @ApiModelProperty(value = "杩濆缓绫诲埆")
     @NotBlank(message = "涓嶅厑璁歌繚寤虹被鍒负绌�")
     private Integer categoryId;
 
@@ -26,7 +26,7 @@
     /**
      * 鎵�灞炵ぞ鍖�
      */
-    @ApiModelProperty(value = "鎵�灞炵ぞ鍖�", dataType = "Integer")
+    @ApiModelProperty(value = "鎵�灞炵ぞ鍖�")
     @NotBlank(message = "涓嶅厑璁告墍灞炵ぞ鍖轰负绌�")
     private Integer communityId;
 
@@ -35,84 +35,84 @@
     /**
      * 鎶ヨ鐐逛綅 浜嬪彂鍦扮偣
      */
-    @ApiModelProperty(value = "浜嬪彂鍦扮偣", dataType = "String")
+    @ApiModelProperty(value = "浜嬪彂鍦扮偣")
     @NotBlank(message = "涓嶅厑璁镐簨鍙戝湴鐐逛负绌�")
     private String site;
 
     /**
      * 褰撲簨浜哄鍚�
      */
-    @ApiModelProperty(value = "褰撲簨浜哄鍚�", dataType = "String")
+    @ApiModelProperty(value = "褰撲簨浜哄鍚�")
     @NotBlank(message = "涓嶅厑璁稿綋浜嬩汉濮撳悕涓虹┖")
     private String partyName;
 
     /**
      * 褰撲簨浜鸿韩浠借瘉鍙风爜
      */
-    @ApiModelProperty(value = "褰撲簨浜鸿韩浠借瘉鍙风爜", dataType = "String")
+    @ApiModelProperty(value = "褰撲簨浜鸿韩浠借瘉鍙风爜")
     @NotBlank(message = "涓嶅厑璁稿綋浜嬩汉韬唤璇佸彿鐮佷负绌�")
     private String partyIdCard;
 
     /**
      * 褰撲簨浜鸿仈绯荤數璇�
      */
-    @ApiModelProperty(value = "浜嬪彂鍦扮偣", dataType = "String")
+    @ApiModelProperty(value = "浜嬪彂鍦扮偣")
     @NotBlank(message = "涓嶅厑璁镐簨鍙戝湴鐐逛负绌�")
     private String partyPhone;
 
     /**
      * 韬唤璇佹闈�
      */
-    @ApiModelProperty(value = "韬唤璇佹闈�", dataType = "String")
+    @ApiModelProperty(value = "韬唤璇佹闈�")
     @NotBlank(message = "涓嶅厑璁歌韩浠借瘉姝ｉ潰涓虹┖")
     private String positive;
 
     /**
      * 韬唤璇佸弽闈�
      */
-    @ApiModelProperty(value = "韬唤璇佸弽闈�", dataType = "String")
+    @ApiModelProperty(value = "韬唤璇佸弽闈�")
     @NotBlank(message = "涓嶅厑璁歌韩浠借瘉鍙嶉潰涓虹┖")
     private String negative;
 
     /**
      * 杩濆缓鍏蜂綋浣嶇疆
      */
-    @ApiModelProperty(value = "杩濆缓鍏蜂綋浣嶇疆", dataType = "String")
+    @ApiModelProperty(value = "杩濆缓鍏蜂綋浣嶇疆")
     @NotBlank(message = "涓嶅厑璁歌繚寤哄叿浣撲綅缃负绌�")
     private String position;
 
     /**
      * 杩濆缓闀�
      */
-    @ApiModelProperty(value = "杩濆缓闀�", dataType = "String")
+    @ApiModelProperty(value = "杩濆缓闀�")
     @NotBlank(message = "涓嶅厑璁歌繚寤洪暱涓虹┖")
     private Float buildingLength;
 
     /**
      * 杩濆缓瀹�
      */
-    @ApiModelProperty(value = "杩濆缓瀹�", dataType = "String")
+    @ApiModelProperty(value = "杩濆缓瀹�")
     @NotBlank(message = "涓嶅厑璁歌繚寤哄涓虹┖")
     private Float buildingWidth;
 
     /**
      * 杩濆缓楂�
      */
-    @ApiModelProperty(value = "杩濆缓楂�", dataType = "String")
+    @ApiModelProperty(value = "杩濆缓楂�")
     @NotBlank(message = "涓嶅厑璁歌繚寤洪珮涓虹┖")
     private Float buildingHigh;
 
     /**
      * 杩濆缓闈㈢Н
      */
-    @ApiModelProperty(value = "杩濆缓闈㈢Н", dataType = "String")
+    @ApiModelProperty(value = "杩濆缓闈㈢Н")
     @NotBlank(message = "涓嶅厑璁歌繚寤洪潰绉负绌�")
     private Float buildingArea;
 
     /**
      * 杩濆缓鏉愭枡
      */
-    @ApiModelProperty(value = "杩濆缓鏉愭枡", dataType = "String")
+    @ApiModelProperty(value = "杩濆缓鏉愭枡")
     @NotBlank(message = "涓嶅厑璁歌繚寤烘潗鏂欎负绌�")
     private String materials;
 }
diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
index 90853df..3966a9c 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
@@ -11,35 +11,35 @@
     /**
      * 闂绫诲埆锛�1-杩濊 2-杩濆缓锛�
      */
-    @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓", dataType = "Integer")
+    @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓")
     @NotNull(message = "涓嶅厑璁搁棶棰樼被鍨嬩负绌�")
     private Integer category;
 
     /**
      * 澶х被
      */
-    @ApiModelProperty(value = "澶х被", dataType = "Integer")
+    @ApiModelProperty(value = "澶х被")
     @NotNull(message = "涓嶅厑璁稿ぇ绫讳负绌�")
     private Integer categoryId;
 
     /**
      * 灏忕被
      */
-    @ApiModelProperty(value = "灏忕被", dataType = "Integer")
+    @ApiModelProperty(value = "灏忕被")
     @NotNull(message = "涓嶅厑璁稿皬绫讳负绌�")
     private Integer typeId;
 
     /**
      * 鎵�灞炶閬�
      */
-    @ApiModelProperty(value = "鎵�灞炶閬�", dataType = "Integer")
+    @ApiModelProperty(value = "鎵�灞炶閬�")
     @NotNull(message = "涓嶅厑璁告墍灞炶閬撲负绌�")
     private Integer streetId;
 
     /**
      * 鎵�灞炵ぞ鍖�
      */
-    @ApiModelProperty(value = "鎵�灞炵ぞ鍖�", dataType = "Integer")
+    @ApiModelProperty(value = "鎵�灞炵ぞ鍖�")
     @NotBlank(message = "涓嶅厑璁告墍灞炵ぞ鍖轰负绌�")
     private Integer communityId;
 
@@ -47,7 +47,7 @@
     /**
      * 妗堢敱
      */
-    @ApiModelProperty(value = "妗堢敱", dataType = "String")
+    @ApiModelProperty(value = "妗堢敱")
     @NotBlank(message = "涓嶅厑璁告鐢变负绌�")
     private String actionCause;
 
@@ -55,50 +55,50 @@
     /**
      * 鎶ヨ鐐逛綅 浜嬪彂鍦扮偣
      */
-    @ApiModelProperty(value = "浜嬪彂鍦扮偣", dataType = "String")
+    @ApiModelProperty(value = "浜嬪彂鍦扮偣")
     @NotBlank(message = "涓嶅厑璁镐簨鍙戝湴鐐逛负绌�")
     private String site;
 
     /**
      * 鏄惁鍏宠仈鍟嗛摵
      */
-    @ApiModelProperty(value = "鏄惁鍏宠仈鍟嗛摵", dataType = "Boolean")
+    @ApiModelProperty(value = "鏄惁鍏宠仈鍟嗛摵(0鍚�1鏄�)")
     private Integer linkShop;
 
     /**
      * 鍏宠仈鍟嗛摵鍚嶇О
      */
-    @ApiModelProperty(value = "鍏宠仈鍟嗛摵鍚嶇О", dataType = "String")
+    @ApiModelProperty(value = "鍏宠仈鍟嗛摵鍚嶇О")
     private String shopName;
 
     /**
      * 杞︾墝鍙�
      */
-    @ApiModelProperty(value = "杞︾墝鍙�", dataType = "String")
+    @ApiModelProperty(value = "杞︾墝鍙�")
     private String carNumber;
 
     /**
      * 闂鎻忚堪
      */
-    @ApiModelProperty(value = "闂鎻忚堪", dataType = "String")
+    @ApiModelProperty(value = "闂鎻忚堪")
     @NotBlank(message = "涓嶅厑璁搁棶棰樻弿杩颁负绌�")
     private String description;
 
     /**
      * 鍙嶆槧浜�
      */
-    @ApiModelProperty(value = "鍙嶆槧浜�", dataType = "String")
+    @ApiModelProperty(value = "鍙嶆槧浜�")
     private String informant;
 
     /**
      * 鍙嶆槧浜鸿仈绯绘柟寮�
      */
-    @ApiModelProperty(value = "鍙嶆槧浜鸿仈绯绘柟寮�", dataType = "String")
+    @ApiModelProperty(value = "鍙嶆槧浜鸿仈绯绘柟寮�")
     private String informantPhoneCode;
 
     /**
      * 韬唤璇佸彿鐮�
      */
-    @ApiModelProperty(value = "韬唤璇佸彿鐮�", dataType = "String")
+    @ApiModelProperty(value = "韬唤璇佸彿鐮�")
     private String informantIdCard;
 }
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java
new file mode 100644
index 0000000..0407995
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java
@@ -0,0 +1,50 @@
+package com.ycl.entity.caseHandler;
+
+import com.ycl.bo.casePool.CurrentSitVo;
+import com.ycl.bo.casePool.FilesPictureVo;
+import com.ycl.bo.casePool.HandlePassVo;
+import com.ycl.bo.casePool.ProblemProVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *  妗堜欢璇︽儏绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-09-29
+ */
+@Data
+public class BaseCaseDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 妗堜欢鍩烘湰淇℃伅
+     */
+    @ApiModelProperty(value = "妗堜欢鍩烘湰淇℃伅",dataType = "BaseCase")
+    private BaseCase baseCase;
+    /**
+     * 鍔炵悊缁忚繃
+     */
+    @ApiModelProperty(value = "鍔炵悊缁忚繃",dataType = "HandlePassVo")
+    private HandlePassVo handlePassVo;
+    /**
+     * 妗堝嵎鍥剧墖
+     */
+    @ApiModelProperty(value = "妗堝嵎鍥剧墖",dataType = "FilesPictureVo")
+    private FilesPictureVo filesPictureVo;
+    /**
+     * 闂澶勭悊
+     */
+    @ApiModelProperty(value = "闂澶勭悊",dataType = "ProblemProVo")
+    private ProblemProVo problemProVo;
+    /**
+     * 鐜板満澶勭悊
+     */
+    @ApiModelProperty(value = "鐜板満澶勭悊",dataType = "CurrentSitVo")
+    private CurrentSitVo currentSitVo;
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
index c72ca6c..82a709e 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
@@ -4,9 +4,11 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -20,7 +22,7 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("ums_dispatch_info")
-public class DispatchInfo {
+public class DispatchInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -28,62 +30,74 @@
      * id
      */
     @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "id",dataType = "Integer")
     private Integer id;
 
     /**
      * 澶勭疆娴佺▼璁板綍Id
      */
     @TableField("dispose_record_id")
+    @ApiModelProperty(value = "澶勭疆娴佺▼璁板綍Id",dataType = "Integer")
     private Integer disposeRecordId;
     /**
      * 鎵ф硶浜哄憳
      */
     @TableField("law_enforcer")
+    @ApiModelProperty(value = "鎵ф硶浜哄憳",dataType = "Integer")
     private Integer lawEnforcer;
     /**
      * 鎵ф硶浜哄憳濮撳悕
      */
     @TableField("law_enforcer_name")
+    @ApiModelProperty(value = "鎵ф硶浜哄憳濮撳悕",dataType = "String")
     private String lawEnforcerName;
     /**
      * 鎵ф硶杞�
      */
     @TableField("enforcement_car")
+    @ApiModelProperty(value = "鎵ф硶杞�",dataType = "Integer")
     private Integer enforcementCar;
     /**
      * 鎵ф硶闃熶紞
      */
     @TableField("enforcement_team")
+    @ApiModelProperty(value = "鎵ф硶闃熶紞",dataType = "String")
     private String enforcementTeam;
     /**
      * 鑱旂郴鏂瑰紡
      */
     @TableField("contact_way")
+    @ApiModelProperty(value = "鑱旂郴鏂瑰紡",dataType = "String")
     private String contactWay;
     /**
      * 璺濈
      */
     @TableField("distance")
+    @ApiModelProperty(value = "璺濈",dataType = "Integer")
     private Integer distance;
     /**
      * 澶勭疆鏃ユ湡
      */
     @TableField("dispose_date")
+    @ApiModelProperty(value = "澶勭疆鏃ユ湡",dataType = "Date")
     private Date disposeDate;
     /**
      * 娲鹃仯鎰忚
      */
     @TableField("dispatch_opinion")
+    @ApiModelProperty(value = "娲鹃仯鎰忚",dataType = "String")
     private String dispatchOpinion;
     /**
      * 鍒涘缓浜�
      */
     @TableField("create_user")
+    @ApiModelProperty(value = "鍒涘缓浜�",dataType = "Integer")
     private Integer createUser;
     /**
      * 鍒涘缓鏃堕棿
      */
     @TableField("create_time")
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿",dataType = "Date")
     private Date createTime;
 
 }
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java
index 26b3d38..87aaa07 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java
@@ -83,4 +83,16 @@
     private LocalDateTime createTime;
 
 
+    /**
+     * 缁撴灉
+     */
+    @TableField("result")
+    private String result;
+
+    /**
+     * 闄愬埗鏃堕檺
+     */
+    @TableField("limit_time")
+    private LocalDateTime limitTime;
+
 }
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java
new file mode 100644
index 0000000..62bae4b
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java
@@ -0,0 +1,59 @@
+package com.ycl.entity.caseHandler;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 澶勭疆娴佺▼鐜妭閰嶇疆 绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_workflow_config_step")
+public class WorkflowConfigStep implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "id",dataType = "Integer")
+    private Integer id;
+
+    /**
+     * 澶勭疆娴佺▼閰嶇疆id
+     */
+    @TableField(value = "workflow_config_id ")
+    @ApiModelProperty(value = "澶勭疆娴佺▼閰嶇疆id",dataType = "Integer")
+    private Integer workflowConfigId ;
+
+    /**
+     * 鐜妭鍚嶇О
+     */
+    @TableField("name")
+    @ApiModelProperty(value = "鐜妭鍚嶇О",dataType = "String")
+    private String name;
+    /**
+     * 瀵瑰簲瑙掕壊id
+     */
+    @TableField(value = "role_id ")
+    @ApiModelProperty(value = "瀵瑰簲瑙掕壊id",dataType = "Integer")
+    private Integer roleId ;
+    /**
+     * 搴忓彿
+     */
+    @TableField(value = "seq ")
+    @ApiModelProperty(value = "搴忓彿",dataType = "Integer")
+    private Integer seq ;
+}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java
new file mode 100644
index 0000000..487a0fd
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java
@@ -0,0 +1,15 @@
+package com.ycl.mapper.caseHandler;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.caseHandler.WorkflowConfigStep;
+
+/**
+ * <p>
+ * 澶勭疆娴佺▼鐜妭閰嶇疆琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author mg
+ * @since 2022-09-29
+ */
+public interface WorkflowConfigStepMapper extends BaseMapper<WorkflowConfigStep> {
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
index 2174583..a63356e 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
@@ -1,10 +1,13 @@
 package com.ycl.service.caseHandler;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ycl.dto.casePool.IllegalBuildingParam;
 import com.ycl.dto.casePool.ViolationParam;
 import com.ycl.entity.caseHandler.BaseCase;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.caseHandler.BaseCaseDetail;
+
+import java.util.ArrayList;
 
 /**
  * <p>
@@ -41,4 +44,8 @@
      * @date 2022-09-28 17:45
      */
     String processEvent(Integer caseId);
+
+    BaseCaseDetail baseCaseDetail(String code);
+
+    ArrayList<String> listCaseImages(Integer id, Integer type);
 }
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index f157999..147accf 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -1,22 +1,19 @@
 package com.ycl.service.caseHandler.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.bo.casePool.CasePoolIllegalBuildingDO;
-import com.ycl.bo.casePool.CasePoolViolationDO;
+import com.ycl.bo.casePool.*;
 import com.ycl.dto.casePool.IllegalBuildingParam;
 import com.ycl.dto.casePool.ViolationParam;
-import com.ycl.entity.caseHandler.BaseCase;
-import com.ycl.entity.caseHandler.IllegalBuilding;
-import com.ycl.entity.caseHandler.Violations;
+import com.ycl.entity.caseHandler.*;
 import com.ycl.entity.video.VideoAlarmReport;
-import com.ycl.mapper.caseHandler.BaseCaseMapper;
-import com.ycl.mapper.caseHandler.IllegalBuildingMapper;
-import com.ycl.mapper.caseHandler.ViolationsMapper;
+import com.ycl.mapper.caseHandler.*;
 import com.ycl.mapper.dict.DataDictionaryMapper;
-import com.ycl.remote.dto.*;
-import com.ycl.remote.service.CityPlatformService;
+import com.ycl.remote.dto.EventAddParamDto;
+import com.ycl.remote.dto.EventProcessParamDto;
 import com.ycl.service.caseHandler.IBaseCaseService;
 import com.ycl.service.caseHandler.IViolationsService;
 import com.ycl.service.video.IVideoAlarmReportService;
@@ -31,6 +28,7 @@
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -75,6 +73,19 @@
     ViolationsMapper violationsMapper;
     @Resource
     IllegalBuildingMapper illegalBuildingMapper;
+
+    @Resource
+    ArrivalSituationMapper arrivalSituationMapper;
+    @Resource
+    InvestigationMapper investigationMapper;
+    @Resource
+    WritMapper writMapper;
+
+    @Resource
+    WorkflowConfigStepMapper workflowConfigStepMapper;
+    @Resource
+    WorkflowConfigMapper workflowConfigMapper;
+
 
     @Override
     public String uploadEvent(Integer caseId) {
@@ -192,4 +203,84 @@
         Integer value = 1;
         return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false;
     }
+
+    @Override
+    public BaseCaseDetail baseCaseDetail(String code) {
+        BaseCaseDetail bcd = new BaseCaseDetail();
+        //1.鏌ヨ妗堜欢鍩烘湰淇℃伅
+        QueryWrapper<BaseCase> wrapper = new QueryWrapper<>();
+        wrapper.lambda().eq(BaseCase::getCode, code);
+        BaseCase baseCase = baseCaseMapper.selectOne(wrapper);
+        bcd.setBaseCase(baseCase);
+        //2.鏌ヨ鍔炵悊缁忚繃淇℃伅
+        //2.1鏌ヨ澶勭疆娴佺▼閰嶇疆
+        HandlePassVo handlePassVo = new HandlePassVo();
+        QueryWrapper<WorkflowConfig> wrapperWc = new QueryWrapper<>();
+        wrapperWc.lambda().eq(WorkflowConfig::getCode, "ddlc").or().eq(WorkflowConfig::getCode, "wtcllc");
+        List<WorkflowConfig> wcs = workflowConfigMapper.selectList(wrapperWc);
+        Integer ddlcId=0,wtcllcId=0;
+        for (WorkflowConfig wc : wcs) {
+            if ("ddlc".equals(wc.getCode())) {
+                ddlcId = wc.getId();
+            }
+            if ("wtcllc".equals(wc.getCode())) {
+                wtcllcId = wc.getId();
+            }
+        }
+        //2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
+        QueryWrapper<WorkflowConfigStep> wrapperWcs = new QueryWrapper<>();
+        wrapperWcs.lambda().eq(WorkflowConfigStep::getWorkflowConfigId, ddlcId);
+        List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectList(wrapperWcs);
+        //2.3璁剧疆璋冨害娴佺▼
+        handlePassVo.setWorkflowConfigSteps(listWcs);
+        bcd.setHandlePassVo(handlePassVo);
+        //3.鏌ヨ妗堝嵎鍥剧墖淇℃伅
+        //4.鏌ヨ闂澶勭悊淇℃伅
+        ProblemProVo problemProVo = new ProblemProVo();
+        //4.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
+        QueryWrapper<WorkflowConfigStep> wrapperWcsPp = new QueryWrapper<>();
+        wrapperWcsPp.lambda().eq(WorkflowConfigStep::getWorkflowConfigId, wtcllcId);
+        List<WorkflowConfigStep> listWcsPp = workflowConfigStepMapper.selectList(wrapperWcsPp);
+        //4.3璁剧疆璋冨害娴佺▼
+        problemProVo.setWorkflowConfigSteps(listWcsPp);
+        bcd.setProblemProVo(problemProVo);
+        //5.鏌ヨ鐜板満鎯呭喌淇℃伅
+        CurrentSitVo currentSitVo = new CurrentSitVo();
+        QueryWrapper<ArrivalSituation> wrapperAs = new QueryWrapper<>();
+        //璁剧疆鍒拌揪鐜板満鎯呭喌
+        ArrivalSituation as = arrivalSituationMapper.selectOne(wrapperAs);
+        currentSitVo.setArrivalSituation(as);
+        //璁剧疆璋冩煡鍙栬瘉
+        QueryWrapper<Investigation> wrapperI = new QueryWrapper<>();
+        wrapperI.lambda().eq(Investigation::getBaseCaseId, baseCase.getId());
+        Investigation investigation = investigationMapper.selectOne(wrapperI);
+        currentSitVo.setInvestigation(investigation);
+        //璁剧疆鍛婄煡杩濇硶
+        QueryWrapper<Writ> wrapperW = new QueryWrapper<>();
+        wrapperW.lambda().eq(Writ::getBaseCaseId, baseCase.getId());
+        Writ writ = writMapper.selectOne(wrapperW);
+        currentSitVo.setWrit(writ);
+        bcd.setCurrentSitVo(currentSitVo);
+        return bcd;
+    }
+
+    @Override
+    public ArrayList<String> listCaseImages(Integer id, Integer type) {
+        Integer illegalBuildingType = 02;
+        ArrayList<String> caseImages = new ArrayList<>();
+        caseImages.add(investigationMapper
+                .selectOne(new LambdaQueryWrapper<Investigation>()
+                        .eq(Investigation::getBaseCaseId, id)).getPic());
+        caseImages.add(arrivalSituationMapper
+                .selectOne(new LambdaQueryWrapper<ArrivalSituation>()
+                        .eq(ArrivalSituation::getBaseCaseId, id)).getSituationPic());
+        if (type == illegalBuildingType) {
+            Writ writ = writMapper.selectOne(new LambdaQueryWrapper<Writ>().eq(Writ::getBaseCaseId, id));
+            caseImages.add(writ.getWritPic());
+            caseImages.add(writ.getOriginalPic());
+            caseImages.add(writ.getOtherPic());
+            caseImages.add(writ.getRectifiedPic());
+        }
+        return caseImages;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0