From cb3870820f63e6f7ba595d80dcbbfd3deae6fdf6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 07 十一月 2023 17:49:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 156 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 130 insertions(+), 26 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 099330c..60a7caf 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -1,18 +1,20 @@
package com.zy.crm.manager.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.entity.CompanyTarget;
-import com.zy.crm.manager.entity.Order;
-import com.zy.crm.manager.service.CompanyTargetService;
-import com.zy.crm.manager.service.OrderService;
-import com.zy.crm.manager.utils.WordUtils;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
+import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -26,6 +28,20 @@
private CompanyTargetService companyTargetService;
@Autowired
private OrderService orderService;
+ @Autowired
+ private PlanService planService;
+ @Autowired
+ private PriOnline2Service priOnline2Service;
+ @Autowired
+ private PriQuoteService priQuoteService;
+ @Autowired
+ private BusinessTripService businessTripService;
+ @Autowired
+ private BusinessTripOtherService businessTripOtherService;
+ @Autowired
+ private ReimburseOnlineService reimburseOnlineService;
+ @Autowired
+ private CompanyMoneyService companyMoneyService;
//鑾峰彇鍥㈤槦鏁版嵁
@RequestMapping(value = "/dashboard/companyData/auth")
@@ -33,25 +49,31 @@
public R getCompanyData() {
HashMap<String, Object> map = new HashMap<>();
+ NumberFormat formatter = new DecimalFormat("#,###");
Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy");
String year = format.format(date);
- CompanyTarget companyTarget = companyTargetService.selectByYear(year);//鑾峰彇鍏徃鍏ㄥ勾鐩爣鏁版嵁
+ CompanyTarget companyTarget = companyTargetService.selectCompanyByYear(year);//鑾峰彇鍏徃鍏ㄥ勾鐩爣鏁版嵁
if (companyTarget == null) {
return R.error();
}
- map.put("yearTarget", companyTarget.getTarget$());//鍏ㄥ勾浜ゆ槗鐩爣
+ double whole = Double.parseDouble(companyTarget.getTarget());
+ map.put("yearTarget", formatter.format(whole));//鍏ㄥ勾浜ゆ槗鐩爣
//鑾峰彇鍏ㄥ勾浜ゆ槗鎴愬姛閲戦
Double successMoney = orderService.selectMoneyByYearAndStatus(year, 1);
//鑾峰彇鍏ㄥ勾鏈氦鏄撴垚鍔熼噾棰�
- Double progressMoney = orderService.selectMoneyByYearAndStatus(year, 0);
+// double v = whole - orderService.selectMoneyByYearAndStatus(year, 0);
+ double v = whole - orderService.selectMoneyByYearAndStatus(year, 1);
+ Double progressMoney = v > 0? v : 0D;
//鑾峰彇鍏ㄥ勾浜ゆ槗澶辫触閲戦
Double failedMoney = orderService.selectMoneyByYearAndStatus(year, 2);
- //鍏ㄥ勾浜ゆ槗鐜�
- double yearTransactionRate = (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
- map.put("successMoney", WordUtils.formatNumberForAccounting(successMoney));//鍏ㄥ勾浜ゆ槗鎴愬姛閲戦
- map.put("progressMoney", WordUtils.formatNumberForAccounting(progressMoney));//鍏ㄥ勾鏈氦鏄撴垚鍔熼噾棰�
+ //鍏ㄥ勾瀹屾垚鐜�
+// double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
+ double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / Double.parseDouble(companyTarget.getTarget())) * 100;
+
+ map.put("successMoney", formatter.format(successMoney));//鍏ㄥ勾浜ゆ槗鎴愬姛閲戦
+ map.put("progressMoney", formatter.format(progressMoney));//鍏ㄥ勾鏈氦鏄撴垚鍔熼噾棰�
map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//鍏ㄥ勾浜ゆ槗鐜�
return R.ok().add(map);
}
@@ -62,28 +84,72 @@
public R getPersonData() {
HashMap<String, Object> map = new HashMap<>();
+ NumberFormat formatter = new DecimalFormat("#,###");
Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy");
String year = format.format(date);
- User user = getUser();
- String yearTarget = "0.00";//鑾峰彇涓汉鍏ㄥ勾鐩爣鏁版嵁
- if (user.getTarget() != null) {
- yearTarget = WordUtils.formatNumberForAccounting(Double.parseDouble(user.getTarget()));;
+ Double yearTarget = 0D;//鑾峰彇涓汉鍏ㄥ勾鐩爣鏁版嵁
+ CompanyTarget person = companyTargetService.selectPersonByYear(year, getUserId());
+ if (person != null) {
+ yearTarget = Double.parseDouble(person.getTarget());
}
- map.put("yearTarget", yearTarget);//鍏ㄥ勾浜ゆ槗鐩爣
+ map.put("yearTarget", formatter.format(yearTarget));//鍏ㄥ勾浜ゆ槗鐩爣
//鑾峰彇鍏ㄥ勾浜ゆ槗鎴愬姛閲戦
- Double successMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 1);
+ Double successMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 1);
//鑾峰彇鍏ㄥ勾鏈氦鏄撴垚鍔熼噾棰�
- Double progressMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 0);
+ double v = yearTarget - orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 1);
+ Double progressMoney = v > 0? v : 0D;
+ Double progressMoney2 = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 0);
//鑾峰彇鍏ㄥ勾浜ゆ槗澶辫触閲戦
- Double failedMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 2);
- //鍏ㄥ勾浜ゆ槗鐜�
- double yearTransactionRate = (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
- map.put("successMoney", WordUtils.formatNumberForAccounting(successMoney));//鍏ㄥ勾浜ゆ槗鎴愬姛閲戦
- map.put("progressMoney", WordUtils.formatNumberForAccounting(progressMoney));//鍏ㄥ勾鏈氦鏄撴垚鍔熼噾棰�
+ Double failedMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 2);
+ //鍏ㄥ勾瀹屾垚鐜�
+// double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
+ double yearTransactionRate = yearTarget==0? 0 : successMoney == 0 ? successMoney : (successMoney / yearTarget) * 100;
+
+ map.put("successMoney", formatter.format(successMoney));//鍏ㄥ勾浜ゆ槗鎴愬姛閲戦
+ map.put("progressMoney", formatter.format(progressMoney));//鍏ㄥ勾鏈氦鏄撴垚鍔熼噾棰�
+ map.put("progressMoney2", formatter.format(progressMoney2));//璺熻釜椤圭洰閲戦
map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//鍏ㄥ勾浜ゆ槗鐜�
+
+ //鑾峰彇鍏ㄥ勾璺熻釜鏁伴噺
+ Integer progressCount = orderService.selectCountByUserYearAndStatus(getUserId(), year, 0);
+ //鑾峰彇鍏ㄥ勾鎴愪氦鏁伴噺
+ Integer successCount = orderService.selectCountByUserYearAndStatus(getUserId(), year, 1);
+ 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);
+ int priOnlinePendingTaskCount = priOnline2Service.selectCount(new EntityWrapper<PriOnline2>().eq("member_id", getUserId()).lt("settle",2));
+ map.put("priOnlinePendingTaskCount", priOnlinePendingTaskCount);
+ int priQuotePendingTaskCount = priQuoteService.selectCount(new EntityWrapper<PriQuote>().eq("member_id", getUserId()).lt("settle",4));
+ map.put("priQuotePendingTaskCount", priQuotePendingTaskCount);
+ int businessTripCount = businessTripService.selectCount(new EntityWrapper<BusinessTrip>().eq("member_id", getUserId()).lt("settle", 2));
+ int businessTripOtherCount = businessTripOtherService.selectCount(new EntityWrapper<BusinessTripOther>().eq("member_id", getUserId()).lt("settle",2));
+ int businessTripPendingTaskCount = businessTripCount+businessTripOtherCount;
+ 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));
+ map.put("planPriOnlinePendingTaskCount", planPriOnlinePendingTaskCount);
+
+ Double successMoney1 = companyMoneyService.selectMoneyReceivablesAll(getUserId(), year);
+ map.put("successMoney1", successMoney1==null? 0:successMoney1);
+
+ Double successMoney2 = companyMoneyService.selectMoneyActualReceiptsAll(getUserId(), year);
+ map.put("successMoney2", successMoney2==null? 0:successMoney2);
+
+
return R.ok().add(map);
}
@@ -92,10 +158,11 @@
@ManagerAuth
public R getStaffRank() {
ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ NumberFormat formatter = new DecimalFormat("#,###");
for (Order order : orderService.selectTopMoney()) {
HashMap<String, Object> map = new HashMap<>();
map.put("username", order.getUserId$());
- map.put("money", WordUtils.formatNumberForAccounting(order.getMoney()));
+ map.put("money", formatter.format(order.getMoney()));
list.add(map);
}
return R.ok().add(list);
@@ -106,7 +173,44 @@
@ManagerAuth
public R getCurrentMonthData() {
List<Double> list = orderService.selectCurrentYearMonthSuccess();
- return R.ok().add(list);
+ List<Double> lists = new ArrayList<>();
+ int i = 0;
+ Double[] money=new Double[]{0.0,0.0,0.0,0.0};
+ for (Double d : list){
+ if (i<3){
+ money[0] = money[0]+d;
+ }else if (i<6){
+ money[1] = money[1]+d;
+ }else if (i<9){
+ money[2] = money[2]+d;
+ }else if (i<12){
+ money[3] = money[3]+d;
+ }
+ i++;
+ }
+ for (Double d : money){
+ double d1=d/3;
+ lists.add(d1);
+ lists.add(d1);
+ lists.add(d1);
+ }
+ return R.ok().add(lists);
+ }
+
+ @RequestMapping("/dashboard/popup/auth")
+ public R popup(String token) {
+ String item = "false";
+ 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";
+ }
+ return R.ok(item);
}
}
--
Gitblit v1.9.1