xujun

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectFundPlanDAO.java

+package com.yiboshi.science.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yiboshi.science.base.BaseDAO;
+import com.yiboshi.science.entity.ComProjectFundPlan;
+import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
+import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
+
+
+import java.util.List;
+
+/**
+ * 经费申请表（任务书/项目申请书） DAO
+ * 
+ * @author lkl
+ * @version 2021-08-26
+ */
+public interface ComProjectFundPlanDAO extends BaseMapper<ComProjectFundPlan>, BaseDAO<ComProjectFundPlanQueryVO, ComProjectFundPlanDTO, ComProjectFundPlan> {
+    List<ComProjectFundPlanDTO> getListByObjectId(String objectId);
+}
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectUnitPaymentDAO.java

+package com.yiboshi.science.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yiboshi.science.base.BaseDAO;
+import com.yiboshi.science.entity.ComProjectUnitPayment;
+import com.yiboshi.science.param.dto.ComProjectUnitPaymentDTO;
+import com.yiboshi.science.param.query.ComProjectUnitPaymentQueryVO;
+
+import java.util.List;
+
+/**
+ * 经费申请表（任务书/项目申请书） DAO
+ * 
+ * @author lkl
+ * @version 2021-08-26
+ */
+public interface ComProjectUnitPaymentDAO extends BaseMapper<ComProjectUnitPayment>, BaseDAO<ComProjectUnitPaymentQueryVO, ComProjectUnitPaymentDTO, ComProjectUnitPayment> {
+    List<ComProjectUnitPaymentDTO> getListByObjectId(String objectId);
+}
\ No newline at end of file

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

@@ -28,8 +28,8 @@ public class ComProjectBudget extends BaseEntity {
     @ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2)
     @Length(max=36, message = "对象id（项目Id/任务书Id）不能大于36")
     private String objectId;
-    /** 金额 */
-    @ApiModelProperty(value = "金额", position = 3)
+    /** 总预算数 */
+    @ApiModelProperty(value = "总预算数", position = 3)
     private BigDecimal totalBudget;
     /** 申请专项经费(临床科技项目) */
     @ApiModelProperty(value = "申请专项经费", position = 4)

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

@@ -20,26 +20,54 @@ import java.math.BigDecimal;
 @ApiModel(description = "设备仪器经费表（任务书/项目申请书）")
 public class ComProjectEquipment extends BaseEntity {
 
+    /** 购置类型Id */
+    @ApiModelProperty(value = "购置类型Id", position = 2 )
+    @Length(max=36, message = "购置类型Id不能大于36")
+    private String purchaseId;
     /** 对象id（项目Id/任务书Id） */
     @ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2 )
     @Length(max=36, message = "对象id（项目Id/任务书Id）不能大于36")
     private String objectId;
     /** 设备仪器名称 */
     @ApiModelProperty(value = "设备仪器名称", position = 1 )
-    @Length(max=36, message = "设备仪器名称不能大于200")
+    @Length(max=100, message = "设备仪器名称不能大于100")
     private String name;
+    /** 功能和技术指标 */
+    @ApiModelProperty(value = "功能和技术指标", position = 1 )
+    @Length(max=200, message = "功能和技术指标不能大于200")
+    private String functionTarget;
     /** 规格型号 */
     @ApiModelProperty(value = "规格型号", position = 1 )
-    @Length(max=36, message = "规格型号不能大于200")
+    @Length(max=100, message = "规格型号不能大于100")
     private String specificationType;
     /** 数量 */
-    @ApiModelProperty(value = "数量", position = 1 )
+    @ApiModelProperty(value = "数量", position = 1)
     private Integer quantity;
     /** 金额 */
-    @ApiModelProperty(value = "金额", position = 3 )
+    @ApiModelProperty(value = "金额", position = 3)
     private BigDecimal totalBudget;
     /** 用途 */
-    @ApiModelProperty(value = "用途", position = 1 )
-    @Length(max=36, message = "用途不能大于200")
+    @ApiModelProperty(value = "用途", position = 1)
+    @Length(max=200, message = "用途不能大于200")
     private String useFrom;
