diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index eb2acded..0cf38fe1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -133,11 +133,9 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayMailBillSearch payMailBillSearch,
 									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize
-	) {
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
 		QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
 		Page<PayMailBill> page = new Page<>(pageNo, pageSize);
-
 		if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) {
 			Calendar calendar= Calendar.getInstance();
 			calendar.setTime(payMailBillSearch.getEndTime());
@@ -146,10 +144,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 			calendar.add(Calendar.SECOND,59);//秒
 			queryWrapper.ge("send_date", payMailBillSearch.getStartTime());
 			queryWrapper.le("send_date", calendar.getTime());
-
 		}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){
 			queryWrapper.ge("send_date", payMailBillSearch.getStartTime());
-
 		}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){
 			Calendar calendar= Calendar.getInstance();
 			calendar.setTime(payMailBillSearch.getEndTime());
@@ -167,7 +163,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
 			queryWrapper.like("project_name",oConvertUtils.replaceAllPercent(payMailBillSearch.getProjectName()));
 		}
-
 		IPage<PayMailBill> pageList = payMailBillService.pageList(page, queryWrapper);
 		getMobile(pageList.getRecords());
 		return Result.OK(pageList);
@@ -182,8 +177,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 @ApiOperation(value="邮寄合同-修改", notes="邮寄合同-修改")
 	 @PostMapping(value = "/editTwo")
 	 @Transactional
