综合服务合同变更添加印章和成本预算-总体计划成本变更添加字段

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

@@ -17,6 +17,7 @@ import java.util.List;
 import com.fasterxml.jackson.annotation.JsonFormat;
 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;
 import org.dromara.xzd.domain.XzdSettlementRules;
@@ -247,5 +248,10 @@ public class XzdCsContractChangeBo extends BaseEntity {
      */
     private List<XzdHtglHtbgqd> htbgqds;
 
+    /**
+     * 印章信息
+     */
+    private List<XzdBusinessChange> sealInfo;
+
 
 }

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

@@ -15,6 +15,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 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;
 import org.dromara.xzd.domain.XzdSettlementRules;
@@ -306,5 +307,10 @@ public class XzdCsContractChangeVo 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

@@ -26,9 +26,13 @@ import org.dromara.xzd.comprehensive.mapper.XzdCsContractChangeMapper;
 import org.dromara.xzd.comprehensive.service.IXzdCsContractChangeService;
 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;
@@ -64,6 +68,10 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
     private IXzdHtglHtbgqdService xzdHtglHtbgqdService;
     @Autowired
     private XzdCsContractInformationServiceImpl xzdCsContractInformationService;
+    @Autowired
+    private XzdBusinessChangeServiceImpl xzdBusinessChangeService;
+    @Autowired
+    private XzdBusinessSealServiceImpl xzdBusinessSealService;
 
 
     /**
@@ -209,6 +217,14 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
             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());
+            }
+            xzdBusinessChangeService.saveBatch(bo.getSealInfo());
+        }
         return flag;
     }
 
@@ -245,6 +261,8 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
         lambdaQueryWrapper4.eq(XzdDeductionItems::getContractDetailsId, old.getId());
         xzdDeductionItemsService.remove(lambdaQueryWrapper4);
 
+        xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().eq(XzdBusinessChange::getContractChangeId, old.getId()));
+
         String tableName = XzdClassEnum.CS_CONTRACT_CHANGE.getClassName();
         if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) {
             throw new ServiceException("扣款与奖励项不能为空");
@@ -273,6 +291,11 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
         }
         contractSuspendZfkxService.saveBatch(bo.getZftk());
 
+        for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) {
+            xzdBusinessChange.setContractChangeId(update.getId());
+        }
+        xzdBusinessChangeService.saveBatch(bo.getSealInfo());
+
         //合同变更清单
         xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
         if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
@@ -331,6 +354,10 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
         LambdaQueryWrapper<XzdCsContractSuspendZfkx> lambdaQueryWrapper3 = new LambdaQueryWrapper<>();
         lambdaQueryWrapper3.in(XzdCsContractSuspendZfkx::getContractInformationId, ids);
         contractSuspendZfkxService.remove(lambdaQueryWrapper3);
+
+        //印章信息
+        xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().in(XzdBusinessChange::getContractChangeId, ids));
+
         //合同变更清单
         xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().in(XzdHtglHtbgqd::getMainDocumentId,ids));
         return baseMapper.deleteByIds(ids) > 0;
@@ -362,6 +389,19 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
         //合同变更清单
         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);
     }
 
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcbAlteration.java

@@ -160,4 +160,13 @@ public class XzdCbysZjhcbAlteration extends BaseEntity {
      */
     private String auditStatus;
 
+    /**
+     * 变更金额
+     */
+    private BigDecimal alterationAmount;
+    /**
+     * 变更率
+     */
+    private BigDecimal alterationTaxRate;
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java

@@ -159,6 +159,14 @@ public class XzdCbysZjhcbAlterationBo extends BaseEntity {
      */
     private String fileId;
 
+    /**
+     * 变更金额
+     */
+    private BigDecimal alterationAmount;
+    /**
+     * 变更率
+     */
+    private BigDecimal alterationTaxRate;
 
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java

@@ -152,6 +152,14 @@ public class XzdCbysZjhcbAlterationVo implements Serializable {
      */
     @ExcelProperty(value = "利润金额")
     private BigDecimal profitAmount;
+    /**
+     * 变更金额
+     */
+    private BigDecimal alterationAmount;
+    /**
+     * 变更率
+     */
+    private BigDecimal alterationTaxRate;
 
     /**
      * 变更理由