From 11878cfe0384752a68917fb444898307305fc40d Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Mon, 13 Dec 2021 11:13:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=9F=E8=AE=A1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/PayCaseCouncilSubitemMapper.xml       |  2 +-
 .../PayResearchProjectController.java         |  6 +-
 .../entity/PayResearchProject.java            |  2 +-
 .../mapper/PayResearchProjectMapper.java      |  4 +-
 .../mapper/xml/PayResearchProjectMapper.xml   |  2 +-
 .../xml/PayWorkingGroupSubItemMapper.xml      |  2 +-
 .../service/IPayResearchProjectService.java   |  4 +-
 .../impl/PayResearchProjectServiceImpl.java   |  8 +--
 .../AllProjectStatisticsController.java       | 18 +++---
 .../CompanyComeMoneyStatisticsController.java | 59 +++++++++++--------
 .../entity/CompanyComeMoneyDetail.java        |  3 +
 11 files changed, 63 insertions(+), 47 deletions(-)
 rename jero-boot-incoming-payment/src/main/java/com/jero/{data => project}/controller/PayResearchProjectController.java (97%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/{data => project}/entity/PayResearchProject.java (98%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/{data => project}/mapper/PayResearchProjectMapper.java (75%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/{data => project}/mapper/xml/PayResearchProjectMapper.xml (69%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/{data => project}/service/IPayResearchProjectService.java (75%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/{data => project}/service/impl/PayResearchProjectServiceImpl.java (65%)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
index d055cd52..ca4ecfed 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
@@ -34,7 +34,7 @@
         group by pe.id
         order by pe.create_time desc
     </select>
-    <select id="listForChildren" resultType="com.jero.data.entity.ChildrenFindByName">
+    <select id="listForChildren" resultType="com.jero.data.entity.subCouncil">
         SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as id
         from
         pay_case_council_subitem pm
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
similarity index 97%
rename from jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayResearchProjectController.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
index 32108008..70c06d31 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayResearchProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
@@ -1,4 +1,4 @@
-package com.jero.data.controller;
+package com.jero.project.controller;
 
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
@@ -8,8 +8,8 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
-import com.jero.data.entity.PayResearchProject;
-import com.jero.data.service.IPayResearchProjectService;
+import com.jero.project.entity.PayResearchProject;
+import com.jero.project.service.IPayResearchProjectService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayResearchProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayResearchProject.java
similarity index 98%
rename from jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayResearchProject.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayResearchProject.java
index e081b32e..1213a644 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayResearchProject.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayResearchProject.java
@@ -1,4 +1,4 @@
-package com.jero.data.entity;
+package com.jero.project.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayResearchProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayResearchProjectMapper.java
similarity index 75%
rename from jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayResearchProjectMapper.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayResearchProjectMapper.java
index 502c4be4..1db3b67b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayResearchProjectMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayResearchProjectMapper.java
@@ -1,6 +1,6 @@
-package com.jero.data.mapper;
+package com.jero.project.mapper;
 
-import com.jero.data.entity.PayResearchProject;
+import com.jero.project.entity.PayResearchProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayResearchProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayResearchProjectMapper.xml
similarity index 69%
rename from jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayResearchProjectMapper.xml
rename to jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayResearchProjectMapper.xml
index ffc65479..9c8e2f15 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayResearchProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayResearchProjectMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.data.mapper.PayResearchProjectMapper">
+<mapper namespace="com.jero.project.mapper.PayResearchProjectMapper">
 
 </mapper>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
index 000189d7..2a70fba2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
@@ -64,7 +64,7 @@
     </select>
 <!--工作组详情-->
     <select id="queryPageList2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
-       select pwg1.principalId,pwg1.principalName,pwg1.chargeCompanyTemporaryName,pwg1.allMoney,pwg1.comeAllMoney,pwg1.chargeUse,if(pwg1.pack=0,'否','是') as packText,pwg1.pack from (SELECT
+       select pwg1.principalId,pwg1.principalName,pwg1.chargeCompanyTemporaryName,pwg1.allMoney,pwg1.comeAllMoney,pwg1.chargeUse,if(pwg1.pack=0,'否','是') as packText,pwg1.pack,pwg1.id from (SELECT
         pwgs.id,
         pwg.principal_id_a as principalId,
         pwg.principal_name_a as principalName,
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayResearchProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java
similarity index 75%
rename from jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayResearchProjectService.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java
index cbf2611d..d2618527 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayResearchProjectService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java
@@ -1,6 +1,6 @@
-package com.jero.data.service;
+package com.jero.project.service;
 
-import com.jero.data.entity.PayResearchProject;
+import com.jero.project.entity.PayResearchProject;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayResearchProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java
similarity index 65%
rename from jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayResearchProjectServiceImpl.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java
index c3b8f3c7..8f31b5f1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayResearchProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java
@@ -1,8 +1,8 @@
-package com.jero.data.service.impl;
+package com.jero.project.service.impl;
 
-import com.jero.data.entity.PayResearchProject;
-import com.jero.data.mapper.PayResearchProjectMapper;
-import com.jero.data.service.IPayResearchProjectService;
+import com.jero.project.entity.PayResearchProject;
+import com.jero.project.mapper.PayResearchProjectMapper;
+import com.jero.project.service.IPayResearchProjectService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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 1d6c6c8e..832da690 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
@@ -373,15 +373,17 @@ public class AllProjectStatisticsController {
     @ApiOperation(value = "通过部门id查所有人员", notes = "通过部门id查所有人员")
     @RequestMapping(value = "/listForUserByOrgCode", method = RequestMethod.GET)
     public Result<?> listForUserByOrgCode(@RequestParam(name = "departCode",required = true) String departCode) {
-        QueryWrapper<SysDepart> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("org_code",departCode);
-        SysDepart one = sysDepartService.getOne(queryWrapper1);
-        List<SysDepartTreeModel> sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(one.getId());
-        SysDepartModel sysDepartModel = sysBaseAPI.selectAllById(one.getId());
-        List<String> orgCodes = sysDepartTreeModels.stream().map(s -> s.getOrgCode()).collect(Collectors.toList());
-        orgCodes.add(sysDepartModel.getOrgCode());
+//        QueryWrapper<SysDepart> queryWrapper1 = new QueryWrapper<>();
+//        queryWrapper1.eq("org_code",departCode);
+//        SysDepart one = sysDepartService.getOne(queryWrapper1);
+//        List<SysDepartTreeModel> sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(one.getId());
+//        SysDepartModel sysDepartModel = sysBaseAPI.selectAllById(one.getId());
+//        List<String> orgCodes = sysDepartTreeModels.stream().map(s -> s.getOrgCode()).collect(Collectors.toList());
+//        orgCodes.add(sysDepartModel.getOrgCode());
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("org_code",orgCodes);
+        queryWrapper.eq("org_code",departCode);
+        queryWrapper.eq("del_flag",0);
+        queryWrapper.eq("status",1);
         List<SysUser> pageList = sysUserService.list(queryWrapper);
         return  Result.OK(pageList);
     }
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 222d0467..5d3475cd 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
@@ -11,6 +11,8 @@ import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.system.vo.SysDepartTreeModel;
 import com.jero.common.util.oConvertUtils;
+import com.jero.company.entity.PayCompanyManagement;
+import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.mail.commont.constant;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.mapper.SysUserMapper;
@@ -51,6 +53,8 @@ public class CompanyComeMoneyStatisticsController {
     private ISysBaseAPI sysBaseAPI;
     @Autowired
     private IPayWorkingGroupService payWorkingGroupService;
+    @Autowired
+    private IPayCompanyManagementService payCompanyManagementService;
 
     /**
      * 分页列表查询
@@ -155,36 +159,43 @@ public class CompanyComeMoneyStatisticsController {
 //            } else {
 //                return Result.OK();
 //            }
+            PayCompanyManagement byId = payCompanyManagementService.getById(companyComeMoneyDetailSearch.getChargeCompanyId());
+            if(ObjectUtils.isEmpty(byId)){
+                return Result.error("企业id错误，无对应企业id");
+            }
             Page<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
-
             IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,null);
-            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);
+                s.setChargeCompanyName(byId.getCompanyName());
             }
-            //处理为空数据为0
-            for(CompanyComeMoneyDetail s: pageList.getRecords()) {
-                if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
-                    s.setAllMoney("0.00");
+            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;
                 }
-                if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
-                    s.setComeAllMoney("0.00");
+                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);
                 }
-            }
-            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);
-    }
+                //处理为空数据为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);
+        }
 
     /**
      *企业来款统计
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java
index 1745cd1d..a69c3573 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java
@@ -13,6 +13,9 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 public class CompanyComeMoneyDetail {
     @ApiModelProperty(value = "项目id")
     private String projectId;
+    @Excel(name = "来款企业", width = 15)
+    @ApiModelProperty(value = "来款企业")
+    private String chargeCompanyName;
     @Excel(name = "来款项目", width = 15)
     @ApiModelProperty(value = "来款项目")
     private String projectName;