+
+    /** 购置单位 */
+    @ApiModelProperty(value = "购置单位", position = 1)
+    @Length(max=100, message = "购置单位不能大于100")
+    private String buyUnit;
+    /** 存放单位(地点) */
+    @ApiModelProperty(value = "存放单位(地点)", position = 1)
+    @Length(max=200, message = "存放单位(地点)不能大于200")
+    private String storageLocation;
+    /** 设备类型 */
+    @ApiModelProperty(value = "设备类型", position = 1)
+    @Length(max=100, message = "设备类型不能大于100")
+    private String equipmentType;
+    /** 主要生产厂家及国别 */
+    @ApiModelProperty(value = "主要生产厂家及国别", position = 1)
+    @Length(max=100, message = "主要生产厂家及国别不能大于100")
+    private String manufacturer;
+    /** 单价(万元/台套) */
+    @ApiModelProperty(value = "单价(万元/台套)", position = 3)
+    private BigDecimal unitPrice;
 }
\ No newline at end of file

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

+package com.yiboshi.science.entity;
+
+import com.yiboshi.science.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import java.math.BigDecimal;
+
+/**
+ * 年度用款计划表VO
+ * 
+ * @author xujun
+ * @version 2024-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper=true)
+@ApiModel(description = "年度用款计划表VO")
+public class ComProjectFundPlan extends BaseEntity {
+
+    /** 用款计划Id */
+    @ApiModelProperty(value = "用款计划Id", position = 2 )
+    @Length(max=36, message = "用款计划Id不能大于36")
+    private String fundId;
+    /** 对象id（项目Id/任务书Id） */
+    @ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2 )
+    @Length(max=36, message = "对象id（项目Id/任务书Id）不能大于36")
+    private String objectId;
+    /** 年度1资金数额 */
+    @ApiModelProperty(value = "年度1资金数额", position = 3 )
+    private BigDecimal yearValue1;
+    /** 年度2资金数额 */
+    @ApiModelProperty(value = "年度2资金数额", position = 3 )
+    private BigDecimal yearValue2;
+    /** 年度3资金数额 */
+    @ApiModelProperty(value = "年度3资金数额", position = 3 )
+    private BigDecimal yearValue3;
+    /** 年度4资金数额 */
+    @ApiModelProperty(value = "年度4资金数额", position = 3 )
+    private BigDecimal yearValue4;
+    /** 年度5资金数额 */
+    @ApiModelProperty(value = "年度5资金数额", position = 3 )
+    private BigDecimal yearValue5;
+
+}
\ No newline at end of file

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

+package com.yiboshi.science.entity;
+
+import com.yiboshi.science.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import java.math.BigDecimal;
+
+/**
+ * 单位支出明细预算表
+ * 
+ * @author xujun
+ * @version 2024-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper=true)
+@ApiModel(description = "单位支出明细预算表")
+public class ComProjectUnitPayment extends BaseEntity {
+
+    /** 对象id（项目Id/任务书Id） */
+    @ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2)
+    @Length(max=36, message = "对象id（项目Id/任务书Id）不能大于36")
+    private String objectId;
+    /** 单位名称 */
+    @ApiModelProperty(value = "单位名称", position = 2)
+    @Length(max=100, message = "单位名称不能大于100")
+    private String unitName;
+    /** 单位国别 */
+    @ApiModelProperty(value = "单位国别", position = 2)
+    @Length(max=100, message = "单位国别不能大于100")
+    private String countryName;
+    /** 统一社会信用代码 */
+    @ApiModelProperty(value = "统一社会信用代码", position = 2)
+    @Length(max=50, message = "统一社会信用代码不能大于50")
+    private String socialCode;
+    /** 单位类型Id */
+    @ApiModelProperty(value = "单位类型Id", position = 2)
+    @Length(max=36, message = "单位类型Id不能大于36")
+    private String unitRole;
+    /** 任务分工 */
+    @ApiModelProperty(value = "任务分工", position = 2)
+    @Length(max=300, message = "任务分工不能大于300")
+    private String taskDivision;
+    /** 研究任务负责人 */
+    @ApiModelProperty(value = "研究任务负责人", position = 2)
+    @Length(max=60, message = "研究任务负责人不能大于60")
+    private String taskLeader;
+
+    /** 间接费用(省级财政资金) */
+    @ApiModelProperty(value = "间接费用(省级财政资金)", position = 3)
+    private BigDecimal IndirectFee;
+    /** 小计金额(省级财政资金) */
+    @ApiModelProperty(value = "小计金额(省级财政资金)", position = 3)
+    private BigDecimal fundAmount;
+
+    /** 自筹资金(单位自筹资金) */
+    @ApiModelProperty(value = "自筹资金(单位自筹资金)", position = 3)
+    private BigDecimal selfAmount;
+
+}
\ No newline at end of file

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

