From c2be8b6fd026bd93c09891febedc1cc06e5bed7e Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 19 十月 2022 14:07:09 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java |    7 +++++--
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java        |   14 ++++++++------
 ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java                         |    6 ++++++
 ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java                   |    6 ++++++
 4 files changed, 25 insertions(+), 8 deletions(-)

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 779be4c..750f380 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
@@ -28,6 +28,12 @@
     private String alarmTime;
 
     /**
+     * 璋冨害鏃堕檺
+     */
+    @TableField("limit_time")
+    private String limitTime;
+
+    /**
      * 鎵�灞炵ぞ鍖�
      */
     @ApiModelProperty(value = "鎵�灞炵ぞ鍖�")
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 89d529c..36fb3e4 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
@@ -27,6 +27,12 @@
     private String alarmTime;
 
     /**
+     * 璋冨害鏃堕檺
+     */
+    @TableField("limit_time")
+    private String limitTime;
+
+    /**
      * 灏忕被
      */
     @ApiModelProperty(value = "灏忕被")
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 de3f0b1..056d077 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
@@ -36,6 +36,7 @@
 import javax.annotation.Resource;
 import java.time.Duration;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -210,11 +211,11 @@
         BeanUtils.copyProperties(violationParam, violations);
         Integer value = 1;
         violations.setId(id);
-        setDisposeRecord(id);
+        setDisposeRecord(id, violationParam.getLimitTime());
         return violationsMapper.insert(violations) == value ? true : false;
     }
 
-    private void setDisposeRecord(Long id) {
+    private void setDisposeRecord(Long id, String limitTime) {
         String stepName = StepName.DISPATCH.getName();
         QueryWrapper<WorkflowConfigStep> stepQuery = new QueryWrapper<>();
         stepQuery.eq("name", stepName);
@@ -231,6 +232,7 @@
         disposeRecord.setCreateUser(userDetails.getUserId());
         disposeRecord.setStartTime(LocalDateTime.now());
         disposeRecord.setStepName(stepName);
+        disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         disposeRecordMapper.insert(disposeRecord);
     }
 
@@ -238,7 +240,7 @@
     public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id) {
         IllegalBuilding illegalBuilding = new IllegalBuilding();
         BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding);
-        setDisposeRecord(id);
+        setDisposeRecord(id, illegalBuildingParam.getLimitTime());
         Integer value = 1;
         illegalBuilding.setBaseCaseId(id);
         return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false;
@@ -266,7 +268,7 @@
         }
         //鑾峰彇璋冨害淇℃伅
         Map mapD = new HashMap();
-        mapD.put("baseCaseId",baseCase.getId());
+        mapD.put("baseCaseId", baseCase.getId());
         DispatchInfo dispatchInfo = dispatchInfoMapper.selectCondMap(mapD);
         baseCase.setDispatchInfo(dispatchInfo);
         bcd.setBaseCase(baseCase);
@@ -367,7 +369,7 @@
     }
 
     @Override
-    public void endCase(Long caseId, String result,String opinion) {
+    public void endCase(Long caseId, String result, String opinion) {
         //鑾峰彇褰撳墠鐧婚檰鐢ㄦ埛淇℃伅
         AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         String endCaseName = StepName.CLOSING_REGISTER.getName();
@@ -384,7 +386,7 @@
             throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�");
         }
         UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id",workflowConfigStep.getId());
+        updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id", workflowConfigStep.getId());
 
         //淇敼缁撴璁板綍
         DisposeRecord disposeRecord = new DisposeRecord();
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
index 306be5b..d3ef954 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
@@ -22,11 +22,12 @@
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
 /**
  * <p>
- *  璋冨害澶勭悊 鏈嶅姟瀹炵幇绫�
+ * 璋冨害澶勭悊 鏈嶅姟瀹炵幇绫�
  * </p>
  *
  * @author mg
@@ -42,6 +43,7 @@
     DisposeRecordMapper disposeRecordMapper;
     @Resource
     WorkflowConfigStepMapper workflowConfigStepMapper;
+
     @Override
     public DispatchInfo dispatch(DispatchInfoParam dispatchInfoParam) {
         //鏂板璋冨害淇℃伅
@@ -64,7 +66,7 @@
         }
 
         UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id",workflowConfigStep.getId());
+        updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id", workflowConfigStep.getId());
 
         //淇敼璋冨害璁板綍
         DisposeRecord disposeRecord = new DisposeRecord();
@@ -85,6 +87,7 @@
         stepNextRecord.setWorkflowConfigStepId(stepNext.getId());
         stepNextRecord.setStepName(stepNext.getName());
         stepNextRecord.setHandlerRoleId(stepNext.getRoleId());
+        stepNextRecord.setLimitTime(LocalDateTime.parse(dispatchInfoParam.getDisposeDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss")));
         //涓婁紶澶勭疆鏈粨鏉�
         stepNextRecord.setState(0);
         stepNextRecord.setStartTime(LocalDateTime.now());

--
Gitblit v1.8.0