From 8725ebeaadc6714823593a6b10a0dd9acdf0d14a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 27 五月 2024 17:19:34 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 deletions(-)
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 2479504..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
@@ -10,12 +10,16 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.ApproveMapper;
import com.doumee.dao.business.CarUseBookMapper;
import com.doumee.dao.business.CarsMapper;
+import com.doumee.dao.business.join.ApproveJoinMapper;
import com.doumee.dao.business.join.CarUseBookJoinMapper;
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;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -56,6 +60,12 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private ApproveJoinMapper approveJoinMapper;
+
+ @Autowired
+ private ApproveService approveService;
@Override
@@ -103,6 +113,8 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪杞﹁締棰勭害鏃堕棿涓庡凡棰勭害鏃堕棿鍐茬獊~");
}
carUseBookMapper.insert(carUseBook);
+ //鐢ㄨ溅鐢宠 瀹℃壒璁板綍鍒涘缓
+ approveService.createApproveFlow(carUseBook.getType()==0?3:4,carUseBook.getId(),carUseBook.getMemberId());
return carUseBook.getId();
}
@@ -140,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);
@@ -155,6 +173,11 @@
.eq(CarUseBook::getId,id)
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
+ model.setApproveDateVO(
+ approveService.arrangeApprovedData(id,
+ model.getType().equals(Constants.ZERO)?3:4,
+ memberId)
+ );
return model;
}
@@ -207,10 +230,8 @@
.le(pageWrap.getModel().getCheckDate() != null, CarUseBook::getCheckDate, Utils.Date.getEnd(pageWrap.getModel().getCheckDate()))
.eq(pageWrap.getModel().getCheckUserId() != null, CarUseBook::getCheckUserId, pageWrap.getModel().getCheckUserId())
.eq(pageWrap.getModel().getCheckInfo() != null, CarUseBook::getCheckInfo, pageWrap.getModel().getCheckInfo())
- .ge(pageWrap.getModel().getCancelType() != null, CarUseBook::getCancelType, Utils.Date.getStart(pageWrap.getModel().getCancelType()))
- .le(pageWrap.getModel().getCancelType() != null, CarUseBook::getCancelType, Utils.Date.getEnd(pageWrap.getModel().getCancelType()))
- .ge(pageWrap.getModel().getCancelStatus() != null, CarUseBook::getCancelStatus, Utils.Date.getStart(pageWrap.getModel().getCancelStatus()))
- .le(pageWrap.getModel().getCancelStatus() != null, CarUseBook::getCancelStatus, Utils.Date.getEnd(pageWrap.getModel().getCancelStatus()))
+ .eq(pageWrap.getModel().getCancelType() != null, CarUseBook::getCancelType, pageWrap.getModel().getCancelType())
+ .eq(pageWrap.getModel().getCancelStatus() != null, CarUseBook::getCancelStatus, pageWrap.getModel().getCancelStatus())
.ge(pageWrap.getModel().getCancelTime() != null, CarUseBook::getCancelTime, Utils.Date.getStart(pageWrap.getModel().getCancelTime()))
.le(pageWrap.getModel().getCancelTime() != null, CarUseBook::getCancelTime, Utils.Date.getEnd(pageWrap.getModel().getCancelTime()))
.eq(pageWrap.getModel().getCancelUser() != null, CarUseBook::getCancelUser, pageWrap.getModel().getCancelUser())
@@ -377,11 +398,30 @@
}
- public void revoke(Integer id, LoginUserInfo loginUserInfo){
+ @Override
+ public void revoke(Integer id, String info, LoginUserInfo loginUserInfo){
CarUseBook carUseBook = carUseBookMapper.selectById(id);
-
-
-
+ if(Objects.isNull(carUseBook)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄨ溅鐢宠淇℃伅");
+ }
+ carUseBook.setCancelInfo(info);
+ carUseBook.setCancelTime(new Date());
+ carUseBook.setCancelStatus(Constants.ONE);
+ carUseBook.setStatus(Constants.FOUR);
+ carUseBook.setCancelUser(loginUserInfo.getId());
+ carUseBook.setCancelType(Constants.ONE);
+ if(loginUserInfo.getId().equals(carUseBook.getCreator())){
+ carUseBook.setCancelType(Constants.ZERO);
+ }
+ carUseBookMapper.updateById(carUseBook);
+ //澶勭悊瀹℃壒璁板綍
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.FOUR)
+ .set(Approve::getCheckInfo,"鐢ㄨ溅鐢宠鍙栨秷")
+ .in(Approve::getStatus,Constants.ZERO,Constants.ONE)
+ .eq(Approve::getObjId,id)
+ );
}
--
Gitblit v1.9.3