|
|
@@ -1,7 +1,5 @@
|
|
|
package com.goafanti.admin.service.impl;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
import com.goafanti.admin.bo.*;
|
|
|
import com.goafanti.admin.service.AdminService;
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
@@ -10,7 +8,6 @@ import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.*;
|
|
|
-import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.common.utils.PasswordUtil;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
@@ -51,7 +48,18 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
@Autowired
|
|
|
private AdminUserCountMapper adminUserCountMapper;
|
|
|
@Autowired
|
|
|
- private TaskTimeMapper taskTimeMapper;
|
|
|
+ private TOrderNewMapper TOrderNewMapper;
|
|
|
+ @Autowired
|
|
|
+ private ExpenseAccountMapper expenseAccountMapper;
|
|
|
+ @Autowired
|
|
|
+ private TOrderInvoiceMapper tOrderInvoiceMapper;
|
|
|
+ @Autowired
|
|
|
+ private TTaskMemberMapper tTaskMemberMapper;
|
|
|
+ @Autowired
|
|
|
+ private TOrderPaymentMapper tOrderPaymentMapper;
|
|
|
+ @Autowired
|
|
|
+ private FinanceCountMapper financeCountMapper;
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
@@ -581,57 +589,131 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
// publiAdminUserCount(list);
|
|
|
// System.out.println("list="+list.size());
|
|
|
// }
|
|
|
- List<TOrderTask> allTimeRecord = taskTimeMapper.getAllTimeRecord();
|
|
|
- List<TaskTime> list=new ArrayList<>();
|
|
|
- for (TOrderTask e : allTimeRecord) {
|
|
|
- String timeRecord = e.getTimeRecord();
|
|
|
- System.out.println(e.getTimeRecord());
|
|
|
- if (StringUtils.isNotBlank(e.getTimeRecord())){
|
|
|
- Map<String,Object> map = JSON.parseObject(timeRecord, Map.class);
|
|
|
- for (String s : map.keySet()) {
|
|
|
- if (s.equals("2")||s.equals("3")||s.equals("29")||s.equals("19")||(s.equals("27"))){
|
|
|
- JSONObject js = JSON.parseObject(map.get(s).toString());
|
|
|
- Object date = js.get("date");
|
|
|
- Object suspendImg = js.get("suspendImg") ;
|
|
|
- Object title = js.get("title") ;
|
|
|
- Object certificateNumber = js.get("certificateNumber") ;
|
|
|
- Object setUpAmount = js.get("setUpAmount") ;
|
|
|
- Object appropriation = js.get("appropriation") ;
|
|
|
- TaskTime tt=new TaskTime();
|
|
|
- tt.setTid(e.getId());
|
|
|
- tt.setProjectStatus(Integer.parseInt(s));
|
|
|
- if (!Objects.isNull(date)){
|
|
|
- String dates=date.toString();
|
|
|
- if (StringUtils.isNotBlank(dates)){
|
|
|
- Date date1 = DateUtils.StringToDate(dates, AFTConstants.YYYYMMDD);
|
|
|
- tt.setDateTime(date1);
|
|
|
- }
|
|
|
- }
|
|
|
- if (!Objects.isNull(setUpAmount))tt.setSetUpAmount(setUpAmount.toString());
|
|
|
- if (!Objects.isNull(suspendImg))tt.setSuspendImg(suspendImg.toString());
|
|
|
- if (!Objects.isNull(title))tt.setTitle(title.toString());
|
|
|
- if (!Objects.isNull(certificateNumber))tt.setCertificateNumber(certificateNumber.toString());
|
|
|
- if (!Objects.isNull(appropriation))tt.setAppropriation(appropriation.toString());
|
|
|
- list.add(tt);
|
|
|
-// taskTimeMapper.insertSelective(tt);
|
|
|
+//咨询师统计处理
|
|
|
+// List<TOrderTask> allTimeRecord = taskTimeMapper.getAllTimeRecord();
|
|
|
+// List<TaskTime> list=new ArrayList<>();
|
|
|
+// for (TOrderTask e : allTimeRecord) {
|
|
|
+// String timeRecord = e.getTimeRecord();
|
|
|
+// System.out.println(e.getTimeRecord());
|
|
|
+// if (StringUtils.isNotBlank(e.getTimeRecord())){
|
|
|
+// Map<String,Object> map = JSON.parseObject(timeRecord, Map.class);
|
|
|
+// for (String s : map.keySet()) {
|
|
|
+// if (s.equals("2")||s.equals("3")||s.equals("29")||s.equals("19")||(s.equals("27"))){
|
|
|
+// JSONObject js = JSON.parseObject(map.get(s).toString());
|
|
|
+// Object date = js.get("date");
|
|
|
+// Object suspendImg = js.get("suspendImg") ;
|
|
|
+// Object title = js.get("title") ;
|
|
|
+// Object certificateNumber = js.get("certificateNumber") ;
|
|
|
+// Object setUpAmount = js.get("setUpAmount") ;
|
|
|
+// Object appropriation = js.get("appropriation") ;
|
|
|
+// TaskTime tt=new TaskTime();
|
|
|
+// tt.setTid(e.getId());
|
|
|
+// tt.setProjectStatus(Integer.parseInt(s));
|
|
|
+// if (!Objects.isNull(date)){
|
|
|
+// String dates=date.toString();
|
|
|
+// if (StringUtils.isNotBlank(dates)){
|
|
|
+// Date date1 = DateUtils.StringToDate(dates, AFTConstants.YYYYMMDD);
|
|
|
+// tt.setDateTime(date1);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// if (!Objects.isNull(setUpAmount))tt.setSetUpAmount(setUpAmount.toString());
|
|
|
+// if (!Objects.isNull(suspendImg))tt.setSuspendImg(suspendImg.toString());
|
|
|
+// if (!Objects.isNull(title))tt.setTitle(title.toString());
|
|
|
+// if (!Objects.isNull(certificateNumber))tt.setCertificateNumber(certificateNumber.toString());
|
|
|
+// if (!Objects.isNull(appropriation))tt.setAppropriation(appropriation.toString());
|
|
|
+// list.add(tt);
|
|
|
+//// taskTimeMapper.insertSelective(tt);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
+// List<TaskTime> addList = new ArrayList<>();
|
|
|
+// for (int i = 0; i <list.size(); i++) {
|
|
|
+// addList.add(list.get(i));
|
|
|
+// if (addList.size()==50|| i==list.size() -1){
|
|
|
+// taskTimeMapper.insertBatch(addList);
|
|
|
+// try {
|
|
|
+// addList.clear();
|
|
|
+// Thread.sleep(500);
|
|
|
+// } catch (InterruptedException exception) {
|
|
|
+// exception.printStackTrace();
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
+ List<String> roles=new ArrayList<>();
|
|
|
+ roles.add(AFTConstants.FINANCE);
|
|
|
+ roles.add(AFTConstants.FINANCE_MANAGER);
|
|
|
+ List<Admin> admins = adminMapper.selectAdminByRoleTypes(roles);
|
|
|
+
|
|
|
+ for (Admin admin : admins){
|
|
|
+ List<FinanceCount> list=new ArrayList<>();
|
|
|
+ List<FinanceCount> orderList = TOrderNewMapper.selectCountByFinance(admin.getId());
|
|
|
+ if (!orderList.isEmpty()){
|
|
|
+
|
|
|
+ list.addAll(orderList);
|
|
|
+ }
|
|
|
+ List<FinanceCount> expenseList = expenseAccountMapper.selectCountByFinance(admin.getId());
|
|
|
+ pushFinanceList(list, expenseList,0);
|
|
|
+ List<FinanceCount> invoiceList =tOrderInvoiceMapper.selectCountByFinance(admin.getId());
|
|
|
+ pushFinanceList(list, invoiceList,1);
|
|
|
+ List<FinanceCount> memberList =tTaskMemberMapper.selectCountByFinance(admin.getId());
|
|
|
+ pushFinanceList(list, memberList,2);
|
|
|
+ List<FinanceCount> paymentList =tOrderPaymentMapper.selectCountByFinance(admin.getId());
|
|
|
+ pushFinanceList(list, paymentList,3);
|
|
|
+ List<FinanceCount> addList=new ArrayList<>();
|
|
|
+ for (int i = 0; i <list.size(); i++) {
|
|
|
+ FinanceCount financeCount = list.get(i);
|
|
|
+ FinanceCount newFc=FinanceCount.initialization(financeCount);
|
|
|
+ addList.add(newFc);
|
|
|
+ if (addList.size()==50||i==list.size()-1){
|
|
|
+ financeCountMapper.insetBatch(addList);
|
|
|
+ addList.clear();
|
|
|
+ try {
|
|
|
+ Thread.sleep(500);
|
|
|
+ } catch (InterruptedException exception) {
|
|
|
+ exception.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
- List<TaskTime> addList = new ArrayList<>();
|
|
|
- for (int i = 0; i <list.size(); i++) {
|
|
|
- addList.add(list.get(i));
|
|
|
- if (addList.size()==50|| i==list.size() -1){
|
|
|
- taskTimeMapper.insertBatch(addList);
|
|
|
- try {
|
|
|
- addList.clear();
|
|
|
- Thread.sleep(500);
|
|
|
- } catch (InterruptedException exception) {
|
|
|
- exception.printStackTrace();
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param list
|
|
|
+ * @param minList
|
|
|
+ * @param type
|
|
|
+ */
|
|
|
+ private void pushFinanceList(List<FinanceCount> list, List<FinanceCount> minList,Integer type) {
|
|
|
+ if (!minList.isEmpty()){
|
|
|
+ for (FinanceCount expense : minList) {
|
|
|
+ boolean flag=true;
|
|
|
+ for (FinanceCount e : list) {
|
|
|
+ if (e.getDateTime().getTime()==expense.getDateTime().getTime()){
|
|
|
+ if (type==0){
|
|
|
+ e.setExpenseCount(expense.getExpenseCount());
|
|
|
+ e.setExpenseUnauditedCount(expense.getExpenseUnauditedCount());
|
|
|
+ }else if (type==1){
|
|
|
+ e.setInvoiceCount(expense.getInvoiceCount());
|
|
|
+ e.setInvoiceUnauditedCount(expense.getInvoiceUnauditedCount());
|
|
|
+ }else if (type==2){
|
|
|
+ e.setMemberCount(expense.getMemberCount());
|
|
|
+ e.setMemberUnauditedCount(expense.getMemberUnauditedCount());
|
|
|
+ }else if (type==3){
|
|
|
+ e.setPaymentCount(expense.getPaymentCount());
|
|
|
+ e.setPaymentUnauditedCount(expense.getPaymentUnauditedCount());
|
|
|
+ }
|
|
|
+ flag=false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (flag){
|
|
|
+ list.add(expense);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return 1;
|
|
|
}
|
|
|
|
|
|
private void publiAdminUserCount(List<AdminUserCount> list) {
|