From daef4a9154b67c2b6c4c684d1c36d1182b6da471 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期日, 02 十月 2022 09:35:20 +0800
Subject: [PATCH] 添加角色批量启用/禁用,案件详情接口文档功能。
---
ycl-platform/src/main/java/com/ycl/vo/casePool/ProblemProVo.java | 4
ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java | 13 +
ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java | 6
ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java | 4
ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java | 30 +++
ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java | 22 ++
ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java | 25 ++
ycl-platform/src/main/java/com/ycl/vo/casePool/CurrentSitVo.java | 8
ycl-platform/src/main/java/com/ycl/vo/casePool/HandlePassVo.java | 4
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 5
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java | 14 +
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java | 47 +++++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java | 35 ++++
ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java | 38 ++++
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java | 26 +-
ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java | 14 +
ycl-common/src/main/java/com/ycl/controller/user/UmsRoleController.java | 16 ++
ycl-platform/src/main/java/com/ycl/service/caseHandler/ICheckHandleService.java | 15 +
ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java | 33 +++
ycl-platform/src/main/java/com/ycl/constant/BaseCaseStatus.java | 21 ++
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java | 17 ++
ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java | 2
ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java | 33 ++--
ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java | 12
ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfig.java | 14 +
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java | 2
26 files changed, 383 insertions(+), 77 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 3137839..251a7df 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -223,7 +223,7 @@
return CommonResult.failed();
}
- @ApiOperation("鎵归噺淇敼鐘舵��")
+ @ApiOperation("鎵归噺淇敼鐢ㄦ埛鐘舵��")
@RequestMapping(value = "/updateStatusBatch", method = RequestMethod.POST)
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids",required = true, dataType = "Array"),
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsRoleController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsRoleController.java
index 72e1abf..24f678a 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsRoleController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsRoleController.java
@@ -8,6 +8,8 @@
import com.ycl.entity.user.UmsRole;
import com.ycl.service.user.UmsRoleService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -123,5 +125,19 @@
int count = roleService.allocResource(roleId, resourceIds);
return CommonResult.success(count);
}
+ @ApiOperation("鎵归噺淇敼瑙掕壊鐘舵��")
+ @RequestMapping(value = "/updateStatusBatch", method = RequestMethod.POST)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids",required = true, dataType = "Array"),
+ @ApiImplicitParam(name = "status", value = "鐘舵��0->绂佺敤锛�1->鍚敤",required = true, dataType = "Integer")
+ })
+ @ResponseBody
+ public CommonResult updateStatusBatch(@RequestParam("ids") List<Long> ids, @RequestParam(value = "status") Integer status) {
+ boolean success = roleService.updateStatusBatch(ids, status);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
}
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
index 49cbd8f..c572cd8 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
@@ -5,8 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
import java.io.Serializable;
import java.util.Date;
@@ -23,6 +22,9 @@
@EqualsAndHashCode(callSuper = false)
@TableName("ums_role")
@ApiModel(value="UmsRole瀵硅薄", description="鍚庡彴鐢ㄦ埛瑙掕壊琛�")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
public class UmsRole implements Serializable {
private static final long serialVersionUID=1L;
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
index 7057986..685f7f3 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
@@ -55,4 +55,6 @@
*/
@Transactional
int allocResource(Long roleId, List<Long> resourceIds);
+
+ Boolean updateStatusBatch(List<Long> ids, Integer status);
}
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
index 9bfaf58..2dae3bd 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
@@ -114,4 +114,17 @@
adminCacheService.delResourceListByRole(roleId);
return resourceIds.size();
}
+
+ @Override
+ public Boolean updateStatusBatch(List<Long> ids, Integer status) {
+ List<UmsRole> roles = new ArrayList<>();
+ for (Long id : ids) {
+ UmsRole umsRole = UmsRole.builder().
+ id(id).status(status).build();
+ roles.add(umsRole);
+ }
+ updateBatchById(roles,roles.size());
+ adminCacheService.delResourceListByRoleIds(ids);
+ return true;
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/constant/BaseCaseStatus.java b/ycl-platform/src/main/java/com/ycl/constant/BaseCaseStatus.java
new file mode 100644
index 0000000..d84014b
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/constant/BaseCaseStatus.java
@@ -0,0 +1,21 @@
+package com.ycl.constant;
+
+/**
+ * <p>
+ * 妗堜欢鐘舵�佺被
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-02
+ */
+public class BaseCaseStatus {
+ /**
+ * 璋冨害
+ */
+ public static final Integer DISPATCH = 3;
+ /**
+ * 瀹℃牳
+ */
+ public static final Integer CHECK = 5;
+
+}
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 6b74abf..007f825 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
@@ -10,6 +10,7 @@
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.BaseCase;
+import com.ycl.entity.caseHandler.BaseCaseDetail;
import com.ycl.entity.caseHandler.DisposeRecord;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IDisposeRecordService;
@@ -38,7 +39,7 @@
* @since 2022-09-24
*/
@RestController
-@RequestMapping("/base_case")
+@RequestMapping("/base-case")
@Api(tags = "妗堜欢姹�")
public class BaseCaseController extends BaseController {
@@ -202,7 +203,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "code", value = "浜嬩欢缂栧彿")
})
- public CommonResult baseCaseDetail(@PathVariable(value = "code") String code) {
+ public CommonResult<BaseCaseDetail> baseCaseDetail(@PathVariable(value = "code") String code) {
return CommonResult.success(baseCaseService.baseCaseDetail(code));
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java
new file mode 100644
index 0000000..26a9ea0
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java
@@ -0,0 +1,35 @@
+package com.ycl.controller.caseHandler;
+
+import com.ycl.api.CommonResult;
+import com.ycl.dto.caseHandler.ChechParam;
+import com.ycl.service.caseHandler.ICheckHandleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 瀹℃牳澶勭悊 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-02
+ */
+@RestController
+@RequestMapping("/check_handle")
+@Api(tags = "瀹℃牳澶勭悊")
+public class CheckHandleController {
+
+
+ @Autowired
+ ICheckHandleService iCheckHandleService;
+
+ @ApiOperation(value = "瀹℃牳")
+ @RequestMapping(value = "/check", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult check(@Validated @RequestBody ChechParam chechParam) {
+ return CommonResult.success(iCheckHandleService.chech(chechParam));
+ }
+}
diff --git a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java
new file mode 100644
index 0000000..5964743
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java
@@ -0,0 +1,38 @@
+package com.ycl.dto.caseHandler;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 瀹℃牳鍙傛暟绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-02
+ */
+@Data
+@ApiModel("ChechParam")
+public class ChechParam {
+ /**
+ * 妗堜欢id
+ */
+ @ApiModelProperty(value = "妗堜欢id")
+ private Integer baseCaseId;
+ /**
+ * 褰撳墠澶勭悊浜�
+ */
+ @ApiModelProperty(value = "褰撳墠澶勭悊浜�")
+ private Integer currentUser;
+ /**
+ * 瀹℃牳鐘舵��
+ */
+ @ApiModelProperty(value = "瀹℃牳鐘舵��")
+ private Integer status;
+ /**
+ * 瀹℃牳鎰忚
+ */
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String checkOpinion;
+}
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 ffb38b1..33a7709 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,6 @@
package com.ycl.dto.caseHandler;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,54 +12,53 @@
* @date: 2022-09-28 13:55
**/
@Data
+@ApiModel("DispatchInfoParam")
public class DispatchInfoParam {
+
+ /**
+ * 妗堜欢id
+ */
+ @ApiModelProperty(value = "妗堜欢id")
+ private Integer baseCaseId;
/**
* 鎵ф硶浜哄憳
*/
- @JsonProperty("lawEnforcer")
- @ApiModelProperty(value = "鎵ф硶浜哄憳",dataType = "Integer")
+ @ApiModelProperty(value = "鎵ф硶浜哄憳")
private Integer lawEnforcer;
/**
* 鎵ф硶浜哄憳濮撳悕
*/
- @JsonProperty("lawEnforcerName")
- @ApiModelProperty(value = "鎵ф硶浜哄憳濮撳悕",dataType = "String")
+ @ApiModelProperty(value = "鎵ф硶浜哄憳濮撳悕")
private String lawEnforcerName;
/**
* 鎵ф硶杞�
*/
- @JsonProperty("enforcementCar")
- @ApiModelProperty(value = "鎵ф硶杞�",dataType = "Integer")
+ @ApiModelProperty(value = "鎵ф硶杞�")
private Integer enforcementCar;
/**
* 鎵ф硶闃熶紞
*/
- @JsonProperty("enforcementTeam")
- @ApiModelProperty(value = "鎵ф硶闃熶紞",dataType = "String")
+ @ApiModelProperty(value = "鎵ф硶闃熶紞")
private String enforcementTeam;
/**
* 鑱旂郴鏂瑰紡
*/
- @JsonProperty("contactWay")
- @ApiModelProperty(value = "鑱旂郴鏂瑰紡",dataType = "String")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
private String contactWay;
/**
* 璺濈
*/
- @JsonProperty("distance")
- @ApiModelProperty(value = "璺濈",dataType = "Integer")
+ @ApiModelProperty(value = "璺濈")
private Integer distance;
/**
* 澶勭疆鏃ユ湡
*/
- @JsonProperty("disposeDate")
- @ApiModelProperty(value = "澶勭疆鏃ユ湡",dataType = "String")
+ @ApiModelProperty(value = "澶勭疆鏃ユ湡")
private String disposeDate;
/**
* 娲鹃仯鎰忚
*/
- @JsonProperty("dispatchOpinion")
- @ApiModelProperty(value = "娲鹃仯鎰忚",dataType = "String")
+ @ApiModelProperty(value = "娲鹃仯鎰忚")
private String dispatchOpinion;
}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
index 703c611..a764ed5 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
@@ -1,14 +1,16 @@
package com.ycl.entity.caseHandler;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -21,59 +23,69 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_arrival_situation")
+@ApiModel(value = "鍒拌揪鐜板満鎯呭喌")
public class ArrivalSituation implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "id")
private Integer id;
/**
* 妗堜欢id
*/
@TableField("base_case_id")
+ @ApiModelProperty(value = "妗堜欢id")
private Integer baseCaseId;
/**
* 鍒拌揪鏃堕棿
*/
@TableField("arrival_time")
+ @ApiModelProperty(value = "鍒拌揪鏃堕棿")
private LocalDateTime arrivalTime;
/**
* 鍒拌揪鍦板潃
*/
@TableField("arrival_address")
+ @ApiModelProperty(value = "鍒拌揪鍦板潃")
private String arrivalAddress;
/**
* 鐜板満鎯呭喌璇存槑
*/
@TableField("situation_explain")
+ @ApiModelProperty(value = "鐜板満鎯呭喌璇存槑")
private String situationExplain;
/**
* 淇¤鍥炲璇存槑
*/
@TableField("reply_explain")
+ @ApiModelProperty(value = "淇¤鍥炲璇存槑")
private String replyExplain;
/**
* 鐜板満鎯呭喌鐓х墖
*/
@TableField("situation_pic")
+ @ApiModelProperty(value = "鐜板満鎯呭喌鐓х墖")
private String situationPic;
/**
* 鍒涘缓浜�
*/
@TableField("create_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
private Integer createUser;
/**
* 鍒涘缓鏃堕棿
*/
@TableField("create_time")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
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 206eee6..356f2a9 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
@@ -1,14 +1,15 @@
package com.ycl.entity.caseHandler;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -24,6 +25,7 @@
@Builder
@AllArgsConstructor
@NoArgsConstructor
+@ApiModel(value = "妗堜欢鍩烘湰淇℃伅")
public class BaseCase implements Serializable {
private static final long serialVersionUID = 1L;
@@ -32,113 +34,132 @@
* id
*/
@TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "id")
private Integer id;
/**
* 浜嬩欢缂栧彿
*/
@TableField("code")
+ @ApiModelProperty(value = "浜嬩欢缂栧彿")
private String code;
/**
* 浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)
*/
@TableField("event_source")
+ @ApiModelProperty(value = "浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)")
private Integer eventSource;
/**
* 闂绫诲埆锛�1-杩濊 2-杩濆缓锛�
*/
@TableField("category")
+ @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓锛�")
private Integer category;
/**
* 鎵�灞炶閬�
*/
@TableField("street_id")
+ @ApiModelProperty(value = "鎵�灞炶閬�")
private Integer streetId;
/**
* 鎵�灞炵ぞ鍖�
*/
@TableField("community_id")
+ @ApiModelProperty(value = "鎵�灞炵ぞ鍖�")
private Integer communityId;
/**
* 鎶ヨ鐐逛綅 浜嬪彂鍦扮偣
*/
@TableField("site")
+ @ApiModelProperty(value = "鎶ヨ鐐逛綅 浜嬪彂鍦扮偣")
private String site;
/**
* 瀹氫綅淇℃伅
*/
@TableField("longitude")
+ @ApiModelProperty(value = "瀹氫綅淇℃伅")
private Double longitude;
/**
* 瀹氫綅-绾害
*/
@TableField("latitude")
+ @ApiModelProperty(value = "瀹氫綅-绾害")
private Double latitude;
/**
* 鎶ヨ鏃堕棿
*/
@TableField("alarm_time")
+ @ApiModelProperty(value = "鎶ヨ鏃堕棿")
private LocalDateTime alarmTime;
/**
* 鐧昏浜�
*/
@TableField("create_user")
+ @ApiModelProperty(value = "鐧昏浜�")
private Integer createUser;
/**
* 澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴)
*/
@TableField("state")
+ @ApiModelProperty(value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴)")
private Integer state;
/**
* 澶勭悊鎰忚
*/
@TableField("handling_opinion")
+ @ApiModelProperty(value = "澶勭悊鎰忚")
private String handlingOpinion;
/**
* 澶囨敞
*/
@TableField("remark")
+ @ApiModelProperty(value = "澶囨敞")
private String remark;
/**
* 瀹℃牳鎰忚
*/
@TableField("audit_opinion")
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
private String auditOpinion;
/**
* 缁撴鎰忚
*/
@TableField("final_opinion")
+ @ApiModelProperty(value = "缁撴鎰忚")
private String finalOpinion;
/**
* 鍒涘缓鏃堕棿
*/
@TableField("create_time")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
/**
* 甯傚钩鍙扮紪鐮�
*/
@TableField("task_code")
+ @ApiModelProperty(value = "甯傚钩鍙扮紪鐮�")
private String taskCode;
/**
* 缁撴潫鏃堕棿
*/
@TableField("close_time")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
private LocalDateTime closeTime;
}
\ No newline at end of file
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
index 1d099f2..22f8277 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java
@@ -4,6 +4,7 @@
import com.ycl.vo.casePool.FilesPictureVo;
import com.ycl.vo.casePool.HandlePassVo;
import com.ycl.vo.casePool.ProblemProVo;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,33 +19,34 @@
* @since 2022-09-29
*/
@Data
+@ApiModel(value = "妗堜欢璇︽儏")
public class BaseCaseDetail implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 妗堜欢鍩烘湰淇℃伅
*/
- @ApiModelProperty(value = "妗堜欢鍩烘湰淇℃伅",dataType = "Object")
+ @ApiModelProperty(value = "妗堜欢鍩烘湰淇℃伅")
private BaseCase baseCase;
/**
* 鍔炵悊缁忚繃
*/
- @ApiModelProperty(value = "鍔炵悊缁忚繃",dataType = "Object")
+ @ApiModelProperty(value = "鍔炵悊缁忚繃")
private HandlePassVo handlePassVo;
/**
* 妗堝嵎鍥剧墖
*/
- @ApiModelProperty(value = "妗堝嵎鍥剧墖",dataType = "Object")
+ @ApiModelProperty(value = "妗堝嵎鍥剧墖")
private FilesPictureVo filesPictureVo;
/**
* 闂澶勭悊
*/
- @ApiModelProperty(value = "闂澶勭悊",dataType = "Object")
+ @ApiModelProperty(value = "闂澶勭悊")
private ProblemProVo problemProVo;
/**
* 鐜板満澶勭悊
*/
- @ApiModelProperty(value = "鐜板満澶勭悊",dataType = "Object")
+ @ApiModelProperty(value = "鐜板満澶勭悊")
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 82a709e..eca2dbf 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,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.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -22,6 +23,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_dispatch_info")
+@ApiModel(value = "璋冨害淇℃伅")
public class DispatchInfo implements Serializable {
private static final long serialVersionUID = 1L;
@@ -30,74 +32,74 @@
* id
*/
@TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value = "id",dataType = "Integer")
+ @ApiModelProperty(value = "id")
private Integer id;
/**
* 澶勭疆娴佺▼璁板綍Id
*/
@TableField("dispose_record_id")
- @ApiModelProperty(value = "澶勭疆娴佺▼璁板綍Id",dataType = "Integer")
+ @ApiModelProperty(value = "澶勭疆娴佺▼璁板綍Id")
private Integer disposeRecordId;
/**
* 鎵ф硶浜哄憳
*/
@TableField("law_enforcer")
- @ApiModelProperty(value = "鎵ф硶浜哄憳",dataType = "Integer")
+ @ApiModelProperty(value = "鎵ф硶浜哄憳")
private Integer lawEnforcer;
/**
* 鎵ф硶浜哄憳濮撳悕
*/
@TableField("law_enforcer_name")
- @ApiModelProperty(value = "鎵ф硶浜哄憳濮撳悕",dataType = "String")
+ @ApiModelProperty(value = "鎵ф硶浜哄憳濮撳悕")
private String lawEnforcerName;
/**
* 鎵ф硶杞�
*/
@TableField("enforcement_car")
- @ApiModelProperty(value = "鎵ф硶杞�",dataType = "Integer")
+ @ApiModelProperty(value = "鎵ф硶杞�")
private Integer enforcementCar;
/**
* 鎵ф硶闃熶紞
*/
@TableField("enforcement_team")
- @ApiModelProperty(value = "鎵ф硶闃熶紞",dataType = "String")
+ @ApiModelProperty(value = "鎵ф硶闃熶紞")
private String enforcementTeam;
/**
* 鑱旂郴鏂瑰紡
*/
@TableField("contact_way")
- @ApiModelProperty(value = "鑱旂郴鏂瑰紡",dataType = "String")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
private String contactWay;
/**
* 璺濈
*/
@TableField("distance")
- @ApiModelProperty(value = "璺濈",dataType = "Integer")
+ @ApiModelProperty(value = "璺濈")
private Integer distance;
/**
* 澶勭疆鏃ユ湡
*/
@TableField("dispose_date")
- @ApiModelProperty(value = "澶勭疆鏃ユ湡",dataType = "Date")
+ @ApiModelProperty(value = "澶勭疆鏃ユ湡")
private Date disposeDate;
/**
* 娲鹃仯鎰忚
*/
@TableField("dispatch_opinion")
- @ApiModelProperty(value = "娲鹃仯鎰忚",dataType = "String")
+ @ApiModelProperty(value = "娲鹃仯鎰忚")
private String dispatchOpinion;
/**
* 鍒涘缓浜�
*/
@TableField("create_user")
- @ApiModelProperty(value = "鍒涘缓浜�",dataType = "Integer")
+ @ApiModelProperty(value = "鍒涘缓浜�")
private Integer createUser;
/**
* 鍒涘缓鏃堕棿
*/
@TableField("create_time")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿",dataType = "Date")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
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 b0cae77..205d9ef 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
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,6 +23,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_dispose_record")
+@ApiModel(value = "澶勭疆娴佺▼璁板綍")
public class DisposeRecord implements Serializable {
private static final long serialVersionUID = 1L;
@@ -32,60 +35,70 @@
* 妗堜欢id
*/
@TableField("base_case_id")
+ @ApiModelProperty(value = "妗堜欢id")
private Integer baseCaseId;
/**
- * 妗堜欢id
+ * 澶勭疆娴佺▼鐜妭閰嶇疆Id
*/
@TableField("workflow_config_step_id")
+ @ApiModelProperty(value = "澶勭疆娴佺▼鐜妭閰嶇疆Id")
private Integer workflowConfigStepId;
/**
* 鐜妭鍚嶇О
*/
@TableField("step_name")
+ @ApiModelProperty(value = "鐜妭鍚嶇О")
private String stepName;
/**
* 寮�濮嬫椂闂�
*/
@TableField("start_time")
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
private LocalDateTime startTime;
/**
* 澶勭悊浜鸿鑹瞚d
*/
@TableField("handler_role_id")
+ @ApiModelProperty(value = "澶勭悊浜鸿鑹瞚d")
private Integer handlerRoleId;
/**
* 缁撴潫鏃堕棿
*/
@TableField("end_time")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
private LocalDateTime endTime;
/**
* 鐜妭鐘舵��
*/
@TableField("state")
+ @ApiModelProperty(value = "鐜妭鐘舵��")
private Integer state;
/**
* 瀹為檯澶勭悊浜�
*/
@TableField("handler_id")
+ @ApiModelProperty(value = "瀹為檯澶勭悊浜�")
private Integer handlerId;
/**
* 鍒涘缓浜�
*/
@TableField("create_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
private Integer createUser;
/**
* 鍒涘缓鏃堕棿
*/
@TableField("create_time")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
@@ -93,12 +106,14 @@
* 缁撴灉
*/
@TableField("result")
+ @ApiModelProperty(value = "缁撴灉")
private String result;
/**
* 闄愬埗鏃堕檺
*/
@TableField("limit_time")
+ @ApiModelProperty(value = "闄愬埗鏃堕檺")
private LocalDateTime limitTime;
}
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 7fae826..65faeff 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
@@ -1,14 +1,16 @@
package com.ycl.entity.caseHandler;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -21,77 +23,90 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_investigation")
+@ApiModel(value = "璋冩煡鍙栬瘉")
public class Investigation implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "id")
private Integer id;
/**
* 妗堜欢id
*/
@TableField("base_case_id")
+ @ApiModelProperty(value = "妗堜欢id")
private Integer baseCaseId;
/**
* 鎵垮姙闃熷憳
*/
@TableField("undertaker")
+ @ApiModelProperty(value = "鎵垮姙闃熷憳")
private String undertaker;
/**
* 鍗忓姙闃熷憳
*/
@TableField("assistant")
+ @ApiModelProperty(value = "鍗忓姙闃熷憳")
private String assistant;
/**
* 鏃堕棿
*/
@TableField("investigation_time")
+ @ApiModelProperty(value = "鏃堕棿")
private LocalDateTime investigationTime;
/**
* 鍦板潃
*/
@TableField("address")
+ @ApiModelProperty(value = "鍦板潃")
private String address;
/**
* 妗堢敱
*/
@TableField("case_action")
+ @ApiModelProperty(value = "妗堢敱")
private String caseAction;
/**
* 褰撲簨浜篿d
*/
@TableField("party_id")
+ @ApiModelProperty(value = "褰撲簨浜篿d")
private Integer partyId;
/**
* 鎯呭喌鎻忚堪
*/
@TableField("description")
+ @ApiModelProperty(value = "鎯呭喌鎻忚堪")
private String description;
/**
* 鐓х墖
*/
@TableField("pic")
+ @ApiModelProperty(value = "鐓х墖")
private String pic;
/**
* 鍒涘缓浜�
*/
@TableField("create_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
private Integer createUser;
/**
* 鍒涘缓鏃堕棿
*/
@TableField("create_time")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfig.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfig.java
index 398fa64..3cbfb86 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfig.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfig.java
@@ -1,13 +1,15 @@
package com.ycl.entity.caseHandler;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
/**
* <p>
@@ -20,6 +22,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_workflow_config")
+@ApiModel(value = "澶勭疆娴佺▼閰嶇疆琛�")
public class WorkflowConfig implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,18 +31,21 @@
* id
*/
@TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "id")
private Integer id;
/**
* 鍚嶇О
*/
@TableField("name")
+ @ApiModelProperty(value = "鍚嶇О")
private String name;
/**
* 缂栫爜
*/
@TableField("code")
+ @ApiModelProperty(value = "缂栫爜")
private String code;
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
index da3fdf5..30ab61a 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.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.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,6 +22,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_workflow_config_step")
+@ApiModel(value = "澶勭疆娴佺▼鐜妭閰嶇疆")
public class WorkflowConfigStep implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,38 +30,38 @@
* id
*/
@TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value = "id",dataType = "Integer")
+ @ApiModelProperty(value = "id")
private Integer id;
/**
* 澶勭疆娴佺▼閰嶇疆id
*/
@TableField(value = "workflow_config_id")
- @ApiModelProperty(value = "澶勭疆娴佺▼閰嶇疆id",dataType = "Integer")
+ @ApiModelProperty(value = "澶勭疆娴佺▼閰嶇疆id")
private Integer workflowConfigId ;
/**
* 鐜妭鍚嶇О
*/
@TableField("name")
- @ApiModelProperty(value = "鐜妭鍚嶇О",dataType = "String")
+ @ApiModelProperty(value = "鐜妭鍚嶇О")
private String name;
/**
* 瀵瑰簲瑙掕壊id
*/
@TableField(value = "role_id")
- @ApiModelProperty(value = "瀵瑰簲瑙掕壊id",dataType = "Integer")
+ @ApiModelProperty(value = "瀵瑰簲瑙掕壊id")
private Integer roleId ;
/**
* 搴忓彿
*/
@TableField(value = "seq")
- @ApiModelProperty(value = "搴忓彿",dataType = "Integer")
+ @ApiModelProperty(value = "搴忓彿")
private Integer seq ;
/**
* 澶勭疆娴佺▼璁板綍
*/
@TableField(value = "disposeRecord",exist = false)
- @ApiModelProperty(value = "澶勭疆娴佺▼璁板綍",dataType = "DisposeRecord")
+ @ApiModelProperty(value = "澶勭疆娴佺▼璁板綍")
private DisposeRecord disposeRecord;
}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java
index 08c0d6b..eb8645c 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java
@@ -1,13 +1,15 @@
package com.ycl.entity.caseHandler;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -20,6 +22,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_writ")
+@ApiModel(value = "鏂囦功绉嶇被")
public class Writ implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,102 +31,119 @@
* 妗堜欢id(鍚寀ms_base_case琛╥d)
*/
@TableId("base_case_id")
+ @ApiModelProperty(value = "妗堜欢id")
private Integer baseCaseId;
/**
* 杩濆缓id
*/
@TableField("illegal_building_id")
+ @ApiModelProperty(value = "杩濆缓id")
private Integer illegalBuildingId;
/**
* 鏂囦功绉嶇被
*/
@TableField("writ_type")
+ @ApiModelProperty(value = "鏂囦功绉嶇被")
private Integer writType;
/**
* 鏂囦功缂栧彿
*/
@TableField("writ_code")
+ @ApiModelProperty(value = "鏂囦功缂栧彿")
private String writCode;
/**
* 杩濇硶绫诲瀷
*/
@TableField("illegal_type")
+ @ApiModelProperty(value = "杩濇硶绫诲瀷")
private Integer illegalType;
/**
* 鏂囦功鍙戞斁鏃堕棿
*/
@TableField("send_time")
+ @ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿")
private LocalDateTime sendTime;
/**
* 鏂囦功闄愬畾鏃堕棿
*/
@TableField("limit_time")
+ @ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿")
private LocalDateTime limitTime;
/**
* 鏂囦功鍙戞斁鍐呭
*/
@TableField("send_content")
+ @ApiModelProperty(value = "鏂囦功鍙戞斁鍐呭")
private String sendContent;
/**
* 瀹為檯鏁存敼鏃堕棿
*/
@TableField("rectify_time")
+ @ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿")
private LocalDateTime rectifyTime;
/**
* 鏁存敼鎯呭喌
*/
@TableField("rectify_situation")
+ @ApiModelProperty(value = "鏁存敼鎯呭喌")
private String rectifySituation;
/**
* 澶囨敞
*/
@TableField("remark")
+ @ApiModelProperty(value = "澶囨敞")
private String remark;
/**
* 鏂囦功鐓х墖涓婁紶
*/
@TableField("writ_pic")
+ @ApiModelProperty(value = "鏂囦功鐓х墖涓婁紶")
private String writPic;
/**
* 鏁存敼鍓嶇収鐗�
*/
@TableField("original_pic")
+ @ApiModelProperty(value = "鏁存敼鍓嶇収鐗�")
private String originalPic;
/**
* 鏁存敼鍚庣収鐗�
*/
@TableField("rectified_pic")
+ @ApiModelProperty(value = "鏁存敼鍚庣収鐗�")
private String rectifiedPic;
/**
* 鍏朵粬鐓х墖
*/
@TableField("other_pic")
+ @ApiModelProperty(value = "鍏朵粬鐓х墖")
private String otherPic;
/**
* 鍒涘缓浜�
*/
@TableField("create_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
private Integer createUser;
/**
* 鍒涘缓鏃堕棿
*/
@TableField("create_time")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/ICheckHandleService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/ICheckHandleService.java
new file mode 100644
index 0000000..ba6ba68
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/ICheckHandleService.java
@@ -0,0 +1,15 @@
+package com.ycl.service.caseHandler;
+
+import com.ycl.dto.caseHandler.ChechParam;
+
+/**
+ * <p>
+ * 瀹℃牳澶勭悊
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-02
+ */
+public interface ICheckHandleService {
+ Boolean chech(ChechParam chechParam);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java
new file mode 100644
index 0000000..3c16547
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java
@@ -0,0 +1,47 @@
+package com.ycl.service.caseHandler.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.constant.BaseCaseStatus;
+import com.ycl.dto.caseHandler.ChechParam;
+import com.ycl.entity.caseHandler.BaseCase;
+import com.ycl.entity.caseHandler.DisposeRecord;
+import com.ycl.mapper.caseHandler.BaseCaseMapper;
+import com.ycl.mapper.caseHandler.DisposeRecordMapper;
+import com.ycl.service.caseHandler.ICheckHandleService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 瀹℃牳澶勭悊 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-02
+ */
+@Service
+@Transactional
+public class CheckHandleServiceImpl extends ServiceImpl<DisposeRecordMapper, DisposeRecord> implements ICheckHandleService {
+
+ @Resource
+ BaseCaseMapper baseCaseMapper;
+
+ @Override
+ public Boolean chech(ChechParam chechParam) {
+ //鏂板娴佺▼璁板綍淇℃伅
+ DisposeRecord disposeRecord = new DisposeRecord();
+ disposeRecord.setBaseCaseId(chechParam.getBaseCaseId());
+ disposeRecord.setWorkflowConfigStepId(3);
+ disposeRecord.setState(chechParam.getStatus());
+ disposeRecord.setCreateUser(chechParam.getCurrentUser());
+ disposeRecord.setStepName("鏍告煡");
+ baseMapper.insert(disposeRecord);
+ //淇敼妗堜欢鐘舵�佷负瀹℃牳
+ BaseCase baseCase = new BaseCase();
+ baseCase.setState(BaseCaseStatus.CHECK);
+ baseCaseMapper.updateById(baseCase);
+ return true;
+ }
+}
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 dd4d8fe..7bb40d9 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
@@ -1,13 +1,18 @@
package com.ycl.service.caseHandler.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.constant.BaseCaseStatus;
import com.ycl.dto.caseHandler.DispatchInfoParam;
+import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DispatchInfo;
+import com.ycl.mapper.caseHandler.BaseCaseMapper;
import com.ycl.mapper.caseHandler.DispatchInfoMapper;
import com.ycl.service.caseHandler.IDispatchHandleService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.util.Date;
/**
@@ -19,13 +24,22 @@
* @since 2022-09-28
*/
@Service
+@Transactional
public class IDispatchHandleServiceImpl extends ServiceImpl<DispatchInfoMapper, DispatchInfo> implements IDispatchHandleService {
+
+ @Resource
+ BaseCaseMapper baseCaseMapper;
@Override
public DispatchInfo dispatch(DispatchInfoParam dispatchInfoParam) {
+ //鏂板璋冨害淇℃伅
DispatchInfo dispatchInfo = new DispatchInfo();
BeanUtils.copyProperties(dispatchInfoParam, dispatchInfo);
dispatchInfo.setCreateTime(new Date());
baseMapper.insert(dispatchInfo);
+ //淇敼妗堜欢鐘舵�佷负璋冨害
+ BaseCase baseCase = new BaseCase();
+ baseCase.setState(BaseCaseStatus.DISPATCH);
+ baseCaseMapper.updateById(baseCase);
return dispatchInfo;
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/CurrentSitVo.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/CurrentSitVo.java
index 132383b..4b6423d 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/CurrentSitVo.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/CurrentSitVo.java
@@ -3,6 +3,7 @@
import com.ycl.entity.caseHandler.ArrivalSituation;
import com.ycl.entity.caseHandler.Investigation;
import com.ycl.entity.caseHandler.Writ;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,20 +16,21 @@
* @since 2022-09-29
*/
@Data
+@ApiModel(value = "鐜板満鎯呭喌")
public class CurrentSitVo {
/**
* 鍒拌揪鐜板満鎯呭喌
*/
- @ApiModelProperty(value = "鍒拌揪鐜板満鎯呭喌",dataType = "ArrivalSituation")
+ @ApiModelProperty(value = "鍒拌揪鐜板満鎯呭喌")
private ArrivalSituation arrivalSituation;
/**
* 璋冩煡鍙栬瘉
*/
- @ApiModelProperty(value = "璋冩煡鍙栬瘉",dataType = "Investigation")
+ @ApiModelProperty(value = "璋冩煡鍙栬瘉")
private Investigation investigation;
/**
* 鍛婄煡杩濇硶
*/
- @ApiModelProperty(value = "鍛婄煡杩濇硶",dataType = "Writ")
+ @ApiModelProperty(value = "鍛婄煡杩濇硶")
private Writ writ;
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java
index e95e1ef..2301d09 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java
@@ -1,6 +1,7 @@
package com.ycl.vo.casePool;
import com.ycl.entity.common.ImageResources;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,10 +16,11 @@
* @since 2022-09-29
*/
@Data
+@ApiModel(value = "妗堝嵎鍥剧墖")
public class FilesPictureVo {
/**
* 鍥剧墖鍒楄〃
*/
- @ApiModelProperty(value = "鍥剧墖鍒楄〃",dataType = "ImageResources")
+ @ApiModelProperty(value = "鍥剧墖鍒楄〃")
private List<ImageResources> imageResources;
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/HandlePassVo.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/HandlePassVo.java
index a422231..f961a36 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/HandlePassVo.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/HandlePassVo.java
@@ -1,6 +1,7 @@
package com.ycl.vo.casePool;
import com.ycl.entity.caseHandler.WorkflowConfigStep;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,11 +16,12 @@
* @since 2022-09-29
*/
@Data
+@ApiModel(value = "鍔炵悊缁忚繃绫�")
public class HandlePassVo {
/**
* 娴佺▼鐜妭鍒楄〃
*/
- @ApiModelProperty(value = "娴佺▼鐜妭鍒楄〃",dataType = "ArrivalSituation")
+ @ApiModelProperty(value = "娴佺▼鐜妭鍒楄〃")
private List<WorkflowConfigStep> workflowConfigSteps;
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/ProblemProVo.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/ProblemProVo.java
index 783791f..d66af62 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/ProblemProVo.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/ProblemProVo.java
@@ -1,6 +1,7 @@
package com.ycl.vo.casePool;
import com.ycl.entity.caseHandler.WorkflowConfigStep;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,10 +16,11 @@
* @since 2022-09-29
*/
@Data
+@ApiModel(value = "闂澶勭悊")
public class ProblemProVo {
/**
* 娴佺▼鐜妭鍒楄〃
*/
- @ApiModelProperty(value = "娴佺▼鐜妭鍒楄〃",dataType = "ArrivalSituation")
+ @ApiModelProperty(value = "娴佺▼鐜妭鍒楄〃")
private List<WorkflowConfigStep> workflowConfigSteps;
}
--
Gitblit v1.8.0