项目成本导出修改导出字段名称

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/vo/ProjectCostHuijiListVO.java

@@ -32,30 +32,36 @@ public class ProjectCostHuijiListVO implements Serializable {
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+
+    /**用于判断是一级还是二级*/
+    @Excel(name = "层级", width = 15)
+    @ApiModelProperty(value = "用于判断是一级还是二级")
+    private java.lang.Integer ji;
+
     /**任务号/来自科研任务*/
-    @Excel(name = "任务号/来自科研任务", width = 15)
+    @Excel(name = "任务号", width = 15)
     @ApiModelProperty(value = "任务号/来自科研任务")
     private java.lang.String taskno;
     /**任务名称/来自科研任务*/
-    @Excel(name = "任务名称/来自科研任务", width = 15)
+    @Excel(name = "任务名称", width = 15)
     @ApiModelProperty(value = "任务名称/来自科研任务")
     private java.lang.String taskname;
     /**型号/来自科研报工*/
-    @Excel(name = "型号/来自科研报工", width = 15)
+    @Excel(name = "型号", width = 15)
     @ApiModelProperty(value = "型号/来自科研报工")
     private java.lang.String xhname;
     /**计划完成时间(进度要求)来自科研任务*/
-    @Excel(name = "计划完成时间(进度要求)来自科研任务", width = 15, format = "yyyy-MM-dd")
+    @Excel(name = "计划完成时间", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "计划完成时间(进度要求)来自科研任务")
     private java.util.Date jhwcsj;
     /**阶段/来自科研报工*/
-    @Excel(name = "阶段/来自科研报工", width = 15)
+    @Excel(name = "阶段", width = 15)
     @ApiModelProperty(value = "阶段/来自科研报工")
     private java.lang.String yzjdname;
     /**项目进度/来自科研任务*/
-    @Excel(name = "项目进度/来自科研任务", width = 15)
+    @Excel(name = "项目进度", width = 15)
     @ApiModelProperty(value = "项目进度/来自科研任务")
     private java.lang.String processpercent;
     /**成本进度*/
@@ -63,47 +69,47 @@ public class ProjectCostHuijiListVO implements Serializable {
     @ApiModelProperty(value = "成本进度")
     private java.lang.String costPercent;
     /**研制数量/来自科研任务*/
-    @Excel(name = "研制数量/来自科研任务", width = 15)
+    @Excel(name = "研制数量", width = 15)
     @ApiModelProperty(value = "研制数量/来自科研任务")
     private java.lang.Integer yzsl;
     /**单台收入/（合同额or预估价）/研制数量*/
-    @Excel(name = "单台收入/（合同额or预估价）/研制数量", width = 15)
+    @Excel(name = "单台收入", width = 15)
     @ApiModelProperty(value = "单台收入/（合同额or预估价）/研制数量")
     private java.math.BigDecimal oneIncome;
     /**单台成本/  总成本额/研制数量*/
-    @Excel(name = "单台成本/  总成本额/研制数量", width = 15)
+    @Excel(name = "单台成本", width = 15)
     @ApiModelProperty(value = "单台成本/  总成本额/研制数量")
     private java.math.BigDecimal oneCost;
     /**单台利润/  利润额/研制数量*/
-    @Excel(name = "单台利润/  利润额/研制数量", width = 15)
+    @Excel(name = "单台利润", width = 15)
     @ApiModelProperty(value = "单台利润/  利润额/研制数量")
     private java.math.BigDecimal oneProfit;
     /**利润额/（合同额or预估价）-总成本额*/
-    @Excel(name = "利润额/（合同额or预估价）-总成本额", width = 15)
+    @Excel(name = "利润额", width = 15)
     @ApiModelProperty(value = "利润额/（合同额or预估价）-总成本额")
     private java.math.BigDecimal lre;
     /**利润率/ 利润额/（合同额or预估价）*100%*/
-    @Excel(name = "利润率/ 利润额/（合同额or预估价）*100%", width = 15)
+    @Excel(name = "利润率", width = 15)
     @ApiModelProperty(value = "利润率/ 利润额/（合同额or预估价）*100%")
     private java.math.BigDecimal lrl;
     /**预估价/来自财务预算*/
-    @Excel(name = "预估价/来自财务预算", width = 15)
+    @Excel(name = "预估价", width = 15)
     @ApiModelProperty(value = "预估价/来自财务预算")
     private java.math.BigDecimal estimationcoat;
     /**合同额/来自收款合同的合同分配额 */
-    @Excel(name = "合同额/来自收款合同的合同分配额 ", width = 15)
+    @Excel(name = "合同额 ", width = 15)
     @ApiModelProperty(value = "合同额/来自收款合同的合同分配额 ")
     private java.math.BigDecimal contractfpe;
     /**已收款/ 来自合同收款详细的任务收款额*/
-    @Excel(name = "已收款/ 来自合同收款详细的任务收款额", width = 15)
+    @Excel(name = "已收款", width = 15)
     @ApiModelProperty(value = "已收款/ 来自合同收款详细的任务收款额")
     private java.math.BigDecimal taskmoney;
     /**总成本/ 直接成本+间接费用/直接成本=材料费（出库）+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费*/
-    @Excel(name = "总成本/ 直接成本+间接费用/直接成本=材料费（出库）+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费", width = 15)
+    @Excel(name = "总成本", width = 15)
     @ApiModelProperty(value = "总成本/ 直接成本+间接费用/直接成本=材料费（出库）+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费")
     private java.math.BigDecimal zcb;
     /**材料费/物资出库单明细 实发主数量*采购单价*/
-    @Excel(name = "材料费/物资出库单明细 实发主数量*采购单价", width = 15)
+    @Excel(name = "材料费", width = 15)
     @ApiModelProperty(value = "材料费/物资出库单明细 实发主数量*采购单价")
     private java.math.BigDecimal clf;
     /**专用费*/
@@ -123,23 +129,23 @@ public class ProjectCostHuijiListVO implements Serializable {
     @ApiModelProperty(value = "筛选费")
     private java.math.BigDecimal sxf;
     /**燃料动力费/（材料费+外协费+事务费+专用费）×1.5%*/
-    @Excel(name = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%", width = 15)
+    @Excel(name = "燃料动力费", width = 15)
     @ApiModelProperty(value = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%")
     private java.math.BigDecimal rldlf;
     /**固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%*/
-    @Excel(name = "固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%", width = 15)
+    @Excel(name = "固定资产折旧", width = 15)
     @ApiModelProperty(value = "固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%")
     private java.math.BigDecimal gdzczj;
     /**工资及劳务费/（材料费+外协费+事务费+专用费）×17%*/
-    @Excel(name = "工资及劳务费/（材料费+外协费+事务费+专用费）×17%", width = 15)
+    @Excel(name = "工资及劳务费", width = 15)
     @ApiModelProperty(value = "工资及劳务费/（材料费+外协费+事务费+专用费）×17%")
     private java.math.BigDecimal gzjlwf;
     /**管理费/（材料费+外协费+事务费+专用费）×5%*/
-    @Excel(name = "管理费/（材料费+外协费+事务费+专用费）×5%", width = 15)
+    @Excel(name = "管理费", width = 15)
     @ApiModelProperty(value = "管理费/（材料费+外协费+事务费+专用费）×5%")
     private java.math.BigDecimal glf;
     /**装机成本/ mes装机信息卡的采购单价*数量*/
-    @Excel(name = "装机成本/ mes装机信息卡的采购单价*数量", width = 15)
+    @Excel(name = "装机成本", width = 15)
     @ApiModelProperty(value = "装机成本/ mes装机信息卡的采购单价*数量")
     private java.math.BigDecimal zjcb;
     /**内部试验*/
@@ -147,67 +153,67 @@ public class ProjectCostHuijiListVO implements Serializable {
     @ApiModelProperty(value = "内部试验")
     private java.math.BigDecimal lbsy;
     /**工时(h)/来自科研报工，每次科研报工累加计时*/
-    @Excel(name = "工时(h)/来自科研报工，每次科研报工累加计时", width = 15)
+    @Excel(name = "工时(h)", width = 15)
     @ApiModelProperty(value = "工时(h)/来自科研报工，每次科研报工累加计时")
     private java.math.BigDecimal workhour;
     /**责任部门/来自科研任务*/
-    @Excel(name = "责任部门/来自科研任务", width = 15)
+    @Excel(name = "责任部门", width = 15)
     @ApiModelProperty(value = "责任部门/来自科研任务")
     private java.lang.String zrbm;
     /**下达部门id/来自科研任务*/
-    @Excel(name = "下达部门id/来自科研任务", width = 15)
+//    @Excel(name = "下达部门id", width = 15)
     @ApiModelProperty(value = "下达部门id/来自科研任务")
     private java.lang.Integer jycsid;
     /**下达部门/来自科研任务*/
-    @Excel(name = "下达部门/来自科研任务", width = 15)
+    @Excel(name = "下达部门", width = 15)
     @ApiModelProperty(value = "下达部门/来自科研任务")
     private java.lang.String jycs;
     /**1：横向 2：纵向/来自科研任务*/
-    @Excel(name = "1：横向 2：纵向/来自科研任务", width = 15)
+//    @Excel(name = "1：横向 2：纵向/来自科研任务", width = 15)
     @ApiModelProperty(value = "1：横向 2：纵向/来自科研任务")
     private java.lang.Integer hxzxid;
     /**横向纵向/来自科研任务*/
-    @Excel(name = "横向纵向/来自科研任务", width = 15)
+    @Excel(name = "横向纵向", width = 15)
     @ApiModelProperty(value = "横向纵向/来自科研任务")
     private java.lang.String hxzxname;
     /**任务类型/来自科研任务*/
-    @Excel(name = "任务类型/来自科研任务", width = 15)
+    @Excel(name = "任务类型", width = 15)
     @ApiModelProperty(value = "任务类型/来自科研任务")
     private java.lang.String tasktype;
     /**审计审价/来自科研任务*/
-    @Excel(name = "审计审价/来自科研任务", width = 15)
+    @Excel(name = "审计审价", width = 15)
     @ApiModelProperty(value = "审计审价/来自科研任务")
     private java.lang.String auditprice;
     /**任务状态/来自科研任务*/
-    @Excel(name = "任务状态/来自科研任务", width = 15)
+    @Excel(name = "任务状态", width = 15)
     @ApiModelProperty(value = "任务状态/来自科研任务")
     private java.lang.String iflag;
     /**提出单位简称/来自科研任务*/
-    @Excel(name = "提出单位简称/来自科研任务", width = 15)
+    @Excel(name = "提出单位简称", width = 15)
     @ApiModelProperty(value = "提出单位简称/来自科研任务")
     private java.lang.String brief;
     /**父级任务/来自科研任务*/
-    @Excel(name = "父级任务/来自科研任务", width = 15)
+    @Excel(name = "父级任务", width = 15)
     @ApiModelProperty(value = "父级任务/来自科研任务")
     private java.lang.String reftaskno;
     /**批产任务号/来自科研任务*/
-    @Excel(name = "批产任务号/来自科研任务", width = 15)
+    @Excel(name = "批产任务号", width = 15)
     @ApiModelProperty(value = "批产任务号/来自科研任务")
     private java.lang.String pccode;
     /**备产任务号/来自科研任务*/
-    @Excel(name = "备产任务号/来自科研任务", width = 15)
+    @Excel(name = "备产任务号", width = 15)
     @ApiModelProperty(value = "备产任务号/来自科研任务")
     private java.lang.String bccode;
     /**备料任务号/来自科研任务*/
-    @Excel(name = "备料任务号/来自科研任务", width = 15)
+    @Excel(name = "备料任务号", width = 15)
     @ApiModelProperty(value = "备料任务号/来自科研任务")
     private java.lang.String blcode;
     /**业务员/来自科研任务*/
-    @Excel(name = "业务员/来自科研任务", width = 15)
+    @Excel(name = "业务员", width = 15)
     @ApiModelProperty(value = "业务员/来自科研任务")
     private java.lang.String businessManName;
 
-    @Excel(name = "主管设计师/来自科研任务", width = 15)
+    @Excel(name = "主管设计师", width = 15)
     @ApiModelProperty(value = "主管设计师/来自科研任务")
     private java.lang.String ywfzrname;
     /**设计工时*/
@@ -218,10 +224,6 @@ public class ProjectCostHuijiListVO implements Serializable {
     @Excel(name = "生产工时", width = 15)
     @ApiModelProperty(value = "生产工时")
     private java.math.BigDecimal scgs;
-    /**用于判断是一级还是二级*/
-    @Excel(name = "层级", width = 15)
-    @ApiModelProperty(value = "用于判断是一级还是二级")
-    private java.lang.Integer ji;
     /**子集*/
     @ApiModelProperty(value = "子集")
     private List<ProjectCostVO> children;
@@ -240,7 +242,7 @@ public class ProjectCostHuijiListVO implements Serializable {
     @ApiModelProperty(value = "状态")
     private java.lang.String hjstatus;
 
-    @Excel(name = "科研任务责任人/来自科研任务", width = 15)
+    @Excel(name = "科研任务责任人", width = 15)
     @ApiModelProperty(value = "科研任务责任人/来自科研任务")
     private java.lang.String xhzzrname;