bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退料申请表数据问题修改

This commit is contained in:
liang.chao 2024-03-08 10:44:19 +08:00
parent 1903c9244e
commit 4c61c18d63
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -408,18 +408,15 @@ public class TmTaskController extends BaseController {
}
}
int size = leaseApplyInfoList.size();
for (int n = 0; n < size; n++) {
List<LeaseApplyDetails> leaseApplyDetails = leaseAuditList.get(i).getLeaseApplyInfoList().get(n).getLeaseApplyDetails();
if (leaseApplyDetails != null) {
List<LeaseApplyDetails> list1 = new ArrayList<>();
for (int l = 0; l < leaseApplyDetails.size(); l++) {
if (leaseApplyDetails.get(l).getCount() == 1) {
list1.add(leaseApplyDetails.get(l));
TmTask tmTask = leaseAuditList.get(i);
tmTask.getLeaseApplyInfoList().get(0).setLeaseApplyDetails(list1);
list.add(tmTask);
}
List<LeaseApplyDetails> leaseApplyDetails = leaseAuditList.get(i).getLeaseApplyInfoList().get(0).getLeaseApplyDetails();
if (leaseApplyDetails != null) {
List<LeaseApplyDetails> list1 = new ArrayList<>();
for (int l = 0; l < leaseApplyDetails.size(); l++) {
if (leaseApplyDetails.get(l).getCount() == 1) {
list1.add(leaseApplyDetails.get(l));
TmTask tmTask = leaseAuditList.get(i);
tmTask.getLeaseApplyInfoList().get(0).setLeaseApplyDetails(list1);
list.add(tmTask);
}
}
}

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -700,7 +700,7 @@ public class TmTaskServiceImpl implements TmTaskService {
}
@Override
@Transactional(rollbackFor=Exception.class)
@Transactional(rollbackFor = Exception.class)
public int edit(TmTask tmTask) {
int flag = 0;
int res = 0;
@ -711,12 +711,12 @@ public class TmTaskServiceImpl implements TmTaskService {
}
// 修改任务关联的协议
this.updateAgreementByTask(tmTask);
//先删除leaseApplyDetail
res = deletePreDetailData(tmTask);
if (res == 0) {
throw new RuntimeException("删除leaseApplyDetail异常");
}
//先删除leaseApplyInfo
//再删除leaseApplyInfo
res = deletePreData(tmTask);
if (res == 0) {
throw new RuntimeException("删除leaseApplyInfo异常");