From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 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 fba319f..25eeca6 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,13 +10,11 @@
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.CarDriverMapper;
-import com.doumee.dao.business.CarUseBookMapper;
-import com.doumee.dao.business.CarsMapper;
+import com.doumee.dao.business.*;
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.ApproveDataVO;
import com.doumee.dao.business.vo.DateIntervalVO;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
@@ -27,6 +25,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -70,6 +69,9 @@
@Autowired
private CarDriverMapper carDriverMapper;
+
+ @Autowired
+ private MemberMapper memberMapper;
@Override
@@ -179,11 +181,32 @@
.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)
- );
+ ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id,
+ Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
+ memberId);
+ List<Approve> approveList = approveDataVO.getApproveList();
+ if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ Member member1 = memberMapper.selectById(model.getCancelUser());
+
+ Approve approve = new Approve();
+ approve.setApproveType(Constants.ZERO);
+ approve.setCreateDate(model.getCancelTime());
+ approve.setTitle("鎾ら攢浜�");
+ approve.setStatusInfo("宸叉挙閿�");
+ approve.setStatus(Constants.FOUR);
+ approve.setType(Constants.ZERO);
+ if(member1!=null) {
+ approve.setMemberName(member1.getName());
+ if (StringUtils.isNotBlank(member1.getFaceImg())) {
+ approve.setFaceImg(path + member1.getFaceImg());
+ }
+ }
+ approve.setCheckInfo(model.getCancelInfo());
+ approveList.add(approve);
+ }
+ model.setApproveDateVO(approveDataVO);
return model;
}
@@ -419,9 +442,11 @@
//澶勭悊瀹℃壒璁板綍
approveJoinMapper.update(null,new UpdateWrapper<Approve>()
.lambda()
+ .set(Approve::getIsdeleted,Constants.ONE)
.set(Approve::getStatus,Constants.FOUR)
.set(Approve::getCheckInfo,"鐢ㄨ溅鐢宠鍙栨秷")
.in(Approve::getStatus,Constants.ZERO,Constants.ONE)
+ .in(Approve::getObjType,Constants.approveObjectType.cityUseCar,Constants.approveObjectType.unCityUseCar)
.eq(Approve::getObjId,id)
);
}
--
Gitblit v1.9.3