From af1e1d14318a6354819108b84205a15f21380748 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 24 十一月 2023 15:12:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/DashboardController.java b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
index 60a7caf..461575d 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -24,6 +24,8 @@
@RestController
public class DashboardController extends BaseController {
+ Integer PBN = 6;
+
@Autowired
private CompanyTargetService companyTargetService;
@Autowired
@@ -42,6 +44,10 @@
private ReimburseOnlineService reimburseOnlineService;
@Autowired
private CompanyMoneyService companyMoneyService;
+ @Autowired
+ private ProcessPermissionsService processPermissionsService;
+ @Autowired
+ private PlanTypeService planTypeService;
//鑾峰彇鍥㈤槦鏁版嵁
@RequestMapping(value = "/dashboard/companyData/auth")
@@ -72,9 +78,15 @@
// double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / Double.parseDouble(companyTarget.getTarget())) * 100;
+ Double successMoney1 = companyMoneyService.selectMoneyReceivablesAll(null, year);
+
+ Double successMoney2 = companyMoneyService.selectMoneyActualReceiptsAll(null, year);
+
map.put("successMoney", formatter.format(successMoney));//鍏ㄥ勾浜ゆ槗鎴愬姛閲戦
map.put("progressMoney", formatter.format(progressMoney));//鍏ㄥ勾鏈氦鏄撴垚鍔熼噾棰�
map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//鍏ㄥ勾浜ゆ槗鐜�
+ map.put("receivablesMoney", successMoney1/10000);//搴旀敹娆�
+ map.put("actualReceiptsMoney",successMoney2/10000);//瀹為檯鏀舵
return R.ok().add(map);
}
@@ -120,13 +132,6 @@
map.put("progressCount", progressCount);
map.put("successCount", successCount);
-// planPendingTaskCount
-// priOnlinePendingTaskCount
-// priQuotePendingTaskCount
-// businessTripPendingTaskCount
-// reimburseOnlinePendingTaskCount
-// planPriOnlinePendingTaskCount
-
//鑾峰彇寰呭鐞嗕换鍔℃暟閲�
int planPendingTaskCount = planService.selectCount(new EntityWrapper<Plan>().eq("director", getUserId()).lt("settle",4));
map.put("planPendingTaskCount", planPendingTaskCount);
@@ -140,7 +145,28 @@
map.put("businessTripPendingTaskCount", businessTripPendingTaskCount);
int reimburseOnlinePendingTaskCount = reimburseOnlineService.selectCount(new EntityWrapper<ReimburseOnline>().eq("member_id", getUserId()).lt("settle",6));
map.put("reimburseOnlinePendingTaskCount", reimburseOnlinePendingTaskCount);
- int planPriOnlinePendingTaskCount = planService.selectCount(new EntityWrapper<Plan>().eq("status", 1).eq("settle",4));
+ int planPriOnlinePendingTaskCount = 0;
+ List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 4).or().eq("process_memo", 5));//2锛氭牳浠锋祦绋�
+ int type =0;
+ for (ProcessPermissions processPermissions:processPermissionsList){
+ if (getUserId().equals(processPermissions.getUserId())){
+ type=PBN-processPermissions.getProcessMemo();
+ break;
+ }
+ }
+ if (type!=0){
+ EntityWrapper<Plan> wrapper = new EntityWrapper<>();
+ wrapper.eq("status",1);
+ wrapper.eq("assistant_host_sign",0);
+ List<Long> typeList = new ArrayList<>();
+ List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
+ for (PlanType planType : planTypes){
+ typeList.add(planType.getId());
+ }
+ wrapper.in("plan_type",typeList);
+ List<Plan> plans = planService.selectList(wrapper);
+ planPriOnlinePendingTaskCount=plans.size();
+ }
map.put("planPriOnlinePendingTaskCount", planPriOnlinePendingTaskCount);
Double successMoney1 = companyMoneyService.selectMoneyReceivablesAll(getUserId(), year);
@@ -203,12 +229,18 @@
if (Cools.isEmpty(token)){
return R.ok(item);
}
- User user = getUser(token);
- if (Cools.isEmpty(user) || Cools.isEmpty(user.getRoleId())){
- return R.ok(item);
- }
- if (user.getRoleId()<3){
- item="true";
+ try{
+ User user = getUser(token);
+ if (Cools.isEmpty(user) || Cools.isEmpty(user.getRoleId())){
+ return R.ok(item);
+ }
+ if (user.getRoleId()<2){
+ item="true";
+ }else if (user.getRoleId()<3){
+ item="true2";
+ }
+ }catch (Exception e){
+
}
return R.ok(item);
}
--
Gitblit v1.9.1