10-21-修复

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java

@@ -398,35 +398,27 @@ public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccoun
             queryWrapper.eq(XzdJsqdTz::getMainId, vo.getId());
             queryWrapper.eq(XzdJsqdTz::getType, "1");
             List<XzdJsqdTz> jsqdTzs = xzdJsqdTzService.list(queryWrapper);
-            if (jsqdTzs != null && !jsqdTzs.isEmpty()){
             vo.setJsqd(jsqdTzs);
-            }
             //扣款与奖励-扣款
             LambdaQueryWrapper<XzdJsDeductionItems> queryWrapper1 = new LambdaQueryWrapper<>();
             queryWrapper1.eq(XzdJsDeductionItems::getMainDocId, vo.getId());
             queryWrapper1.eq(XzdJsDeductionItems::getTableName, "xzd_contract_account");
             queryWrapper1.eq(XzdJsDeductionItems::getDetailType, 1L);
             List<XzdJsDeductionItems> xzdJsDeductionItems = xzdJsDeductionItemsService.list(queryWrapper1);
-            if (xzdJsDeductionItems != null && !xzdJsDeductionItems.isEmpty()){
             vo.setKk(xzdJsDeductionItems);
-            }
             //扣款与奖励-奖励
             LambdaQueryWrapper<XzdJsDeductionItems> queryWrapper2 = new LambdaQueryWrapper<>();
             queryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId());
             queryWrapper2.eq(XzdJsDeductionItems::getTableName, "xzd_contract_account");
             queryWrapper2.eq(XzdJsDeductionItems::getDetailType, 2L);
             List<XzdJsDeductionItems> xzdJsDeductionItems1 = xzdJsDeductionItemsService.list(queryWrapper2);
-            if (xzdJsDeductionItems1 != null && !xzdJsDeductionItems1.isEmpty()){
             vo.setJl(xzdJsDeductionItems1);
-            }
             //质保金归还约定
             LambdaQueryWrapper<XzdZbjghyd> queryWrapper3 = new LambdaQueryWrapper<>();
             queryWrapper3.eq(XzdZbjghyd::getMainId, vo.getId());
             List<XzdZbjghyd> xzdZbjghyds = xzdZbjghydService.list(queryWrapper3);
-            if (xzdZbjghyds != null && !xzdZbjghyds.isEmpty()){
             vo.setZbjghyd(xzdZbjghyds);
         }
     }
-    }
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java

@@ -508,43 +508,33 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl<XzdCon
             queryWrapper1.eq(XzdContractInventory::getPrimaryMeterId, vo.getId());
             queryWrapper1.eq(XzdContractInventory::getType, "2");
             List<XzdContractInventory> list1 = xzdContractInventoryService.list(queryWrapper1);
-            if (list1 != null){
             vo.setHtnqd(list1);
-            }
             //变更清单
             LambdaQueryWrapper<XzdAlterationInventory> queryWrapper2 = new LambdaQueryWrapper<>();
             queryWrapper2.eq(XzdAlterationInventory::getPrimaryMeterId, vo.getId());
             List<XzdAlterationInventory> list2 = xzdAlterationInventoryService.list(queryWrapper2);
-            if (list2 != null){
             vo.setBgzjqd(list2);
-            }
             //合同外清单
             LambdaQueryWrapper<XzdContractInventory> queryWrapper3 = new LambdaQueryWrapper<>();
             queryWrapper3.eq(XzdContractInventory::getPrimaryMeterId, vo.getId());
             queryWrapper3.eq(XzdContractInventory::getType, "1");
             List<XzdContractInventory> list3 = xzdContractInventoryService.list(queryWrapper3);
-            if (list3 != null){
             vo.setHtwqd(list3);
-            }
             //奖励与扣款-扣款
             LambdaQueryWrapper<XzdJsDeductionItems> queryWrapper4 = new LambdaQueryWrapper<>();
             queryWrapper4.eq(XzdJsDeductionItems::getTableName, "xzd_contract_progress_settlement");
             queryWrapper4.eq(XzdJsDeductionItems::getDetailType, 1L);
             queryWrapper4.eq(XzdJsDeductionItems::getMainDocId, vo.getId());
             List<XzdJsDeductionItems> list4 = xzdJsDeductionItemsService.list(queryWrapper4);
