From 3cf5e9483f60c94d29df1a79bc0c1ca910ca46ef Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 13 十二月 2022 14:58:24 +0800
Subject: [PATCH] fix: 执法事件对外接口

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java |   84 +++++++++++++++++++++--------------------
 1 files changed, 43 insertions(+), 41 deletions(-)

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 898ba0e..5f66c8d 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
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.bo.AdminUserDetails;
 import com.ycl.controller.video.common.constant.BaseCaseStatus;
@@ -65,8 +66,8 @@
     IImageResourcesService iImageResourcesService;
 
     @Override
-    public List<MyBacklogVO> listMyTask(String num, Long userId) {
-        return disposeRecordMapper.selectMyBackList(userId, num);
+    public Page<MyBacklogVO> listMyTask(Page<MyBacklogVO> page, String num, Long userId) {
+        return disposeRecordMapper.selectMyBackList(page,userId, num);
     }
 
     @Override
@@ -108,9 +109,9 @@
                 BeanUtils.copyProperties(uploadDisposingResultParam, writ);
                 writ.setBaseCaseId(uploadDisposingResultParam.getCaseId());
                 writ.setIllegalBuildingId(uploadDisposingResultParam.getCaseId());
-                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")));
+                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")));
                 iWritService.updateById(writ);
                 imageResources.setUrl(StringUtils
                         .joinWith(",", uploadDisposingResultParam.getPic()
@@ -121,7 +122,7 @@
                                 , uploadDisposingResultParam.getWritPic()));
                 iImageResourcesService.updateById(imageResources);
             }
-            return baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
+            baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
         } else {
             //褰撲簨浜�
             PartyInfo partyInfo = new PartyInfo();
@@ -162,9 +163,9 @@
                 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")));
+                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")));
                 iWritService.save(writ);
                 imageResources.setUrl(StringUtils
                         .joinWith(",", uploadDisposingResultParam.getPic()
@@ -177,40 +178,41 @@
             }
 
             baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
-            String stepName = StepName.CHECK.getName();
-            DisposeRecord disposeRecord = new DisposeRecord();
-            disposeRecord.setBaseCaseId(uploadDisposingResultParam.getCaseId());
-            disposeRecord.setState(0);
-            disposeRecord.setCreateTime(LocalDateTime.now());
-            disposeRecord.setCreateUser(user.getUserId());
-            disposeRecord.setStepName(stepName);
-            disposeRecord.setStartTime(LocalDateTime.now());
 
-            //缁撴潫涓婁紶澶勭疆娴佺▼
-            QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>();
-            qureyDispatch.eq("name", StepName.DISPOSE.getName());
-            WorkflowConfigStep dispatchStep = workflowConfigStepMapper.selectOne(qureyDispatch);
 
-            UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("base_case_id", disposeRecord.getBaseCaseId()).eq("workflow_config_step_id", dispatchStep.getId());
-
-            DisposeRecord updateRecord = new DisposeRecord();
-            updateRecord.setState(1);
-            updateRecord.setEndTime(LocalDateTime.now());
-            updateRecord.setHandlerId(disposeRecord.getCreateUser());
-            updateRecord.setResult(uploadDisposingResultParam.getDescription());
-            baseMapper.update(updateRecord, updateWrapper);
-
-            QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>();
-            stepQurey.eq("name", disposeRecord.getStepName());
-            WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey);
-            if (workflowConfigStep == null) {
-                throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�");
-            }
-            //璁剧疆娴佺▼鐜妭鏁版嵁
-            disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
-            disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
-            return baseMapper.insert(disposeRecord) == 1 ? true : false;
         }
+        String stepName = StepName.CHECK.getName();
+        DisposeRecord disposeRecord = new DisposeRecord();
+        disposeRecord.setBaseCaseId(uploadDisposingResultParam.getCaseId());
+        disposeRecord.setState(0);
+        disposeRecord.setCreateTime(LocalDateTime.now());
+        disposeRecord.setCreateUser(user.getUserId());
+        disposeRecord.setStepName(stepName);
+        disposeRecord.setStartTime(LocalDateTime.now());
+        //缁撴潫涓婁紶澶勭疆娴佺▼
+        QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>();
+        qureyDispatch.eq("name", StepName.DISPOSE.getName());
+        WorkflowConfigStep dispatchStep = workflowConfigStepMapper.selectOne(qureyDispatch);
+
+        UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("base_case_id", disposeRecord.getBaseCaseId()).eq("workflow_config_step_id", dispatchStep.getId());
+
+        DisposeRecord updateRecord = new DisposeRecord();
+        updateRecord.setState(1);
+        updateRecord.setEndTime(LocalDateTime.now());
+        updateRecord.setHandlerId(disposeRecord.getCreateUser());
+        updateRecord.setResult(uploadDisposingResultParam.getDescription());
+        baseMapper.update(updateRecord, updateWrapper);
+
+        QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>();
+        stepQurey.eq("name", disposeRecord.getStepName());
+        WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey);
+        if (workflowConfigStep == null) {
+            throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�");
+        }
+        //璁剧疆娴佺▼鐜妭鏁版嵁
+        disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
+        disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
+        return baseMapper.insert(disposeRecord) == 1 ? true : false;
     }
 }

--
Gitblit v1.8.0