From 9472d5dc2f433ebb0b0b5efc836632474aca9ca7 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 17 六月 2024 20:30:55 +0800
Subject: [PATCH] 通用审批接口添加
---
project-system/src/main/java/com/project/system/mapper/SysUserMapper.java | 7
project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 112 ++++++++++
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java | 34 +--
project-enforce/src/main/java/com/project/enforce/domain/EnforceCheckLog.java | 24 +-
project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java | 38 +--
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java | 38 +--
project-admin/src/main/java/com/project/admin/controller/tool/CheckController.java | 48 ++++
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderBo.java | 188 +++++++++++++++++
project-system/src/main/resources/mapper/system/SysUserMapper.xml | 11 +
project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java | 6
project-system/src/main/java/com/project/system/domain/bo/editBo/CheckBo.java | 26 ++
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCheckLogQueryBo.java | 10
project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java | 3
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCheckLogVo.java | 13
project-system/src/main/java/com/project/system/domain/SysCompany.java | 3
project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java | 3
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCheckLogBo.java | 20 -
project-system/src/main/java/com/project/system/domain/bo/queryBo/SysCompanyQueryBo.java | 4
project-enforce/src/main/java/com/project/enforce/service/ICheckService.java | 21 +
project-system/src/main/java/com/project/system/domain/bo/editBo/SysCompanyBo.java | 3
project-system/src/main/java/com/project/system/service/ISysUserService.java | 7
21 files changed, 512 insertions(+), 107 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/tool/CheckController.java b/project-admin/src/main/java/com/project/admin/controller/tool/CheckController.java
new file mode 100644
index 0000000..b96d08e
--- /dev/null
+++ b/project-admin/src/main/java/com/project/admin/controller/tool/CheckController.java
@@ -0,0 +1,48 @@
+package com.project.admin.controller.tool;
+
+import com.project.common.annotation.Log;
+import com.project.common.annotation.RepeatSubmit;
+import com.project.common.core.domain.AjaxResult;
+import com.project.common.enums.BusinessType;
+import com.project.enforce.service.ICheckService;
+import com.project.system.domain.bo.editBo.CheckBo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(value = "瀹℃牳绠＄悊", tags = {"瀹℃牳"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/tool/check")
+public class CheckController
+{
+
+ private final ICheckService checkService;
+
+
+ @ApiOperation("瀹℃牳")
+ @Log(title = "瀹℃牳", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/checkOrder")
+ @RepeatSubmit
+ public AjaxResult checkOrder(@RequestBody CheckBo bo)
+ {
+ if (bo.getCheckStatus()!=1 && bo.getCheckStatus()!=-1){
+ return AjaxResult.error("瀹℃牳鐘舵�佹湁璇紒");
+ }
+ Boolean check = checkService.checkOrder(bo);
+ if (check){
+ if (bo.getCheckStatus()==1){
+ return AjaxResult.success("瀹℃牳閫氳繃鎴愬姛锛�");
+ }
+ return AjaxResult.success("瀹℃牳鎷掔粷鎴愬姛锛�");
+ }
+ return AjaxResult.error("瀹℃牳澶辫触锛�");
+ }
+
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceCheckLog.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceCheckLog.java
index 347600a..f0ec34b 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceCheckLog.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceCheckLog.java
@@ -21,7 +21,7 @@
@Accessors(chain = true)
@TableName("enforce_check_log")
@ApiModel("鎵ф硶瀹℃壒璁板綍瀹炰綋瀵硅薄")
-public class EnforceCheckLog extends BaseDomain {
+public class EnforceCheckLog implements Serializable {
private static final long serialVersionUID=1L;
@@ -30,6 +30,8 @@
@ApiModelProperty("ID")
private Long id;
+ @ApiModelProperty("瀹℃壒绫诲瀷锛�1浼佷笟瀹℃壒锛�2鎵ф硶鍗曞鎵�")
+ private Integer checkType;
@ApiModelProperty("鎵ф硶鍗昳d")
private String orderId;
@@ -60,11 +62,11 @@
@ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
+ private String checkUser;
@ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
+ private String checkPhone;
@ApiModelProperty("瀹℃壒浜哄崟浣�")
@@ -72,7 +74,7 @@
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
+ private String checkDeptName;
@ApiModelProperty("瀹℃壒鏃堕棿")
@@ -86,15 +88,11 @@
@ApiModelProperty("瀹℃壒鍘熷洜")
private String checkReason;
-
-
-
-
-
-
-
-
-
+ /**
+ * 閫昏緫鍒犻櫎鐘舵��
+ */
+ @TableLogic(value = "0",delval = "1")
+ private Integer delFlag;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
index 01209fc..97b0ccb 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
@@ -76,11 +76,11 @@
@ApiModelProperty("鐢宠浜�")
- private Long applyUser;
+ private String applyUser;
@ApiModelProperty("鐢宠浜虹數璇�")
- private Long applyPhone;
+ private String applyPhone;
@ApiModelProperty("鐢宠浜哄崟浣�")
@@ -88,14 +88,16 @@
@ApiModelProperty("鐢宠浜哄崟浣�")
- private Long applyDeptName;
+ private String applyDeptName;
@ApiModelProperty("鐢宠鏃堕棿")
private Date applyTime;
- @ApiModelProperty("鎵ф硶闃熷憳鏁伴噺")
+
+ @ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
+
@ApiModelProperty("棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
private Integer warnStatus;
@@ -109,28 +111,12 @@
private Integer orderStatus;
- @ApiModelProperty("瀹℃壒浜篿d")
- private Long checkId;
-
-
- @ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
-
-
- @ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
-
-
@ApiModelProperty("瀹℃壒浜哄崟浣�")
private Long checkDeptId;
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
-
-
- @ApiModelProperty("瀹℃壒鏃堕棿")
- private Date checkTime;
+ private String checkDeptName;
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
@@ -141,16 +127,20 @@
private String checkReason;
+ @ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
+ private Integer checkLevel;
+
+
@ApiModelProperty("鎵ц浜篿d")
private Long executeId;
@ApiModelProperty("鎵ц浜�")
- private Long executeUser;
+ private String executeUser;
@ApiModelProperty("鎵ц浜虹數璇�")
- private Long executePhone;
+ private String executePhone;
@ApiModelProperty("鎵ц浜哄崟浣�")
@@ -158,7 +148,7 @@
@ApiModelProperty("鎵ц浜哄崟浣�")
- private Long executeDeptName;
+ private String executeDeptName;
@ApiModelProperty("鎵ц鏃堕棿")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCheckLogBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCheckLogBo.java
index eb4652c..14c1a02 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCheckLogBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCheckLogBo.java
@@ -27,6 +27,9 @@
@ApiModelProperty("ID")
private Long id;
+ @ApiModelProperty("瀹℃壒绫诲瀷锛�1浼佷笟瀹℃壒锛�2鎵ф硶鍗曞鎵�")
+ private Integer checkType;
+
/** 鎵ф硶鍗昳d */
@ApiModelProperty("鎵ф硶鍗昳d")
private String orderId;
@@ -57,11 +60,11 @@
/** 瀹℃壒浜� */
@ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
+ private String checkUser;
/** 瀹℃壒浜虹數璇� */
@ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
+ private String checkPhone;
/** 瀹℃壒浜哄崟浣� */
@ApiModelProperty("瀹℃壒浜哄崟浣�")
@@ -69,7 +72,7 @@
/** 瀹℃壒浜哄崟浣� */
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
+ private String checkDeptName;
/** 瀹℃壒鏃堕棿 */
@ApiModelProperty("瀹℃壒鏃堕棿")
@@ -84,16 +87,5 @@
@ApiModelProperty("瀹℃壒鍘熷洜")
private String checkReason;
- /** 鏇存柊浜� */
- @ApiModelProperty("鏇存柊浜�")
- private String updateBy;
- /** 鏇存柊鏃堕棿 */
- @ApiModelProperty("鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /** 澶囨敞 */
- @ApiModelProperty("澶囨敞")
- private String remark;
}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
index 02a934d..b321b9d 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
@@ -74,11 +74,11 @@
/** 鐢宠浜� */
@ApiModelProperty("鐢宠浜�")
- private Long applyUser;
+ private String applyUser;
/** 鐢宠浜虹數璇� */
@ApiModelProperty("鐢宠浜虹數璇�")
- private Long applyPhone;
+ private String applyPhone;
/** 鐢宠浜哄崟浣� */
@ApiModelProperty("鐢宠浜哄崟浣�")
@@ -86,14 +86,15 @@
/** 鐢宠浜哄崟浣� */
@ApiModelProperty("鐢宠浜哄崟浣�")
- private Long applyDeptName;
+ private String applyDeptName;
/** 鐢宠鏃堕棿 */
@ApiModelProperty("鐢宠鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
- @ApiModelProperty("鎵ф硶闃熷憳鏁伴噺")
+ /** 鎵ф硶闃熷憳浜烘暟 */
+ @ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
/** 棰勮鐘舵�侊細0姝ｅ父锛�1棰勮 */
@@ -108,30 +109,13 @@
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
private Integer orderStatus;
- /** 瀹℃壒浜篿d */
- @ApiModelProperty("瀹℃壒浜篿d")
- private Long checkId;
-
- /** 瀹℃壒浜� */
- @ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
-
- /** 瀹℃壒浜虹數璇� */
- @ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
-
/** 瀹℃壒浜哄崟浣� */
@ApiModelProperty("瀹℃壒浜哄崟浣�")
private Long checkDeptId;
/** 瀹℃壒浜哄崟浣� */
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
-
- /** 瀹℃壒鏃堕棿 */
- @ApiModelProperty("瀹℃壒鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date checkTime;
+ private String checkDeptName;
/** 璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃 */
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
@@ -141,17 +125,21 @@
@ApiModelProperty("瀹℃壒鍘熷洜")
private String checkReason;
+ /** 褰撳墠瀹℃壒灞傜骇: */
+ @ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
+ private Integer checkLevel;
+
/** 鎵ц浜篿d */
@ApiModelProperty("鎵ц浜篿d")
private Long executeId;
/** 鎵ц浜� */
@ApiModelProperty("鎵ц浜�")
- private Long executeUser;
+ private String executeUser;
/** 鎵ц浜虹數璇� */
@ApiModelProperty("鎵ц浜虹數璇�")
- private Long executePhone;
+ private String executePhone;
/** 鎵ц浜哄崟浣� */
@ApiModelProperty("鎵ц浜哄崟浣�")
@@ -159,7 +147,7 @@
/** 鎵ц浜哄崟浣� */
@ApiModelProperty("鎵ц浜哄崟浣�")
- private Long executeDeptName;
+ private String executeDeptName;
/** 鎵ц鏃堕棿 */
@ApiModelProperty("鎵ц鏃堕棿")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCheckLogQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCheckLogQueryBo.java
index c3de8ee..0dbf9bb 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCheckLogQueryBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCheckLogQueryBo.java
@@ -36,6 +36,10 @@
/** 鎵ф硶鍗昳d */
@ApiModelProperty("鎵ф硶鍗昳d")
private String orderId;
+
+ @ApiModelProperty("瀹℃壒绫诲瀷锛�1浼佷笟瀹℃壒锛�2鎵ф硶鍗曞鎵�")
+ private Integer checkType;
+
/** 鎵ф硶鍗曞彿 */
@ApiModelProperty("鎵ф硶鍗曞彿")
private String orderNo;
@@ -56,16 +60,16 @@
private Long checkId;
/** 瀹℃壒浜� */
@ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
+ private String checkUser;
/** 瀹℃壒浜虹數璇� */
@ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
+ private String checkPhone;
/** 瀹℃壒浜哄崟浣� */
@ApiModelProperty("瀹℃壒浜哄崟浣�")
private Long checkDeptId;
/** 瀹℃壒浜哄崟浣� */
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
+ private String checkDeptName;
/** 瀹℃壒鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("瀹℃壒鏃堕棿")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderBo.java
new file mode 100644
index 0000000..7f22891
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderBo.java
@@ -0,0 +1,188 @@
+package com.project.enforce.domain.bo.queryBo;
+
+import com.project.common.core.domain.BaseDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 鎵ф硶鍗曠紪杈戝璞� enforce_order
+ *
+ * @author manton
+ */
+
+@Data
+@ApiModel("鎵ф硶鍗曟搷浣滃璞�")
+public class EnforceOrderBo {
+
+
+ /** 鍗曟嵁id */
+ @ApiModelProperty("鍗曟嵁id")
+ private Long orderId;
+
+ /** 鍗曟嵁缂栧彿 */
+ @ApiModelProperty("鍗曟嵁缂栧彿")
+ private String orderNo;
+
+ /** 浼佷笟id */
+ @ApiModelProperty("浼佷笟id")
+ private Long companyId;
+
+ /** 浼佷笟鍚� */
+ @ApiModelProperty("浼佷笟鍚�")
+ private String companyName;
+
+ /** 浼佷笟绀句細缂栫爜 */
+ @ApiModelProperty("浼佷笟绀句細缂栫爜")
+ private String companyCode;
+
+ /** 浼佷笟鑱旂郴浜� */
+ @ApiModelProperty("浼佷笟鑱旂郴浜�")
+ private String companyUser;
+
+ /** 浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛� */
+ @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ private String companyPhone;
+
+ /** 浼佷笟鍦板潃 */
+ @ApiModelProperty("浼佷笟鍦板潃")
+ private String companyAddress;
+
+ /** 鎵�灞炲尯鍩熺紪鐮� */
+ @ApiModelProperty("鎵�灞炲尯鍩熺紪鐮�")
+ private String regionCode;
+
+ /** 鎵�灞炲尯鍩� */
+ @ApiModelProperty("鎵�灞炲尯鍩�")
+ private String regionName;
+
+ /** 鎵ф硶鍘熷洜 */
+ @ApiModelProperty("鎵ф硶鍘熷洜")
+ private String enforceReason;
+
+ /** 鐢宠浜篿d */
+ @ApiModelProperty("鐢宠浜篿d")
+ private Long applyId;
+
+ /** 鐢宠浜� */
+ @ApiModelProperty("鐢宠浜�")
+ private String applyUser;
+
+ /** 鐢宠浜虹數璇� */
+ @ApiModelProperty("鐢宠浜虹數璇�")
+ private String applyPhone;
+
+ /** 鐢宠浜哄崟浣� */
+ @ApiModelProperty("鐢宠浜哄崟浣�")
+ private Long applyDeptId;
+
+ /** 鐢宠浜哄崟浣� */
+ @ApiModelProperty("鐢宠浜哄崟浣�")
+ private String applyDeptName;
+
+ /** 鐢宠鏃堕棿 */
+ @ApiModelProperty("鐢宠鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date applyTime;
+
+ /** 鎵ф硶闃熷憳浜烘暟 */
+ @ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
+ private Integer userNum;
+
+ /** 棰勮鐘舵�侊細0姝ｅ父锛�1棰勮 */
+ @ApiModelProperty("棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
+ private Integer warnStatus;
+
+ /** 棰勮鍘熷洜 */
+ @ApiModelProperty("棰勮鍘熷洜")
+ private String warnReason;
+
+ /** 璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠� */
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
+ private Integer orderStatus;
+
+ /** 瀹℃壒浜哄崟浣� */
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptId;
+
+ /** 瀹℃壒浜哄崟浣� */
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private String checkDeptName;
+
+ /** 璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃 */
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ private Integer checkStatus;
+
+ /** 瀹℃壒鍘熷洜 */
+ @ApiModelProperty("瀹℃壒鍘熷洜")
+ private String checkReason;
+
+ /** 褰撳墠瀹℃壒灞傜骇: */
+ @ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
+ private Integer checkLevel;
+
+ /** 鎵ц浜篿d */
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+
+ /** 鎵ц浜� */
+ @ApiModelProperty("鎵ц浜�")
+ private String executeUser;
+
+ /** 鎵ц浜虹數璇� */
+ @ApiModelProperty("鎵ц浜虹數璇�")
+ private String executePhone;
+
+ /** 鎵ц浜哄崟浣� */
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptId;
+
+ /** 鎵ц浜哄崟浣� */
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private String executeDeptName;
+
+ /** 鎵ц鏃堕棿 */
+ @ApiModelProperty("鎵ц鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date executeTime;
+
+ /** 鎵ф硶缁撴灉锛�0姝ｅ父锛�1寰呮暣鏀� */
+ @ApiModelProperty("鎵ф硶缁撴灉锛�0姝ｅ父锛�1寰呮暣鏀�")
+ private Integer regionStatus;
+
+ /** 鎵ф硶缁撴灉璇存槑 */
+ @ApiModelProperty("鎵ф硶缁撴灉璇存槑")
+ private String regionReason;
+
+ /** 鎵ф硶鍥剧墖 */
+ @ApiModelProperty("鎵ф硶鍥剧墖")
+ private String regionImgs;
+
+ /** 鎵ф硶瑙嗛 */
+ @ApiModelProperty("鎵ф硶瑙嗛")
+ private String regionVideos;
+
+ /** 鏄惁閫氱煡浼佷笟锛�0鍚︼紝1鏄� */
+ @ApiModelProperty("鏄惁閫氱煡浼佷笟锛�0鍚︼紝1鏄�")
+ private Integer isNoticeCompany;
+
+ /** 鏄惁鍏ず锛�0鍚︼紝1鏄� */
+ @ApiModelProperty("鏄惁鍏ず锛�0鍚︼紝1鏄�")
+ private Integer isShow;
+
+ /** 鏄惁璇勪环锛�0鍚︼紝1鏄� */
+ @ApiModelProperty("鏄惁璇勪环锛�0鍚︼紝1鏄�")
+ private Integer isEva;
+
+ /** 璇勪环鎬诲緱鍒� */
+ @ApiModelProperty("璇勪环鎬诲緱鍒�")
+ private BigDecimal totalScore;
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCheckLogVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCheckLogVo.java
index f76b962..16e38b2 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCheckLogVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCheckLogVo.java
@@ -23,6 +23,9 @@
@ApiModelProperty("ID")
private Long id;
+ @ApiModelProperty("瀹℃壒绫诲瀷锛�1浼佷笟瀹℃壒锛�2鎵ф硶鍗曞鎵�")
+ private Integer checkType;
+
@Excel(name = "鎵ф硶鍗昳d")
@ApiModelProperty("鎵ф硶鍗昳d")
private String orderId;
@@ -46,16 +49,16 @@
private Long checkId;
@Excel(name = "瀹℃壒浜�")
@ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
+ private String checkUser;
@Excel(name = "瀹℃壒浜虹數璇�")
@ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
+ private String checkPhone;
@Excel(name = "瀹℃壒浜哄崟浣�")
@ApiModelProperty("瀹℃壒浜哄崟浣�")
private Long checkDeptId;
@Excel(name = "瀹℃壒浜哄崟浣�")
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
+ private String checkDeptName;
@Excel(name = "瀹℃壒鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("瀹℃壒鏃堕棿")
@@ -66,8 +69,6 @@
@Excel(name = "瀹℃壒鍘熷洜")
@ApiModelProperty("瀹℃壒鍘熷洜")
private String checkReason;
- @Excel(name = "澶囨敞")
- @ApiModelProperty("澶囨敞")
- private String remark;
+
}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
index 5303b0e..1573111 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
@@ -59,22 +59,22 @@
private Long applyId;
@Excel(name = "鐢宠浜�")
@ApiModelProperty("鐢宠浜�")
- private Long applyUser;
+ private String applyUser;
@Excel(name = "鐢宠浜虹數璇�")
@ApiModelProperty("鐢宠浜虹數璇�")
- private Long applyPhone;
+ private String applyPhone;
@Excel(name = "鐢宠浜哄崟浣�")
@ApiModelProperty("鐢宠浜哄崟浣�")
private Long applyDeptId;
@Excel(name = "鐢宠浜哄崟浣�")
@ApiModelProperty("鐢宠浜哄崟浣�")
- private Long applyDeptName;
+ private String applyDeptName;
@Excel(name = "鐢宠鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鐢宠鏃堕棿")
private Date applyTime;
- @Excel(name = "鎵ф硶闃熷憳鏁伴噺")
- @ApiModelProperty("鎵ф硶闃熷憳鏁伴噺")
+ @Excel(name = "鎵ф硶闃熷憳浜烘暟")
+ @ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
@Excel(name = "棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
@ApiModelProperty("棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
@@ -85,46 +85,36 @@
@Excel(name = "璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
private Integer orderStatus;
- @Excel(name = "瀹℃壒浜篿d")
- @ApiModelProperty("瀹℃壒浜篿d")
- private Long checkId;
- @Excel(name = "瀹℃壒浜�")
- @ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
- @Excel(name = "瀹℃壒浜虹數璇�")
- @ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
@Excel(name = "瀹℃壒浜哄崟浣�")
@ApiModelProperty("瀹℃壒浜哄崟浣�")
private Long checkDeptId;
@Excel(name = "瀹℃壒浜哄崟浣�")
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
- @Excel(name = "瀹℃壒鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("瀹℃壒鏃堕棿")
- private Date checkTime;
+ private String checkDeptName;
@Excel(name = "璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
@Excel(name = "瀹℃壒鍘熷洜")
@ApiModelProperty("瀹℃壒鍘熷洜")
private String checkReason;
+ @Excel(name = "褰撳墠瀹℃壒灞傜骇:")
+ @ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
+ private Integer checkLevel;
@Excel(name = "鎵ц浜篿d")
@ApiModelProperty("鎵ц浜篿d")
private Long executeId;
@Excel(name = "鎵ц浜�")
@ApiModelProperty("鎵ц浜�")
- private Long executeUser;
+ private String executeUser;
@Excel(name = "鎵ц浜虹數璇�")
@ApiModelProperty("鎵ц浜虹數璇�")
- private Long executePhone;
+ private String executePhone;
@Excel(name = "鎵ц浜哄崟浣�")
@ApiModelProperty("鎵ц浜哄崟浣�")
private Long executeDeptId;
@Excel(name = "鎵ц浜哄崟浣�")
@ApiModelProperty("鎵ц浜哄崟浣�")
- private Long executeDeptName;
+ private String executeDeptName;
@Excel(name = "鎵ц鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鎵ц鏃堕棿")
diff --git a/project-enforce/src/main/java/com/project/enforce/service/ICheckService.java b/project-enforce/src/main/java/com/project/enforce/service/ICheckService.java
new file mode 100644
index 0000000..c5c3773
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/ICheckService.java
@@ -0,0 +1,21 @@
+package com.project.enforce.service;
+
+import com.project.system.domain.bo.editBo.CheckBo;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ */
+public interface ICheckService
+{
+
+ /**
+ * 瀹℃牳
+ * @param bo 娴嬭瘯
+ * @return 缁撴灉
+ */
+ Boolean checkOrder(CheckBo bo);
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
new file mode 100644
index 0000000..f5cf852
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
@@ -0,0 +1,112 @@
+package com.project.enforce.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import com.project.common.core.domain.entity.SysRole;
+import com.project.common.core.domain.entity.SysUser;
+import com.project.common.exception.base.BaseException;
+import com.project.common.utils.SecurityUtils;
+import com.project.common.utils.StringUtils;
+import com.project.enforce.domain.EnforceCheckLog;
+import com.project.enforce.domain.EnforceOrder;
+import com.project.enforce.service.ICheckService;
+import com.project.enforce.service.IEnforceCheckLogService;
+import com.project.enforce.service.IEnforceOrderService;
+import com.project.system.domain.SysCompany;
+import com.project.system.domain.bo.editBo.CheckBo;
+import com.project.system.service.ISysCompanyService;
+import com.project.system.service.ISysUserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ * @date 2024骞�06鏈�17鏃�
+ */
+
+@Service
+@RequiredArgsConstructor
+public class CheckServiceImpl implements ICheckService
+{
+
+ private final ISysCompanyService companyService;
+ private final IEnforceOrderService orderService;
+ private final IEnforceCheckLogService checkLogService;
+ private final ISysUserService userService;
+
+ @Override
+ @Transactional
+ public Boolean checkOrder(CheckBo bo)
+ {
+ switch (bo.getCheckType())
+ {
+ case 1:
+ SysCompany company = companyService.getById(bo.getId());
+ if (company==null) {
+ throw new BaseException("娌℃湁鎵惧埌瀵瑰簲鏁版嵁锛岃妫�鏌ュ鏍哥被鍨嬶紒");
+ }
+ if (bo.getCheckStatus()== -1){
+ company.setCheckStatus(-1);
+ } else {
+ company.setCheckStatus(2);
+ }
+ addCheckLog(company, bo);
+ company.setCheckReason(bo.getCheckReason());
+ companyService.updateById(company);
+ break;
+ case 2:
+ EnforceOrder order = orderService.getById(bo.getId());
+ if (order==null) {
+ throw new BaseException("娌℃湁鎵惧埌瀵瑰簲鏁版嵁锛岃妫�鏌ュ鏍哥被鍨嬶紒");
+ }
+ addCheckLog(order, bo);
+ if (bo.getCheckStatus()==-1){
+ order.setCheckStatus(-1);
+ } else {
+ String roleKey = "check_enforce_" + (order.getCheckLevel() + 1);
+ List<Long> ids = userService.getNumByRoleKey(roleKey, order.getCheckDeptId());
+ if (StringUtils.isNotEmpty(ids)){
+ order.setCheckStatus(1);
+ } else {
+ order.setCheckStatus(2);
+ }
+ //瀹℃壒鐧昏鍔�1
+ order.setCheckLevel(order.getCheckLevel()+1);
+ }
+ order.setCheckReason(bo.getCheckReason());
+ orderService.updateById(order);
+ break;
+ }
+ return false;
+ }
+
+
+ /**
+ * 娣诲姞瀹℃壒璁板綍
+ * @param obj 涓氬姟瀵硅薄
+ * @param bo 瀹℃壒鍙傛暟
+ */
+ private void addCheckLog(Object obj, CheckBo bo)
+ {
+ EnforceCheckLog checkLog = Convert.convert(EnforceCheckLog.class, obj);
+ checkLog.setCheckType(bo.getCheckType());
+ SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+ checkLog.setCheckId(loginUser.getUserId());
+ checkLog.setCheckUser(loginUser.getUserName());
+ checkLog.setCheckPhone(loginUser.getPhonenumber());
+ checkLog.setCheckStatus(bo.getCheckStatus());
+ checkLog.setCheckReason(bo.getCheckReason());
+ boolean save = checkLogService.save(checkLog);
+ if (!save) {
+ throw new BaseException("瀹℃壒璁板綍娣诲姞澶辫触锛岃閲嶈瘯锛�");
+ }
+ }
+
+
+}
diff --git a/project-system/src/main/java/com/project/system/domain/SysCompany.java b/project-system/src/main/java/com/project/system/domain/SysCompany.java
index 7d9e659..e523e99 100644
--- a/project-system/src/main/java/com/project/system/domain/SysCompany.java
+++ b/project-system/src/main/java/com/project/system/domain/SysCompany.java
@@ -71,6 +71,9 @@
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
+ @ApiModelProperty("瀹℃壒璇存槑")
+ private String checkReason;
+
@ApiModelProperty("鑷畾涔夋帓搴�")
private Integer sortNum;
diff --git a/project-system/src/main/java/com/project/system/domain/bo/editBo/CheckBo.java b/project-system/src/main/java/com/project/system/domain/bo/editBo/CheckBo.java
new file mode 100644
index 0000000..da7246c
--- /dev/null
+++ b/project-system/src/main/java/com/project/system/domain/bo/editBo/CheckBo.java
@@ -0,0 +1,26 @@
+package com.project.system.domain.bo.editBo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Mr.Zhao
+ */
+@Data
+public class CheckBo
+{
+
+ @ApiModelProperty(value = "涓氬姟绫诲瀷锛�1浼佷笟瀹℃壒锛�2鎵ф硶鍗曞鎵�",required = true)
+ private Integer checkType;
+
+ @ApiModelProperty(value = "id",required = true)
+ private Long id;
+
+ @ApiModelProperty(value = "绫诲瀷锛�1閫氳繃锛�-1鎷掔粷",required = true)
+ private Integer checkStatus;
+
+ @ApiModelProperty("瀹℃牳璇存槑")
+ private String checkReason;
+
+
+}
diff --git a/project-system/src/main/java/com/project/system/domain/bo/editBo/SysCompanyBo.java b/project-system/src/main/java/com/project/system/domain/bo/editBo/SysCompanyBo.java
index b6feb0a..700a82e 100644
--- a/project-system/src/main/java/com/project/system/domain/bo/editBo/SysCompanyBo.java
+++ b/project-system/src/main/java/com/project/system/domain/bo/editBo/SysCompanyBo.java
@@ -65,6 +65,9 @@
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
+ @ApiModelProperty("瀹℃壒璇存槑")
+ private String checkReason;
+
/** 鑷畾涔夋帓搴� */
@ApiModelProperty("鑷畾涔夋帓搴�")
private Integer sortNum;
diff --git a/project-system/src/main/java/com/project/system/domain/bo/queryBo/SysCompanyQueryBo.java b/project-system/src/main/java/com/project/system/domain/bo/queryBo/SysCompanyQueryBo.java
index ad3b3aa..41aa34c 100644
--- a/project-system/src/main/java/com/project/system/domain/bo/queryBo/SysCompanyQueryBo.java
+++ b/project-system/src/main/java/com/project/system/domain/bo/queryBo/SysCompanyQueryBo.java
@@ -61,6 +61,10 @@
/** 璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃 */
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
+
+ @ApiModelProperty("瀹℃壒璇存槑")
+ private String checkReason;
+
/** 鑷畾涔夋帓搴� */
@ApiModelProperty("鑷畾涔夋帓搴�")
private Integer sortNum;
diff --git a/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java b/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
index 58ed304..48a7c0e 100644
--- a/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
+++ b/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
@@ -56,6 +56,9 @@
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
+ @ApiModelProperty("瀹℃壒璇存槑")
+ private String checkReason;
+
@Excel(name = "鑷畾涔夋帓搴�")
@ApiModelProperty("鑷畾涔夋帓搴�")
private Integer sortNum;
diff --git a/project-system/src/main/java/com/project/system/mapper/SysUserMapper.java b/project-system/src/main/java/com/project/system/mapper/SysUserMapper.java
index daf3024..75c3d29 100644
--- a/project-system/src/main/java/com/project/system/mapper/SysUserMapper.java
+++ b/project-system/src/main/java/com/project/system/mapper/SysUserMapper.java
@@ -135,4 +135,11 @@
public SysUser checkEmailUnique(String email);
+ /**
+ * 鏌ヨ瑙掕壊鏍囪瘑瀵瑰簲浜烘暟
+ * @param roleKey 鏍囪瘑
+ * @param deptId 閮ㄩ棬id
+ * @return 浜烘暟
+ */
+ List<Long> getNumByRoleKey(@Param("roleKey") String roleKey,@Param("deptId") Long deptId);
}
diff --git a/project-system/src/main/java/com/project/system/service/ISysUserService.java b/project-system/src/main/java/com/project/system/service/ISysUserService.java
index ed59bf8..6151278 100644
--- a/project-system/src/main/java/com/project/system/service/ISysUserService.java
+++ b/project-system/src/main/java/com/project/system/service/ISysUserService.java
@@ -212,4 +212,11 @@
* @return 缁撴灉
*/
public int deleteUserByDeptId(Long deptId);
+
+ /**
+ * 鑾峰彇瑙掕壊鏍囪瘑浜烘暟
+ * @param roleKey 瑙掕壊鏍囪瘑
+ * @return 浜烘暟
+ */
+ List<Long> getNumByRoleKey(String roleKey, Long deptId);
}
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
index ed25210..7988c94 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
@@ -162,6 +162,9 @@
throw new BaseException(String.format("%1$s锛屼紒涓氳仈绯荤數璇濆凡瀛樺湪锛�", entity.getCompanyName()));
}
}
+ if (isImport==1){
+ entity.setCheckStatus(2);
+ }
}
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
index b1983d5..e2d8390 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
@@ -547,4 +547,10 @@
List<SysUser> sysUsers = userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getDeptId, deptId));
return this.deleteUserByIds((Long[]) sysUsers.stream().map(SysUser::getUserId).toArray());
}
+
+ @Override
+ public List<Long> getNumByRoleKey(String roleKey, Long deptId)
+ {
+ return userMapper.getNumByRoleKey(roleKey, deptId);
+ }
}
diff --git a/project-system/src/main/resources/mapper/system/SysUserMapper.xml b/project-system/src/main/resources/mapper/system/SysUserMapper.xml
index f14ecff..70b1c79 100644
--- a/project-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/project-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -235,4 +235,15 @@
</delete>
+ <select id="getNumByRoleKey" resultType="Long">
+ select u.user_id
+ from sys_user u
+ join sys_user_role ur on u.user_id = ur.user_id
+ join sys_role r on r.role_id=ur.role_id
+ where
+ u.user_type = '01'
+ and r.role_key = #{roleKey}
+ and (u.dept_id = #{deptId} or u.dept_id in (SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors)))
+ </select>
+
</mapper>
--
Gitblit v1.9.1