LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

注释不需要内容

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