@@ -373,6 +373,10 @@ public class ComProjectDTO extends BaseDTO {
     private List<ComProjectMembersDTO> members;
     /** 经费表 */
     private List<ComProjectBudgetDTO> budget;
+    /** 年度用款计划 */
+    private List<ComProjectFundPlanDTO> fundPlan;
+    /** 单位支出明细预算 */
+    private List<ComProjectUnitPaymentDTO> unitPayment;
     /** 项目经费构成表   */
     private List<ComProjectFundCompositionDTO> fundCompositions;
     /** 设备仪器经费表 */

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -20,12 +21,21 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper=true)
 @ApiModel(description = "设备仪器经费表（任务书/项目申请书）DTO")
 public class ComProjectEquipmentDTO extends BaseDTO {
+
+    /** 购置类型Id */
+    @ApiModelProperty(value = "购置类型Id", position = 2 )
+    @Length(max=36, message = "购置类型Id不能大于36")
+    private String purchaseId;
     /** 对象id（项目Id/任务书Id） */
     @ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2 )
     private String objectId;
     /** 设备仪器名称 */
     @ApiModelProperty(value = "设备仪器名称", position = 1 )
     private String name;
+    /** 功能和技术指标 */
+    @ApiModelProperty(value = "功能和技术指标", position = 1 )
+    @Length(max=200, message = "功能和技术指标不能大于200")
+    private String functionTarget;
     /** 规格型号 */
     @ApiModelProperty(value = "规格型号", position = 1 )
     private String specificationType;
@@ -38,4 +48,24 @@ public class ComProjectEquipmentDTO extends BaseDTO {
     /** 用途 */
     @ApiModelProperty(value = "用途", position = 1 )
     private String useFrom;
+
+    /** 购置单位 */
+    @ApiModelProperty(value = "购置单位", position = 1)
+    @Length(max=100, message = "购置单位不能大于100")
+    private String buyUnit;
+    /** 存放单位(地点) */
+    @ApiModelProperty(value = "存放单位(地点)", position = 1)
+    @Length(max=200, message = "存放单位(地点)不能大于200")
+    private String storageLocation;
+    /** 设备类型 */
+    @ApiModelProperty(value = "设备类型", position = 1)
+    @Length(max=100, message = "设备类型不能大于100")
+    private String equipmentType;
+    /** 主要生产厂家及国别 */
+    @ApiModelProperty(value = "主要生产厂家及国别", position = 1)
+    @Length(max=100, message = "主要生产厂家及国别不能大于100")
+    private String manufacturer;
+    /** 单价(万元/台套) */
+    @ApiModelProperty(value = "单价(万元/台套)", position = 3)
+    private BigDecimal unitPrice;
 }
\ No newline at end of file

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

+package com.yiboshi.science.param.dto;
+
+import com.yiboshi.science.base.BaseDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import java.math.BigDecimal;
+
+/**
+ * 年度用款计划表DTO
+ * 
+ * @author xujun
+ * @version 2024-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper=true)
+@ApiModel(description = "年度用款计划表DTO")
+public class ComProjectFundPlanDTO extends BaseDTO {
+
+    /** 用款计划Id */
+    @ApiModelProperty(value = "用款计划Id", position = 2 )
+    @Length(max=36, message = "用款计划Id不能大于36")
+    private String fundId;
+    /** 用款计划名称 */
+    @ApiModelProperty(value = "用款计划名称", position = 2)
+    private String fundName;
+    /** 对象id（项目Id/任务书Id） */
+    @ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2 )
+    @Length(max=36, message = "对象id（项目Id/任务书Id）不能大于36")
+    private String objectId;
+    /** 年度1资金数额 */
+    @ApiModelProperty(value = "年度1资金数额", position = 3 )
+    private BigDecimal yearValue1;
+    /** 年度2资金数额 */
+    @ApiModelProperty(value = "年度2资金数额", position = 3 )
+    private BigDecimal yearValue2;
+    /** 年度3资金数额 */
+    @ApiModelProperty(value = "年度3资金数额", position = 3 )
+    private BigDecimal yearValue3;
+    /** 年度4资金数额 */
+    @ApiModelProperty(value = "年度4资金数额", position = 3 )
+    private BigDecimal yearValue4;
+    /** 年度5资金数额 */
+    @ApiModelProperty(value = "年度5资金数额", position = 3 )
+    private BigDecimal yearValue5;
+}
\ No newline at end of file

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

