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 10:15:33 +08:00
parent 38967e1245
commit 21d2f9c83d
2 changed files with 57 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
+8 -1
View File
@@ -25,12 +25,18 @@
left join sys_user su on pdg.principal_id_a = su.id
left join sys_user su1 on pdg.principal_id_b = su1.id
left join pay_working_group pwg on pwg.id = pdg.working_group_id
<!-- 动态添加表连接 -->
<if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '')
or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">
or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">
left join pay_drafting_group_subitem pdgs on pdg.id = pdgs.drafting_group_id
left JOIN pay_drafting_group_subitem_contacts pdgsc on pdgsc.drafting_group_sub_id = pdgs.id
</if>
<where>
<!-- 动态条件 -->
<if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '')
or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">
AND pdgs.check_result != 3
</if>
<if test="payDraftingGroup.draftingGroupProject != null and payDraftingGroup.draftingGroupProject != ''">
AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%'))
</if>
@@ -55,4 +61,5 @@
</where>
ORDER BY pdg.create_time DESC
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java
+49 -30
View File
@@ -16,6 +16,7 @@ import com.jero.common.service.RolePermissionService;
import com.jero.common.system.vo.LoginUser;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.drafting.common.DraftingConstant;
import com.jero.drafting.entity.PayDraftingGroup;
import com.jero.drafting.entity.PayDraftingGroupResearchProject;
import com.jero.drafting.entity.PayDraftingGroupSubItem;
@@ -125,12 +126,13 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
}
payDraftingGroup.setPrincipalNameA(principalIdA.getRealname());
// 负责人B名称
SysUser principalIdB = sysUserService.getById(payDraftingGroup.getPrincipalIdB());
if (Objects.isNull(principalIdB)) {
throw new JeroBootException("负责人B不存在！");
if (!Objects.isNull(payDraftingGroup.getPrincipalIdB())) {
SysUser principalIdB = sysUserService.getById(payDraftingGroup.getPrincipalIdB());
if (Objects.isNull(principalIdB)) {
throw new JeroBootException("负责人B不存在！");
}
payDraftingGroup.setPrincipalNameB(principalIdB.getRealname());
}
payDraftingGroup.setPrincipalNameB(principalIdB.getRealname());
}
/**
@@ -167,7 +169,11 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
query.eq(PayDraftingGroupSubItem::getDraftingGroupId, id);
List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query);
if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) {
throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!");
for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) {
if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) {
throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!");
}
}
}
LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
@@ -182,6 +188,11 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
LambdaUpdateWrapper<PayDraftingGroupSubItem> updatePayDraftingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayDraftingGroupSubItem.eq(PayDraftingGroupSubItem::getDraftingGroupId, id);
payDraftingGroupSubItemService.remove(updatePayDraftingGroupSubItem);
LambdaUpdateWrapper<PayDraftingGroupSubItemContacts> updatePayDraftingGroupContacts = new LambdaUpdateWrapper<>();
updatePayDraftingGroupContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId,id);
payDraftingGroupSubItemContactsMapper.delete(updatePayDraftingGroupContacts);
}
/**
@@ -206,7 +217,12 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
query.eq(PayDraftingGroupSubItem::getDraftingGroupId, p);
List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query);
if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) {
sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！<br/>");
for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) {
if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) {
sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！<br/>");
break;
}
}
}
LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
meetingQuery.eq(PayMeeting::getDraftingGroupId,p);
@@ -226,6 +242,9 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
LambdaUpdateWrapper<PayDraftingGroupSubItem> updatePayDraftingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayDraftingGroupSubItem.in(PayDraftingGroupSubItem::getDraftingGroupId, ids);
payDraftingGroupSubItemService.remove(updatePayDraftingGroupSubItem);
LambdaUpdateWrapper<PayDraftingGroupSubItemContacts> updatePayDraftingGroupContacts = new LambdaUpdateWrapper<>();
updatePayDraftingGroupContacts.in(PayDraftingGroupSubItemContacts::getDraftingGroupId,ids);
payDraftingGroupSubItemContactsMapper.delete(updatePayDraftingGroupContacts);
}
/**
@@ -348,29 +367,29 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
});
// TODO 待确定发送消息的path路径
// listPayDraftGroupSubItem.forEach(p->{
// JSONObject json = new JSONObject();
// json.put("type", ProjectCommon.PROJECT_TYPE7);
// json.put("DraftingGroupId",p.getDraftingGroupId());
// json.put("projectId",p.getId());
// json.put("path","/workTeam/WorkTeamDetail");
// //新建项目 给企业联系人发消息
// List<PayDraftingGroupSubItemContacts> itemContactsList = p.getPayDraftingGroupSubItemContactsList();
// for (PayDraftingGroupSubItemContacts subItemContacts : itemContactsList) {
// PayContactsManagement payContactsManagement = payContactsManagementService.getById(subItemContacts.getContactsId());
// if (!Objects.isNull(payContactsManagement)) {
// PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO();
// paySendContactsMessageDTO.setProjectName(payDraftingGroupOld.getDraftingGroupProject());
// paySendContactsMessageDTO.setProjectId(p.getId());
// paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
// paySendContactsMessageDTO.setUserId(payDraftingGroupOld.getPrincipalIdA());
// paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
// paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
// paySendContactsMessageDTO.setJson(json);
// contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
// }
// }
// });
listPayDraftGroupSubItem.forEach(p->{
JSONObject json = new JSONObject();
json.put("type", ProjectCommon.PROJECT_TYPE7);
json.put("DraftingGroupId",p.getDraftingGroupId());
json.put("projectId",p.getId());
json.put("path","/workTeam/WorkTeamDetail");
//新建项目 给企业联系人发消息
List<PayDraftingGroupSubItemContacts> itemContactsList = p.getPayDraftingGroupSubItemContactsList();
for (PayDraftingGroupSubItemContacts subItemContacts : itemContactsList) {
PayContactsManagement payContactsManagement = payContactsManagementService.getById(subItemContacts.getContactsId());
if (!Objects.isNull(payContactsManagement)) {
PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO();
paySendContactsMessageDTO.setProjectName(payDraftingGroupOld.getDraftingGroupProject());
paySendContactsMessageDTO.setProjectId(p.getId());
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
paySendContactsMessageDTO.setUserId(payDraftingGroupOld.getPrincipalIdA());
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
paySendContactsMessageDTO.setJson(json);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
}
});
}
}
}