全所统计
This commit is contained in:
+18
-13
@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
@@ -33,32 +35,35 @@ public class FirstPageStatisticsController {
|
||||
List<PayWorkingGroupStatistics> pageList2 = payWorkingGroupService.queryPageListForStatisticsFirstPage();
|
||||
List<CompanyComeMoneyList> pageList3 = payWorkingGroupService.queryPageListForCompanyFirstPage();
|
||||
List<DepartStatistics> pageList4 = payWorkingGroupService.queryPageListForDepartFirstPage();
|
||||
ArrayList<PrincipalPeopleList> list = new ArrayList<>();
|
||||
for(PrincipalPeopleList s: pageList){
|
||||
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
|
||||
s.setComeAllMoney("0.00");
|
||||
if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") )) {
|
||||
list.add(s);
|
||||
}
|
||||
}
|
||||
ArrayList<PayWorkingGroupStatistics> list2 = new ArrayList<>();
|
||||
for(PayWorkingGroupStatistics s: pageList2){
|
||||
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
|
||||
s.setComeAllMoney("0.00");
|
||||
if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") )) {
|
||||
list2.add(s);
|
||||
}
|
||||
}
|
||||
ArrayList<CompanyComeMoneyList> list3 = new ArrayList<>();
|
||||
for(CompanyComeMoneyList s: pageList3){
|
||||
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
|
||||
s.setComeAllMoney("0.00");
|
||||
if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") ) ){
|
||||
list3.add(s);
|
||||
}
|
||||
}
|
||||
ArrayList<DepartStatistics> list4 = new ArrayList<>();
|
||||
for(DepartStatistics s: pageList4){
|
||||
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
|
||||
s.setComeAllMoney("0.00");
|
||||
if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") ) ){
|
||||
list4.add(s);
|
||||
}
|
||||
}
|
||||
|
||||
HashMap<String, Object> hashMap = new HashMap<>();
|
||||
hashMap.put("principalPeople",pageList);
|
||||
hashMap.put("payWorkingGroup",pageList2);
|
||||
hashMap.put("company",pageList3);
|
||||
hashMap.put("depart",pageList4);
|
||||
hashMap.put("principalPeople",list);
|
||||
hashMap.put("payWorkingGroup",list2);
|
||||
hashMap.put("company",list3);
|
||||
hashMap.put("depart",list4);
|
||||
return Result.OK(hashMap);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user