From d5e62ae5585f5d479921439e9f1af462a783f740 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 13 十月 2022 18:04:08 +0800
Subject: [PATCH] 优化案件池流程。

---
 ycl-platform/src/main/java/com/ycl/mapper/task/TaskMapper.java                           |   16 ++
 ycl-platform/src/main/java/com/ycl/service/task/ITaskService.java                        |   17 ++
 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java    |    2 
 ycl-common/src/main/java/com/ycl/api/BasePageVO.java                                     |    4 
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java                      |    7 
 ycl-platform/src/main/resources/mapper/caseHandler/DispatchInfoMapper.xml                |   37 ++++
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java                     |   20 ++
 ycl-platform/src/main/java/com/ycl/mapper/caseHandler/DispatchInfoMapper.java            |    3 
 ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml                   |   20 ++
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java                 |    7 
 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java          |    2 
 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java |    2 
 ycl-platform/src/main/java/com/ycl/entity/task/Task.java                                 |  137 +++++++++++++++++
 ycl-platform/src/main/java/com/ycl/mapper/caseHandler/PartyInfoMapper.java               |    6 
 ycl-platform/src/main/java/com/ycl/service/task/impl/TaskServiceImpl.java                |   29 +++
 ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml                  |    4 
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java     |   15 +
 ycl-platform/src/main/java/com/ycl/controller/task/TaskController.java                   |   91 +++++++++++
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java                  |   24 ++
 19 files changed, 428 insertions(+), 15 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/api/BasePageVO.java b/ycl-common/src/main/java/com/ycl/api/BasePageVO.java
index 2001586..14a26fd 100644
--- a/ycl-common/src/main/java/com/ycl/api/BasePageVO.java
+++ b/ycl-common/src/main/java/com/ycl/api/BasePageVO.java
@@ -1,5 +1,6 @@
 package com.ycl.api;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,12 +15,13 @@
 
     @ApiModelProperty(value = "褰撳墠椤�",example = "1")
     @Min(value = 1, message = "鏈�灏忛〉鏁�1")
+    @TableField(value = "current",exist = false)
     private int current = 1;
 
     @ApiModelProperty(value = "鏉℃暟",example = "1")
     @Min(value = 1, message = "鏈�灏忔潯鏁�1")
     @Max(value = 100, message = "鏈�澶ф潯鏁�100")
+    @TableField(value = "page_size",exist = false)
     private int pageSize = 20;
-
 
 }
diff --git a/ycl-platform/src/main/java/com/ycl/controller/task/TaskController.java b/ycl-platform/src/main/java/com/ycl/controller/task/TaskController.java
new file mode 100644
index 0000000..bec02a8
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/task/TaskController.java
@@ -0,0 +1,91 @@
+package com.ycl.controller.task;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
+import com.ycl.common.util.UtilNumber;
+import com.ycl.entity.task.Task;
+import com.ycl.service.task.ITaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  浠诲姟绠$悊  鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("/task")
+@Api(tags = "浠诲姟绠$悊")
+public class TaskController {
+    @Autowired
+    private ITaskService iTaskService;
+
+
+    @ApiOperation(value = "鏂板浠诲姟")
+    @RequestMapping(value = "/addTask", method = RequestMethod.POST)
+    @ResponseBody
+    public CommonResult addColumn(@Validated @RequestBody Task task) {
+        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        //璁剧疆鍒涘缓浜�
+        task.setNumber(UtilNumber.getNumber("RW",0));
+        task.setCreateUser(user.getUserId());
+        task.setCreateTime(new Date());
+        task.setUpdateUser(user.getUserId());
+        task.setUpdateTime(new Date());
+        iTaskService.save(task);
+        return CommonResult.success(task);
+    }
+
+    @ApiOperation(value = "鑾峰彇浠诲姟鍒嗛〉鏌ヨ")
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    @ResponseBody
+    public CommonResult<IPage<Task>> list(@Validated @RequestBody Task task) {
+        return CommonResult.success(iTaskService.list(task));
+    }
+
+
+    @ApiOperation("鑾峰彇鎸囧畾浠诲姟")
+    @RequestMapping(value = "/getTask/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<Task> getTask(@PathVariable Long id) {
+        Task task = iTaskService.getById(id);
+        return CommonResult.success(task);
+    }
+
+    @ApiOperation("淇敼鎸囧畾浠诲姟")
+    @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+    @ResponseBody
+    public CommonResult update(@PathVariable Long id, @RequestBody Task task) {
+        task.setId(id);
+        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        //璁剧疆鍒涘缓浜�
+        task.setCreateUser(user.getUserId());
+        boolean success = iTaskService.updateById(task);
+        if (success) {
+            return CommonResult.success(null);
+        }
+        return CommonResult.failed();
+    }
+
+    @ApiOperation("鎵归噺鍒犻櫎浠诲姟")
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    @ResponseBody
+    public CommonResult delete(@RequestParam("ids") List<Long> ids) {
+        boolean success = iTaskService.removeBatchByIds(ids);
+        if (success) {
+            return CommonResult.success(null);
+        }
+        return CommonResult.failed();
+    }
+}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
index c607900..eb69ffa 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
@@ -204,6 +204,13 @@
     @ApiModelProperty(value = "杩濆缓浜嬩欢")
     private IllegalBuilding illegalBuilding;
 