-	 public Result<?> editTwo(@RequestBody PayMailBill payMailBill
-	 ) {
+	 public Result<?> editTwo(@RequestBody PayMailBill payMailBill) {
 		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 payMailBill.setPostStatus(1);
 		 payMailBill.setContactMobile(PasswordUtil.encrypt(payMailBill.getContactMobile()));
@@ -351,12 +345,12 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
 	@Transactional
 	@PostMapping(value = "/edit")
-	public Result<?> edit(@RequestBody PayMailBill payMailBill)  {
+	public Result<?> edit(@RequestBody PayMailBill payMailBill){
 		LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
 		payMailBill.setContactMobile(PasswordUtil.encrypt(payMailBill.getContactMobile()));
-		 payMailBill.setPostStatus(1);
+		payMailBill.setPostStatus(1);
 		payMailBill.setMailer(sysUser.getUsername());
-		 payMailBillService.updateById(payMailBill);
+		payMailBillService.updateById(payMailBill);
 		//变更5种项目的邮寄状态
 		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
 		queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId());
@@ -651,11 +645,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	@AutoLog(value = "邮寄票据-导出")
 	@ApiOperation(value="邮寄票据-导出", notes="邮寄票据-导出")
     @GetMapping(value = "/exportXls")
-    public ModelAndView exportXls(
-			PayMailBillSearch payMailBillSearch,
-    		@RequestParam(name = "ids",required = false) String ids
-
-																							) {
+    public ModelAndView exportXls(PayMailBillSearch payMailBillSearch, @RequestParam(name = "ids",required = false) String ids) {
 		if(StringUtils.isBlank(ids)){
 			QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
 			if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) {
@@ -692,16 +682,10 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 			return AmountUtil.exportListXls(pageList,PayMailBill.class,"邮寄票据");
 		}else {
 			ArrayList<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
-
-
-				List<PayMailBill> list = payMailBillService.listByIds(strings);
-
+			List<PayMailBill> list = payMailBillService.listByIds(strings);
 			getMobile(list);
-
-			return AmountUtil.exportListXls(list,PayMailBill.class,"邮寄票据");
+			return AmountUtil.exportListXls(list, PayMailBill.class, "邮寄票据");
 		}
-
-
     }
 
 	private void getMobile(List<PayMailBill> list) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
index 87d8d0d5..ef8b8229 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
@@ -84,42 +84,41 @@ public class AllProjectStatisticsController {
             LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
             String roleCode = sysUser.getRoleCode();
             List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-        //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-            List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
-
-            idList.addAll(allDepartIds);//项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            return Result.OK();
-        }
-        assert idList != null;
+                //admin
+                if (roleCodes.contains(constant.ADMIN)) {
+                    idList = null;
+                    //部门负责人
+                } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                    //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+                    List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                    //获取本部门成员
+                    idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
+                    idList.addAll(allDepartIds);//项目负责人
+                } else if (roleCodes.contains(constant.XMFZR)) {
+                    String userId = sysUser.getId();
+                    idList.add(userId);
+                } else {
+                    return Result.OK();
+                }
+                assert idList != null;
             Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
             IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList );
             HashMap<String, Object> hashMap = new HashMap<>();
             double sum=0;
             double sumTwo =0;
-            if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
-                 sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
-                 sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
-            }
-        DecimalFormat df = new DecimalFormat("#,##0.00");
-            if (pageList.getRecords() != null) {
-                for(AllProjectStatistics s: pageList.getRecords()){
-                    String key = String.valueOf(s.getChargeUse());
-                    String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
-                    s.setChargeUse_text(payment_charge_use);
+                if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
+                     sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
+                     sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
+                }
+            DecimalFormat df = new DecimalFormat("#,##0.00");
+                if (pageList.getRecords() != null) {
+                    for(AllProjectStatistics s: pageList.getRecords()){
+                        String key = String.valueOf(s.getChargeUse());
+                        String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
+                        s.setChargeUse_text(payment_charge_use);
+                    }
                 }
-            }
             //处理为空数据为0
             for(AllProjectStatistics s: pageList.getRecords()){
                 if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
@@ -160,25 +159,24 @@ public class AllProjectStatisticsController {
             String roleCode = sysUser.getRoleCode();
              List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
 
-        //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
-
-            idList.addAll(allDepartIds);//项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            return Result.OK();
-        }
-            Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
+            //admin
+            if (roleCodes.contains(constant.ADMIN)) {
+                idList = null;
+                //部门负责人
+            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                //获取本部门成员
+                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
+                idList.addAll(allDepartIds);//项目负责人
+            } else if (roleCodes.contains(constant.XMFZR)) {
+                String userId = sysUser.getId();
+                idList.add(userId);
+            } else {
+                return Result.OK();
+            }
+                Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
             IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
             HashMap<String, Object> hashMap = new HashMap<>();
             double sum=0;
@@ -187,7 +185,7 @@ public class AllProjectStatisticsController {
                 sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
                 sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
             }
-        DecimalFormat df = new DecimalFormat("#,##0.00");
+            DecimalFormat df = new DecimalFormat("#,##0.00");
             if (pageList.getRecords() != null) {
                 for(AllProjectStatistics s: pageList.getRecords()){
                     String key = String.valueOf(s.getChargeUse());
@@ -224,94 +222,93 @@ public class AllProjectStatisticsController {
                                 @RequestParam(name = "selections",required = false) String selections) {
 
         if(StringUtils.isBlank(selections)) {
-                    allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
-                    allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
-                    //根据不同角色加载不同列表的参数
-                    List<String> idList = new ArrayList<>();
-                    //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
-                    LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-                    String roleCode = sysUser.getRoleCode();
-                    List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+                allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
+                allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
+                //根据不同角色加载不同列表的参数
+                List<String> idList = new ArrayList<>();
+                //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+                LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+                String roleCode = sysUser.getRoleCode();
+                List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
 
-            //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
+                    //admin
+                if (roleCodes.contains(constant.ADMIN)) {
+                    idList = null;
+                    //部门负责人
+                } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                    //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+                   List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                    //获取本部门成员
+                    idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
-            idList.addAll(allDepartIds);//项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            ArrayList<AllProjectStatistics> objects = new ArrayList<>();
-              return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计");
-        }
-                    if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
-                        Calendar calendar = Calendar.getInstance();
-                        String year = String.valueOf(calendar.get(Calendar.YEAR));
-                        allProjectStatisticsSearch.setYear(year);
-                    }
-
-                    List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList);
-                    if (pageList != null) {
-                        for (AllProjectStatistics s : pageList) {
-                            String key = String.valueOf(s.getChargeUse());
-                            String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
-                            s.setChargeUse_text(payment_charge_use);
-                        }
-                    }
-                    return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计");
-        }else {
-            ArrayList<String> strings = new ArrayList<>(Arrays.asList(selections.split(",")));
-            allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
-            allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
-            //根据不同角色加载不同列表的参数
-            List<String> idList = new ArrayList<>();
-            //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
-            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            String roleCode = sysUser.getRoleCode();
-            List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-
-            //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
-
-            idList.addAll(allDepartIds);//项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            ArrayList<AllProjectStatistics> objects = new ArrayList<>();
-            return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计");
-        }
-
-            if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
-                Calendar calendar = Calendar.getInstance();
-                String year = String.valueOf(calendar.get(Calendar.YEAR));
-                allProjectStatisticsSearch.setYear(year);
-            }
-
-            List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList,strings);
-            if (pageList != null) {
-                for (AllProjectStatistics s : pageList) {
-                    String key = String.valueOf(s.getChargeUse());
-                    String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
-                    s.setChargeUse_text(payment_charge_use);
+                    idList.addAll(allDepartIds);//项目负责人
+                } else if (roleCodes.contains(constant.XMFZR)) {
+                    String userId = sysUser.getId();
+                    idList.add(userId);
+                } else {
+                    ArrayList<AllProjectStatistics> objects = new ArrayList<>();
+                      return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计");
                 }
+                            if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
+                                Calendar calendar = Calendar.getInstance();
+                                String year = String.valueOf(calendar.get(Calendar.YEAR));
+                                allProjectStatisticsSearch.setYear(year);
+                            }
+
+                            List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList);
+                            if (pageList != null) {
+                                for (AllProjectStatistics s : pageList) {
+                                    String key = String.valueOf(s.getChargeUse());
+                                    String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
+                                    s.setChargeUse_text(payment_charge_use);
+                                }
+                            }
+                            return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计");
+        }else {
+                ArrayList<String> strings = new ArrayList<>(Arrays.asList(selections.split(",")));
+                allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
+                allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
+                //根据不同角色加载不同列表的参数
+                List<String> idList = new ArrayList<>();
+                //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+                LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+                String roleCode = sysUser.getRoleCode();
+                List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+                    //admin
+                if (roleCodes.contains(constant.ADMIN)) {
+                    idList = null;
+                    //部门负责人
+                } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                    //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+                   List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                    //获取本部门成员
+                    idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
+
+                    idList.addAll(allDepartIds);//项目负责人
+                } else if (roleCodes.contains(constant.XMFZR)) {
+                    String userId = sysUser.getId();
+                    idList.add(userId);
+                } else {
+                    ArrayList<AllProjectStatistics> objects = new ArrayList<>();
+                    return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计");
+                }
+
+                if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
+                    Calendar calendar = Calendar.getInstance();
+                    String year = String.valueOf(calendar.get(Calendar.YEAR));
+                    allProjectStatisticsSearch.setYear(year);
+                }
+
+                List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList,strings);
+                if (pageList != null) {
+                    for (AllProjectStatistics s : pageList) {
+                        String key = String.valueOf(s.getChargeUse());
+                        String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
+                        s.setChargeUse_text(payment_charge_use);
+                    }
+                }
+                return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计");
             }