-            if (list4 != null){
             vo.setKk(list4);
-            }
             //奖励与扣款-奖励
             queryWrapper4.clear();
             queryWrapper4.eq(XzdJsDeductionItems::getTableName, "xzd_contract_progress_settlement");
             queryWrapper4.eq(XzdJsDeductionItems::getDetailType, 2L);
             queryWrapper4.eq(XzdJsDeductionItems::getMainDocId, vo.getId());
             List<XzdJsDeductionItems> list5 = xzdJsDeductionItemsService.list(queryWrapper4);
-            if (list5 != null){
             vo.setJl(list5);
         }
     }
-    }
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java

@@ -24,6 +24,7 @@ import org.dromara.xzd.domain.bo.XzdWorkcontractCompletionAdjustBo;
 import org.dromara.xzd.domain.vo.XzdWorkcontractCompletionAdjustVo;
 import org.dromara.xzd.mapper.XzdWorkcontractCompletionAdjustMapper;
 import org.dromara.xzd.service.IXzdWorkcontractCompletionAdjustService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.List;
@@ -124,6 +125,7 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdW
      * @param bo 承包合同竣工结算调整
      * @return 是否新增成功
      */
+    @Transactional
     @Override
     public Boolean insertByBo(XzdWorkcontractCompletionAdjustBo bo) {
         XzdWorkcontractCompletionAdjust add = MapstructUtils.convert(bo, XzdWorkcontractCompletionAdjust.class);
@@ -225,6 +227,10 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdW
                 jl.setTableName("xzd_workcontract_completion_adjust");
             }
             xzdJsDeductionItemsService.saveBatch(bo.getJl());
+        }else {
+            if (old.getJl() != null && !old.getJl().isEmpty()){
+                xzdJsDeductionItemsService.removeByIds(old.getJl());
+            }
         }
 
         //奖励与扣款-扣款
@@ -238,6 +244,10 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdW
                 kk.setTableName("xzd_workcontract_completion_adjust");
             }
             xzdJsDeductionItemsService.saveBatch(bo.getKk());
+        }else {
+            if (old.getKk() != null && !old.getKk().isEmpty()){
+                xzdJsDeductionItemsService.removeByIds(old.getKk());
+            }
         }
 
         return baseMapper.updateById(update) > 0;
@@ -332,28 +342,22 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdW
             queryWrapper.eq(XzdJsqdTz::getMainId, vo.getId());
             queryWrapper.eq(XzdJsqdTz::getType, "2");
             List<XzdJsqdTz> jsqdTzs = xzdJsqdTzService.list(queryWrapper);
-            if (jsqdTzs != null && !jsqdTzs.isEmpty()){
             vo.setJsqdTz(jsqdTzs);
-            }
             //奖励与扣款-奖励
             LambdaQueryWrapper<XzdJsDeductionItems> queryWrapper1 = new LambdaQueryWrapper<>();
             queryWrapper1.eq(XzdJsDeductionItems::getMainDocId, vo.getId());
             queryWrapper1.eq(XzdJsDeductionItems::getDetailType, 2L);
             queryWrapper1.eq(XzdJsDeductionItems::getTableName, "xzd_workcontract_completion_adjust");
             List<XzdJsDeductionItems> jl = xzdJsDeductionItemsService.list(queryWrapper1);
-            if (jl != null && !jl.isEmpty()){
             vo.setJl(jl);
-            }
             //奖励与扣款-扣款
             LambdaQueryWrapper<XzdJsDeductionItems> queryWrapper2 = new LambdaQueryWrapper<>();
             queryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId());
             queryWrapper2.eq(XzdJsDeductionItems::getDetailType, 1L);
             queryWrapper2.eq(XzdJsDeductionItems::getTableName, "xzd_workcontract_completion_adjust");
             List<XzdJsDeductionItems> kk = xzdJsDeductionItemsService.list(queryWrapper2);
-            if (kk != null && !kk.isEmpty()){
             vo.setKk(kk);
         }
     }
-    }
 
 }