+    /**
+     *  璋冨害淇℃伅
+     */
+    @TableField(value = "dispatchInfo",exist = false)
+    @ApiModelProperty(value = "璋冨害淇℃伅")
+    private DispatchInfo dispatchInfo;
+
 
 
 }
\ No newline at end of file
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 3fc0fc2..a4112cf 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
@@ -34,13 +34,12 @@
     @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     private Integer id;
-
     /**
-     * 澶勭疆娴佺▼璁板綍Id
+     * 妗堜欢id(鍚寀ms_base_case琛╥d)
      */
-    @TableField("dispose_record_id")
-    @ApiModelProperty(value = "澶勭疆娴佺▼璁板綍Id")
-    private Integer disposeRecordId;
+    @TableField("base_case_id")
+    @ApiModelProperty(value = "妗堜欢id(鍚寀ms_base_case琛╥d)")
+    private Long baseCaseId;
     /**
      * 鎵ф硶浜哄憳
      */
@@ -58,7 +57,7 @@
      */
     @TableField("enforcement_car")
     @ApiModelProperty(value = "鎵ф硶杞�")
-    private Integer enforcementCar;
+    private Long enforcementCar;
     /**
      * 鎵ф硶闃熶紞
      */
@@ -102,4 +101,17 @@
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     private Date createTime;
 
+    /**
+     * 娲鹃仯浜哄鍚�
+     */
+    @ApiModelProperty(value = "娲鹃仯浜哄鍚�")
+    @TableField(value = "create_user_text",exist = false)
+    private String createUserText;
+    /**
+     * 鎵ф硶杞�-杞︾墝鍙�
+     */
+    @TableField(value = "enforcement_car_text",exist = false)
+    @ApiModelProperty(value = "娉曡溅-杞︾墝鍙�")
+    private String enforcementCarText;
+
 }
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
index 0dee79f..115b436 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
@@ -110,5 +110,12 @@
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     private LocalDateTime createTime;
 
+    /**
+     *  褰撲簨浜轰俊鎭�
+     */
+    @TableField(value = "partyInfo",exist = false)
+    @ApiModelProperty(value = "褰撲簨浜轰俊鎭�")
+    private PartyInfo partyInfo;
+
 
 }
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java
index 5525609..4c15d61 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java
@@ -4,6 +4,7 @@
 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;
 
@@ -105,6 +106,23 @@
      */
     @TableField("create_time")
     private LocalDateTime createTime;
+    /**
+     * 璇佷欢绫诲瀷鏂囨湰
+     */
+    @TableField(value = "certificate_type_text",exist = false)
+    @ApiModelProperty(value = "璇佷欢绫诲瀷鏂囨湰")
+    private String certificateTypeText;
 
-
+    /**
+     * 鏂囧寲绋嬪害鏂囨湰
+     */
+    @TableField(value = "education_degree_text",exist = false)
+    @ApiModelProperty(value = "鏂囧寲绋嬪害鏂囨湰")
+    private String educationDegreeText;
+    /**
+     * 姘戞棌鏂囨湰
+     */
+    @ApiModelProperty(value = "姘戞棌鏂囨湰")
+    @TableField(value = "nation_text",exist = false)
+    private String nationText;
 }