+package com.yiboshi.science.param.dto;
+
+import com.yiboshi.science.base.BaseDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import java.math.BigDecimal;
+
+/**
+ * 单位支出明细预算表DTO
+ * 
+ * @author xujun
+ * @version 2024-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper=true)
+@ApiModel(description = "单位支出明细预算表DTO")
+public class ComProjectUnitPaymentDTO extends BaseDTO {
+
+    /** 对象id（项目Id/任务书Id） */
+    @ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2)
+    @Length(max=36, message = "对象id（项目Id/任务书Id）不能大于36")
+    private String objectId;
+    /** 单位名称 */
+    @ApiModelProperty(value = "单位名称", position = 2)
+    @Length(max=100, message = "单位名称不能大于100")
+    private String unitName;
+    /** 单位国别 */
+    @ApiModelProperty(value = "单位国别", position = 2)
+    @Length(max=100, message = "单位国别不能大于100")
+    private String countryName;
+    /** 统一社会信用代码 */
+    @ApiModelProperty(value = "统一社会信用代码", position = 2)
+    @Length(max=50, message = "统一社会信用代码不能大于50")
+    private String socialCode;
+    /** 单位类型Id */
+    @ApiModelProperty(value = "单位类型Id", position = 2)
+    @Length(max=36, message = "单位类型Id不能大于36")
+    private String unitRole;
+    /** 单位类型名称 */
+    @ApiModelProperty(value = "单位类型名称", position = 2)
+    private String roleName;
+    /** 任务分工 */
+    @ApiModelProperty(value = "任务分工", position = 2)
+    @Length(max=300, message = "任务分工不能大于300")
+    private String taskDivision;
+    /** 研究任务负责人 */
+    @ApiModelProperty(value = "研究任务负责人", position = 2)
+    @Length(max=60, message = "研究任务负责人不能大于60")
+    private String taskLeader;
+
+    /** 间接费用(省级财政资金) */
+    @ApiModelProperty(value = "间接费用(省级财政资金)", position = 3)
+    private BigDecimal IndirectFee;
+    /** 小计金额(省级财政资金) */
+    @ApiModelProperty(value = "小计金额(省级财政资金)", position = 3)
+    private BigDecimal fundAmount;
+
+    /** 自筹资金(单位自筹资金) */
+    @ApiModelProperty(value = "自筹资金(单位自筹资金)", position = 3)
+    private BigDecimal selfAmount;
+}
\ No newline at end of file

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

@@ -21,6 +21,11 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper=true)
 @ApiModel(description = "设备仪器经费表（任务书/项目申请书）VO")
 public class ComProjectEquipmentQueryVO extends PaginationVO{
+
+    /** 购置类型Id */
+    @ApiModelProperty(value = "购置类型Id", position = 2 )
+    @Length(max=36, message = "购置类型Id不能大于36")
+    private String purchaseId;
     /** 对象id（项目Id/任务书Id） */
     @ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2 )
     @Length(max=36, message = "对象id（项目Id/任务书Id）不能大于36")
@@ -29,6 +34,10 @@ public class ComProjectEquipmentQueryVO extends PaginationVO{
     @ApiModelProperty(value = "设备仪器名称", position = 1 )
     @Length(max=36, message = "设备仪器名称不能大于200")
     private String name;
+    /** 功能和技术指标 */
+    @ApiModelProperty(value = "功能和技术指标", position = 1 )
+    @Length(max=200, message = "功能和技术指标不能大于200")
+    private String functionTarget;
     /** 规格型号 */
     @ApiModelProperty(value = "规格型号", position = 1 )
     @Length(max=36, message = "规格型号不能大于200")
@@ -43,4 +52,24 @@ public class ComProjectEquipmentQueryVO extends PaginationVO{
     @ApiModelProperty(value = "用途", position = 1 )
     @Length(max=36, message = "用途不能大于200")
     private String useFrom;
+
+    /** 购置单位 */
+    @ApiModelProperty(value = "购置单位", position = 1)
+    @Length(max=100, message = "购置单位不能大于100")
+    private String buyUnit;
+    /** 存放单位(地点) */
+    @ApiModelProperty(value = "存放单位(地点)", position = 1)
+    @Length(max=200, message = "存放单位(地点)不能大于200")
+    private String storageLocation;
+    /** 设备类型 */
+    @ApiModelProperty(value = "设备类型", position = 1)
+    @Length(max=100, message = "设备类型不能大于100")
+    private String equipmentType;
+    /** 主要生产厂家及国别 */
+    @ApiModelProperty(value = "主要生产厂家及国别", position = 1)
+    @Length(max=100, message = "主要生产厂家及国别不能大于100")
+    private String manufacturer;
+    /** 单价(万元/台套) */
+    @ApiModelProperty(value = "单价(万元/台套)", position = 3)
+    private BigDecimal unitPrice;
 }
\ No newline at end of file

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

+package com.yiboshi.science.param.query;
+
+import com.yiboshi.science.base.PaginationVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import java.math.BigDecimal;
+
+/**
+ * 年度用款计划表VO
+ * 
+ * @author xujun
+ * @version 2024-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper=true)
+@ApiModel(description = "年度用款计划表VO")
+public class ComProjectFundPlanQueryVO extends PaginationVO{
+
+    /** 用款计划Id */
+    @ApiModelProperty(value = "用款计划Id", position = 2 )
+    @Length(max=36, message = "用款计划Id不能大于36")
+    private String fundId;
+    /** 对象id（项目Id/任务书Id） */
+    @ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2 )
+    @Length(max=36, message = "对象id（项目Id/任务书Id）不能大于36")
+    private String objectId;
+    /** 年度1资金数额 */
+    @ApiModelProperty(value = "年度1资金数额", position = 3 )
+    private BigDecimal yearValue1;
+    /** 年度2资金数额 */
+    @ApiModelProperty(value = "年度2资金数额", position = 3 )
+    private BigDecimal yearValue2;
+    /** 年度3资金数额 */
+    @ApiModelProperty(value = "年度3资金数额", position = 3 )
+    private BigDecimal yearValue3;
+    /** 年度4资金数额 */
+    @ApiModelProperty(value = "年度4资金数额", position = 3 )
+    private BigDecimal yearValue4;
+    /** 年度5资金数额 */
+    @ApiModelProperty(value = "年度5资金数额", position = 3 )
+    private BigDecimal yearValue5;
+}
\ No newline at end of file

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

