From bb48c066cc11f571be02eb0dc7f9ef26dd3151ca Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 02 四月 2025 10:08:48 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 23 deletions(-)
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 6360447..814663a 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
@@ -569,7 +569,7 @@
.eq(ApproveParam::getLevel,Constants.ONE)
.eq(ApproveParam::getMemberType,Constants.ZERO)
.last("limit 1"));
- return Objects.isNull(approveParam)?null:approveParam.getId();
+ return Objects.isNull(approveParam)?null:approveParam.getId();
}
@@ -1574,28 +1574,41 @@
}
-
- /**
- * 澶勭悊寰呭鏍搞�佸鏍镐腑銆佸凡瀹℃牳鐨勬暟鎹彇娑堜笟鍔�
- * 2025骞�3鏈�25鏃�14:10:10
- */
@Override
- public void visitsCancel(Integer visitId,LoginUserInfo loginUserInfo){
+ public void visitsSelfCancel(Integer visitId,Integer memberId){
Visits visits = visitsMapper.selectById(visitId);
if(Objects.isNull(visits)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!(Constants.equalsInteger(loginUserInfo.getMemberId(),visits.getMemberId()) ||
- Constants.equalsInteger(loginUserInfo.getMemberId(),visits.getCreateMemberId()) ||
- ( CollectionUtils.isNotEmpty(loginUserInfo.getPermissions()) &&
- loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")).collect(Collectors.toList()).size()>0))){
+ if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺");
}
+ this.visitsCancelBiz(visits);
+ }
+
+ @Override
+ public void visitsCancel(Integer visitId,LoginUserInfo loginUserInfo) {
+ Visits visits = visitsMapper.selectById(visitId);
+ if (Objects.isNull(visits)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!(
+ CollectionUtils.isNotEmpty(loginUserInfo.getPermissions()) &&
+ loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")).collect(Collectors.toList()).size()>0)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺");
+ }
+ this.visitsCancelBiz(visits);
+ }
+ /**
+ * 澶勭悊寰呭鏍搞�佸鏍镐腑銆佸凡瀹℃牳鐨勬暟鎹彇娑堜笟鍔�
+ * 2025骞�3鏈�25鏃�14:10:10
+ */
+ public void visitsCancelBiz(Visits visits){
UpdateWrapper<Visits> updateWrapper = new UpdateWrapper();
updateWrapper.lambda().set(Visits::getStatus,Constants.VisitStatus.cancel)
.set(Visits::getEditDate,DateUtil.getCurrDateTime())
- .set(Visits::getEditor,loginUserInfo.getId())
- .eq(Visits::getId,visitId);
+ .set(Visits::getEditor,visits.getEditor())
+ .eq(Visits::getId,visits.getId());
//璁垮鎶ュ
if(Constants.equalsInteger(visits.getType(),Constants.TWO)){
if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)
@@ -1604,7 +1617,7 @@
}
if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass)
&& Constants.equalsInteger(visits.getHkStatus(),Constants.ONE)
- &&StringUtils.isNotBlank(visits.getHkId())){
+ &&StringUtils.isNotBlank(visits.getCarNos())){
//鍙栨秷鍋滆溅鍦洪绾�
List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()
.eq(VisitPark::getCarCode,visits.getCarNos())
@@ -1640,9 +1653,9 @@
}
if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)
&& Constants.equalsInteger(visits.getHkStatus(),Constants.ONE)
- &&StringUtils.isNotBlank(visits.getHkId())){
+ &&StringUtils.isNotBlank(visits.getHkRecordId())){
VisitAppointmentCancelRequest request = new VisitAppointmentCancelRequest();
- request.setAppointRecordIds(new String[]{visits.getHkId()});
+ request.setAppointRecordIds(new String[]{visits.getHkRecordId()});
BaseResponse response = HKService.iccmCancelAppointment(request);
if(response==null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMsg());
@@ -1668,14 +1681,32 @@
new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
.set(Notices::getInfo,"鎵嬪姩鍙栨秷")
-// .set(Notices::getStatus,Constants.ONE)
- .set(Notices::getParam2,Constants.FOUR)//宸插彇娑�
- .eq(Notices::getIsdeleted,Constants.ZERO)
+ .setSql(" param4 = user_id ")
+ .set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getParam2,Constants.ONE)//鏍囪宸插鐞�
.eq(Notices::getStatus,Constants.ZERO)
.eq(Notices::getParam2,Constants.ZERO)//寰呭鐞�
.eq(Notices::getObjId,visits.getId())
.eq(Notices::getObjType,Constants.equalsInteger(visits.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
);
+
+ Approve approve = new Approve();
+ approve.setCreateDate(new Date());
+ approve.setIsdeleted(Constants.ZERO);
+ approve.setRemark("鎵嬪姩鍙栨秷");
+ approve.setChekorId(visits.getEditor());
+ approve.setTitle("鍙栨秷棰勭害");
+ approve.setStatus(Constants.THREE);
+ approve.setStatusInfo("鎵嬪姩鍙栨秷");
+ approve.setObjId(visits.getId());
+ approve.setLevel(9999);
+ approve.setApproveType(2);
+ approve.setDriverParam(Constants.ZERO);
+ approve.setAddrParam(Constants.ZERO);
+ approve.setObjType(visits.getType());
+ approve.setType(Constants.ZERO);
+ approve.setCheckDate(new Date());
+ approveMapper.insert(approve);
}
visitsMapper.update(null,updateWrapper);
@@ -2025,9 +2056,26 @@
.eq(Visits::getId,s.getId()));
VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"绯荤粺鍙栨秷",s.getId(),
- s.getType(),Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting
+ s.getType(),
+ !Constants.equalsInteger(s.getType(),Constants.TWO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting
);
+ Approve approve = new Approve();
+ approve.setCreateDate(new Date());
+ approve.setIsdeleted(Constants.ZERO);
+ approve.setRemark("绯荤粺鑷姩鍙栨秷");
+ approve.setTitle("鍙栨秷棰勭害");
+ approve.setStatus(Constants.THREE);
+ approve.setStatusInfo("瓒呮椂鑷姩鍙栨秷");
+ approve.setObjId(s.getId());
+ approve.setLevel(9999);
+ approve.setApproveType(2);
+ approve.setDriverParam(Constants.ZERO);
+ approve.setAddrParam(Constants.ZERO);
+ approve.setObjType(s.getType());
+ approve.setType(Constants.ZERO);
+ approve.setCheckDate(new Date());
+ approveMapper.insert(approve);
// //鏇存柊瀹℃壒涓殑璁板綍涓哄彇娑�
// approveMapper.update(null,
@@ -2074,9 +2122,10 @@
noticesJoinMapper.update(null,
new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
- .set(Notices::getInfo,info)
- .set(Notices::getParam2,Constants.FOUR)//宸插彇娑�
- .eq(Notices::getIsdeleted,Constants.ZERO)
+ .set(Notices::getInfo,"鑷姩鍙栨秷")
+ .setSql(" param4 = user_id ")
+ .set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getParam2,Constants.ONE)//宸插彇娑�
.eq(Notices::getStatus,Constants.ZERO)
.eq(Notices::getParam2,Constants.ZERO)//寰呭鐞�
.eq(Notices::getObjId,objId)
--
Gitblit v1.9.3