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-10 09:21:11 +08:00
parent 09712b50fa
commit d573a64102
6 changed files with 126 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
+46
View File
@@ -75,6 +75,52 @@
AND tmps.id = #{projectId}
</if>
</where>
UNION ALL
SELECT
gsub.id,
g.drafting_group_project,
'',
g.principal_id_a,
su.realname,
gsub.contacts_temporary_id_one,
gsub.contacts_temporary_name_one,
gsub.charge_company_temporary_name,
'',
'',
'',
'',
'',
'',
'',
gsub.create_time,
7,
'',
'',
gsub.remarks,
'',
gsub.charge_company_temporary_id,
'',
'',
'',
'',
g.year,
'',
g.mission_and_objectives,
'',
'',
'',
''
FROM
pay_drafting_group g
LEFT JOIN
sys_user su ON g.principal_id_a = su.id
INNER JOIN
pay_drafting_group_subitem gsub ON g.id = gsub.drafting_group_id
<where>
<if test="projectId != null and projectId != ''">
AND gsub.id = #{projectId}
</if>
</where>
</select>
<select id="queryProjectList" resultType="com.jero.project.entity.PayCommonProject">
<!-- 普通项目-->
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+64
View File
@@ -21,6 +21,10 @@ import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.entity.PayIncomeContractAssociated;
import com.jero.contract.service.IPayIncomeContractAssociatedService;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.drafting.entity.PayDraftingGroupSubItem;
import com.jero.drafting.entity.PayDraftingGroupSubItemContacts;
import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService;
import com.jero.drafting.service.IPayDraftingGroupSubItemService;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.service.IPayMailBillProjectService;
@@ -86,6 +90,10 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Resource
private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
@Resource
private IPayDraftingGroupSubItemService payDraftingGroupSubItemService;
@Resource
private IPayDraftingGroupSubItemContactsService payDraftingGroupSubItemContactsService;
@Override
public ProjectDetailVO getProjectDetail(String projectId) {
@@ -129,6 +137,26 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
payCommonProject.setFiles(sb.toString());
}
}
// 起草组项目资料
if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,projectId);
queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getContactsId,sysUser.getId());
List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord = payWorkingGroupDistributionRecordService.list(queryPayWorkingGroupDistributionRecord);
if(!CollectionUtils.isEmpty(listPayWorkingGroupDistributionRecord)){
StringBuilder sb = new StringBuilder();
listPayWorkingGroupDistributionRecord.forEach(p->{
sb.append(p.getFileId());
if(listPayWorkingGroupDistributionRecord.indexOf(p) != (listPayWorkingGroupDistributionRecord.size() - 1)){
sb.append(",");
}
});
payCommonProject.setFiles(sb.toString());
}
}
ProjectDetailVO projectDetailVO = new ProjectDetailVO();
LoginUser user = sysBaseAPI.getUserById(payCommonProject.getPrincipalId());
projectDetailVO.setPrincipalName(user.getRealname());
@@ -274,6 +302,42 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
projectDetailVO.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts);
}
}
}else if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)) {
PayDraftingGroupSubItem payDraftingGroupSubItem = payDraftingGroupSubItemService.getById(projectId);
if(Objects.isNull(payDraftingGroupSubItem)){
throw new JeroBootException("项目不存在！");
}
LambdaQueryWrapper<PayDraftingGroupSubItemContacts> queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>();
queryPayDraftingGroupSubItemContacts.in(PayDraftingGroupSubItemContacts::getDraftingGroupSubId,projectId);
queryPayDraftingGroupSubItemContacts.orderByAsc(PayDraftingGroupSubItemContacts::getOrderNum);
List<PayDraftingGroupSubItemContacts> listPayDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts);
if(!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContacts)){
List<String> listIds = listPayDraftingGroupSubItemContacts.stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
List<PayContactsManagementTemporary> payContactsManagementTemporaryList = payContactsManagementTemporaryService.listByIds(listIds);
if(!CollectionUtils.isEmpty(payContactsManagementTemporaryList)){
listPayDraftingGroupSubItemContacts.forEach(p->{
List<PayContactsManagementTemporary> listNew = payContactsManagementTemporaryList.stream().filter(o->Objects.equals(o.getId(),p.getContactsTemporaryId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listNew)){
return;
}
PayContactsManagementTemporary payContactsManagementTemporary = listNew.get(0);
p.setGender(payContactsManagementTemporary.getGender());
if(!Objects.isNull(payContactsManagementTemporary.getGender())){
p.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender())));
}
p.setPost(payContactsManagementTemporary.getPost());
if(!StringUtils.isBlank(payContactsManagementTemporary.getPhone())){
p.setPhone(PasswordUtil.decrypt(payContactsManagementTemporary.getPhone()));
}
if(!StringUtils.isBlank(payContactsManagementTemporary.getEmail())){
p.setEmail(PasswordUtil.decrypt(payContactsManagementTemporary.getEmail()));
}
p.setPostalCodeContacts(payContactsManagementTemporary.getPostalCode());
p.setContactAddress(payContactsManagementTemporary.getContactAddress());
});
projectDetailVO.setPayDraftingGroupSubItemContactsLists(listPayDraftingGroupSubItemContacts);
}
}
}else {
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsTemporaryId());
if(Objects.isNull(payContactsManagementTemporary)){
jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
+5
View File
@@ -2,6 +2,7 @@ package com.jero.common.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import com.jero.drafting.entity.PayDraftingGroupSubItemContacts;
import com.jero.payment.entity.PayPaymentRecord;
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
import io.swagger.annotations.ApiModelProperty;
@@ -285,4 +286,8 @@ public class ProjectDetailVO implements Serializable {
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal noTaxAmount;
/**起草组成员联系人**/
@ApiModelProperty(value = "起草组成员联系人")
private List<PayDraftingGroupSubItemContacts> payDraftingGroupSubItemContactsLists;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java
+6 -6
View File
@@ -51,7 +51,7 @@ public class DraftGroupMeetingController {
/**
* 分页列表查询
*/
// @RequiresPermissions("draftGroupMeeting:search")
// @RequiresPermissions("draftGroupMeetingSituation:search")
@ApiOperation(value = "会议管理-分页列表查询", notes = "会议管理-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(PayMeeting payMeeting,
@@ -66,7 +66,7 @@ public class DraftGroupMeetingController {
/**
* 添加
*/
// @RequiresPermissions("draftGroupMeeting:add")
// @RequiresPermissions("draftGroupMeetingSituation:add")
@AutoLog(value = "会议管理-添加")
@ApiOperation(value = "会议管理-添加", notes = "会议管理-添加")
@PostMapping(value = "/add")
@@ -83,7 +83,7 @@ public class DraftGroupMeetingController {
/**
* 编辑
*/
// @RequiresPermissions("draftGroupMeeting:edit")
// @RequiresPermissions("draftGroupMeetingSituation:edit")
@AutoLog(value = "会议管理-编辑")
@ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑")
@PostMapping(value = "/edit")
@@ -116,7 +116,7 @@ public class DraftGroupMeetingController {
/**
* 通过id删除
*/
// @RequiresPermissions("draftGroupMeeting:delete")
// @RequiresPermissions("draftGroupMeetingSituation:delete")
@AutoLog(value = "会议管理-通过id删除")
@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
@GetMapping(value = "/delete")
@@ -129,7 +129,7 @@ public class DraftGroupMeetingController {
/**
* 批量删除
*/
// @RequiresPermissions("draftGroupMeeting:batchDel")
// @RequiresPermissions("draftGroupMeetingSituation:batchDel")
@AutoLog(value = "会议管理-批量删除")
@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
@GetMapping(value = "/deleteBatch")
@@ -145,7 +145,7 @@ public class DraftGroupMeetingController {
/**
* 通过id查询
*/
@ApiOperation(value = "会议管理-通过id查询", notes = "会议管理-通过id查询")
// @ApiOperation(value = "会议管理-通过id查询", notes = "会议管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) {
PayMeeting meeting = payMeetingService.queryById(id);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java
+1 -1
View File
@@ -186,7 +186,7 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
* 审核报名信息
*/
@AutoLog(value = "审核报名信息")
// @RequiresPermissions("draftGroupMeetingSituation:auditSignUp")
@RequiresPermissions("draftGroupMeetingSituation:auditCredentials")
@ApiOperation(value = "审核报名信息")
@PostMapping(value = "/checkRegister")
public Result<?> checkRegister(@RequestBody CheckVO checkVO) {
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+4 -3
View File
@@ -1004,11 +1004,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
permission = "otherMeeting:search";
}else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)){
permission = "committeeMeeting:search";
}else if (meetingType.equals(MeetingCommon.COUNCIL_MEETING_INT)){
}else if (meetingType.equals(MeetingCommon.COUNCIL_MEETING_INT)) {
permission = "committeeMeeting:search";
}else if (meetingType.equals(MeetingCommon.DRAFTING_GROUP_MEETING_INT)) {
permission = "draftGroupMeeting:search";
}
// }else if (meetingType.equals(MeetingCommon.DRAFTING_GROUP_MEETING_INT)) {
// permission = "draftGroupMeeting:search";
// }
}
if (StringUtils.isNotBlank(permission)) {
if (!rolePermissionService.getRolePermission(permission)) {