-            return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计");
-        }
     }
 
     /**
@@ -332,24 +329,24 @@ public class AllProjectStatisticsController {
             String roleCode = sysUser.getRoleCode();
             List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
 
-        //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
+            //admin
+            if (roleCodes.contains(constant.ADMIN)) {
+                idList = null;
+                //部门负责人
+            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                //获取本部门成员
+                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
-            idList.addAll(allDepartIds);
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            ArrayList<AllProjectStatistics> objects = new ArrayList<>();
-            return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计");
-        }
+                idList.addAll(allDepartIds);
+            } else if (roleCodes.contains(constant.XMFZR)) {
+                String userId = sysUser.getId();
+                idList.add(userId);
+            } else {
+                ArrayList<AllProjectStatistics> objects = new ArrayList<>();
+                return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计");
+            }
 
             List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList);
             if (pageList != null) {
@@ -360,8 +357,7 @@ public class AllProjectStatisticsController {
                 }
             }
             return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "项目来款统计");
-
-        }
+            }
 
 
 }
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
index e0bb643d..2a7fc8e0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
@@ -65,55 +65,55 @@ public class CompanyComeMoneyStatisticsController {
     public Result<?> list(CompanyComeMoneySearch companyComeMoneySearch,
                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-        //根据不同角色加载不同列表的参数
-        List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
-        LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String roleCode = sysUser.getRoleCode();
-        List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-            //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
+            //根据不同角色加载不同列表的参数
+            List<String> idList = new ArrayList<>();
+            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
+            LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+            String roleCode = sysUser.getRoleCode();
+            List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+                //admin
+            if (roleCodes.contains(constant.ADMIN)) {
+                idList = null;
+                //部门负责人
+            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                //获取本部门成员
+                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
-            idList.addAll(allDepartIds);
-            //项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            return Result.OK();
-        }
-        Page<CompanyComeMoneyList> page = new Page<>(pageNo, pageSize);
-
-        IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList);
-        HashMap<String, Object> hashMap = new HashMap<>();
-        double sum=0;
-        double sumTwo =0;
-        if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
-             sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
-             sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
-        }
-        //处理为空数据为0
-        for(CompanyComeMoneyList s: pageList.getRecords()){
-            if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
-                s.setAllMoney("0.00");
-            }
-            if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
-                s.setComeAllMoney("0.00");
+                idList.addAll(allDepartIds);
+                //项目负责人
+            } else if (roleCodes.contains(constant.XMFZR)) {
+                String userId = sysUser.getId();
+                idList.add(userId);
+            } else {
+                return Result.OK();
             }
+            Page<CompanyComeMoneyList> page = new Page<>(pageNo, pageSize);
 
-        }
-        DecimalFormat df = new DecimalFormat("#,##0.00");
-        hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
-        hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
-        hashMap.put("pageList",pageList);
-        return Result.OK(hashMap);
+            IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList);
+            HashMap<String, Object> hashMap = new HashMap<>();
+            double sum=0;
+            double sumTwo =0;
+            if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
+                 sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
+                 sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
+            }
+            //处理为空数据为0
+            for(CompanyComeMoneyList s: pageList.getRecords()){
+                if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
+                    s.setAllMoney("0.00");
+                }
+                if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
+                    s.setComeAllMoney("0.00");
+                }
+
+            }
+            DecimalFormat df = new DecimalFormat("#,##0.00");
+            hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
+            hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
+            hashMap.put("pageList",pageList);
+            return Result.OK(hashMap);
 
 
     }
@@ -131,64 +131,60 @@ public class CompanyComeMoneyStatisticsController {
     public Result<?> listForDetail(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch,
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+            companyComeMoneyDetailSearch.setProjectName( oConvertUtils.replaceAllPercent(companyComeMoneyDetailSearch.getProjectName()));
+            //根据不同角色加载不同列表的参数
+            List<String> idList = new ArrayList<>();
+            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
+            LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+            String roleCode = sysUser.getRoleCode();
+            List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+            //admin
+            if (roleCodes.contains(constant.ADMIN)) {
+                idList = null;
+                //部门负责人
+            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                //获取本部门成员
+                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
-        companyComeMoneyDetailSearch.setProjectName( oConvertUtils.replaceAllPercent(companyComeMoneyDetailSearch.getProjectName()));
-        //根据不同角色加载不同列表的参数
-        List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
-        LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String roleCode = sysUser.getRoleCode();
-        List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-        //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
-
-            idList.addAll(allDepartIds);
-            //项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            return Result.OK();
-        }
-        Page<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
-
-        IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
-        HashMap<String, Object> hashMap = new HashMap<>();
-        double sum=0;
-        double sumTwo =0;
-        if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
-             sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
-             sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
-        }
-        DecimalFormat df = new DecimalFormat("#,##0.00");
-        for(CompanyComeMoneyDetail s: pageList.getRecords()){
-            String key = String.valueOf(s.getChargeUse());
-            String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
-            s.setChargeUse_text(payment_charge_use);
-        }
-        //处理为空数据为0
-        for(CompanyComeMoneyDetail s: pageList.getRecords()) {
-            if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
-                s.setAllMoney("0.00");
+                idList.addAll(allDepartIds);
+                //项目负责人
+            } else if (roleCodes.contains(constant.XMFZR)) {
+                String userId = sysUser.getId();
+                idList.add(userId);
+            } else {
+                return Result.OK();
             }
-            if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
-                s.setComeAllMoney("0.00");
+            Page<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
+
+            IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
+            HashMap<String, Object> hashMap = new HashMap<>();
+            double sum=0;
+            double sumTwo =0;
+            if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
+                 sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
+                 sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
             }
-        }
-        hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
-        hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
-        hashMap.put("pageList", pageList);
-        return Result.OK(hashMap);
-
-
-
+            DecimalFormat df = new DecimalFormat("#,##0.00");
+            for(CompanyComeMoneyDetail s: pageList.getRecords()){
+                String key = String.valueOf(s.getChargeUse());
+                String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
+                s.setChargeUse_text(payment_charge_use);
+            }
+            //处理为空数据为0
+            for(CompanyComeMoneyDetail s: pageList.getRecords()) {
+                if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
+                    s.setAllMoney("0.00");
+                }
+                if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
+                    s.setComeAllMoney("0.00");
+                }
+            }
+            hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
+            hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
+            hashMap.put("pageList", pageList);
+            return Result.OK(hashMap);
     }
 
     /**
@@ -206,28 +202,28 @@ public class CompanyComeMoneyStatisticsController {
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             String roleCode = sysUser.getRoleCode();
             List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-        //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
+            //admin
+            if (roleCodes.contains(constant.ADMIN)) {
+                idList = null;
+                //部门负责人
+            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                //获取本部门成员
+                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
-            idList.addAll(allDepartIds);//项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            ArrayList<CompanyComeMoneyList> objects = new ArrayList<>();
-            return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计");
-        }
+                idList.addAll(allDepartIds);//项目负责人
+            } else if (roleCodes.contains(constant.XMFZR)) {
+                String userId = sysUser.getId();
+                idList.add(userId);
+            } else {
+                ArrayList<CompanyComeMoneyList> objects = new ArrayList<>();
+                return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计");
+            }
 
-            List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, idList);
+                List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, idList);
 
-            return AmountUtil.exportListXls(pageList, CompanyComeMoneyList.class, "企业来款统计");
+                return AmountUtil.exportListXls(pageList, CompanyComeMoneyList.class, "企业来款统计");
 
     }
 
@@ -245,32 +241,32 @@ public class CompanyComeMoneyStatisticsController {
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             String roleCode = sysUser.getRoleCode();
             List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-        //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
+            //admin
+            if (roleCodes.contains(constant.ADMIN)) {
+                idList = null;
+                //部门负责人
+            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                //获取本部门成员
+                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
-            idList.addAll(allDepartIds);//项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            ArrayList<CompanyComeMoneyDetail> objects = new ArrayList<>();
-            return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计");
-        }
-
-            List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, idList);
-            for (CompanyComeMoneyDetail s : pageList) {
-                String key = String.valueOf(s.getChargeUse());
-                String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
-                s.setChargeUse_text(payment_charge_use);
+                idList.addAll(allDepartIds);//项目负责人
+            } else if (roleCodes.contains(constant.XMFZR)) {
+                String userId = sysUser.getId();
+                idList.add(userId);
+            } else {
+                ArrayList<CompanyComeMoneyDetail> objects = new ArrayList<>();
+                return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计");
             }
-            return AmountUtil.exportListXls(pageList, CompanyComeMoneyDetail.class, "企业来款详情统计");
+
+                List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, idList);
+                for (CompanyComeMoneyDetail s : pageList) {
+                    String key = String.valueOf(s.getChargeUse());
+                    String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
+                    s.setChargeUse_text(payment_charge_use);
+                }
+                return AmountUtil.exportListXls(pageList, CompanyComeMoneyDetail.class, "企业来款详情统计");
 
     }
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
index 244dc6e6..69a28259 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
@@ -75,7 +75,6 @@ public class PayWorkingGroupStatisticsController {
     public Result<?> list(PayWorkingGroupSearch payWorkingGroupSearch,
                            @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-
         payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
         Page<PayWorkingGroupStatistics> page = new Page<>(pageNo, pageSize);
         //根据不同角色加载不同列表的参数
@@ -108,7 +107,6 @@ public class PayWorkingGroupStatisticsController {
                 payWorkingGroupStatistics.setComeAllMoney("0.00");
             }
         }
-
         //计算应收和实收总金额
         double sum=0;
         double sumTwo =0;
@@ -146,89 +144,88 @@ public class PayWorkingGroupStatisticsController {
     @ApiOperation(value="工作组项目统计-统计导出excel", notes="工作组项目统计-统计导出excel")
     public ModelAndView exportXls2( PayWorkingGroupSearch payWorkingGroupSearch,  @RequestParam(name = "selections", required = false) String selections) {
         if (StringUtils.isBlank(selections)) {
-            payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
-            //根据不同角色加载不同列表的参数
-            List<String> idList = new ArrayList<>();
-            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
-            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            String roleCode = sysUser.getRoleCode();
-            List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-            //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
+                payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
+                //根据不同角色加载不同列表的参数
+                List<String> idList = new ArrayList<>();
+                //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
+                LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+                String roleCode = sysUser.getRoleCode();
+                List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+                //admin
+            if (roleCodes.contains(constant.ADMIN)) {
+                idList = null;
+                //部门负责人
+            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                //获取本部门成员
+                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
-            idList.addAll(allDepartIds);//项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
-            return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
-        }
-
-            List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList);
-            //处理为空数据为0
-            for (PayWorkingGroupStatistics s : pageList) {
-                if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
-                    s.setAllMoney("0.00");
-                }
-                if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
-                    s.setComeAllMoney("0.00");
-                }
-                if (s.getMoneyRate() == null || s.getMoneyRate().equals("")) {
-                    s.setMoneyRate("0.00%");
-                }
+                idList.addAll(allDepartIds);//项目负责人
+            } else if (roleCodes.contains(constant.XMFZR)) {
+                String userId = sysUser.getId();
+                idList.add(userId);
+            } else {
+                ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
+                return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
             }
-            return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class, "工作组项目统计");
+
+                List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList);
+                //处理为空数据为0
+                for (PayWorkingGroupStatistics s : pageList) {
+                    if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
+                        s.setAllMoney("0.00");
+                    }
+                    if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
+                        s.setComeAllMoney("0.00");
+                    }
+                    if (s.getMoneyRate() == null || s.getMoneyRate().equals("")) {
+                        s.setMoneyRate("0.00%");
+                    }
+                }
+                return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class, "工作组项目统计");
         }else {
-            ArrayList<String> strings = new ArrayList<>(Arrays.asList(selections.split(",")));
-            payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
-            //根据不同角色加载不同列表的参数
-            List<String> idList = new ArrayList<>();
-            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
-            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            String roleCode = sysUser.getRoleCode();
-            List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-              //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
+                ArrayList<String> strings = new ArrayList<>(Arrays.asList(selections.split(",")));
+                payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
+                //根据不同角色加载不同列表的参数
+                List<String> idList = new ArrayList<>();
+                //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
+                LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+                String roleCode = sysUser.getRoleCode();
+                List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+                  //admin
+            if (roleCodes.contains(constant.ADMIN)) {
+                idList = null;
+                //部门负责人
+            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                //获取本部门成员
+                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
-            idList.addAll(allDepartIds);//项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
-            return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
-        }
-
-            List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList,strings);
-            //处理为空数据为0
-            for (PayWorkingGroupStatistics s : pageList) {
-                if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
-                    s.setAllMoney("0.00");
-                }
-                if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
-                    s.setComeAllMoney("0.00");
-                }
-                if (s.getMoneyRate() == null || s.getMoneyRate().equals("")) {
-                    s.setMoneyRate("0.00%");
-                }
+                idList.addAll(allDepartIds);//项目负责人
+            } else if (roleCodes.contains(constant.XMFZR)) {
+                String userId = sysUser.getId();
+                idList.add(userId);
+            } else {
+                ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
+                return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
             }
-            return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class, "工作组项目统计");
 
+                List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList,strings);
+                //处理为空数据为0
+                for (PayWorkingGroupStatistics s : pageList) {
+                    if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
+                        s.setAllMoney("0.00");
+                    }
+                    if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
+                        s.setComeAllMoney("0.00");
+                    }
+                    if (s.getMoneyRate() == null || s.getMoneyRate().equals("")) {
+                        s.setMoneyRate("0.00%");
+                    }
+                }
+                return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class, "工作组项目统计");
         }
     }
 
@@ -249,25 +246,24 @@ public class PayWorkingGroupStatisticsController {
     public Result<?> list2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch,
                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                            @RequestParam(name = "id") String id,
-                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize
-                         ) {
-        payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
-        Page<PayWorkGroupSubletStatistics> page = new Page<>(pageNo, pageSize);
-        IPage<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.queryPageList2(page, payWorkingGroupSubletSearch,id);
-        double sum=0;
-        double sumTwo =0;
-        if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
-             sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0.0" : t.getAllMoney())).sum();
-             sumTwo = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.0" : t.getComeAllMoney())).sum();
-        }
-        HashMap<String, Object> hashMap = new HashMap<>();
-        DecimalFormat df = new DecimalFormat("#,##0.00");
-        //        转义来款用途
-        for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
-            String key = String.valueOf(s.getChargeUse());
-            String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
-            s.setChargeUse_text(payment_charge_use);
-        }
+                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+            payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
+            Page<PayWorkGroupSubletStatistics> page = new Page<>(pageNo, pageSize);
+            IPage<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.queryPageList2(page, payWorkingGroupSubletSearch,id);
+            double sum=0;
+            double sumTwo =0;
+            if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
+                 sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0.0" : t.getAllMoney())).sum();
+                 sumTwo = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.0" : t.getComeAllMoney())).sum();
+            }
+            HashMap<String, Object> hashMap = new HashMap<>();
+            DecimalFormat df = new DecimalFormat("#,##0.00");
+            //        转义来款用途
+            for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
+                String key = String.valueOf(s.getChargeUse());
+                String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
+                s.setChargeUse_text(payment_charge_use);
+            }
            for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
                if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
                    s.setAllMoney("0.0");
@@ -276,12 +272,11 @@ public class PayWorkingGroupStatisticsController {
                    s.setComeAllMoney("0.0");
                }
            }
-
-                hashMap.put("pageList",pageList);
-                hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
-                hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
-                return Result.OK(hashMap);
-            }
+            hashMap.put("pageList",pageList);
+            hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
+            hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
+            return Result.OK(hashMap);
+    }
 
     /**
      *导出
@@ -295,9 +290,7 @@ public class PayWorkingGroupStatisticsController {
     public ModelAndView excelSub(
             PayWorkingGroupSubletSearch payWorkingGroupSubletSearch,
             @RequestParam(name = "id", required = true) String id,
-            @RequestParam(name = "selections", required = false) String selections
-    ) {
-
+            @RequestParam(name = "selections", required = false) String selections){
         if (ObjectUtils.isEmpty(selections)) {
             payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
             List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics(payWorkingGroupSubletSearch, id);
@@ -311,7 +304,7 @@ public class PayWorkingGroupStatisticsController {
                 }
             }
             return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计");
-        } else {
+        }else{
             payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
             ArrayList<String> selections2 = new ArrayList<>(Arrays.asList(selections.split(",")));
             List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics2(payWorkingGroupSubletSearch,id,selections2);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
index 376073fe..9a4982f7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
@@ -68,55 +68,52 @@ public class PrincipalPeopleStatisticsController {
     public Result<?> list(PrincipalPeopleSearch principalPeopleSearch,
                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+            //根据不同角色加载不同列表的参数
+            List<String> idList = new ArrayList<>();
+            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
+            LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+            String roleCode = sysUser.getRoleCode();
+            List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+           //admin
+            if (roleCodes.contains(constant.ADMIN)) {
+                idList = null;
+                //部门负责人
+            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                //获取本部门成员
+                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
-        //根据不同角色加载不同列表的参数
-        List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
-        LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String roleCode = sysUser.getRoleCode();
-        List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-       //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
-
-            idList.addAll(allDepartIds);
-            //项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            return Result.OK();
-        }
-
+                idList.addAll(allDepartIds);
+                //项目负责人
+            } else if (roleCodes.contains(constant.XMFZR)) {
+                String userId = sysUser.getId();
+                idList.add(userId);
+            } else {
+                return Result.OK();
+            }
             Page<PrincipalPeopleList> page = new Page<>(pageNo, pageSize);
-
             IPage<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipal(page,principalPeopleSearch,idList);
             HashMap<String, Object> hashMap = new HashMap<>();
-         double sum=0;
-         double sumTwo =0;
-        if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
-                 sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
-                 sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
+             double sum=0;
+             double sumTwo =0;
+            if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
+                     sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
+                     sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
+                }
+            //处理为空数据为0
+            for(PrincipalPeopleList s: Objects.requireNonNull(pageList.getRecords())) {
+                if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
+                    s.setAllMoney("0.00");
+                }
+                if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
+                    s.setComeAllMoney("0.00");
+                }
+                if(s.getFinishRate() == null || s.getFinishRate().equals("")){
+                    s.setFinishRate("0.00%");
+                }
             }
-        //处理为空数据为0
-        for(PrincipalPeopleList s: Objects.requireNonNull(pageList.getRecords())) {
-            if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
-                s.setAllMoney("0.00");
-            }
-            if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
-                s.setComeAllMoney("0.00");
-            }
-            if(s.getFinishRate() == null || s.getFinishRate().equals("")){
-                s.setFinishRate("0.00%");
-            }
-        }
-        DecimalFormat df = new DecimalFormat("#,##0.00");
+            DecimalFormat df = new DecimalFormat("#,##0.00");
             hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
             hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
             hashMap.put("pageList",pageList);
@@ -140,35 +137,32 @@ public class PrincipalPeopleStatisticsController {
             Page<PrincipalPeopleDetail> page = new Page<>(pageNo, pageSize);
             IPage<PrincipalPeopleDetail> pageList = payWorkingGroupService.queryPageListForPrincipalDetail(page, principalPeopleDetailSearch);
             HashMap<String, Object> hashMap = new HashMap<>();
-        double sum=0;
-        double sumTwo =0;
-        if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
-             sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
-             sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
-        }
-        DecimalFormat df = new DecimalFormat("#,##0.00");
-        for(PrincipalPeopleDetail s: pageList.getRecords()){
-            String key = String.valueOf(s.getChargeUse());
-            String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
-            s.setChargeUse_text(payment_charge_use);
-        }
-        //处理为空数据为0
-        for(PrincipalPeopleDetail s: pageList.getRecords()) {
-            if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
-                s.setAllMoney("0.00");
+            double sum=0;
+            double sumTwo =0;
+            if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
+                 sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
+                 sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
             }
-            if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
-                s.setComeAllMoney("0.00");
+            DecimalFormat df = new DecimalFormat("#,##0.00");
+            for(PrincipalPeopleDetail s: pageList.getRecords()){
+                String key = String.valueOf(s.getChargeUse());
+                String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
+                s.setChargeUse_text(payment_charge_use);
             }
+            //处理为空数据为0
+            for(PrincipalPeopleDetail s: pageList.getRecords()) {
+                if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
+                    s.setAllMoney("0.00");
+                }
+                if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
+                    s.setComeAllMoney("0.00");
+                }
 
-        }
+            }
             hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
             hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
             hashMap.put("pageList", pageList);
             return Result.OK(hashMap);
-
-
-
     }
 
 
@@ -193,27 +187,25 @@ public class PrincipalPeopleStatisticsController {
             String roleCode = sysUser.getRoleCode();
             List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
               //admin
-        if (roleCodes.contains(constant.ADMIN)) {
-            idList = null;
-            //部门负责人
-        } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-            //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-           List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-            //获取本部门成员
-            idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
-
-            idList.addAll(allDepartIds);
-            //项目负责人
-        } else if (roleCodes.contains(constant.XMFZR)) {
-            String userId = sysUser.getId();
-            idList.add(userId);
-        } else {
-            ArrayList<PrincipalPeopleList> objects = new ArrayList<>();
-            return AmountUtil.exportListXls(objects, PrincipalPeopleList.class, "个人来款");
-        }
+            if (roleCodes.contains(constant.ADMIN)) {
+                idList = null;
+                //部门负责人
+            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
+                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
+               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
+                //获取本部门成员
+                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
+                idList.addAll(allDepartIds);
+                //项目负责人
+            } else if (roleCodes.contains(constant.XMFZR)) {
+                String userId = sysUser.getId();
+                idList.add(userId);
+            } else {
+                ArrayList<PrincipalPeopleList> objects = new ArrayList<>();
+                return AmountUtil.exportListXls(objects, PrincipalPeopleList.class, "个人来款");
+            }
             List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch, idList);
-
             return AmountUtil.exportListXls(pageList, PrincipalPeopleList.class, "个人来款");
 
     }
@@ -238,8 +230,6 @@ public class PrincipalPeopleStatisticsController {
                 s.setChargeUse_text(payment_charge_use);
             }
             return AmountUtil.exportListXls(pageList, PrincipalPeopleDetail.class, "个人来款详情");
-
-
     }