From b2cb07157105f1ad8ba43ce174c8069c7ac8cfd1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 11 九月 2024 15:03:11 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 37 +++++++++++++++++++++++--------------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java | 3 ++-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 8 ++++----
4 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
index 35c331f..1178e83 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
@@ -98,7 +98,7 @@
@PostMapping("/page")
@CloudRequiredPermission("business:visits:query")
public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId());
+// pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId());
return ApiResponse.success(visitsService.findPage(pageWrap));
}
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 a3d460f..d687420 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
@@ -802,7 +802,7 @@
private List<Approve> getLevelInfoFromList(Approve level,List<Approve> approveGroupList) {
List<Approve> list = new ArrayList<>();
if(Constants.equalsInteger(level.getApproveType(),Constants.TWO)){
- level.setApproveType(Constants.ZERO);
+ level.setApproveType(Constants.TWO);
//濡傛灉鏄崟浜哄鎵�
list.add(level);
return list;
@@ -829,11 +829,17 @@
waitModel.setType(Constants.ZERO);
waitModel.setTitle(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"));
waitModel.setStatus(Constants.equalsInteger(waitList.get(Constants.ZERO).getStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
- waitModel.setStatusInfo("澶勭悊涓�");
- if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.auditIng)
- ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
- waitModel.setMemberName(waitList.size() +"浜轰細绛�");
+ if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.wait)){
+ waitModel.setStatusInfo("寰呭鐞�");
+ }else if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.auditIng)){
+ waitModel.setStatusInfo("澶勭悊涓�");
}
+
+ waitModel.setMemberName(waitList.size() +"浜轰細绛�");
+// if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.auditIng)
+// ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
+// waitModel.setMemberName(waitList.size() +"浜轰細绛�");
+// }
if(CollectionUtils.isNotEmpty(waitList)){
waitModel.setCreateDate(waitList.get(Constants.ZERO).getCreateDate());
}
@@ -854,9 +860,11 @@
waitModel.setType(Constants.ONE);
waitModel.setTitle("瀹℃壒浜猴紙鎶勯�佹垨绛惧鎵逛汉锛�");
}else{
- waitModel.setType(Constants.ZERO);
- waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
waitModel.setStatus(passList.size()>0?Constants.ONE:Constants.ZERO);
+ waitModel.setType(Constants.ZERO);
+ //waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
+ waitModel.setTitle(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
+
}
List<Approve> approveList = new ArrayList<>();
approveList.addAll(waitList);
@@ -870,7 +878,10 @@
if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.pass)){
waitModel.setMemberName("宸叉妱閫�"+ approveList.size() +"浜�");
}else if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.wait)){
- waitModel.setMemberName("澶勭悊涓�");
+ waitModel.setMemberName(waitList.size() +"浜烘垨绛�");
+ waitModel.setStatusInfo("寰呭鐞�");
+ }else{
+ waitModel.setStatusInfo("澶勭悊涓�");
}
waitModel.setApproveList(approveList);
list.add(waitModel);
@@ -1225,8 +1236,6 @@
if(Objects.nonNull(visits)){
if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)){
visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
- }else{
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁瀵硅薄!璇峰埛鏂伴噸璇�");
}
}
@@ -1329,9 +1338,9 @@
String info = "";
List<String> memberNameList = Arrays.asList(memberNames.split(","));
if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
- info = "寰� "+memberNameList.get(0)+" 澶勭悊涓�";
+ info = "寰�"+memberNameList.get(0)+"澶勭悊涓�";
}else{
- info = "寰� "+memberNameList.get(0)+" 绛�"+memberNameList.size()+"浜哄鐞嗕腑";
+ info = "寰�"+memberNameList.get(0)+"绛�"+memberNameList.size()+"浜哄鐞嗕腑";
}
//鏇存柊璇ヤ笟鍔℃暟鎹殑鎵�鏈夎褰曚俊鎭�
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
@@ -1395,9 +1404,9 @@
notices.setParam5(memberNames);
notices.setRemark(nextDealApprove.getMemberName());
if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
- notices.setInfo("寰� "+memberNameList.get(0)+" 澶勭悊涓�");
+ notices.setInfo("寰�"+memberNameList.get(0)+"澶勭悊涓�");
}else{
- notices.setInfo("寰� "+memberNameList.get(0)+" 绛�"+memberNameList.size()+"浜哄鐞嗕腑");
+ notices.setInfo("寰�"+memberNameList.get(0)+"绛�"+memberNameList.size()+"浜哄鐞嗕腑");
}
noticesJoinMapper.insert(newNotices);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
index 9150d38..b3b0653 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -27,6 +27,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 瀹℃壒妯＄増淇℃伅琛⊿ervice瀹炵幇
@@ -99,7 +100,7 @@
param.setType(Constants.formatIntegerNum(param.getType()));
param.setAddrParam(Constants.formatIntegerNum(param.getAddrParam()));
param.setDriverParam(Constants.formatIntegerNum(param.getDriverParam()));
- param.setApproveType(Constants.formatIntegerNum(param.getApproveType()));
+ param.setApproveType(Objects.isNull(param.getApproveType())?Constants.TWO:param.getApproveType());
level ++ ;
}
//鍏堟竻闄ゅ師鏉ユ墍鏈夌殑灏遍櫔閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 3d3bcbe..32c7945 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -144,7 +144,7 @@
createNotices.setSendacopy(Constants.ZERO);
createNotices.setParam2("0");
createNotices.setParam3(hiddenDanger.getLoginUserInfo().getMemberId().toString());
- createNotices.setInfo("寰� "+member.getName()+" 澶勭悊");
+ createNotices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(createNotices);
//瀛樺偍澶勭悊浜虹殑閫氱煡娑堟伅
@@ -163,7 +163,7 @@
notices.setStatus(Constants.ZERO);
notices.setSendacopy(Constants.ZERO);
notices.setReaded(Constants.ZERO);
- notices.setInfo("寰� "+member.getName()+" 澶勭悊");
+ notices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(notices);
@@ -514,13 +514,13 @@
newNotices.setCreateDate(new Date());
newNotices.setParam2("0");
newNotices.setUserId(hiddenDanger.getCheckUserId());
- newNotices.setInfo("寰� "+member.getName()+" 澶勭悊");
+ newNotices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(newNotices);
notices.setStatus(Constants.ONE);
notices.setParam2("3");
notices.setEditDate(new Date());
notices.setReaded(Constants.ONE);
- notices.setInfo("寰� "+member.getName()+" 澶勭悊");
+ notices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.updateById(notices);
}
}
--
Gitblit v1.9.3