From de00fe811ce5f1c1e8592869d218e7c201e1748f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 17:42:22 +0800
Subject: [PATCH] 代码初始化
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 14 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/ApproveDTO.java | 36 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java | 5
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java | 11 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 10 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ApproveDataVO.java | 27 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java | 18 +-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 27 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 275 +++++++++++++++++++++++++++++++++-
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java | 12
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 11 +
17 files changed, 420 insertions(+), 48 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index bdfaecf..8c421d1 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -426,12 +426,26 @@
}
+public interface approveObjectType{
+ int unConstructionVisit = 0;//闈炴柦宸ヤ汉鍛樿瀹㈢敵璇�
+ int constructionVisit = 1;//宸ヤ汉鍛樿瀹㈢敵璇�
+ int visitReporting = 2;//璁垮鎶ュ
+ int cityUseCar = 3;//甯傚唴鐢ㄨ溅
+ int unCityUseCar = 4;//甯傚鐢ㄨ溅
+ int logisticsCarUse = 5;//鐗╂祦杞﹂绾�
+
+}
+
+
+
public interface approveStatus{
int wait = 0;//寰呭鎵�
int auditIng = 1;//瀹℃壒涓�
int pass = 2;//瀹℃壒閫氳繃
int unPass = 3;//瀹℃壒鏈�氳繃
int otherDeal = 4;//浠栦汉宸插鐞�
+ int cancel = 5;//宸插彇娑�
+ int otherUnPass = 6;//浠栦汉鎷掔粷
}
/**
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java
index ee6bbc5..9737e6e 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java
@@ -73,10 +73,10 @@
ExcelExporter.build(CarUseBook.class).export(carUseBookService.findPage(pageWrap).getRecords(), "杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�", response);
}
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:carusebook:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(carUseBookService.findById(id));
- }
+// @ApiOperation("鏍规嵁ID鏌ヨ")
+// @GetMapping("/{id}")
+// @RequiresPermissions("business:carusebook:query")
+// public ApiResponse findById(@PathVariable Integer id) {
+// return ApiResponse.success(carUseBookService.findById(id));
+// }
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java
index fae2187..ab99117 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java
@@ -8,6 +8,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.model.Approve;
import com.doumee.service.business.ApproveService;
import io.swagger.annotations.Api;
@@ -88,4 +89,14 @@
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(approveService.findById(id));
}
+
+ @ApiOperation("瀹℃壒淇℃伅鎻愪氦")
+ @PostMapping("/approved")
+ @CloudRequiredPermission("business:approve:create")
+ public ApiResponse approved (@RequestBody ApproveDTO approveDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ approveDTO.setLoginUserInfo(getLoginUser(token));
+ approveService.approved(approveDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
index 0c6e2df..7e5ce04 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
@@ -85,7 +85,7 @@
@GetMapping("/{id}")
@CloudRequiredPermission("business:carusebook:query")
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- return ApiResponse.success(carUseBookService.findById(id));
+ return ApiResponse.success(carUseBookService.findById(id,getLoginUser(token).getMemberId()));
}
@ApiOperation("鏌ヨ杞﹁締棰勭害璁板綍")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
index 509cf0a..cd6c692 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
@@ -75,15 +75,15 @@
return ApiResponse.success(visitsService.taskCenter(pageWrap));
}
- @ApiOperation("璁垮璁板綍璇︽儏")
- @GetMapping("/visitDetail")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "璁板綍涓婚敭", required = true)
- })
- public ApiResponse<VisitDetailVO> visitDetail (@RequestParam Integer id) {
- return ApiResponse.success(visitsService.getVisitDetail(id));
- }
+// @ApiOperation("璁垮璁板綍璇︽儏")
+// @GetMapping("/visitDetail")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+// @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "璁板綍涓婚敭", required = true)
+// })
+// public ApiResponse<VisitDetailVO> visitDetail (@RequestParam Integer id) {
+// return ApiResponse.success(visitsService.getVisitDetail(id));
+// }
@ApiOperation(value = "浜哄憳鍒嗛〉",notes = "鍙嫓璁垮唴閮ㄤ汉鍛�")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
index e27e0a7..bd006e1 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
@@ -76,8 +76,8 @@
@ApiOperation(value = "璁垮璁板綍璇︽儏", notes = "璁垮璁板綍璇︽儏")
@GetMapping("/detail")
- public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id) {
- return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.getVisitDetail(id));
+ public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.getVisitDetail(id,getLoginUser(token).getMemberId()));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/ApproveDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/ApproveDTO.java
new file mode 100644
index 0000000..e73c8fb
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/ApproveDTO.java
@@ -0,0 +1,36 @@
+package com.doumee.dao.business.dto;
+
+import com.doumee.core.model.LoginUserInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/5/20 14:54
+ */
+@Data
+@ApiModel("瀹℃壒璇锋眰绫�")
+public class ApproveDTO {
+
+ @ApiModelProperty(value = "鍏宠仈涓氬姟涓婚敭")
+ private Integer objId;
+
+ @ApiModelProperty(value = "鍏宠仈涓氬姟绫诲瀷锛�0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害")
+ private Integer objType;
+
+ @ApiModelProperty(value = "2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃")
+ private Integer status;
+
+ @ApiModelProperty(value = "瀹℃壒澶囨敞")
+ private String checkInfo;
+
+ @ApiModelProperty(value = "鍙告満淇℃伅 鍏宠仈car_driver")
+ private Integer driverId;
+
+ @ApiModelProperty(value = "鎿嶄綔浜�",hidden = true)
+ private LoginUserInfo loginUserInfo;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
index 46c455d..f9545d1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
@@ -11,6 +11,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 瀹℃壒淇℃伅璁板綍琛�
@@ -69,8 +70,8 @@
@ExcelColumn(name="ERP瀹℃壒缂栫爜")
private String erpId;
- @ApiModelProperty(value = "瀹℃壒鐘舵�� 0寰呰嚜宸卞鎵瑰鎵� 1寰呰嚜宸卞鎵� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4浠栦汉宸插鐞� ", example = "1")
- @ExcelColumn(name="瀹℃壒鐘舵�� 0寰呰嚜宸卞鎵瑰鎵� 1寰呰嚜宸卞鎵� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4浠栦汉宸插鐞�")
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4宸插彇娑� 5浠栦汉鎴栫 6浠栦汉鎷掔粷", example = "1")
+ @ExcelColumn(name="瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4宸插彇娑� 5浠栦汉鎴栫 6浠栦汉鎷掔粷")
private Integer status;
@ApiModelProperty(value = "鐘舵�佷俊鎭�")
@@ -141,4 +142,9 @@
@TableField(exist = false)
private String companyName;
+
+ @ApiModelProperty(value = "寰呭鎵硅褰�", example = "1")
+ @TableField(exist = false)
+ private List<Approve> approveList;
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
index b9b1d62..0180d89 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.business.vo.ApproveDataVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -170,7 +171,7 @@
@ApiModelProperty(value = "鐢宠浜虹數璇�")
@TableField(exist = false)
private String memberMobile;
- @ApiModelProperty(value = "瀹℃壒璁板綍")
+ @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
@TableField(exist = false)
- private List<Approve> approveList;
+ private ApproveDataVO approveDateVO;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ApproveDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ApproveDataVO.java
new file mode 100644
index 0000000..71bdad5
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ApproveDataVO.java
@@ -0,0 +1,27 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.dao.business.model.Approve;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/5/23 14:56
+ */
+@Data
+public class ApproveDataVO {
+
+ @ApiModelProperty(value = "瀹℃壒璁板綍")
+ private List<Approve> approveList;
+
+ @ApiModelProperty(value = "鏄惁鍙互瀹℃壒 0=涓嶅彲浠ワ紱1=鍙互")
+ private Integer canBeApproved;
+
+ @ApiModelProperty(value = "鎶勯�佽褰�")
+ private List<Approve> copyList;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
index 9a2bebb..5e237df 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
@@ -1,7 +1,9 @@
package com.doumee.dao.web.response;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.business.model.Visits;
+import com.doumee.dao.business.vo.ApproveDataVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -65,6 +67,9 @@
@ApiModelProperty(value = "璁垮浜岀淮鐮�")
private String qrcode;
+ @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
+ @TableField(exist = false)
+ private ApproveDataVO approveDateVO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
index 1259862..fb8029d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
@@ -2,7 +2,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.model.Approve;
+import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.web.response.InternalHomeVO;
import java.util.List;
@@ -106,4 +108,8 @@
InternalHomeVO getHomeData(Integer memberId);
void createApproveFlow(Integer tempType,Integer businessId,Integer createMemberId);
+
+ ApproveDataVO arrangeApprovedData(Integer businessId, Integer businessType, Integer memberId);
+
+ void approved(ApproveDTO approveDTO);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java
index 9754f62..c6532b5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java
@@ -62,9 +62,10 @@
* 涓婚敭鏌ヨ
*
* @param id 涓婚敭
+ * @param memberId
* @return CarUseBook
*/
- CarUseBook findById(Integer id);
+ CarUseBook findById(Integer id,Integer memberId);
/**
* 鏉′欢鏌ヨ鍗曟潯璁板綍
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
index ed0a5fc..b89edf1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
@@ -120,7 +120,7 @@
* @param id
* @return
*/
- VisitDetailVO getVisitDetail(Integer id);
+ VisitDetailVO getVisitDetail(Integer id,Integer memberId);
/**
* 鍐呴儴浜哄憳 浠诲姟涓績
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 289c28d..19b9c4b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -9,8 +9,10 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dto.ApproveDTO;
+import com.doumee.dao.business.join.ApproveJoinMapper;
import com.doumee.dao.business.model.*;
-import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.response.InternalHomeVO;
import com.doumee.service.business.ApproveService;
@@ -18,11 +20,13 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
+import org.apache.xpath.operations.Bool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
import java.util.*;
import java.util.stream.Collectors;
@@ -37,6 +41,9 @@
@Autowired
private ApproveMapper approveMapper;
+
+ @Autowired
+ private ApproveJoinMapper approveJoinMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -58,6 +65,9 @@
@Autowired
private CarDriverMapper carDriverMapper;
+
+ @Autowired
+ private VisitsMapper visitsMapper;
@Override
public Integer create(Approve approve) {
@@ -258,12 +268,12 @@
this.organizeApproveData(approveTempl,approveParamList,createMember,businessId,approveList);
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(approveList)){
+ if(CollectionUtils.isEmpty(approveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇�");
}
//澶勭悊鎶勯�佹暟鎹�
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(approveCopyList)){
+ if(CollectionUtils.isNotEmpty(approveCopyList)){
this.organizeApproveCopyData(approveTempl,approveParamList,businessId,approveList);
}
approveMapper.insertBatchSomeColumn(approveList);
@@ -290,8 +300,8 @@
approve.setIsdeleted(Constants.ZERO);
approve.setTemplatId(approveTempl.getId());
approve.setChekorId(memberId);
- approve.setStatus(Constants.ZERO);
- approve.setStatusInfo("寰呭鎵�");
+ approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
+ approve.setStatusInfo(i==0?"瀹℃壒涓�":"寰呭鎵�");
approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
approve.setObjId(businessId);
approve.setLevel(i+1);
@@ -315,7 +325,7 @@
.eq(Member::getWorkStatus,Constants.ZERO)
.in(Member::getId,approveParam.getObjIds().split(",")));
List<Integer> userIds = new ArrayList<>();
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
+ if(CollectionUtils.isNotEmpty(memberList)){
userIds.addAll(memberList.stream().map(m->m.getId()).collect(Collectors.toList()));
}
//鍏姟鐢ㄨ溅 榛樿鍔犲叆 鍙告満鎶勯��
@@ -331,7 +341,7 @@
userIds.add(carDriver.getMemberId());
}
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(userIds)){
+ if(CollectionUtils.isNotEmpty(userIds)){
for (Integer memberId:userIds) {
Approve approve = new Approve();
approve.setCreateDate(new Date());
@@ -425,4 +435,253 @@
}
+ /**
+ * 鏁寸悊 瀹℃壒鏁版嵁
+ * @param businessId
+ * @param businessType
+ * @return
+ */
+ @Override
+ public ApproveDataVO arrangeApprovedData(Integer businessId, Integer businessType, Integer memberId){
+ ApproveDataVO approveDateVO = new ApproveDataVO();
+ approveDateVO.setCanBeApproved(Constants.ZERO);
+ List<Approve> approveGroupList = approveJoinMapper.selectJoinList(Approve.class,
+ new MPJLambdaWrapper<Approve>().
+ select(Approve::getLevel,Approve::getType)
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .eq(Approve::getObjId,businessId)
+ .isNotNull(Approve::getLevel)
+ .eq(Approve::getObjType,businessType)
+ .groupBy(Approve::getLevel,Approve::getType)
+ );
+ if(CollectionUtils.isEmpty(approveGroupList)){
+ return approveDateVO;
+ }
+ //鎵�鏈夌殑瀹℃壒璁板綍
+ List<Approve> approveAllList = approveJoinMapper.selectJoinList(Approve.class,
+ new MPJLambdaWrapper<Approve>()
+ .selectAll(Approve.class)
+ .selectAs(Member::getName,Approve::getMemberName)
+ .selectAs(Member::getPhone,Approve::getMemberPhone)
+ .selectAs(Company::getName,Approve::getCompanyName)
+ .leftJoin(Member.class,Member::getId,Approve::getChekorId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Member::getId)
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .eq(Approve::getObjId,businessId)
+ .eq(Approve::getObjType,businessType)
+ .orderByAsc(Approve::getType)
+ .orderByAsc(Approve::getLevel)
+ .orderByAsc(Approve::getId)
+ );
+ if(CollectionUtils.isEmpty(approveAllList)){
+ return approveDateVO;
+ }
+ List<Approve> approveList = approveAllList.stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(approveList)){
+ return approveDateVO;
+ }
+ approveDateVO.setCanBeApproved(this.canBeApproved(approveList,memberId));
+ //鏍规嵁瀹℃壒绾у埆 澶勭悊鏁版嵁
+ for (Approve approve:approveGroupList) {
+ approve.setApproveList(
+ approveList.stream().filter(i->Objects.nonNull(i.getLevel())&&i.getLevel().equals(approve.getLevel())).collect(Collectors.toList())
+ );
+ }
+ approveDateVO.setApproveList(approveGroupList);
+ approveDateVO.setCopyList(approveAllList.stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList()));
+ return approveDateVO;
+ }
+
+
+ public Integer canBeApproved(List<Approve> approveList,Integer memberId){
+ //鑾峰彇鎵�鏈夊緟瀹℃壒鐨勬暟鎹�
+ List<Approve> waitApprovedList = approveList.stream().filter(i->i.getType().equals(Constants.ZERO)&&i.getStatus().equals(Constants.ZERO)).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(waitApprovedList)){
+ //涓嬩釜瀹℃壒娴佺▼绛夌骇
+ Integer nextApprovedLevel = waitApprovedList.get(Constants.ZERO).getLevel();
+ //涓嬩釜瀹℃壒娴佺▼鐨� 鎵�鏈夋暟鎹�
+ List<Approve> nextApprovedList = waitApprovedList.stream().filter(i->i.getStatus().equals(Constants.ZERO)&&i.getLevel().equals(nextApprovedLevel)).collect(Collectors.toList());
+ //涓嬩釜瀹℃壒娴佺▼鍐� 濡傛灉瀛樺湪褰撳墠 鐢ㄦ埛鐨勬姄绱� 鍒欏彲浠ヨ繘琛屽鎵�
+ if(nextApprovedList.stream().filter(i->i.getChekorId().equals(memberId)).collect(Collectors.toList()).size()>0){
+ return Constants.ONE;
+ }
+ }
+ return Constants.ZERO;
+ }
+
+
+
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void approved(ApproveDTO approveDTO){
+ if(Objects.isNull(approveDTO)
+ || Objects.isNull(approveDTO.getObjId())
+ || Objects.isNull(approveDTO.getObjType())
+ || Objects.isNull(approveDTO.getStatus())
+ || Objects.isNull(approveDTO.getLoginUserInfo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(approveDTO.getStatus().equals(Constants.THREE)&&StringUtils.isBlank(approveDTO.getCheckInfo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ嫆缁濊鏄�");
+ }
+ Approve approve = approveMapper.selectOne(new QueryWrapper<Approve>()
+ .lambda()
+ .eq(Approve::getObjId,approveDTO.getObjId())
+ .eq(Approve::getObjType,approveDTO.getObjType())
+ .last(" limit 1")
+ );
+ if(Objects.isNull(approve)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌瀹℃壒鏁版嵁");
+ }
+ if(!approve.getStatus().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒璁板綍鐘舵�侀敊璇�!");
+ }
+
+ //澶勭悊瀹℃壒淇℃伅
+ approve.setStatus(approveDTO.getStatus());
+ approve.setCheckInfo(approveDTO.getCheckInfo());
+ approve.setCheorId(approveDTO.getLoginUserInfo().getMemberId().toString());
+ approve.setCheckorName(approve.getLoginUserInfo().getRealname());
+ approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"瀹℃壒閫氳繃":approveDTO.getCheckInfo());
+ Visits visits = new Visits();
+ CarUseBook carUseBook = new CarUseBook();
+ this.dealBusinessData(approveDTO,approve,visits,carUseBook);
+ //鏈骇鎵�鏈� 寰呭鎵硅褰�
+ List<Approve> approveList = approveJoinMapper.selectJoinList(Approve.class,
+ new MPJLambdaWrapper<Approve>()
+ .selectAll(Approve.class)
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .eq(Approve::getObjId,approveDTO.getObjId())
+ .eq(Approve::getObjType,approveDTO.getObjType())
+ .eq(Approve::getLevel,approve.getLevel())
+ .eq(Approve::getStatus,Constants.ONE)
+ .ne(Approve::getId,approve.getId())
+ );
+ //澶勭悊鏈瀹℃壒鐨勪笟鍔℃暟鎹�
+ approveMapper.updateById(approve);
+ //鏄惁澶勭悊 涓氬姟鏁版嵁
+ Boolean dealBusinessBean = false;
+ //瀹℃壒椹冲洖鎯呭喌
+ if(approveDTO.getStatus().equals(Constants.THREE)){
+ //淇敼鍏朵粬鎵�鏈夊緟瀹℃壒鍜屽鎵逛腑璁板綍鏁版嵁
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.otherUnPass)
+ .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
+ .eq(Approve::getObjId,approve.getObjId())
+ .eq(Approve::getObjType,approve.getObjType())
+ .ne(Approve::getId,approve.getId()));
+ }else{
+ //澶勭悊鍏朵粬涓氬姟鏁版嵁
+ if(approve.getApproveType().equals(Constants.ZERO)&&approve.getIsEndCheck()==Constants.ONE){
+ //鎴栫 涓� 缁堝
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.otherDeal)
+ .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ dealBusinessBean = true;
+
+ }else if(approve.getApproveType().equals(Constants.ZERO)&&approve.getIsEndCheck()!=Constants.ONE){
+ //鎴栫 闈炵粓瀹� 鍒欏紑鍚笅涓�姝ヤ笟鍔℃祦绋�
+ /**澶勭悊鏈骇鏁版嵁**/
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.otherDeal)
+ .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ /**寮�鍚笅涓�绾у埆鐨勬暟鎹负寰呭鏍�**/
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.auditIng)
+ .eq(Approve::getStatus,Constants.approveStatus.wait)
+ .eq(Approve::getObjId,approve.getObjId())
+ .eq(Approve::getObjType,approve.getObjType())
+ .eq(Approve::getLevel,(approve.getLevel()+1))
+ );
+
+ }else if(approve.getApproveType().equals(Constants.ONE)&&approve.getIsEndCheck()==Constants.ONE){
+ //浼氱 涓旂粓瀹�
+ if(approveList.size()==Constants.ZERO){
+ dealBusinessBean = true;
+ }
+ }
+ }
+
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
+ // 璁垮 涓夌被涓氬姟鏁版嵁
+ visitsMapper.updateById(visits);
+ if(dealBusinessBean){
+ //TODO 鍙戦�佸鎵归�氳繃娑堟伅
+
+ }else if(approveDTO.getStatus().equals(Constants.THREE)){
+ //TODO 瀹℃壒鏈�氳繃閫氱煡
+
+ }
+
+
+ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+ Constants.approveObjectType.unCityUseCar)){
+ // 甯傚唴澶栫敤杞︾敵璇�
+ carUseBookMapper.updateById(carUseBook);
+ if(dealBusinessBean){
+ //TODO 鍙戦�佸鎵归�氳繃娑堟伅
+
+ }else if(approveDTO.getStatus().equals(Constants.THREE)){
+ //TODO 瀹℃壒鏈�氳繃閫氱煡
+
+ }
+
+
+ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.logisticsCarUse)){
+ //TODO 鐗╂祦杞﹂绾�
+
+ }
+ }
+
+ public void dealBusinessData(ApproveDTO approveDTO,Approve approve,Visits visits,CarUseBook carUseBook){
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
+ // 璁垮 涓夌被涓氬姟鏁版嵁
+ visits = visitsMapper.selectById(approveDTO.getObjId());
+ if(Objects.isNull(visits)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢宠璁板綍");
+ }
+ visits.setStatus(approveDTO.getStatus());
+ visits.setEditDate(new Date());
+ visits.setEditor(approveDTO.getLoginUserInfo().getMemberId());
+
+
+ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+ Constants.approveObjectType.unCityUseCar)){
+ // 甯傚唴澶栫敤杞︾敵璇�
+ carUseBook = carUseBookMapper.selectById(approveDTO.getObjId());
+ if(Objects.isNull(carUseBook)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鐢ㄨ溅璁板綍");
+ }
+ carUseBook.setStatus(approveDTO.getStatus());
+ carUseBook.setEditDate(new Date());
+ carUseBook.setEditor(approveDTO.getLoginUserInfo().getMemberId());
+ //濡傛灉閰嶇疆淇敼鍙告満 涓� 鍏ュ弬浜嗘洿鎹㈠悗鍙告満淇℃伅
+ if(approveDTO.getStatus()==Constants.TWO&&approve.getDriverParam().equals(Constants.ONE)){
+ CarDriver carDriver = carDriverMapper.selectById(approveDTO.getDriverId());
+ if(Objects.isNull(carDriver)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鍙告満淇℃伅");
+ }
+ carUseBook.setDriverId(carDriver.getId());
+ }
+
+ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.logisticsCarUse)){
+ //TODO 鐗╂祦杞﹂绾�
+
+ }else{
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ }
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 2b41210..f875670 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -18,6 +18,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.DateIntervalVO;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ApproveService;
import com.doumee.service.business.CarUseBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -151,8 +152,14 @@
}
}
+ /**
+ *
+ * @param id 涓婚敭
+ * @param memberId
+ * @return
+ */
@Override
- public CarUseBook findById(Integer id) {
+ public CarUseBook findById(Integer id,Integer memberId) {
MPJLambdaWrapper<CarUseBook> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(CarUseBook.class);
queryWrapper.select("t1.name",CarUseBook::getMemberName);
@@ -166,21 +173,11 @@
.eq(CarUseBook::getId,id)
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
- //瀹℃壒璁板綍
- List<Approve> approveList = approveJoinMapper.selectJoinList(Approve.class,
- new MPJLambdaWrapper<Approve>()
- .selectAll(Approve.class)
- .selectAs(Member::getName,Approve::getMemberName)
- .selectAs(Member::getPhone,Approve::getMemberPhone)
- .selectAs(Company::getName,Approve::getCompanyName)
- .leftJoin(Member.class,Member::getId,Approve::getChekorId)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .eq(Approve::getIsdeleted,Constants.ZERO)
- .eq(Approve::getObjType,Constants.ONE)
- .eq(Approve::getObjId,id)
- .orderByAsc(Approve::getLevel)
+ model.setApproveDateVO(
+ approveService.arrangeApprovedData(id,
+ model.getType().equals(Constants.ZERO)?3:4,
+ memberId)
);
- model.setApproveList(approveList);
return model;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 59ca333..922d615 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1213,7 +1213,7 @@
@Override
- public VisitDetailVO getVisitDetail(Integer id){
+ public VisitDetailVO getVisitDetail(Integer id,Integer memberId){
Visits visits = visitsMapper.selectById(id);
if(Objects.isNull(visits)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -1257,6 +1257,15 @@
visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
.select(Visits::getName,Visits::getPhone,Visits::getQrcode,Visits::getFaceImg,Visits::getImgurl,Visits::getIdcardDecode,Visits::getStatus)
.eq(Visits::getParentId,id)));
+
+
+ if(Objects.nonNull(memberId)){
+ visitDetailVO.setApproveDateVO(
+ approveService.arrangeApprovedData(id,
+ visits.getType(),
+ memberId)
+ );
+ }
return visitDetailVO;
}
--
Gitblit v1.9.3