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

管理端bug修改

Browse Source
This commit is contained in:
梁琦涛
2021-09-30 16:03:22 +08:00
parent a9fc95cfd1
commit 745bb480a3
5 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+19 -3
View File
@@ -639,8 +639,13 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
List<PayCompanyManagement> listSigning = new ArrayList<>();
List<PayCompanyManagement> listRemove = new ArrayList<>();
List<String> companyList = list.stream().map(PayCompanyManagement::getCompanyName).collect(Collectors.toList());
List<PayCompanyManagement> listAll = payCompanyManagementService.listPayCompanyManagement(companyList);
List<String> dutyCodeList = list.stream().map(PayCompanyManagement::getDutyCode).collect(Collectors.toList());
List<PayCompanyManagement> listCompanyAll = payCompanyManagementService.listPayCompanyManagement(companyList);
LambdaQueryWrapper<PayCompanyManagement> queryPayCompanyManagement = new LambdaQueryWrapper<>();
queryPayCompanyManagement.in(PayCompanyManagement::getDutyCode,dutyCodeList);
List<PayCompanyManagement> listDutyCodeAll = payCompanyManagementService.list(queryPayCompanyManagement);
List<String> listCompany = new ArrayList<>();
List<String> listDutyCode = new ArrayList<>();
StringBuilder msg = new StringBuilder();
int finalDataSource = dataSource;
int finalStatus = status;
@@ -651,6 +656,10 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
msg.append("第 ").append(count + 3).append(" 行：企业名称在excel中重复，请修改。<br/>");
}
listCompany.add(p.getCompanyName());
if(listDutyCode.contains(p.getDutyCode())){
msg.append("第 ").append(count + 3).append(" 行：信用代码在excel中重复，请修改。<br/>");
}
listCompany.add(p.getDutyCode());
p.setDataSource(finalDataSource);
p.setStatus(finalStatus);
// 校验字段值
@@ -659,12 +668,19 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
msg.append(s);
}
// 校验 表中是否存在企业名称
if(!CollectionUtils.isEmpty(listAll)){
List<PayCompanyManagement> listCompanyEquals = listAll.stream().filter(p1->Objects.equals(p1.getCompanyName(),p.getCompanyName())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listCompanyAll)){
List<PayCompanyManagement> listCompanyEquals = listCompanyAll.stream().filter(p1->Objects.equals(p1.getCompanyName(),p.getCompanyName())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listCompanyEquals)){
msg.append("第").append(count + 3).append("行：企业名称已经存在，请修改。<br/>");
}
}
// 校验 表中是否存在信用代码
if(!CollectionUtils.isEmpty(listDutyCodeAll)){
List<PayCompanyManagement> listDutyCodeEquals = listDutyCodeAll.stream().filter(p1->Objects.equals(p1.getDutyCode(),p.getDutyCode())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listDutyCodeEquals)){
msg.append("第").append(count + 3).append("行：信用代码已经存在，请修改。<br/>");
}
}
if (!StringUtils.isBlank(p.getCompanyPhone())){
p.setCompanyPhone(PasswordUtil.encrypt(p.getCompanyPhone()));
}
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+6 -1
View File
@@ -92,6 +92,9 @@ public class PayContactsManagementController extends JeroController<PayContactsM
if(!StringUtils.isBlank(payContactsManagement.getPhone()) && payContactsManagement.getPhone().length() > 11){
return Result.error("手机号长度不能大于11个字符！");
}
if(!StringUtils.isBlank(payContactsManagement.getPhone())){
payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone()));
}
Page<PayContactsManagement> page = new Page<>(pageNo, pageSize);
IPage<PayContactsManagement> pageList = payContactsManagementService.queryPageList(page, payContactsManagement);
List<PayContactsManagement> listPayContactsManagement = pageList.getRecords();
@@ -592,9 +595,11 @@ public class PayContactsManagementController extends JeroController<PayContactsM
@ApiOperation(value="联系人管理-导出excel", notes="联系人管理-导出excel")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayContactsManagement payContactsManagement) {
if(!StringUtils.isEmpty(payContactsManagement.getPhone())){
payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone()));
}
// Step.1 组装查询条件
QueryWrapper<PayContactsManagement> queryWrapper = QueryGenerator.initQueryWrapper(payContactsManagement, request.getParameterMap());
// Step.2 获取导出数据
List<PayContactsManagement> pageList = payContactsManagementService.list(queryWrapper);
List<PayContactsManagement> exportList = null;
jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml
+1 -1
View File
@@ -26,7 +26,7 @@
AND pcm.name LIKE concat('%',concat(#{payContactsManagement.name},'%'))
</if>
<if test="payContactsManagement.phone != null and payContactsManagement.phone != ''">
AND pcm.phone LIKE concat('%',concat(#{payContactsManagement.phone},'%'))
AND pcm.phone = #{payContactsManagement.phone}
</if>
<if test="payContactsManagement.companyName != null and payContactsManagement.companyName != ''">
AND pcm1.company_name LIKE concat('%',concat(#{payContactsManagement.companyName},'%'))
jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
+1 -1
View File
@@ -252,7 +252,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
* @param request
* @param payPackCompany
*/
// @GetMapping(value = "/exportXls")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayPackCompany payPackCompany) {
return super.exportXls(request, payPackCompany, PayPackCompany.class, "打包企业管理");
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+7
View File
@@ -215,6 +215,13 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
payPackCompany = payPackCompanyService.addPayPackCompany(payPackCompanyData);
}else{
payPackCompany = listPayPackCompany.get(0);
LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
queryPayPackCompanyProject.eq(PayPackCompanyProject::getPackId,payPackCompany.getId());
List<PayPackCompanyProject> list = payPackCompanyProjectService.list(queryPayPackCompanyProject);
// 验证打包企业是否已存在,存在不在添加
if(!CollectionUtils.isEmpty(list)){
return;
}
}
// 添加打包企业成员
PayPackCompanyProject payPackCompanyProject = new PayPackCompanyProject();