diff --git a/ycl-platform/src/main/java/com/ycl/entity/task/Task.java b/ycl-platform/src/main/java/com/ycl/entity/task/Task.java
new file mode 100644
index 0000000..6666887
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/entity/task/Task.java
@@ -0,0 +1,137 @@
+package com.ycl.entity.task;
+
+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 com.ycl.api.BasePageVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *   浠诲姟瀹炰綋绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_task")
+@ApiModel(value = "浠诲姟琛�")
+public class Task extends BasePageVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 涓婚敭
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "涓婚敭")
+    private Long id;
+
+    /**
+     * 鏍囬
+     */
+    @TableField("title")
+    @ApiModelProperty(value = "鏍囬")
+    @NotBlank(message = "鏍囬涓虹┖")
+    private String title;
+
+
+    /**
+     *  浠诲姟缂栫爜
+     */
+    @TableField("number")
+    @ApiModelProperty(value = "浠诲姟缂栫爜")
+    private String number;
+
+    /**
+     * 绫诲瀷
+     */
+    @TableField("type")
+    @ApiModelProperty(value = "绫诲瀷")
+    private Integer type;
+
+    /**
+     * 绾у埆
+     */
+    @TableField("level")
+    @ApiModelProperty(value = "绾у埆")
+    private Integer level;
+
+    /**
+     * 琛楅亾
+     */
+    @TableField("street_id")
+    @ApiModelProperty(value = "琛楅亾")
+    private Integer streetId;
+
+    /**
+     * 绀惧尯
+     */
+    @TableField("community_id")
+    @ApiModelProperty(value = "绀惧尯")
+    private Integer communityId;
+
+    /**
+     * 寮�濮嬫椂闂�
+     */
+    @TableField("start_time")
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    private Date startTime;
+
+    /**
+     * 缁撴潫鏃堕棿
+     */
+    @TableField("end_time")
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    private Date endTime;
+    /**
+     *  浠诲姟鎻忚堪
+     */
+    @TableField("description")
+    @ApiModelProperty(value = "浠诲姟鎻忚堪")
+    private String description;
+
+    /**
+     * 鐘舵��0-鏈彂甯�1-宸插彂甯�
+     */
+    @TableField("status")
+    @ApiModelProperty(value = "鐘舵��0-鏈彂甯�1-宸插彂甯�")
+    private Integer status;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    @TableField("create_user")
+    @ApiModelProperty(value = "鍒涘缓浜�")
+    private Long createUser;
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @TableField("create_time")
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    private Date createTime;
+    /**
+     * 鏇存柊浜�
+     */
+    @TableField("update_user")
+    @ApiModelProperty(value = "鍒涘缓浜�")
+    private Long updateUser;
+    /**
+     * 鏇存柊鏃堕棿
+     */
+    @TableField("update_time")
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
+    private Date updateTime;
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/DispatchInfoMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/DispatchInfoMapper.java
index b2d91e7..b833ccb 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/DispatchInfoMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/DispatchInfoMapper.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ycl.entity.caseHandler.DispatchInfo;
 
+import java.util.Map;
+
 /**
  * <p>
  *  璋冨害淇℃伅 Mapper 鎺ュ彛
@@ -12,4 +14,5 @@
  * @since 2022-09-28
  */
 public interface DispatchInfoMapper extends BaseMapper<DispatchInfo> {
+    DispatchInfo selectCondMap(Map map);
 }
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/PartyInfoMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/PartyInfoMapper.java
index 835a069..a107dd9 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/PartyInfoMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/PartyInfoMapper.java
@@ -1,7 +1,9 @@
 package com.ycl.mapper.caseHandler;
 
-import com.ycl.entity.caseHandler.PartyInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.caseHandler.PartyInfo;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +14,5 @@
  * @since 2022-09-24
  */
 public interface PartyInfoMapper extends BaseMapper<PartyInfo> {
-
+    PartyInfo selectCondMap(Map map);
 }
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/task/TaskMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/task/TaskMapper.java
new file mode 100644
index 0000000..532f895
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/task/TaskMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.mapper.task;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.task.Task;
+
+/**
+ * <p>
+ *  浠诲姟绠$悊琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-13
+ */
+
+public interface TaskMapper extends BaseMapper<Task> {
+}
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 f4069a2..2967722 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
@@ -96,6 +96,10 @@
     WorkflowConfigMapper workflowConfigMapper;
     @Resource
     ImageResourcesMapper imageResourcesMapper;
