改正项目所在公司分布图的查询逻辑

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/CostInfoController.java

@@ -176,15 +176,9 @@ public class CostInfoController {
                 taskVo.setProjectId(projectId);
                 taskVo.setProjectName(projectInfoFlowMapper.getById(projectId).getProjectName());
             }
-            if (masterAndOneToOne.get("application_fee") != null) {
-                taskVo.setApplicationFee(masterAndOneToOne.get("application_fee").toString());
-            }
             if (masterAndOneToOne.get("total_money") != null) {
                 taskVo.setApplicationFee(masterAndOneToOne.get("total_money").toString());
             }
-            if (masterAndOneToOne.get("accommodation_days") != null) {
-                taskVo.setAccommodationDays(masterAndOneToOne.get("accommodation_days").toString());
-            }
             //取每条费用申请记录中的费用项，费用类型的直接取，工时和新建项目使用流程分类名称即可
             if (masterAndOneToOne.get("cost_type") != null) {
                 taskVo.setCostType(masterAndOneToOne.get("cost_type").toString());
@@ -516,6 +510,9 @@ public class CostInfoController {
 
     private ResMsg PackageAgain(List<FlowTaskVo> flowTaskVoListByExpense, Integer pageNum) {
         //重新进行包装分页
+        if (flowTaskVoListByExpense.size() < 1) {
+            return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(flowTaskVoListByExpense, Long.valueOf(flowTaskVoListByExpense.size())));
+        }
         List<FlowTaskVo> flowTaskVoListByExpenseRsg = new ArrayList<>();
         if (pageNum == 1) {
             for (int i = 0; i < 10; i++) {

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/mapper/ProjectInfoMapper.java

@@ -49,10 +49,9 @@ public interface ProjectInfoMapper extends JpaRepository<ProjectInfoEntity, Inte
     List<Map<String, Object>> findProjectNumber(List<String> twoDaysDayDes);
 
     @Transactional
-    @Query(value = "SELECT COUNT(*) num , DATE_FORMAT(create_date,'%Y-%m') AS 'time',project_principal projectPrincipal" +
-            " FROM project_info WHERE create_date>= ?1 and  create_date<= ?2 and is_delete='1' and flow_task_status='3' " +
-            " GROUP BY project_principal ORDER BY num DESC",
-            nativeQuery = true)
+    @Query(value = "SELECT DATE_FORMAT(create_date,'%Y-%m') AS 'time',project_principal projectPrincipal" +
+            " FROM project_info WHERE create_date>= ?1 and  create_date<= ?2 and is_delete='1' and flow_task_status='3' "
+            , nativeQuery = true)
     List<Map<String, Object>> getProjectNumberOfMonth(String startDate, String endDate);
 
 

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/ProjectInfoServiceImpl.java

@@ -271,7 +271,7 @@ public class ProjectInfoServiceImpl implements ProjectInfoService {
         //今日              年--月--日
         String endDate = getToDay();
         List<Map<String, Object>> projectNumber = projectInfoMapper.getProjectNumberOfMonth(startDate + " 00:00:00", endDate + " 23:59:59");
-        //获取姓名负责人。再查负责人所在公司
+        //获取负责人姓名。再查负责人所在公司
         List<String> deptNameList = new ArrayList<>();
         for (Map<String, Object> map : projectNumber) {
             String projectPrincipal = map.get("projectPrincipal").toString();