Merge remote-tracking branch 'origin/master'

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java

@@ -214,5 +214,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
 
     IPage<DepartStatistics> queryPageListDepartment(Page<DepartStatistics> page, @Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List<String> idList);
 
+    List<DepartStatistics> queryPageListDepartment(@Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List<String> idList);
+
     AllMoney queryPageListDepartment33(@Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List<String> idList);
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml

@@ -1100,10 +1100,10 @@
             <if test="principalPeopleSearch.column == 'billMoney' and principalPeopleSearch.order == 'desc'">
                 order by billMoney desc
             </if>
-            <if test="payWorkingGroupSearch.column == 'confirmAmount' and payWorkingGroupSearch.order == 'desc'">
+            <if test="principalPeopleSearch.column == 'confirmAmount' and principalPeopleSearch.order == 'desc'">
                 order by confirmAmount desc
             </if>
-            <if test="payWorkingGroupSearch.column == 'confirmAmount' and payWorkingGroupSearch.order == 'asc'">
+            <if test="principalPeopleSearch.column == 'confirmAmount' and principalPeopleSearch.order == 'asc'">
                 order by confirmAmount
             </if>
             <if test="principalPeopleSearch.column == 'allMoney' and principalPeopleSearch.order == 'asc'">

jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java

@@ -235,5 +235,7 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
 
     IPage<DepartStatistics> queryPageListDepartment(Page<DepartStatistics> page, DepartStatisticsSearch allProjectStatisticsSearch, List<String> idList);
 
+    List<DepartStatistics> queryPageListDepartmentExcel(DepartStatisticsSearch departStatisticsSearch, List<String> idList);
+
     AllMoney queryPageListDepartment33(DepartStatisticsSearch departStatisticsSearch, List<String> idList);
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java

@@ -600,6 +600,11 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
         return payWorkingGroupMapper.queryPageListDepartment(page, departStatisticsSearch, idList);
     }
 
+    @Override
+    public List<DepartStatistics> queryPageListDepartmentExcel(DepartStatisticsSearch departStatisticsSearch, List<String> idList) {
+        return payWorkingGroupMapper.queryPageListDepartment(departStatisticsSearch, idList);
+    }
+
     @Override
     public AllMoney queryPageListDepartment33(DepartStatisticsSearch departStatisticsSearch, List<String> idList) {
         return payWorkingGroupMapper.queryPageListDepartment33(departStatisticsSearch, idList);

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java

@@ -304,7 +304,7 @@ public class AllProjectStatisticsController {
      * @param pageNo                     页数
      * @param pageSize                   条数
      */
-    //@RequiresPermissions("projectPaymentStatistics:search")
+    @RequiresPermissions("departmentAllStatistics:search")
     @ApiOperation(value = "科室统计-分页列表查询", notes = "科室统计-详情分页列表查询")
     @GetMapping(value = "/listDepartment")
     public Result<?> listDepartment(DepartStatisticsSearch departStatisticsSearch,
@@ -352,4 +352,44 @@ public class AllProjectStatisticsController {
 
     }
 
+    /**
+     * 企业来款统计
+     */
+    @RequiresPermissions("departmentAllStatistics:export")
+    @AutoLog(value = "科室统计-导出统计")
+    @GetMapping(value = "/department/excelProject")
+    @ApiOperation(value = "项目来款统计-导出统计", notes = "项目来款统计-导出统计")
+    public ModelAndView excelProject(DepartStatisticsSearch departStatisticsSearch) {
+        //根据不同角色加载不同列表的参数
+        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)) {
+
+        } else if (roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD)) {
+            //获取本部门下全部子部门的id(包含本部门)
+            List<String> allDepartIds = sysBaseAPI.getAllDepartIdsByDepart(sysUser.getDepartIds(), idList);
+
+            idList.addAll(allDepartIds);
+        } else {
+            ArrayList<DepartStatistics> objects = new ArrayList<>();
+            return AmountUtil.exportListXls(objects, DepartStatistics.class, "科室总体统计");
+        }
+        List<DepartStatistics> list = payWorkingGroupService.queryPageListDepartmentExcel(departStatisticsSearch, idList);
+        //处理为空数据为0
+        for (DepartStatistics s : list) {
+            if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
+                s.setAllMoney("0.00");
+            }
+            if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
+                s.setComeAllMoney("0.00");
+            }
+        }
+        return AmountUtil.exportListXls(list, DepartStatistics.class, "科室总体统计");
+    }
+
 }