+    @Resource
+    DispatchInfoMapper dispatchInfoMapper;
+    @Resource
+    PartyInfoMapper partyInfoMapper;
 
 
     @Override
@@ -251,6 +255,11 @@
             IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
             baseCase.setIllegalBuilding(illegalBuilding);
         }
+        //鑾峰彇璋冨害淇℃伅
+        Map mapD = new HashMap();
+        mapD.put("baseCaseId",baseCase.getId());
+        DispatchInfo dispatchInfo = dispatchInfoMapper.selectCondMap(mapD);
+        baseCase.setDispatchInfo(dispatchInfo);
         bcd.setBaseCase(baseCase);
         //妗堜欢鐩稿叧淇℃伅
         //2.鏌ヨ鍔炵悊缁忚繃淇℃伅
@@ -318,6 +327,12 @@
         QueryWrapper<Investigation> wrapperI = new QueryWrapper<>();
         wrapperI.lambda().eq(Investigation::getBaseCaseId, baseCase.getId());
         Investigation investigation = investigationMapper.selectOne(wrapperI);
+        //鑾峰彇褰撲簨浜轰俊鎭�
+        Map mapP = new HashMap();
+        mapP.put("id", investigation.getPartyId());
+        PartyInfo partyInfo = partyInfoMapper.selectCondMap(mapP);
+        //濉厖褰撲簨浜�
+        investigation.setPartyInfo(partyInfo);
         currentSitVo.setInvestigation(investigation);
         //璁剧疆鍛婄煡杩濇硶
         QueryWrapper<Writ> wrapperW = new QueryWrapper<>();
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
similarity index 89%
rename from ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java
rename to ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
index 5d8cadb..d714f8a 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
@@ -19,7 +19,7 @@
  * @since 2022-10-10
  */
 @Service