+package com.yiboshi.science.param.query;
+
+import com.yiboshi.science.base.PaginationVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import java.math.BigDecimal;
+
+/**
+ * 单位支出明细预算表VO
+ * 
+ * @author xujun
+ * @version 2024-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper=true)
+@ApiModel(description = "单位支出明细预算表VO")
+public class ComProjectUnitPaymentQueryVO extends PaginationVO{
+
+    /** 对象id（项目Id/任务书Id） */
+    @ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2)
+    @Length(max=36, message = "对象id（项目Id/任务书Id）不能大于36")
+    private String objectId;
+    /** 单位名称 */
+    @ApiModelProperty(value = "单位名称", position = 2)
+    @Length(max=100, message = "单位名称不能大于100")
+    private String unitName;
+    /** 单位国别 */
+    @ApiModelProperty(value = "单位国别", position = 2)
+    @Length(max=100, message = "单位国别不能大于100")
+    private String countryName;
+    /** 统一社会信用代码 */
+    @ApiModelProperty(value = "统一社会信用代码", position = 2)
+    @Length(max=50, message = "统一社会信用代码不能大于50")
+    private String socialCode;
+    /** 单位类型Id */
+    @ApiModelProperty(value = "单位类型Id", position = 2)
+    @Length(max=36, message = "单位类型Id不能大于36")
+    private String unitRole;
+    /** 任务分工 */
+    @ApiModelProperty(value = "任务分工", position = 2)
+    @Length(max=300, message = "任务分工不能大于300")
+    private String taskDivision;
+    /** 研究任务负责人 */
+    @ApiModelProperty(value = "研究任务负责人", position = 2)
+    @Length(max=60, message = "研究任务负责人不能大于60")
+    private String taskLeader;
+
+    /** 间接费用(省级财政资金) */
+    @ApiModelProperty(value = "间接费用(省级财政资金)", position = 3)
+    private BigDecimal IndirectFee;
+    /** 小计金额(省级财政资金) */
+    @ApiModelProperty(value = "小计金额(省级财政资金)", position = 3)
+    private BigDecimal fundAmount;
+
+    /** 自筹资金(单位自筹资金) */
+    @ApiModelProperty(value = "自筹资金(单位自筹资金)", position = 3)
+    private BigDecimal selfAmount;
+}
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectFundPlanController.java

+package com.yiboshi.science.rest.v1;
+
+import com.yiboshi.science.entity.ComProjectFundComposition;
+import com.yiboshi.science.entity.ComProjectFundPlan;
+import com.yiboshi.science.param.dto.ComProjectFundCompositionDTO;
+import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
+import com.yiboshi.science.param.query.ComProjectFundCompositionQueryVO;
+import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
+import com.yiboshi.science.rest.BaseController;
+import com.yiboshi.science.service.ComProjectFundCompositionService;
+import com.yiboshi.science.service.ComProjectFundPlanService;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 功能：年度用款计划接口
+ *
+ * @author xujun
+ * @version 2024-11-28
+ */
+@Api(tags = "com-project-fund-plan", description = "年度用款计划接口")
+@RestController
+@RequestMapping("/v1/science-admin/com-project-fund-plan")
+public class ComProjectFundPlanController extends BaseController<ComProjectFundPlanService, ComProjectFundPlanQueryVO, ComProjectFundPlanDTO, ComProjectFundPlan> {
+
+
+}
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectUnitPaymentController.java

