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

fix: 82892 工作组--调账生成的普通项目--待确收金额没有变为0

Browse Source
This commit is contained in:
mzaxd
2024-03-25 10:14:15 +08:00
parent b5b0564e2e
commit 95229a29df
3 changed files with 17 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/project/controller/PayWorkingGroupSubItemController.java
+1 -2
View File
@@ -623,8 +623,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
public Result<?> editAccount(@RequestParam(name = "workGroupId") String workGroupId, public Result<?> editAccount(@RequestParam(name = "workGroupId") String workGroupId,
@RequestParam(name = "companyId") String companyId, @RequestParam(name = "companyId") String companyId,
@RequestParam(name = "id") String id) { @RequestParam(name = "id") String id) {
payWorkingGroupSubItemService.delete(id); payWorkingGroupSubItemService.editAccount(workGroupId, companyId, id);
payWorkingGroupSubItemService.editAccount(workGroupId, companyId);
return Result.OK("调账成功!"); return Result.OK("调账成功!");
} }
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java
+3 -2
View File
@@ -141,7 +141,8 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
* 调账 * 调账
* *
* @param workGroupId 工作组id * @param workGroupId 工作组id
* @param companyId 成员单位id * @param companyId 成员单位id
* @param id
*/ */
void editAccount(String workGroupId, String companyId); void editAccount(String workGroupId, String companyId, String id);
} }
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+13 -2
View File
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.common.ProjectCommon; import com.jero.common.common.ProjectCommon;
import com.jero.common.dto.PaySendContactsMessageDTO; import com.jero.common.dto.PaySendContactsMessageDTO;
import com.jero.common.dto.SendMessageDTO; import com.jero.common.dto.SendMessageDTO;
@@ -1240,7 +1239,12 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
} }
@Override @Override
public void editAccount(String workGroupId, String companyId) { public void editAccount(String workGroupId, String companyId, String id) {
if (StringUtils.isBlank(id)) {
throw new JeroBootException("id不能为空!");
}
deleteProject(id, "workingGroupMember:delete");
// 获取对应成员单位数据 // 获取对应成员单位数据
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workGroupId); PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workGroupId);
if (Objects.isNull(payWorkingGroup)){ if (Objects.isNull(payWorkingGroup)){
@@ -1308,6 +1312,13 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
// 备注 // 备注
payCommonProject.setRemarks(data.getRemarks()); payCommonProject.setRemarks(data.getRemarks());
payCommonProjectService.addPayCommonProject(payCommonProject); payCommonProjectService.addPayCommonProject(payCommonProject);
// 删除
payWorkingGroupSubItemService.removeById(id);
// 删除成员企业联系人
LambdaUpdateWrapper<PayWorkingGroupSubItemContacts> updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>();
updatePayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId, id);
payWorkingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts);
} }
/** /**