From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 154 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 114 insertions(+), 40 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 91309e2..bb5e871 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
@@ -111,6 +111,8 @@
private ErpTool erpTool;
@Autowired
+ private VisitParkMapper visitParkMapper;
+ @Autowired
private WxPlatNotice wxPlatNotice;
@Autowired
@@ -1044,6 +1046,7 @@
problemLog.setUserId(member.getId());
problemLog.setPhone(member.getPhone());
problemLog.setLogId(visits.getId());
+ problemLog.setCompanyName(visits.getCompanyName());
problemLogMapper.updateById(problemLog);
}
}
@@ -1570,31 +1573,42 @@
.eq(Retention::getMemberId,visits.getMemberId()));
}
- @Autowired
- private VisitParkMapper visitParkMapper;
-
- /**
- * 澶勭悊寰呭鏍搞�佸鏍镐腑銆佸凡瀹℃牳鐨勬暟鎹彇娑堜笟鍔�
- * 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)
@@ -1649,6 +1663,33 @@
updateWrapper.lambda().set(Visits::getHkStatus,Constants.ZERO).set(Visits::getHkDate,DateUtil.getCurrDateTime());
}
}
+
+ if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)||Constants.equalsInteger(visits.getStatus(),Constants.ONE)){
+ //鏇存柊瀹℃壒涓殑璁板綍涓哄彇娑�
+ approveMapper.update(null,
+ new UpdateWrapper<Approve>().lambda()
+ .set(Approve::getEditDate,new Date())
+ .set(Approve::getStatus,Constants.approveStatus.cancel)
+ .set(Approve::getStatusInfo,"鎵嬪姩鍙栨秷")
+ .set(Approve::getCheckInfo,"鎵嬪姩鍙栨秷")
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
+ .eq(Approve::getObjId,visits.getId())
+ .eq(Approve::getObjType,visits.getType()));
+ //鏇存柊寰呭姙娑堟伅鐘舵��
+ noticesJoinMapper.update(null,
+ new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getEditDate,new Date())
+ .set(Notices::getInfo,"鎵嬪姩鍙栨秷")
+// .set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getParam2,Constants.FOUR)//宸插彇娑�
+ .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)
+ );
+ }
+
visitsMapper.update(null,updateWrapper);
}
@@ -1969,9 +2010,6 @@
);
}
}
-
-
-
}
@Override
public void visitNoCheckCancel(){
@@ -1997,31 +2035,67 @@
.set(Visits::getEditDate,date)
.set(Visits::getRemark,"棰勭害鎴鏃堕棿宸茶繃鏈鎵癸紝绯荤粺鑷姩鍙栨秷")
.eq(Visits::getId,s.getId()));
- //鏇存柊瀹℃壒涓殑璁板綍涓哄彇娑�
- approveMapper.update(null,
- new UpdateWrapper<Approve>().lambda()
- .set(Approve::getEditDate,date)
- .set(Approve::getStatus,Constants.approveStatus.cancel)
- .set(Approve::getStatusInfo,"绯荤粺宸插彇娑�")
- .set(Approve::getCheckInfo,"璁块棶鏃堕棿宸茶繃锛岀郴缁熻嚜鍔ㄥ彇娑�")
- .eq(Approve::getIsdeleted,Constants.ZERO)
- .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
- .eq(Approve::getObjId,s.getId())
- .eq(Approve::getObjType,s.getType()));
- //鏇存柊寰呭姙娑堟伅鐘舵��
- noticesJoinMapper.update(null,
- new UpdateWrapper<Notices>().lambda()
- .set(Notices::getEditDate,date)
- .set(Notices::getInfo,"宸插彇娑�")
-// .set(Notices::getStatus,Constants.ONE)
- .set(Notices::getParam2,Constants.FOUR)//宸插彇娑�
- .eq(Notices::getIsdeleted,Constants.ZERO)
- .eq(Notices::getStatus,Constants.ZERO)
- .eq(Notices::getParam2,Constants.ZERO)//寰呭鐞�
- .eq(Notices::getObjId,s.getId())
- .eq(Notices::getObjType,Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
+
+ VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"绯荤粺鍙栨秷",s.getId(),
+ s.getType(),Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting
);
+
+
+// //鏇存柊瀹℃壒涓殑璁板綍涓哄彇娑�
+// approveMapper.update(null,
+// new UpdateWrapper<Approve>().lambda()
+// .set(Approve::getEditDate,date)
+// .set(Approve::getStatus,Constants.approveStatus.cancel)
+// .set(Approve::getStatusInfo,"绯荤粺宸插彇娑�")
+// .set(Approve::getCheckInfo,"璁块棶鏃堕棿宸茶繃锛岀郴缁熻嚜鍔ㄥ彇娑�")
+// .eq(Approve::getIsdeleted,Constants.ZERO)
+// .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
+// .eq(Approve::getObjId,s.getId())
+// .eq(Approve::getObjType,s.getType()));
+// //鏇存柊寰呭姙娑堟伅鐘舵��
+// noticesJoinMapper.update(null,
+// new UpdateWrapper<Notices>().lambda()
+// .set(Notices::getEditDate,date)
+// .set(Notices::getInfo,"宸插彇娑�")
+//// .set(Notices::getStatus,Constants.ONE)
+// .set(Notices::getParam2,Constants.FOUR)//宸插彇娑�
+// .eq(Notices::getIsdeleted,Constants.ZERO)
+// .eq(Notices::getStatus,Constants.ZERO)
+// .eq(Notices::getParam2,Constants.ZERO)//寰呭鐞�
+// .eq(Notices::getObjId,s.getId())
+// .eq(Notices::getObjType,Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
+// );
}
+ public static void dealCancelNoticesData(NoticesJoinMapper noticesJoinMapper,ApproveMapper approveMapper,String info,Integer objId,Integer approveObjectType,Integer noticesType){
+ if(Objects.nonNull(approveObjectType)){
+ approveMapper.update(null,
+ new UpdateWrapper<Approve>().lambda()
+ .set(Approve::getEditDate,new Date())
+ .set(Approve::getStatus,Constants.approveStatus.cancel)
+ .set(Approve::getStatusInfo,info)
+ .set(Approve::getCheckInfo,info)
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
+ .eq(Approve::getObjId,objId)
+ .eq(Approve::getObjType,approveObjectType));
+ }
+ if(Objects.nonNull(noticesType)){
+ //鏇存柊寰呭姙娑堟伅鐘舵��
+ noticesJoinMapper.update(null,
+ new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getEditDate,new Date())
+ .set(Notices::getInfo,info)
+ .set(Notices::getParam2,Constants.FOUR)//宸插彇娑�
+ .eq(Notices::getStatus,Constants.ZERO)
+ .eq(Notices::getParam2,Constants.ZERO)//寰呭鐞�
+ .eq(Notices::getObjId,objId)
+ .eq(Notices::getObjType,noticesType)
+ );
+ }
+ }
+
+
+
}
--
Gitblit v1.9.3