综合服务合同信息和变更添加印章

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractInformationBo.java

@@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.xzd.comprehensive.domain.XzdCsContractInformation;
 import org.dromara.xzd.comprehensive.domain.XzdCsContractSuspendZfkx;
 import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
+import org.dromara.xzd.domain.XzdBusinessChange;
 import org.dromara.xzd.domain.XzdContractClause;
 import org.dromara.xzd.domain.XzdDeductionItems;
 
@@ -293,5 +294,10 @@ public class XzdCsContractInformationBo extends BaseEntity {
      */
     private List<XzdHtglHtbgqd> htbgqds;
 
+    /**
+     * 印章信息
+     */
+    private List<XzdBusinessChange> sealInfo;
+
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java

@@ -11,6 +11,7 @@ import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.xzd.comprehensive.domain.XzdCsContractInformation;
 import org.dromara.xzd.comprehensive.domain.XzdCsContractSuspendZfkx;
 import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
+import org.dromara.xzd.domain.XzdBusinessChange;
 import org.dromara.xzd.domain.XzdContractClause;
 import org.dromara.xzd.domain.XzdDeductionItems;
 
@@ -359,5 +360,11 @@ public class XzdCsContractInformationVo implements Serializable {
      */
     private List<XzdHtglHtbgqd> htbgqds;
 
+    /**
+     * 印章信息
+     */
+    private List<XzdBusinessChange> sealInfo;
+
+
 
 }

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

@@ -222,6 +222,7 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
         if (bo.getSealInfo() != null && !bo.getSealInfo().isEmpty()){
             for (XzdBusinessChange sealInfo : bo.getSealInfo()) {
                 sealInfo.setContractChangeId(add.getId());
+                sealInfo.setType("11");
             }
             xzdBusinessChangeService.saveBatch(bo.getSealInfo());
         }
@@ -293,6 +294,7 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
 
         for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) {
             xzdBusinessChange.setContractChangeId(update.getId());
+            xzdBusinessChange.setType("11");
         }
         xzdBusinessChangeService.saveBatch(bo.getSealInfo());
 

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

@@ -29,9 +29,13 @@ import org.dromara.xzd.comprehensive.mapper.XzdCsContractInformationMapper;
 import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService;
 import org.dromara.xzd.comprehensive.service.IXzdCsContractSuspendZfkxService;
 import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService;
+import org.dromara.xzd.domain.XzdBusinessChange;
 import org.dromara.xzd.domain.XzdContractClause;
 import org.dromara.xzd.domain.XzdDeductionItems;
+import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
 import org.dromara.xzd.enums.XzdClassEnum;
+import org.dromara.xzd.service.impl.XzdBusinessChangeServiceImpl;
+import org.dromara.xzd.service.impl.XzdBusinessSealServiceImpl;
 import org.dromara.xzd.service.impl.XzdContractClauseServiceImpl;
 import org.dromara.xzd.service.impl.XzdDeductionItemsServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,6 +70,11 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
     @Autowired
     private IXzdHtglHtbgqdService xzdHtglHtbgqdService;
 
+    @Autowired
+    private XzdBusinessChangeServiceImpl xzdBusinessChangeService;
+    @Autowired
+    private XzdBusinessSealServiceImpl xzdBusinessSealService;
+
 
     /**
      * 查询综合服务合同信息
@@ -107,6 +116,19 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
         //合同变更清单
         List<XzdHtglHtbgqd> list4 = xzdHtglHtbgqdService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId, vo.getId()));
         vo.setHtbgqds(list4);
+
+        //印章信息
+        LambdaQueryWrapper<XzdBusinessChange> lambdaQueryWrapper4 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper4.select(XzdBusinessChange::getBusinessId);
+        lambdaQueryWrapper4.eq(XzdBusinessChange::getContractChangeId, vo.getId());
+        List<XzdBusinessChange> list3 = xzdBusinessChangeService.list(lambdaQueryWrapper4);
+        for (XzdBusinessChange businessChange : list3) {
+            XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId());
+            if (sealVo != null){
+                businessChange.setSealName(sealVo.getYzName());
+            }
+        }
+        vo.setSealInfo(list3);
     }
 
     /**
@@ -235,6 +257,15 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
             bo.getHtbgqds().forEach(item->{item.setMainDocumentId(add.getId());});
             xzdHtglHtbgqdService.saveBatch(bo.getHtbgqds());
         }
+
+        //印章信息
+        if (bo.getSealInfo() != null && !bo.getSealInfo().isEmpty()){
+            for (XzdBusinessChange sealInfo : bo.getSealInfo()) {
+                sealInfo.setContractChangeId(add.getId());
+                sealInfo.setType("10");
+            }
+            xzdBusinessChangeService.saveBatch(bo.getSealInfo());
+        }
         return flag;
     }
 
@@ -274,6 +305,9 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
         LambdaQueryWrapper<XzdDeductionItems> lambdaQueryWrapper4 = new LambdaQueryWrapper<>();
         lambdaQueryWrapper4.eq(XzdDeductionItems::getContractDetailsId, old.getId());
         xzdDeductionItemsService.remove(lambdaQueryWrapper4);
+        //印章信息
+        xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().eq(XzdBusinessChange::getContractChangeId, old.getId()));
+
 
         String tableName = XzdClassEnum.CS_CONTRACT_INFORMATION.getClassName();
         if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) {
@@ -309,6 +343,13 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
             xzdHtglHtbgqdService.saveBatch(bo.getHtbgqds());
         }
 
+        //印章信息
+        for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) {
+            xzdBusinessChange.setContractChangeId(update.getId());
+            xzdBusinessChange.setType("10");
+        }
+        xzdBusinessChangeService.saveBatch(bo.getSealInfo());
+
         return baseMapper.updateById(update) > 0;
     }
 
@@ -361,6 +402,9 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
         lambdaQueryWrapper3.in(XzdCsContractSuspendZfkx::getContractInformationId, ids);
         contractSuspendZfkxService.remove(lambdaQueryWrapper3);
         xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().in(XzdHtglHtbgqd::getMainDocumentId,ids));
+        //印章信息
+        xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().in(XzdBusinessChange::getContractChangeId, ids));
+
         return baseMapper.deleteByIds(ids) > 0;
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdBusinessChange.java

@@ -54,7 +54,7 @@ public class XzdBusinessChange extends BaseEntity {
     private String remark;
 
     /**
-     * 合同类型
+     * 类型（4、分包合同信息,5、分包合同变更，7、采购合同信息，8、采购合同变更，10、综合服务合同信息，11、综合服务合同变更）
      */
     private String type;