+package com.yiboshi.science.rest.v1;
+
+import com.yiboshi.science.entity.ComProjectFundPlan;
+import com.yiboshi.science.entity.ComProjectUnitPayment;
+import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
+import com.yiboshi.science.param.dto.ComProjectUnitPaymentDTO;
+import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
+import com.yiboshi.science.param.query.ComProjectUnitPaymentQueryVO;
+import com.yiboshi.science.rest.BaseController;
+import com.yiboshi.science.service.ComProjectFundPlanService;
+import com.yiboshi.science.service.ComProjectUnitPaymentService;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 功能：年度用款计划接口
+ *
+ * @author xujun
+ * @version 2024-11-28
+ */
+@Api(tags = "com-project-unit-payment", description = "年度用款计划接口")
+@RestController
+@RequestMapping("/v1/science-admin/com-project-unit-payment")
+public class ComProjectUnitPaymentController extends BaseController<ComProjectUnitPaymentService, ComProjectUnitPaymentQueryVO, ComProjectUnitPaymentDTO, ComProjectUnitPayment> {
+
+
+}
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/service/ComProjectFundPlanService.java

+package com.yiboshi.science.service;
+import com.yiboshi.science.base.BaseService;
+import com.yiboshi.science.entity.ComProjectFundComposition;
+import com.yiboshi.science.entity.ComProjectFundPlan;
+import com.yiboshi.science.param.dto.ComProjectFundCompositionDTO;
+import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
+import com.yiboshi.science.param.query.ComProjectFundCompositionQueryVO;
+import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
+
+import java.util.List;
+
+/**
+ * 经费申请表（任务书/项目申请书） Service
+ * 
+ * @author lkl
+ * @version 2021-08-26
+ */
+public interface ComProjectFundPlanService extends BaseService<ComProjectFundPlanQueryVO, ComProjectFundPlanDTO, ComProjectFundPlan> {
+    /** 根据对象获取合作单位列表
+     *
+     * @param objectId
+     * @return
+     */
+    List<ComProjectFundPlanDTO> getListByObjectId(String objectId);
+
+    /**
+     * 单位支出明细预算列表
+     * @return
+     */
+    List<ComProjectFundPlanDTO> getList();
+    /** 删除对象列表
+     *
+     * @param objectId
+     */
+    void deleteByObjectId(String objectId);
+    /** 插入合作单位
+     *
+     * @param togetherList
+     * @param objectId
+     */
+    void insertList(List<ComProjectFundPlanDTO> togetherList, String objectId);
+}
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/service/ComProjectUnitPaymentService.java

+package com.yiboshi.science.service;
+import com.yiboshi.science.base.BaseService;
+import com.yiboshi.science.entity.ComProjectFundPlan;
+import com.yiboshi.science.entity.ComProjectUnitPayment;
+import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
+import com.yiboshi.science.param.dto.ComProjectUnitPaymentDTO;
+import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
+import com.yiboshi.science.param.query.ComProjectUnitPaymentQueryVO;
+
+import java.util.List;
+
+/**
+ * 单位研究资金支出预算明细表 Service
+ * 
+ * @author xujun
+ * @version 2024-11-28
+ */
+public interface ComProjectUnitPaymentService extends BaseService<ComProjectUnitPaymentQueryVO, ComProjectUnitPaymentDTO, ComProjectUnitPayment> {
+    /** 根据对象获取合作单位列表
+     *
+     * @param objectId
+     * @return
+     */
+    List<ComProjectUnitPaymentDTO> getListByObjectId(String objectId);
+
+    /** 删除对象列表
+     *
+     * @param objectId
+     */
+    void deleteByObjectId(String objectId);
+    /** 插入合作单位
+     *
+     * @param togetherList
+     * @param objectId
+     */
+    void insertList(List<ComProjectUnitPaymentDTO> togetherList, String objectId);
+}
\ No newline at end of file

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

