From a25d3c16f9f9be1a1b4774402d1907a28dab06fb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 09:43:55 +0800
Subject: [PATCH] #核价管理完善
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 263 +++++++++++++++++++++++++++++++---------------------
1 files changed, 156 insertions(+), 107 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 002ed96..51e0baa 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 ProcessPermissionsService processPermissionsService;
+
+ @Autowired
private PlanTypeService planTypeService;
@RequestMapping(value = "/priQuote/{id}/auth")
@@ -76,7 +79,7 @@
@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,user_id as userId,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
+ 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);
@@ -117,7 +120,7 @@
}
@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()));
@@ -126,6 +129,7 @@
priQuote.setTitle(map.get("title").toString());
priQuote.setTemplateName(priQuoteBudget.getTemplateName());
priQuote.setSheetData(map.get("sheetData").toString());
+ priQuote.setOriQuoteBudgetId(Long.parseLong(map.get("priQuoteBudgetId").toString()));
priQuote.setItemId(priQuoteBudget.getItemId());
priQuote.setOrderNum(priQuoteBudget.getInOrderNum());
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -135,8 +139,12 @@
priQuote.setUserId(getUserId());
//鏇存柊浜哄憳
priQuote.setUpdateUserId(getUserId());
+ //鎵�灞為儴闂�
+ priQuote.setDeptId(getDeptId());
//鏇存柊鏃堕棿
priQuote.setUpdateTime(new Date());
+ //妯℃澘
+ priQuote.setTemplate(map.get("template").toString());
//涓氬姟鍛�
Plan plan = planService.selectById(priQuote.getItemId());
@@ -148,7 +156,9 @@
priQuote.setForm(JSON.toJSONString(map)); // 鑷畾涔夎〃鍗曞唴瀹�
priQuote.setSettle(1); // 1.寮�濮�
User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
- priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager)));
+ 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);
@@ -157,7 +167,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()));
@@ -188,7 +198,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());
@@ -202,7 +212,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);
@@ -216,7 +226,7 @@
}
@RequestMapping(value = "/priQuote/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鎶ヤ环鍗�")
public R delete(Long[] ids){
if (Cools.isEmpty(ids)){
return R.error();
@@ -279,7 +289,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);
}
@@ -311,14 +321,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;
@@ -354,7 +364,7 @@
}
String value = "";
- if (jsonObjectValue != null && jsonObjectValue.get("v") != null){
+ if (jsonObjectValue != null && jsonObjectValue.get("v") != null) {
//鑾峰彇鍗曞厓鏍煎��
value = jsonObjectValue.get("v").toString();
}
@@ -362,11 +372,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_);
}
}
@@ -386,11 +396,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;
@@ -420,7 +430,126 @@
@PostMapping(value = "/priQuote/approval/auth")
@ManagerAuth
public R approvalPriQuote(@RequestParam Long planId,
- @RequestParam(required = false) Long plannerId){return null;}
+ @RequestParam(required = false) Long plannerId){
+ PriQuote priQuote = priQuoteService.selectById(planId);
+ assert priQuote != null;
+
+ switch (priQuote.getSettle()) {
+ case 1:
+ // 鏈儴闂ㄧ粡鐞嗗鏍�
+ User user = userService.selectById(priQuote.getUserId());
+ User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+ if (manager.getId().equals(getUserId())) {
+
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list) {
+ switch (dto.getStep()) {
+ case 1:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 2:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ default:
+ break;
+ }
+ }
+ priQuote.setSettleMsg(JSON.toJSONString(list));
+
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ priQuote.setSettle(2); // 鎬昏鍔炲緟瀹�
+ priQuote.setUpdateUserId(getUserId());
+ priQuote.setUpdateTime(new Date());
+
+ if (!priQuoteService.updateById(priQuote)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ } else {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ break;
+ case 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-1纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒");
+ }
+ if (!getUserId().equals(planLeader.getId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ User planner = userService.selectById(plannerId);
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list) {
+ switch (dto.getStep()) {
+ case 2:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 3:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ default:
+ break;
+ }
+ }
+ priQuote.setSettleMsg(JSON.toJSONString(list));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ priQuote.setSettle(3); // 瑙勫垝鍛樺緟瀹�
+ priQuote.setUpdateUserId(getUserId());
+ priQuote.setUpdateTime(new Date());
+
+ if (!priQuoteService.updateById(priQuote)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ break;
+ case 3:
+ // 涓氬姟鍛�
+ User salesman0 = userService.selectById(priQuote.getUserId());
+ if (!getUserId().equals(salesman0.getId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list1 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list1) {
+ switch (dto.getStep()) {
+ case 3:
+ dto.setCurr(Boolean.TRUE);
+ break;
+ case 4:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ default:
+ break;
+ }
+ }
+ priQuote.setSettleMsg(JSON.toJSONString(list1));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ priQuote.setSettle(4); // 瀹℃壒閫氳繃
+ priQuote.setUpdateUserId(getUserId());
+ priQuote.setUpdateTime(new Date());
+
+ if (!priQuoteService.updateById(priQuote)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ break;
+ default:
+ return R.error();
+ }
+ return R.ok("瀹℃壒鎴愬姛");
+ }
+
+ @PostMapping(value = "/priQuote/refuse/auth")
+ @ManagerAuth
+ public R refusePriQuote(@RequestParam Long planId,
+ @RequestParam(required = false) Long plannerId){
// PriQuote priQuote = priQuoteService.selectById(planId);
// assert priQuote != null;
//
@@ -430,14 +559,6 @@
// User user = userService.selectById(priQuote.getUserId());
// User manager = userService.getDeptManager(getHostId(), user.getDeptId());
// if (manager.getId().equals(getUserId())) {
-//
-//
-// // 鏌ユ壘鎬昏鍔�
-// PlanType planType = planTypeService.selectById(priQuote.getPlanType());
-// User planLeader = planTypeService.findPlanLeader(planType);
-// if (Cools.isEmpty(planLeader)) {
-// throw new CoolException("鏈煡鎵惧埌鎬昏鍔烇紝璇疯仈绯荤鐞嗗憳");
-// }
//
// // 淇敼 settle 姝ラ鏁版嵁
// List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
@@ -451,10 +572,6 @@
// dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
// dto.setTime(DateUtils.convert(new Date()));
// break;
-// case 3:
-// dto.setUserId(planLeader.getId());
-// dto.setUsername(planLeader.getNickname());
-// break;
// default:
// break;
// }
@@ -462,19 +579,11 @@
// priQuote.setSettleMsg(JSON.toJSONString(list));
//
// // 淇敼瑙勫垝鍗曠姸鎬�
-// priQuote.setSettle(2); // 瑙勫垝缁勯暱寰呭
+// priQuote.setSettle(2); // 鎬昏鍔炲緟瀹�
// priQuote.setUpdateUserId(getUserId());
// priQuote.setUpdateTime(new Date());
//
// if (!priQuoteService.updateById(priQuote)) {
-// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
-//
-// // 娣诲姞瑙勫垝缁勯暱璺熻繘浜�
-// PlanFoll planFoll = new PlanFoll();
-// planFoll.setPlanId(priQuote.getId());
-// planFoll.setUserId(planLeader.getId());
-// if (!planFollService.insert(planFoll)) {
// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
// }
//
@@ -483,20 +592,13 @@
// }
// break;
// case 2:
-// // 鏌ユ壘瑙勫垝缁勯暱
-// PlanType planType = planTypeService.selectById(priQuote.getPlanType());
-// User planLeader = planTypeService.findPlanLeader(planType);
+// 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("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
-// }
-// if (Cools.isEmpty(planLeader)) {
-// throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
+// throw new CoolException("鏈煡鎵惧埌鎶ヤ环娴佺▼鑺傜偣3-1纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒");
// }
// if (!getUserId().equals(planLeader.getId())) {
// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
-// }
-// if (Cools.isEmpty(plannerId)) {
-// return R.error("鎸囧畾瑙勫垝鍛樹笉鑳戒负绌�");
// }
// User planner = userService.selectById(plannerId);
// // 淇敼 settle 姝ラ鏁版嵁
@@ -508,12 +610,8 @@
// break;
// case 3:
// dto.setCurr(Boolean.TRUE);
-// dto.setMsg("鍞墠缁勯暱" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+// dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
// dto.setTime(DateUtils.convert(new Date()));
-// break;
-// case 4:
-// dto.setUserId(planner.getId());
-// dto.setUsername(planner.getNickname());
// break;
// default:
// break;
@@ -522,63 +620,14 @@
// priQuote.setSettleMsg(JSON.toJSONString(list));
// // 淇敼瑙勫垝鍗曠姸鎬�
// priQuote.setSettle(3); // 瑙勫垝鍛樺緟瀹�
-// priQuote.setPlanner(planner.getId());
// priQuote.setUpdateUserId(getUserId());
// priQuote.setUpdateTime(new Date());
//
// if (!priQuoteService.updateById(priQuote)) {
// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
// }
-//
-// // 娣诲姞瑙勫垝鍛樿窡杩涗汉
-// PlanFoll planFoll = new PlanFoll();
-// planFoll.setPlanId(priQuote.getId());
-// planFoll.setUserId(planner.getId());
-// if (!planFollService.insert(planFoll)) {
-// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
// break;
// case 3:
-// User plannerUser = userService.selectById(priQuote.getPlanner());
-// if (Cools.isEmpty(plannerUser)) {
-// return R.error("鏈壘鍒拌鍒掑憳");
-// }
-// if (!getUserId().equals(plannerUser.getId())) {
-// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
-// }
-// // 涓氬姟鍛�
-// User salesman = userService.selectById(priQuote.getUserId());
-// // 淇敼 settle 姝ラ鏁版嵁
-// List<SettleDto> list0 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
-// for (SettleDto dto : list0) {
-// switch (dto.getStep()) {
-// case 3:
-// dto.setCurr(Boolean.FALSE);
-// break;
-// case 4:
-// dto.setCurr(Boolean.TRUE);
-// dto.setMsg("瑙勫垝鍛�" + plannerUser.getNickname() + "瀹℃壒閫氳繃");
-// dto.setTime(DateUtils.convert(new Date()));
-// break;
-// case 5:
-// dto.setUserId(salesman.getId());
-// dto.setUsername(salesman.getNickname());
-// break;
-// default:
-// break;
-// }
-// }
-// priQuote.setSettleMsg(JSON.toJSONString(list0));
-// // 淇敼瑙勫垝鍗曠姸鎬�
-// priQuote.setSettle(4); // 瀹℃壒閫氳繃
-// priQuote.setUpdateUserId(getUserId());
-// priQuote.setUpdateTime(new Date());
-//
-// if (!planService.updateById(priQuote)) {
-// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
-// break;
-// case 4:
// // 涓氬姟鍛�
// User salesman0 = userService.selectById(priQuote.getUserId());
// if (!getUserId().equals(salesman0.getId())) {
@@ -588,10 +637,10 @@
// List<SettleDto> list1 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
// for (SettleDto dto : list1) {
// switch (dto.getStep()) {
-// case 4:
+// case 3:
// dto.setCurr(Boolean.TRUE);
// break;
-// case 5:
+// case 4:
// dto.setCurr(Boolean.TRUE);
// dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
// dto.setTime(DateUtils.convert(new Date()));
@@ -602,18 +651,18 @@
// }
// priQuote.setSettleMsg(JSON.toJSONString(list1));
// // 淇敼瑙勫垝鍗曠姸鎬�
-// priQuote.setSettle(5); // 瀹℃壒閫氳繃
+// priQuote.setSettle(4); // 瀹℃壒閫氳繃
// priQuote.setUpdateUserId(getUserId());
// priQuote.setUpdateTime(new Date());
//
-// if (!planService.updateById(priQuote)) {
+// if (!priQuoteService.updateById(priQuote)) {
// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
// }
// break;
// default:
// return R.error();
// }
-// return R.ok("瀹℃壒鎴愬姛");
-// }
+ return R.ok("瀹℃壒鎴愬姛");
+ }
}
--
Gitblit v1.9.1