整合union

src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsContractCostSubItem.java

@@ -26,7 +26,7 @@ public class TbsContractCostSubItem {
         private String accountName;
         private String costCenterNo;
         private String costCenterName;
-        private BigDecimal costMoney;
+        private BigDecimal applyMoney;
 
     }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -219,6 +219,39 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         this.releaseCost(tbsCostApply.getId(),0);
         Map<String, Object> data = new HashMap<>(10);
         if(tbsCostApply.getContractFlag()!=null&&tbsCostApply.getContractFlag().equals(1)){
+
+            data.put("title",tbsCostApply.getChargeTheme());
+            data.put("orgId",tbsCostApply.getId().toString());
+            data.put("costApplyCode", tbsCostApply.getCode());
+            data.put("applyUserCode", sysUser.getCode());
+            data.put("applyUserName", sysUser.getName());
+            data.put("supplierName", tbsCostApply.getSupplierName());
+            data.put("supplierCode", tbsCostApply.getSupplierCode());
+            data.put("targetId", tbsCostApply.getId()+"");
+            data.put("targetCode", tbsCostApply.getCode());
+            data.put("exsp1",TbsSeeYonConst.CostApplyConf.Code());
+            //添加跳转地址业务
+            String urlKey = "exsp5"+IdUtil.simpleUUID();
+            String baseJumpUrl = JumpToUtil.getUrl(projectProperties.getHostUrl(),TbsSeeYonConst.CostApplyConf.Code(),urlKey);
+            data.put("exsp5",urlKey);
+            data.put("cmsLink",baseJumpUrl);
+
+            data.put("rowDate",DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME));
+            data.put("rowState","03");
+
+            //拓展添加审批关联区域
+            String saleRegionId = supplier.handleSaleRegionId();
+            String bizRegionId = supplier.handleBizRegionId();
+            BmsRegion saleRegion = regionMapper.selectById(saleRegionId);
+            BmsRegion2 bizRegion = region2Mapper.selectById(bizRegionId);
+            String saleRegionNames = saleRegion!=null?saleRegion.getPathNames():"null_申请时未录入";
+            String bizRegionNames = bizRegion!=null?bizRegion.getPathNames():"null_申请时未录入";
+
+            //拓展添加审批关联
+            data.put("biz_region",bizRegionNames);
+            data.put("exsp2",saleRegionNames);
+            data.put("dataState",TbsCostApplyState.State_1_apply.getCode()+"");
+
             //创建协议类data数据
             data.put("serialNumber",tbsCostApply.getCode());
             data.put("applySubject",tbsCostApply.getChargeTheme());
@@ -227,13 +260,14 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             data.put("totalSalesMoney",tbsCostApply.getTotalActivityAmount());
             data.put("totalExpenseRate",tbsCostApply.getTotalActivityPreNotAmount());
             data.put("remark",tbsCostApply.getRemark());
-//            data.put("payee","");
+
-//            data.put("bankName","");
+            data.put("payee","");
-//            data.put("bankAccount","");
+            data.put("bankName","");
-//            data.put("sealID","");
+            data.put("bankAccount","");
-//            data.put("sealName","");
+            data.put("sealID","");
-//            data.put("sealNum","");
+            data.put("sealName","");
-//            data.put("fileNum","");
+            data.put("sealNum","");
+            data.put("fileNum","");
 
             LambdaQueryWrapper<TbsCostContract> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsCostContract::getCostApplyId,tbsCostApply.getId());
@@ -241,11 +275,11 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             if(contracts.size()>0){
                 TbsCostContract contract = contracts.get(0);
                 data.put("contractName",contract.getContractName());
-                data.put("applyMoney",contract.getContractAmount());
+                data.put("contractTotalMoney",contract.getContractAmount());
                 data.put("signDate",contract.getSignTime());
                 data.put("expireDate",contract.getExpireTime());
                 data.put("contractContent",contract.getContractCondition());
-                //data.put("contractFile","");
+                data.put("contractFile","");
             }
 
             //创建子表数据
@@ -276,7 +310,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 dataActivity.setAccountName(centerGoods.getSubjectName());
                 dataActivity.setCostCenterNo(centerGoods.getCenterType());
                 dataActivity.setCostCenterName(centerGoods.getCenterName());
-                dataActivity.setCostMoney(centerGoods.getCenterGoodsAmount());
+                dataActivity.setApplyMoney(centerGoods.getCenterGoodsAmount());
                 subList.add(dataActivity);
             }