From c6e9227208dc46f2f46f046fea0b21bea398a16c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 07 十月 2023 09:40:15 +0800
Subject: [PATCH] #报销相关
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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 4546d68..273923c 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -79,11 +79,12 @@
@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));
}
@@ -120,7 +121,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()));
@@ -129,6 +130,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");
@@ -142,6 +144,8 @@
priQuote.setDeptId(getDeptId());
//鏇存柊鏃堕棿
priQuote.setUpdateTime(new Date());
+ //妯℃澘
+ priQuote.setTemplate(map.get("template").toString());
//涓氬姟鍛�
Plan plan = planService.selectById(priQuote.getItemId());
@@ -164,7 +168,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 +199,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 +213,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 +227,7 @@
}
@RequestMapping(value = "/priQuote/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鎶ヤ环鍗�")
public R delete(Long[] ids){
if (Cools.isEmpty(ids)){
return R.error();
@@ -248,7 +252,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 +290,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 +322,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 +365,7 @@
}
String value = "";
- if (jsonObjectValue != null && jsonObjectValue.get("v") != null){
+ if (jsonObjectValue != null && jsonObjectValue.get("v") != null) {
//鑾峰彇鍗曞厓鏍煎��
value = jsonObjectValue.get("v").toString();
}
@@ -369,11 +373,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 +397,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;
--
Gitblit v1.9.1