From d4819c6b5d7913cb30bd9a71f2b67b0da275d0a2 Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Fri, 8 Oct 2021 16:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayCaseCommitteeController.java           |  2 -
 .../mail/mapper/xml/PayMailContractMapper.xml |  8 +--
 .../mail/service/IPayMailContractService.java |  1 +
 ...kingGroupDistributionRecordController.java | 45 ++++++++--------
 .../mapper/xml/PayWorkingGroupMapper.xml      | 54 +++++++++----------
 .../AllProjectStatisticsController.java       |  2 +-
 .../CompanyComeMoneyStatisticsController.java |  8 +--
 .../PayWorkingGroupStatisticsController.java  |  4 +-
 .../PrincipalPeopleStatisticsController.java  |  6 +--
 .../src/main/resources/application-dev.yml    |  4 +-
 10 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
index 13294e67..f69dacc0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
@@ -70,7 +70,6 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 	 * @param pageSize
 	 * @return
 	 */
-	@AutoLog(value = "分标委表-企业端分页列表查询")
 	@ApiOperation(value="分标委表-企业端分页列表查询", notes="分标委表-企业端分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(@RequestParam(name="name",required = false) String name,
@@ -89,7 +88,6 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 	  * @param id
 	  * @return
 	  */
-	 @AutoLog(value = "分标委表-企业端通过分标委id查询详情")
 	 @ApiOperation(value="分标委表-企业端通过分标委id查询详情", notes="分标委表-企业端通过分标委id查询详情")
 	 @GetMapping(value = "/detail")
 	 public Result<?> detail(@RequestParam(name="id",required = true) String id) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
index a2439f1e..21d6cb78 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
@@ -13,11 +13,13 @@ pc.remark,
 pc.send_date as sendDate,
 pic.contract_num as contractNum,
 pic.contract_name as contractName,
-pic.signed_company_temporary_name as signedCompanyTemporaryName,
+pcm.company_name as signedCompanyTemporaryName,
 pic.principal_name as principalName,
 pic.principal_id as principalId,
-pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id)
-         ${ew.customSqlSegment}
+pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) left join pay_company_management pcm
+on(pic.signed_company_id=pcm.id)
+<!--  where pcm.status=1 -->
+     ${ew.customSqlSegment}
     </select>
 
     <select id="pageContractExcel"  resultType="com.jero.mail.entity.PayMailBillList">
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java
index 7f340045..4b84e4c1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java
@@ -25,6 +25,7 @@ public interface IPayMailContractService extends IService<PayMailContract> {
 
 
     IPage<PayMailBillList> pageContract(Page<PayMailBillList> page, QueryWrapper<PayMailBillList> queryWrapper);
+
     List<PayMailBillList> pageContractExcel(QueryWrapper<PayMailBillList> queryWrapper);
 
     List<PayMailBillList> pageContractTwo(QueryWrapper<PayMailBillList> queryWrapper);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
index 1bc2ca95..352a5a78 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
@@ -1,6 +1,7 @@
 package com.jero.project.controller;
 
 import java.io.*;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -8,6 +9,7 @@ import java.util.UUID;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -37,6 +39,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.mybatis.logging.Logger;
+import org.mybatis.logging.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -68,7 +72,8 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
 	 private IOSSFileService iossFileService;
 	 @Value("${jero.path.upload}")
 	 private  String upLoadPath;
-	
+
+
 	/**
 	 * 企业端-资料下载列表查询
 	 *
@@ -99,31 +104,26 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
 		}
 		return Result.OK(pageList);
 	}
+
+
 	 /**
 	  * 导出下载zip(多个以逗号隔开)
 	  *
 	  */
 	 @ApiOperation(value="企业端-资料下载多个zip(多个以逗号隔开)", notes="企业端-资料下载多个zip(多个以逗号隔开")
 	 @GetMapping(value = "/zipFile")
-	 public void zipFile(@RequestParam(name="ids",required = true) String ids) {
+	 public void zipFile(@RequestParam(name="ids",required = true) String ids,HttpServletRequest request,HttpServletResponse response) {
 		 ArrayList<String> fileIdList = new ArrayList<>(Arrays.asList(ids.split(",")));
-		 ArrayList<String> objects = new ArrayList<>();
-		 for(String id :fileIdList){
-			 OSSFile file = iossFileService.getById(id);
-			 objects.add(file.getUrl());
-
-		 }
-		 zipFileDownload(objects);
+		 List<OSSFile> files = iossFileService.listByIds(fileIdList);
+		 zipFileDownload(files,request,response);
 
 	 }
 
 	 /**
 	  * 打包下载
-	  * @param paths 目前处理是文件绝对路径.
+	  * @param listOSSFile 目前处理是文件绝对路径.
 	  */
-	 public  void zipFileDownload(List<String> paths){
-		 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		 HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
+	 public  void zipFileDownload(List<OSSFile> listOSSFile,HttpServletRequest request,HttpServletResponse response){
 		 //循环将文件写入压缩流
 		 DataOutputStream os = null;
 		 //设置压缩流：直接写入response，实现边压缩边下载
@@ -150,16 +150,16 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
 			 response.setHeader("Content-Disposition", "attachment;fileName=\"" + downloadName + "\"");
 			 zipos = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
 			 zipos.setMethod(ZipOutputStream.DEFLATED); //设置压缩方法
-			 for (String path : paths){
-				 File file = new File(upLoadPath + "\\" + path);
+			 for (OSSFile ossFile : listOSSFile) {
+				 File file = new File(upLoadPath + "\\" + ossFile.getUrl());
 				 if(file.exists()){
 					 try {
 						 //添加ZipEntry，并ZipEntry中写入文件流w
 						 //这里，防止要下载的文件有重名的导致下载失败
-						 zipos.putNextEntry(new ZipEntry("folder/"+ file.getName()));
+						 zipos.putNextEntry(new ZipEntry(ossFile.getFileName()));
 						 os = new DataOutputStream(zipos);
 						 InputStream is = new FileInputStream(file);
-						 byte[] b = new byte[100];
+						 byte[] b = new byte[1024];
 						 int length = 0;
 						 while((length = is.read(b))!= -1){
 							 os.write(b, 0, length);
@@ -171,17 +171,14 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
 					 }
 				 }
 			 }
+			 assert os != null;
+			 os.flush();
 		 }catch (Exception e){
 			 e.printStackTrace();
 		 }finally {
 			 try {
-				 if (os!= null){
-					 os.flush();
-					 os.close();
-				 }
-				 if (zipos != null){
-					 zipos.close();
-				 }
+				 if (os!= null){os.close();}
+				 if (zipos != null){zipos.close();}
 			 }catch (Exception e){
 				 e.printStackTrace();
 			 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index f1ef6302..3281d69b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -986,37 +986,37 @@
         </choose>
     </where>) pp
     inner join
-    --          判断来款项目的来款年份
- (select pwgs.id as id
-    from pay_working_group_subitem pwgs
-    inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)
-    WHERE ppr.payment_date like
-    concat('%',#{principalPeopleDetailSearch.year},'%')
-    GROUP BY pwgs.id
-    union ALL
-    SELECT
-    pcp.id as id
-    FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id) WHERE ppr.payment_date like  concat('%',#{principalPeopleDetailSearch.year},'%')
-    group by pcp.id
-    union all
-    SELECT
-    pmps.id as id from
-     pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)
-    WHERE ppr.payment_date like
-    concat('%',#{principalPeopleDetailSearch.year},'%')
-    group by pmps.id
-    union all
-    SELECT
-    pms.id as id from pay_meeting_situation  pms inner join  pay_payment_record ppr on (pms.id=ppr.project_id)
-    WHERE ppr.payment_date like  concat('%',#{principalPeopleDetailSearch.year},'%')
-    group by pms.id) pprr on(pp.id=pprr.id)
-    order by pp.createTime
-</select>
+    <!--          判断来款项目的来款年份-->
+   (select pwgs.id as id
+      from pay_working_group_subitem pwgs
+      inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)
+      WHERE ppr.payment_date like
+      concat('%',#{principalPeopleDetailSearch.year},'%')
+      GROUP BY pwgs.id
+      union ALL
+      SELECT
+      pcp.id as id
+      FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id) WHERE ppr.payment_date like  concat('%',#{principalPeopleDetailSearch.year},'%')
+      group by pcp.id
+      union all
+      SELECT
+      pmps.id as id from
+       pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)
+      WHERE ppr.payment_date like
+      concat('%',#{principalPeopleDetailSearch.year},'%')
+      group by pmps.id
+      union all
+      SELECT
+      pms.id as id from pay_meeting_situation  pms inner join  pay_payment_record ppr on (pms.id=ppr.project_id)
+      WHERE ppr.payment_date like  concat('%',#{principalPeopleDetailSearch.year},'%')
+      group by pms.id) pprr on(pp.id=pprr.id)
+      order by pp.createTime
+  </select>
 
 
 
 
-<!--企业来款统计-->
+  <!--企业来款统计-->
     <select id="queryPageListForCompany" resultType="com.jero.statistics.entity.CompanyComeMoneyList">
         select chargeCompanyTemporaryId as chargeCompanyId, chargeCompanyTemporaryName as
         chargeCompanyName,allMoney,comeAllMoney,createTime,
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 5f979bce..f3b501c4 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
@@ -71,7 +71,7 @@ public class AllProjectStatisticsController {
 
             //根据不同角色加载不同列表的参数
             List<String> idList = new ArrayList<>();
-            //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
             LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
             String roleCode = sysUser.getRoleCode();
             List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
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 7ef5b3b5..c2f961a6 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
@@ -67,7 +67,7 @@ public class CompanyComeMoneyStatisticsController {
         }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysUser.getRoleCode();
         List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
@@ -134,7 +134,7 @@ public class CompanyComeMoneyStatisticsController {
         }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysUser.getRoleCode();
         List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
@@ -201,7 +201,7 @@ public class CompanyComeMoneyStatisticsController {
         }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysUser.getRoleCode();
         List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
@@ -240,7 +240,7 @@ public class CompanyComeMoneyStatisticsController {
         }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysUser.getRoleCode();
         List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
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 2a95400e..1c901c99 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
@@ -78,7 +78,7 @@ public class PayWorkingGroupStatisticsController {
         }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysUser.getRoleCode();
         List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
@@ -147,7 +147,7 @@ public class PayWorkingGroupStatisticsController {
         }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysUser.getRoleCode();
         List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
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 7fe8ee63..3aec7d81 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
@@ -50,8 +50,6 @@ public class PrincipalPeopleStatisticsController {
     private ISysBaseAPI sysBaseAPI;
     @Autowired
     private IPayWorkingGroupService payWorkingGroupService;
-    @Autowired
-    private ProjectDetailService projectDetailService;
 
     /**
      * 分页列表查询
@@ -73,7 +71,7 @@ public class PrincipalPeopleStatisticsController {
             }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysUser.getRoleCode();
         List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
@@ -191,7 +189,7 @@ public class PrincipalPeopleStatisticsController {
         }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+        //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysUser.getRoleCode();
         List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml
index 5ffc3a66..53229a37 100644
--- a/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -148,7 +148,7 @@ spring:
   redis:
     database: 14
     #      host: 121.36.69.172
-    host: 192.168.18.254
+    host: 127.0.0.1
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -157,7 +157,7 @@ spring:
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
     #    password: hzwlsoft.com
-    password: 123456
+    password:
     #    port: 4780
     port: 6379