From 10e6b23d0f556310c3a065c5b4f6ec141b327159 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 十一月 2023 13:16:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
index bf22ba6..a78fcc4 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -16,6 +16,7 @@
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.*;
import com.zy.crm.manager.service.*;
+import com.zy.crm.manager.utils.CompanySearchUtils;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -142,6 +143,69 @@
wrapper.or().eq("host_id", 1);
}
}
+ @RequestMapping(value = "/priOnline2/HJ/add/auth")
+ @ManagerAuth(memo = "鎺ュ彇闆嗘垚鏍镐环浠诲姟")
+ public R addHJ(PriOnline2 priOnline2) {
+ PriOnline2 priOnline21 = priOnline2Service.selectById(priOnline2.getId());
+ if (priOnline21.getSettle()!=1 || !priOnline21.getMemberId().equals(0L)){
+ return R.error("姝ら泦鎴愭牳浠峰崟鐘舵�佸凡鏀瑰彉锛岃鍒锋柊椤甸潰閲嶆柊閫夋嫨锛�");
+ }
+ Date now = new Date();
+ priOnline21.setMemberId(getUserId());
+
+
+ List<SettleDto> planDtos = JSON.parseArray(priOnline21.getSettleMsg(), SettleDto.class);
+ List<SettleDto> planDtoList = new ArrayList<>();
+ for (SettleDto dto : planDtos) {
+ if (dto.getStep().equals(2)) {
+ dto.setUserId(getUserId());
+ dto.setUsername(getUser().getNickname());
+ if (Cools.isEmpty(dto.getMsg())) {
+ dto.setMsg(getUser().getNickname() + "鎺ュ彇鏍镐环");
+ } else {
+ dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(now) + " " + getUser().getNickname() + "鎺ュ彇鏍镐环");
+ }
+ dto.setTime(DateUtils.convert(new Date()));
+ }
+ planDtoList.add(dto);
+ }
+ priOnline21.setSettleMsg(JSON.toJSONString(planDtoList));
+ priOnline21.setUpdateUserId(getUserId());
+ priOnline21.setUpdateTime(now);
+ priOnline2Service.updateById(priOnline21);
+ return R.ok("鎺ュ彇鎴愬姛");
+ }
+
+ @RequestMapping(value = "/priOnline2/HJ/search/auth")
+ @ManagerAuth
+ public R priOnline2Search(String condition) {
+ EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>();
+ wrapper.like("template_name", condition);
+ wrapper.eq("member_id",0L);
+
+ List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5));//2锛氭牳浠锋祦绋�
+ int type =0;
+ for (ProcessPermissions processPermissions:processPermissionsList){
+ if (getUserId().equals(processPermissions.getUserId())){
+ type=1;
+ break;
+ }
+ }
+ if (type==0){
+ return R.error("浣犱笉鏄牳浠峰憳,鏃犳潈鎺ヤ换鍔�");
+ }
+ List<Map<String, Object>> result = new ArrayList<>();
+
+ List<PriOnline2> priOnline2s = priOnline2Service.selectList(wrapper);
+ for (PriOnline2 priOnline2 : priOnline2s){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", priOnline2.getId());
+ map.put("name", priOnline2.getTemplateName()+" - ID:"+priOnline2.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
@RequestMapping(value = "/priOnline2/add/auth")
@ManagerAuth(memo = "娣诲姞鏍镐环绠＄悊")
@@ -208,11 +272,12 @@
users.add(getUser());
users.add(getUser());
if (planType.getType().equals(2)) {
- users.add(userService.selectById(73));
+ users.add(new User());
}
users.add(userUp);
priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.InItFlowPath(users, initNames, users.size())));
priOnline2.setSettleSize(users.size());
+ priOnline2.setPlanId(plan.getId());
//璁剧疆椤圭洰娴佺▼
plan.setStep(2);
@@ -529,7 +594,11 @@
}
dto.setTime(DateUtils.convert(new Date()));
} else if (dto.getStep().equals(priOnline2.getSettle() + 2)) {
- nextUserId=dto.getUserId();
+ if (Cools.isEmpty(dto.getUserId())){
+ nextUserId= 0L;
+ }else {
+ nextUserId=dto.getUserId();
+ }
}
}
priOnline2.setSettleMsg(JSON.toJSONString(list));
--
Gitblit v1.9.1