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:
sunzheng
2024-01-11 17:32:36 +08:00
parent ce7f37fb96
commit 62dac46bd2
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
+4
View File
@@ -166,6 +166,10 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
pageList = payDraftingGroupSubItemService.queryCompanyPageListByCompanyManager(page, payDraftingGroupSubItem,listNeedInvoice,sysUser.getCompanyId());
}
// 过滤数据，只要审核通过的数据
List<PayDraftingGroupSubItem> passList = pageList.getRecords().stream().filter(item -> Objects.equals(item.getCheckResult(), DraftingConstant.CHECK_PASS)).collect(Collectors.toList());
pageList.setRecords(passList);
if(!CollectionUtils.isEmpty(pageList.getRecords())){
List<PayDraftingGroupSubItem> list = pageList.getRecords();
// 过滤数据，只要审核通过的数据
jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
+10
View File
@@ -714,6 +714,16 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
updateWrapper.set(StringUtils.isNotBlank(checkRemark),PayDraftingGroupSubItem::getCheckRemark,checkRemark);
updateWrapper.set(!Objects.isNull(checkResult),PayDraftingGroupSubItem::getCheckResult,checkResult);
payDraftingGroupSubItemService.update(updateWrapper);
// 如果审核通过,发送消息
if(Objects.equals(checkVO.getCheckResult(),DraftingConstant.CHECK_PASS)) {
PayDraftingGroupSubItem draftingGroupSubItem = payDraftingGroupSubItemService.getById(payDraftingGroupSubItemId);
if (Objects.isNull(draftingGroupSubItem) || StringUtils.isBlank(draftingGroupSubItem.getDraftingGroupId())) {
throw new JeroBootException("起草组不存在");
}
PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(draftingGroupSubItem.getDraftingGroupId());
List<PayDraftingGroupSubItemContacts> payDraftingGroupSubItemContactsList = draftingGroupSubItem.getPayDraftingGroupSubItemContactsList();
sendMessage(draftingGroupSubItem,payDraftingGroup,payDraftingGroupSubItemContactsList);
}
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+4 -1
View File
@@ -160,7 +160,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
* @param paymentDate 日期
* @return
*/
@ApiOperation(value = "企业端-工作组成员-分页列表查询", notes = "企业端-工作组成员-分页列表查询")
@ApiOperation(value = "企业端-工作组成员-查询某个工作组", notes = "企业端-工作组成员-查询某个工作组")
@GetMapping(value = "/getItemById")
public Result<?> getItemById(PayWorkingGroupSubItem payWorkingGroupSubItem,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -172,6 +172,9 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
if (StringUtils.isBlank(payWorkingGroupSubItem.getWorkingGroupId())) {
return Result.error("工作组id不能为空！");
}
if (StringUtils.isBlank(payWorkingGroupSubItem.getId())) {
return Result.error("工作组成员id不能为空！");
}
if(!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName())){
payWorkingGroupSubItem.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubItem.getChargeCompanyTemporaryName()));
}