xujun

science-admin/src/main/java/com/yiboshi/science/entity/ComProjectEquipment.java

@@ -70,4 +70,7 @@ public class ComProjectEquipment extends BaseEntity {
     /** 单价(万元/台套) */
     @ApiModelProperty(value = "单价(万元/台套)", position = 3)
     private BigDecimal unitPrice;
+    /** 拟开发共享范围 */
+    @ApiModelProperty(value = "拟开发共享范围", position = 3)
+    private String sharedScope;
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectEquipmentDTO.java

@@ -68,4 +68,7 @@ public class ComProjectEquipmentDTO extends BaseDTO {
     /** 单价(万元/台套) */
     @ApiModelProperty(value = "单价(万元/台套)", position = 3)
     private BigDecimal unitPrice;
+    /** 拟开发共享范围 */
+    @ApiModelProperty(value = "拟开发共享范围", position = 3)
+    private String sharedScope;
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectEquipmentQueryVO.java

@@ -72,4 +72,7 @@ public class ComProjectEquipmentQueryVO extends PaginationVO{
     /** 单价(万元/台套) */
     @ApiModelProperty(value = "单价(万元/台套)", position = 3)
     private BigDecimal unitPrice;
+    /** 拟开发共享范围 */
+    @ApiModelProperty(value = "拟开发共享范围", position = 3)
+    private String sharedScope;
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -627,6 +627,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         comProjectMembersService.insertList(dto.getMembers(), id);
         // 经费预算
         comProjectBudgetService.insertBudgetList(dto.getBudget(), id);
+        // 年度用款计划表
+        comProjectFundPlanService.insertList(dto.getFundPlan(), id);
+        // 单位支出明细预算表
+        comProjectUnitPaymentService.insertList(dto.getUnitPayment(), id);
         // 项目经费构成表
         comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
         // 仪器、设备
@@ -674,6 +678,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         comProjectMembersService.insertList(dto.getMembers(), comProject.getId());
         // 经费预算
         comProjectBudgetService.insertBudgetList(dto.getBudget(), comProject.getId());
+        // 年度用款计划表
+        comProjectFundPlanService.insertList(dto.getFundPlan(), comProject.getId());
+        // 单位支出明细预算表
+        comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId());
         // 项目经费构成表
         comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
         // 仪器、设备