@@ -51,12 +51,7 @@ public class ComProjectBudgetServiceImpl extends BaseServiceImpl<ComProjectBudge
     @Override
     public List<ComProjectBudgetDTO> getList(Integer projType) {
         List<ComProjectBudgetDTO> budgetList = new ArrayList<>();
-        List<SystemParameter> list;
-        //健康领域科技项目
-        if (projType == CommonEnum.projType.num.getCode())
-            list = systemParameterService.getListByType(54);
-        else//临床科技项目
-            list = systemParameterService.getListByType(12);
+        List<SystemParameter> list = systemParameterService.getListByType(54);
         list.forEach((e) -> {
             ComProjectBudgetDTO newVO = new ComProjectBudgetDTO();
             newVO.setBudgetId(e.getId());

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

@@ -8,6 +8,8 @@ import com.yiboshi.science.entity.ComProjectEquipment;
 import com.yiboshi.science.param.dto.ComProjectEquipmentDTO;
 import com.yiboshi.science.param.query.ComProjectEquipmentQueryVO;
 import com.yiboshi.science.service.ComProjectEquipmentService;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

+package com.yiboshi.science.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yiboshi.science.base.BaseServiceImpl;
+
+import com.yiboshi.science.dao.ComProjectFundPlanDAO;
+import com.yiboshi.science.entity.ComProjectFundPlan;
+
+import com.yiboshi.science.entity.SystemParameter;
+import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
+import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
+import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
+import com.yiboshi.science.service.ComProjectFundPlanService;
+import com.yiboshi.science.service.SystemParameterService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class ComProjectFundPlanServiceImpl extends BaseServiceImpl<ComProjectFundPlanDAO, ComProjectFundPlanQueryVO, ComProjectFundPlanDTO, ComProjectFundPlan> implements ComProjectFundPlanService {
+
+    @Autowired
+    private SystemParameterService systemParameterService;
+
+    @Autowired
+    private ComProjectFundPlanDAO comProjectFundPlanDAO;
+
+    @Override
+    protected void setCriteriaForQuery(ComProjectFundPlanQueryVO vo, QueryWrapper<ComProjectFundPlanQueryVO> criteria) {
+
+    }
+
+    public List<ComProjectFundPlanDTO> getList() {
+        List<ComProjectFundPlanDTO> fundPlanList = new ArrayList<>();
+        List<SystemParameter> list = systemParameterService.getListByType(64);
+        list.forEach((e) -> {
+            ComProjectFundPlanDTO newVO = new ComProjectFundPlanDTO();
+            newVO.setFundId(e.getId());
+            newVO.setYearValue1(new BigDecimal(0.00));
+            newVO.setYearValue2(new BigDecimal(0.00));
+            newVO.setYearValue3(new BigDecimal(0.00));
+            newVO.setYearValue4(new BigDecimal(0.00));
+            newVO.setYearValue5(new BigDecimal(0.00));
+            newVO.setFundName(e.getName());
+            fundPlanList.add(newVO);
+        });
+
+        return fundPlanList;
+    }
+
+    public List<ComProjectFundPlanDTO> getListByObjectId(String objectId)
+    {
+        return comProjectFundPlanDAO.getListByObjectId(objectId);
+    }
+
+    public void deleteByObjectId(String objectId){
+        ComProjectFundPlan model = new ComProjectFundPlan();
+        model.setObjectId(objectId);
+        this.delete(model);
+    }
+
+    public void insertList(List<ComProjectFundPlanDTO> list, String objectId) {
+        ComProjectFundPlan model =new ComProjectFundPlan();
+        model.setObjectId(objectId);
+        this.delete(model);
+        if (null != list) {
+            List<ComProjectFundPlan> iList = new ArrayList<>();
+            for (int i = 0; i < list.size(); i++) {
+                ComProjectFundPlan item = convert2Entity(list.get(i));
+                item.setObjectId(objectId);
+                iList.add(item);
+            }
+            this.insertBatch(iList);
+        }
+    }
+}

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

@@ -88,6 +88,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
     private final ExcelUtils excelUtils;
     @Autowired
     private final HtmlBuilder htmlBuilder;
+    @Autowired
+    private final ComProjectFundPlanService comProjectFundPlanService;
+    @Autowired
+    private final ComProjectUnitPaymentService comProjectUnitPaymentService;
 
     @Override
     protected void setCriteriaForQuery(ComProjectQueryVO vo, QueryWrapper<ComProjectQueryVO> criteria) {
@@ -258,6 +262,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         //经费表
         List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList(projType);
         dto.setBudget(budgetList);
+        //年度用款计划表
+        List<ComProjectFundPlanDTO> fundPlanList = comProjectFundPlanService.getList();
+        dto.setFundPlan(fundPlanList);
 
         // 附件
         List<ComFileDTO> fileList = processAttachmentList(projType);
@@ -365,10 +372,20 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             budgetList = comProjectBudgetService.getList(dto.getProjType());
         dto.setBudget(budgetList);
 
+        //年度用款计划
+        List<ComProjectFundPlanDTO> fundPlanList = comProjectFundPlanService.getListByObjectId(dto.getId());
+        if (null == fundPlanList || fundPlanList.size() == 0)
+            fundPlanList = comProjectFundPlanService.getList();
+        dto.setFundPlan(fundPlanList);
+
         // 项目经费构成表
         List<ComProjectFundCompositionDTO> fundCompositions = comProjectFundCompositionService.getListByObjectId(dto.getId());
         dto.setFundCompositions(fundCompositions);
 
+        //单位支出明细预算
+        List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
+        dto.setUnitPayment(unitPaymentList);
+
         // 设备仪器经费表
         List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId());
         dto.setEquipments(equipmentList);

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

+package com.yiboshi.science.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yiboshi.science.base.BaseServiceImpl;
+import com.yiboshi.science.dao.ComProjectUnitPaymentDAO;
+import com.yiboshi.science.entity.ComProjectUnitPayment;
+import com.yiboshi.science.param.dto.ComProjectUnitPaymentDTO;
+import com.yiboshi.science.param.query.ComProjectUnitPaymentQueryVO;
+import com.yiboshi.science.service.ComProjectUnitPaymentService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class ComProjectUnitPaymentServiceImpl extends BaseServiceImpl<ComProjectUnitPaymentDAO, ComProjectUnitPaymentQueryVO, ComProjectUnitPaymentDTO, ComProjectUnitPayment> implements ComProjectUnitPaymentService {
+
+    @Autowired
+    private ComProjectUnitPaymentDAO comProjectUnitPaymentDAO;
+
+    @Override
+    protected void setCriteriaForQuery(ComProjectUnitPaymentQueryVO vo, QueryWrapper<ComProjectUnitPaymentQueryVO> criteria) {
+
+    }
+    public List<ComProjectUnitPaymentDTO> getListByObjectId(String objectId)
+    {
+        return comProjectUnitPaymentDAO.getListByObjectId(objectId);
+    }
+
+    public void deleteByObjectId(String objectId){
+        ComProjectUnitPayment model = new ComProjectUnitPayment();
+        model.setObjectId(objectId);
+        this.delete(model);
+    }
+
+    public void insertList(List<ComProjectUnitPaymentDTO> list, String objectId) {
+        ComProjectUnitPayment model =new ComProjectUnitPayment();
+        model.setObjectId(objectId);
+        this.delete(model);
+        if (null != list) {
+            List<ComProjectUnitPayment> iList = new ArrayList<>();
+            for (int i = 0; i < list.size(); i++) {
+                ComProjectUnitPayment item = convert2Entity(list.get(i));
+                item.setObjectId(objectId);
+                iList.add(item);
+            }
+            this.insertBatch(iList);
+        }
+    }
+}

science-admin/src/main/resources/mapper/ComProjectFundPlanDAO.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<!-- 经费申请表（任务书/项目申请书） -->
+<mapper namespace="com.yiboshi.science.dao.ComProjectFundPlanDAO">
+    <sql id="allColumns">
+        id, fund_id, object_id, year_value1, year_value2, year_value3, year_value4, year_value5, created, updated
+    </sql>
+    <select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectFundPlanDTO">
+        SELECT a.*, b.name as fundName
+        FROM com_project_fund_plan a
+        left join system_parameter b on a.fund_id=b.id and b.type_id = 64
+        where object_id=#{objectId} order by a.fund_id asc
+    </select>
+</mapper>
\ No newline at end of file

science-admin/src/main/resources/mapper/ComProjectUnitPaymentDAO.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<!-- 经费申请表（任务书/项目申请书） -->
+<mapper namespace="com.yiboshi.science.dao.ComProjectUnitPaymentDAO">
+    <sql id="allColumns">
+        id, object_id, unit_name, country_name, social_code, unit_role, task_division, task_leader, Indirect_fee, fund_amount,
+        self_amount, created, updated
+    </sql>
+    <select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectUnitPaymentDTO">
+        SELECT a.*, b.name as roleName
+        FROM com_project_unit_payment a
+        left join system_parameter b on a.unit_role=b.id and b.type_id = 65
+        where object_id=#{objectId} order by a.fund_id asc
+    </select>
+</mapper>
\ No newline at end of file