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

Merge remote-tracking branch 'origin/branch20211008' into branch20211008

Browse Source
This commit is contained in:
梁琦涛
2021-10-28 10:14:36 +08:00
parent 74db8ab27b 59ff173699
commit cecdd93e8a
8 changed files with 28 additions and 18 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
+1 -1
View File
@@ -132,7 +132,7 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
byte[] buff = new byte[1024];
BufferedInputStream bis = null;
// 读取filename
bis = new BufferedInputStream(new FileInputStream(new File(upLoadPath+"\\"+url)));
bis = new BufferedInputStream(new FileInputStream(new File(upLoadPath+File.separator+url)));
int i = bis.read(buff);
while (i != -1) {
outputStream.write(buff, 0, buff.length);
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
+1 -1
View File
@@ -156,7 +156,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
zipos = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
zipos.setMethod(ZipOutputStream.DEFLATED); //设置压缩方法
for (OSSFile ossFile : listOSSFile) {
File file = new File(upLoadPath + "\\" + ossFile.getUrl());
File file = new File(upLoadPath + File.separator + ossFile.getUrl());
if(file.exists()){
try {
//添加ZipEntry，并ZipEntry中写入文件流w
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+8 -5
View File
@@ -96,7 +96,7 @@ public class AllProjectStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
return Result.OK();
}
Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList );
@@ -167,7 +167,7 @@ public class AllProjectStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
return Result.OK();
}
Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
@@ -236,7 +236,8 @@ public class AllProjectStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
ArrayList<AllProjectStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计");
}
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
@@ -275,7 +276,8 @@ public class AllProjectStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
ArrayList<AllProjectStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计");
}
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
@@ -325,7 +327,8 @@ public class AllProjectStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
ArrayList<AllProjectStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "企业来款统计");
}
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList);
if (pageList != null) {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+6 -4
View File
@@ -84,7 +84,7 @@ public class CompanyComeMoneyStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
return Result.OK();
}
Page<CompanyComeMoneyList> page = new Page<>(pageNo, pageSize);
IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList);
@@ -148,7 +148,7 @@ public class CompanyComeMoneyStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
return Result.OK();
}
Page<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
@@ -210,7 +210,8 @@ public class CompanyComeMoneyStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
ArrayList<CompanyComeMoneyList> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计");
}
List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, idList);
@@ -244,7 +245,8 @@ public class CompanyComeMoneyStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
ArrayList<CompanyComeMoneyDetail> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计");
}
List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, idList);
for (CompanyComeMoneyDetail s : pageList) {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+6 -3
View File
@@ -22,6 +22,7 @@ import com.jero.project.entity.PayWorkingGroupStatistics;
import com.jero.project.entity.PayWorkingGroupSubletSearch;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.statistics.entity.CompanyComeMoneyDetail;
import com.jero.util.AmountUtil;
import com.jero.util.SearchUtil;
import io.swagger.annotations.Api;
@@ -95,7 +96,7 @@ public class PayWorkingGroupStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
return Result.OK();
}
IPage<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,idList);
List<PayWorkingGroupStatistics> records = pageList.getRecords();
@@ -161,7 +162,8 @@ public class PayWorkingGroupStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
}
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList);
//处理为空数据为0
@@ -198,7 +200,8 @@ public class PayWorkingGroupStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
}
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList,strings);
//处理为空数据为0
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+4 -2
View File
@@ -18,6 +18,7 @@ import com.jero.mail.entity.PayMailBillProject;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.project.entity.PayWorkGroupSubletStatistics;
import com.jero.project.entity.PayWorkingGroupStatistics;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.statistics.entity.*;
import com.jero.util.AmountUtil;
@@ -92,7 +93,7 @@ public class PrincipalPeopleStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
return Result.OK();
}
Page<PrincipalPeopleList> page = new Page<>(pageNo, pageSize);
@@ -205,7 +206,8 @@ public class PrincipalPeopleStatisticsController {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
ArrayList<PrincipalPeopleList> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, PrincipalPeopleList.class, "个人来款");
}
List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch, idList);
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+1 -1
View File
@@ -453,7 +453,7 @@ public class SysDepartController {
LambdaQueryWrapper<SysDepart> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(SysDepart::getOrgCode,sysDepart.getOrgCode());
if (sysDepartService.count(wrapper1) > 0) {
errorMessage.add("第 " + lineNumber + " 行：部门编码已经存在");
errorMessage.add("第 " + lineNumber + " 行：机构编码已经存在");
}
if (errorMessage.isEmpty()){
SysDepart sysDepart1 = new SysDepart();
jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class SysDepartExcel {
private String orgCode;
/**手机号*/
@Excel(name="手机号",width=15,orderNum = "5")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误")
private String mobile;
/**传真*/
private String fax;