From 3ac5ee0ef5f6b1ca9537786c4c98556892a2fe4c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 09 十月 2023 16:27:10 +0800
Subject: [PATCH] #流程相关
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 104 +++++++++++++++++++++++++++++++++------------------
1 files changed, 67 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
index 45d3c06..8309e79 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -47,6 +47,9 @@
private PriQuoteBudgetService priQuoteBudgetService;
@Autowired
+ private PriOnline2Service priOnline2Service;
+
+ @Autowired
private ProcessPermissionsService processPermissionsService;
@Autowired
@@ -79,22 +82,26 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<PriQuote> wrapper = new EntityWrapper<>();
- wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,sheet_data as sheetData,user_id as userId,dept_id as deptId,settle,settle_msg as settleMsg,form,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
- wrapper.in("member_id", getUserRoleBelongsToUserId());
+ wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,sheet_data as sheetData,user_id as userId,dept_id as deptId,settle,settle_msg as settleMsg,form,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId,template");
+// wrapper.in("member_id", getUserRoleBelongsToUserId());
excludeTrash(param);
convert(param, wrapper);
allLike(PriQuote.class, param.keySet(), wrapper, condition);
+ wrapper.or().eq("member_id",getUserId());
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(priQuoteService.selectPage(new Page<>(curr, limit), wrapper));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- Long deptId = getDeptId();
boolean signUserId = false;
boolean signDeptId = false;
+ boolean signHostId = false;
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().equals("dept_id")){
signDeptId = true;
+ if (String.valueOf(entry.getValue()).equals("19")){
+ signHostId = true;
+ }
}
}
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -117,44 +124,59 @@
if (!signUserId && !signDeptId){
wrapper.eq("user_id", getUserId());
}
+ if (signHostId){
+ wrapper.or().eq("host_id",1);
+ }
}
@RequestMapping(value = "/priQuote/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鎶ヤ环鍗�")
public R add(@RequestBody Map<String,Object> map) {
- PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
+// PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
+ PriOnline2 priOnline2 = priOnline2Service.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
PriQuote priQuote = new PriQuote();
priQuote.setCreateTime(new Date());
priQuote.setTitle(map.get("title").toString());
- priQuote.setTemplateName(priQuoteBudget.getTemplateName());
+ priQuote.setTemplateName(priOnline2.getTemplateName());
priQuote.setSheetData(map.get("sheetData").toString());
- priQuote.setItemId(priQuoteBudget.getItemId());
- priQuote.setOrderNum(priQuoteBudget.getInOrderNum());
+ priQuote.setPriOnlineId(Long.parseLong(map.get("priQuoteBudgetId").toString()));
+ priQuote.setItemId(priOnline2.getItemId());
+ priQuote.setOrderNum(priOnline2.getOrderNum());
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
priQuote.setInOrderNum(format.format(new Date()));
- //鍒涘缓浜哄憳
- priQuote.setUserId(getUserId());
+ //涓氬姟鍛�
+ Plan plan = planService.selectById(priQuote.getItemId());
+ User userUp = userService.selectById(plan.getUserId());
+
+ //涓氬姟鍛�
+ priQuote.setUserId(userUp.getId());
//鏇存柊浜哄憳
priQuote.setUpdateUserId(getUserId());
//鎵�灞為儴闂�
- priQuote.setDeptId(getDeptId());
+ priQuote.setDeptId(userUp.getDeptId());
//鏇存柊鏃堕棿
priQuote.setUpdateTime(new Date());
+ //妯℃澘
+ priQuote.setTemplate(map.get("template").toString());
- //涓氬姟鍛�
- Plan plan = planService.selectById(priQuote.getItemId());
- priQuote.setMemberId(plan.getUserId());
+
//璁剧疆椤圭洰娴佺▼
plan.setStep(5);
priQuote.setForm(JSON.toJSONString(map)); // 鑷畾涔夎〃鍗曞唴瀹�
priQuote.setSettle(1); // 1.寮�濮�
- User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
- ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", 3));//2锛氭姤浠锋祦绋�
- User president = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), userUp.getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = getUser();
+ }
+ priQuote.setMemberId(manager.getId());
+ ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
+ User president = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3-1纭浜�
priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager,president,getUser())));
planService.updateById(plan);
@@ -164,7 +186,7 @@
}
@RequestMapping(value = "/priQuote/addOther/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍙﹀瓨鎶ヤ环鍗�")
public R addOther(@RequestBody Map<String,Object> map) {
PriQuote quote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));
@@ -195,7 +217,7 @@
}
@RequestMapping(value = "/priQuote/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鎶ヤ环鍗�")
public R update(@RequestBody Map<String,Object> map){
PriQuote priQuote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));
priQuote.setTitle(map.get("title").toString());
@@ -209,7 +231,7 @@
}
@RequestMapping(value = "/priQuote/updateForm/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鎶ヤ环鍗�")
public R updateForm(Long id,String templateName,String title){
PriQuote priQuote = priQuoteService.selectById(id);
priQuote.setTemplateName(templateName);
@@ -223,7 +245,7 @@
}
@RequestMapping(value = "/priQuote/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鎶ヤ环鍗�")
public R delete(Long[] ids){
if (Cools.isEmpty(ids)){
return R.error();
@@ -248,7 +270,7 @@
public R query(String condition) {
EntityWrapper<PriQuote> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- wrapper.in("member_id", getUserRoleBelongsToUserId());
+ wrapper.in("user_id", getUserRoleBelongsToUserId());
Page<PriQuote> page = priQuoteService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (PriQuote priQuote : page.getRecords()){
@@ -286,7 +308,7 @@
String path = ClassUtils.getDefaultClassLoader().getResource("excel").getPath();
String filename = format.format(new Date()) + ".xlsx";
String filepath = path + "/" + filename;
- exportLuckySheetXlsx(path,"/" + filename,map.get("exceldata").toString());
+ exportLuckySheetXlsx(path, "/" + filename, map.get("exceldata").toString(), map.get("template").toString());
return R.ok("/priQuote/excel/" + filename);
}
@@ -318,14 +340,14 @@
}
}
- public void exportLuckySheetXlsx(String newFileDir,String newFileName, String excelData) {
+ public void exportLuckySheetXlsx(String newFileDir, String newFileName, String excelData, String template) {
//瑙ｆ瀽瀵硅薄锛屽彲浠ュ弬鐓у畼鏂规枃妗�:https://mengshukeji.github.io/LuckysheetDocs/zh/guide/#%E6%95%B4%E4%BD%93%E7%BB%93%E6%9E%84
JSONArray jsonArray = (JSONArray) JSONObject.parse(excelData);
//濡傛灉鍙湁涓�涓猻heet閭ｅ氨鏄痝et(0),鏈夊涓偅灏卞搴斿彇涓嬫爣
JSONObject jsonObject = (JSONObject) jsonArray.get(0);
JSONArray jsonObjectList = jsonObject.getJSONArray("celldata");
//excel妯℃澘璺緞
- String filePath = ClassUtils.getDefaultClassLoader().getResource("excel").getPath() + "/priQuoteTemplate.xlsx";
+ String filePath = ClassUtils.getDefaultClassLoader().getResource("excel").getPath() + "/priQuoteTemplate/data" + template +".xlsx";
// String filePath = "/Users/ouyang/Downloads/uploadTestProductFile/鐢熶骇鏃ユ姤琛�.xlsx";
File file = new File(filePath);
FileInputStream in = null;
@@ -361,7 +383,7 @@
}
String value = "";
- if (jsonObjectValue != null && jsonObjectValue.get("v") != null){
+ if (jsonObjectValue != null && jsonObjectValue.get("v") != null) {
//鑾峰彇鍗曞厓鏍煎��
value = jsonObjectValue.get("v").toString();
}
@@ -369,11 +391,11 @@
if (Integer.parseInt(object.get("r").toString()) >= 4 && Integer.parseInt(object.get("r").toString()) <= 9) {
if (Integer.parseInt(object.get("c").toString()) == 2 || Integer.parseInt(object.get("c").toString()) == 6) {
//濉厖绗簩鍒楁暟鎹�
- if (sheet.getRow((int) object.get("r")) !=null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null){
+ if (sheet.getRow((int) object.get("r")) != null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null) {
if (!value.equals("")) {
sheet.getRow((int) object.get("r")).getCell((int) object.get("c")).setCellValue(value);
}
- }else{
+ } else {
System.out.println("閿欒鐨�=" + index + ">>>" + str_);
}
}
@@ -393,11 +415,11 @@
case 3:
case 4:
case 5:
- if (sheet.getRow((int) object.get("r")) !=null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null){
+ if (sheet.getRow((int) object.get("r")) != null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null) {
if (!value.equals("")) {
sheet.getRow((int) object.get("r")).getCell((int) object.get("c")).setCellValue(value);
}
- }else{
+ } else {
System.out.println("閿欒鐨�=" + index + ">>>" + str_);
}
break;
@@ -435,7 +457,12 @@
case 1:
// 鏈儴闂ㄧ粡鐞嗗鏍�
User user = userService.selectById(priQuote.getUserId());
- User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), user.getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = user;
+ }
if (manager.getId().equals(getUserId())) {
// 淇敼 settle 姝ラ鏁版嵁
@@ -457,7 +484,10 @@
priQuote.setSettleMsg(JSON.toJSONString(list));
// 淇敼瑙勫垝鍗曠姸鎬�
+ ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
+ User planLeader = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
priQuote.setSettle(2); // 鎬昏鍔炲緟瀹�
+ priQuote.setMemberId(planLeader.getId());
priQuote.setUpdateUserId(getUserId());
priQuote.setUpdateTime(new Date());
@@ -470,11 +500,10 @@
}
break;
case 2:
- // 鏌ユ壘瑙勫垝缁勯暱
- ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", 3));//2锛氭姤浠锋祦绋�
+ ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
User planLeader = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
if (Cools.isEmpty(planLeader)) {
- throw new CoolException("鏈煡鎵惧埌鎶ヤ环娴佺▼鑺傜偣3纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒");
+ throw new CoolException("鏈煡鎵惧埌鎶ヤ环娴佺▼鑺傜偣3-1纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒");
}
if (!getUserId().equals(planLeader.getId())) {
return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
@@ -500,6 +529,7 @@
// 淇敼瑙勫垝鍗曠姸鎬�
priQuote.setSettle(3); // 瑙勫垝鍛樺緟瀹�
priQuote.setUpdateUserId(getUserId());
+ priQuote.setMemberId(priQuote.getUserId());
priQuote.setUpdateTime(new Date());
if (!priQuoteService.updateById(priQuote)) {
@@ -590,10 +620,10 @@
// }
// break;
// case 2:
-// // 鏌ユ壘瑙勫垝缁勯暱
-// User planLeader = userService.selectOne(new EntityWrapper<User>().eq("username","鐜嬪紑鏉�"));
+// ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
+// User planLeader = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
// if (Cools.isEmpty(planLeader)) {
-// throw new CoolException("鏈煡鎵炬�昏鍔烇紝璇疯仈绯荤鐞嗗憳");
+// throw new CoolException("鏈煡鎵惧埌鎶ヤ环娴佺▼鑺傜偣3-1纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒");
// }
// if (!getUserId().equals(planLeader.getId())) {
// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
--
Gitblit v1.9.1