-public class IMessageColumnServiceImpl extends ServiceImpl<MessageColumnMapper, MessageColumn> implements IMessageColumnService {
+public class MessageColumnServiceImpl extends ServiceImpl<MessageColumnMapper, MessageColumn> implements IMessageColumnService {
     @Override
     public IPage<MessageColumn> list(MessageColumnParam messageColumnParam) {
         Page<MessageColumn> page = new Page<>(messageColumnParam.getCurrent(), messageColumnParam.getPageSize());
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnSetServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java
similarity index 75%
rename from ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnSetServiceImpl.java
rename to ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java
index c9a120c..be23e71 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnSetServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java
@@ -15,6 +15,6 @@
  * @since 2022-10-10
  */
 @Service
-public class IMessageColumnSetServiceImpl extends ServiceImpl<MessageColumnSetMapper, MessageColumnSet> implements IMessageColumnSetService {
+public class MessageColumnSetServiceImpl extends ServiceImpl<MessageColumnSetMapper, MessageColumnSet> implements IMessageColumnSetService {
 
 }
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
similarity index 96%
rename from ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
rename to ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index 77a4d29..619cac2 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -27,7 +27,7 @@
  * @since 2022-10-08
  */
 @Service
-public class IMessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
+public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
 
     @Autowired
     private UmsAdminService adminService;
diff --git a/ycl-platform/src/main/java/com/ycl/service/task/ITaskService.java b/ycl-platform/src/main/java/com/ycl/service/task/ITaskService.java
new file mode 100644
index 0000000..4222461
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/task/ITaskService.java
@@ -0,0 +1,17 @@
+package com.ycl.service.task;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.task.Task;
+
+/**
+ * <p>
+ *  浠诲姟绠$悊鏈嶅姟绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-13
+ */
+public interface ITaskService extends IService<Task> {
+    IPage<Task> list(Task task);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/task/impl/TaskServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/task/impl/TaskServiceImpl.java
new file mode 100644
index 0000000..85da530
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/task/impl/TaskServiceImpl.java
@@ -0,0 +1,29 @@
+package com.ycl.service.task.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.task.Task;
+import com.ycl.mapper.task.TaskMapper;
+import com.ycl.service.task.ITaskService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  浠诲姟绠$悊 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-13
+ */
+@Service
+public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements ITaskService {
+    @Override
+    public IPage<Task> list(Task task) {
+        Page<Task> page = new Page<>(task.getCurrent(), task.getPageSize());
+        LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<>();
+        Page<Task> result = baseMapper.selectPage(page, queryWrapper);
+        return result;
+    }
+}
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/DispatchInfoMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/DispatchInfoMapper.xml
new file mode 100644
index 0000000..4344a8e
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/DispatchInfoMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.mapper.caseHandler.DispatchInfoMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.DispatchInfo">
+        <id column="id" property="id"/>
+        <result column="base_case_id" property="baseCaseId"/>
+        <result column="law_enforcer" property="lawEnforcer"/>
+        <result column="law_enforcer_name" property="lawEnforcerName"/>
+        <result column="enforcement_car" property="enforcementCar"/>
+        <result column="enforcement_team" property="enforcementTeam"/>
+        <result column="contact_way" property="contactWay"/>
+        <result column="distance" property="distance"/>
+        <result column="dispose_date" property="disposeDate"/>
+        <result column="dispatch_opinion" property="dispatchOpinion"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+    </resultMap>
+    <resultMap type="com.ycl.entity.caseHandler.DispatchInfo" id="CondMapResultMap" extends="BaseResultMap">
+            <result column="create_user_text" property="createUserText" />
+            <result column="enforcement_car_text" property="enforcementCarText" />
+    </resultMap>
+    <select id="selectCondMap" parameterType="map" resultMap="CondMapResultMap">
+        SELECT
+            udi.*,
+            ua.username create_user_text,
+            uce.car_number enforcement_car_text
+        FROM
+            ums_dispatch_info udi
+                LEFT JOIN ums_admin ua on udi.create_user = ua.id
+                LEFT JOIN ums_car_enforcecar uce on udi.enforcement_car = uce.id
+        WHERE
+            udi.`base_case_id` = #{baseCaseId}
+    </select>
+
+</mapper>
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml
index 5b2c634..ad8472e 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml
@@ -19,10 +19,30 @@
         <result column="create_user" property="createUser" />
         <result column="create_time" property="createTime" />
     </resultMap>
+    <resultMap type="com.ycl.entity.caseHandler.PartyInfo" id="CondMapResultMap" extends="BaseResultMap">
+        <result column="certificate_type_text" property="certificateTypeText" />
+        <result column="education_degree_text" property="educationDegreeText" />
+        <result column="nation_text" property="nationText" />
+    </resultMap>
 
     <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
     <sql id="Base_Column_List">
         id, name, phone_code, certificate_type, certificate_code, education_degree, career, work, nation, native_place, live_address, register_address, create_user, create_time
     </sql>
 
+    <select id="selectCondMap" parameterType="map" resultMap="CondMapResultMap">
+        SELECT
+            upi.*,
+            udd.name certificate_type_text,
+            udd2.name education_degree_text,
+            udd3.name nation_text
+        FROM
+            ums_party_info upi
+                LEFT JOIN ums_data_dictionary udd on upi.certificate_type = udd.id and udd.type_code = '03'
+                LEFT JOIN ums_data_dictionary udd2 on upi.education_degree = udd2.id and udd2.type_code = '04'
+                LEFT JOIN ums_data_dictionary udd3 on upi.nation = udd3.id and udd3.type_code = '05'
+        WHERE
+            upi.`id` = #{id}
+    </select>
+
 </mapper>
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
index d4bc27c..bc3d42d 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
@@ -35,8 +35,8 @@
         FROM
             ums_violations uv
                 LEFT JOIN ums_data_dictionary udd on uv.category_id = udd.id and udd.type_code = '01'
-                LEFT JOIN ums_data_dictionary udd2 on uv.type_id = udd2.id and udd.type_code = '01'
-                LEFT JOIN ums_data_dictionary udd3 on uv.grade_id = udd3.id and udd.type_code = '01'
+                LEFT JOIN ums_data_dictionary udd2 on uv.type_id = udd2.id and udd2.type_code = '01'
+                LEFT JOIN ums_data_dictionary udd3 on uv.grade_id = udd3.id and udd3.type_code = '02'
         WHERE
             uv.`id` =  #{id}
     </select>

--
Gitblit v1.8.0