漏掉的vo fix明细

module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/mapper/KyBgInfoMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
 public interface KyBgInfoMapper extends BaseMapper<KyBgInfo> {
 
     /**项目成本——工时详情*/
-    @Select("select `key`,userdept,taskno,workhour from ky_bg_info where taskno = #{taskno}")
+    @Select("select * from ky_bg_info where taskno = #{taskno}")
     public List<KyBgInfoDetailListVO> getGSDeatilList(@Param("taskno") String taskno);
 
 }

module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/vo/KyBgInfoDetailListVO.java

@@ -1,8 +1,12 @@
 package org.jeecg.modules.kyBgInfo.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
@@ -18,17 +22,94 @@ public class KyBgInfoDetailListVO implements Serializable {
     @Excel(name = "key", width = 15)
     @ApiModelProperty(value = "key")
     private java.lang.Integer key;
+    /**id*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.Integer id;
     /**报工任务号*/
     @Excel(name = "报工任务号", width = 15)
     @ApiModelProperty(value = "报工任务号")
     private java.lang.String taskno;
-    /**填报部门*/
-    @Excel(name = "填报部门", width = 15)
-    @ApiModelProperty(value = "填报部门")
-    private java.lang.String userdept;
+    /**任务名称*/
+    @Excel(name = "任务名称", width = 15)
+    @ApiModelProperty(value = "任务名称")
+    private java.lang.String taskname;
+    /**工作内容*/
+    @Excel(name = "工作内容", width = 15)
+    @ApiModelProperty(value = "工作内容")
+    private java.lang.String workcontent;
     /**当日用时（h）*/
     @Excel(name = "当日用时（h）", width = 15)
     @ApiModelProperty(value = "当日用时（h）")
     private java.math.BigDecimal workhour;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String memo;
+    /**审核人*/
+    @Excel(name = "审核人", width = 15)
+    @ApiModelProperty(value = "审核人")
+    private java.lang.String shr;
+    /**审批人*/
+    @Excel(name = "审批人", width = 15)
+    @ApiModelProperty(value = "审批人")
+    private java.lang.String spr;
+    /**型号*/
+    @Excel(name = "型号", width = 15)
+    @ApiModelProperty(value = "型号")
+    private java.lang.String xhname;
+    /**研制数量*/
+    @Excel(name = "研制数量", width = 15)
+    @ApiModelProperty(value = "研制数量")
+    private java.lang.Integer yzsl;
+    /**研制阶段*/
+    @Excel(name = "研制阶段", width = 15)
+    @ApiModelProperty(value = "研制阶段")
+    private java.lang.String yzjdname;
+    /**用户名称*/
+    @Excel(name = "用户名称", width = 15)
+    @ApiModelProperty(value = "用户名称")
+    private java.lang.String tcdw;
+    /**用户简称*/
+    @Excel(name = "用户简称", width = 15)
+    @ApiModelProperty(value = "用户简称")
+    private java.lang.String brief;
+    /**计划开始时间*/
+    @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 jhkssj;
+    /**计划完成时间（进度要求）*/
+    @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)
+    @ApiModelProperty(value = "状态")
+    private java.lang.String status;
+    /**工作日期*/
+    @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 worktime;
+    /**填写时间*/
+    @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 createtime;
+    /**填报人*/
+    @Excel(name = "填报人", width = 15)
+    @ApiModelProperty(value = "填报人")
+    private java.lang.String username;
+    /**填报部门*/
+    @Excel(name = "填报部门", width = 15)
+    @ApiModelProperty(value = "填报部门")
+    private java.lang.String userdept;
+
 
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/service/impl/ProjectChbZyfServiceImpl.java

@@ -55,16 +55,16 @@ public class ProjectChbZyfServiceImpl extends ServiceImpl<ProjectChbZyfMapper, P
      * 导出专用费的详情excel
      */
     public ModelAndView exportZYFDetail(List<ProjectChbZyf>  exportList, Class<ProjectChbZyf> clazz, String title) {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // Step.3 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         //此处设置的filename无效 ,前端会重更新设置一下
         mv.addObject(NormalExcelConstants.FILE_NAME, title);
         mv.addObject(NormalExcelConstants.CLASS, clazz);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-//        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + "admin111", title);
+        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + "admin111", title);
 
-        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+//        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
         exportParams.setImageBasePath(upLoadPath);
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
         mv.addObject(NormalExcelConstants.PARAMS,exportParams);

module_kzks/src/main/java/org/jeecg/modules/projectCost/vo/ProjectCostVO.java

@@ -0,0 +1,218 @@
+package org.jeecg.modules.projectCost.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+public class ProjectCostVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.Integer id;
+    /**任务号/来自科研任务*/
+    @Excel(name = "任务号/来自科研任务", width = 15)
+    @ApiModelProperty(value = "任务号/来自科研任务")
+    private java.lang.String taskno;
+    /**任务名称/来自科研任务*/
+    @Excel(name = "任务名称/来自科研任务", width = 15)
+    @ApiModelProperty(value = "任务名称/来自科研任务")
+    private java.lang.String taskname;
+    /**型号/来自科研报工*/
+    @Excel(name = "型号/来自科研报工", width = 15)
+    @ApiModelProperty(value = "型号/来自科研报工")
+    private java.lang.String xhname;
+    /**计划完成时间(进度要求)来自科研任务*/
+    @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)
+    @ApiModelProperty(value = "阶段/来自科研报工")
+    private java.lang.String yzjdname;
+    /**项目进度/来自科研任务*/
+    @Excel(name = "项目进度/来自科研任务", width = 15)
+    @ApiModelProperty(value = "项目进度/来自科研任务")
+    private java.lang.String processpercent;
+    /**成本进度*/
+    @Excel(name = "成本进度", width = 15)
+    @ApiModelProperty(value = "成本进度")
+    private java.lang.String costPercent;
+    /**研制数量/来自科研任务*/
+    @Excel(name = "研制数量/来自科研任务", width = 15)
+    @ApiModelProperty(value = "研制数量/来自科研任务")
+    private java.lang.Integer yzsl;
+    /**单台收入/（合同额or预估价）/研制数量*/
+    @Excel(name = "单台收入/（合同额or预估价）/研制数量", width = 15)
+    @ApiModelProperty(value = "单台收入/（合同额or预估价）/研制数量")
+    private java.math.BigDecimal oneIncome;
+    /**单台成本/  总成本额/研制数量*/
+    @Excel(name = "单台成本/  总成本额/研制数量", width = 15)
+    @ApiModelProperty(value = "单台成本/  总成本额/研制数量")
+    private java.math.BigDecimal oneCost;
+    /**单台利润/  利润额/研制数量*/
+    @Excel(name = "单台利润/  利润额/研制数量", width = 15)
+    @ApiModelProperty(value = "单台利润/  利润额/研制数量")
+    private java.math.BigDecimal oneProfit;
+    /**利润额/（合同额or预估价）-总成本额*/
+    @Excel(name = "利润额/（合同额or预估价）-总成本额", width = 15)
+    @ApiModelProperty(value = "利润额/（合同额or预估价）-总成本额")
+    private java.math.BigDecimal lre;
+    /**利润率/ 利润额/（合同额or预估价）*100%*/
+    @Excel(name = "利润率/ 利润额/（合同额or预估价）*100%", width = 15)
+    @ApiModelProperty(value = "利润率/ 利润额/（合同额or预估价）*100%")
+    private java.math.BigDecimal lrl;
+    /**预估价/来自财务预算*/
+    @Excel(name = "预估价/来自财务预算", width = 15)
+    @ApiModelProperty(value = "预估价/来自财务预算")
+    private java.math.BigDecimal estimationcoat;
+    /**合同额/来自收款合同的合同分配额 */
+    @Excel(name = "合同额/来自收款合同的合同分配额 ", width = 15)
+    @ApiModelProperty(value = "合同额/来自收款合同的合同分配额 ")
+    private java.math.BigDecimal contractfpe;
+    /**已收款/ 来自合同收款详细的任务收款额*/
+    @Excel(name = "已收款/ 来自合同收款详细的任务收款额", width = 15)
+    @ApiModelProperty(value = "已收款/ 来自合同收款详细的任务收款额")
+    private java.math.BigDecimal taskmoney;
+    /**总成本/ 直接成本+间接费用/直接成本=材料费（出库）+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费*/
+    @Excel(name = "总成本/ 直接成本+间接费用/直接成本=材料费（出库）+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费", width = 15)
+    @ApiModelProperty(value = "总成本/ 直接成本+间接费用/直接成本=材料费（出库）+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费")
+    private java.math.BigDecimal zcb;
+    /**材料费/物资出库单明细 实发主数量*采购单价*/
+    @Excel(name = "材料费/物资出库单明细 实发主数量*采购单价", width = 15)
+    @ApiModelProperty(value = "材料费/物资出库单明细 实发主数量*采购单价")
+    private java.math.BigDecimal clf;
+    /**专用费*/
+    @Excel(name = "专用费", width = 15)
+    @ApiModelProperty(value = "专用费")
+    private java.math.BigDecimal zyf;
+    /**事务费*/
+    @Excel(name = "事务费", width = 15)
+    @ApiModelProperty(value = "事务费")
+    private java.math.BigDecimal swf;
+    /**外协费*/
+    @Excel(name = "外协费", width = 15)
+    @ApiModelProperty(value = "外协费")
+    private java.math.BigDecimal wxf;
+    /**燃料动力费/（材料费+外协费+事务费+专用费）×1.5%*/
+    @Excel(name = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%", width = 15)
+    @ApiModelProperty(value = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%")
+    private java.math.BigDecimal rldlf;
+    /**固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%*/
+    @Excel(name = "固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%", width = 15)
+    @ApiModelProperty(value = "固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%")
+    private java.math.BigDecimal gdzczj;
+    /**工资及劳务费/（材料费+外协费+事务费+专用费）×17%*/
+    @Excel(name = "工资及劳务费/（材料费+外协费+事务费+专用费）×17%", width = 15)
+    @ApiModelProperty(value = "工资及劳务费/（材料费+外协费+事务费+专用费）×17%")
+    private java.math.BigDecimal gzjlwf;
+    /**管理费/（材料费+外协费+事务费+专用费）×5%*/
+    @Excel(name = "管理费/（材料费+外协费+事务费+专用费）×5%", width = 15)
+    @ApiModelProperty(value = "管理费/（材料费+外协费+事务费+专用费）×5%")
+    private java.math.BigDecimal glf;
+    /**装机成本/ mes装机信息卡的采购单价*数量*/
+    @Excel(name = "装机成本/ mes装机信息卡的采购单价*数量", width = 15)
+    @ApiModelProperty(value = "装机成本/ mes装机信息卡的采购单价*数量")
+    private java.math.BigDecimal zjcb;
+    /**内部试验*/
+    @Excel(name = "内部试验", width = 15)
+    @ApiModelProperty(value = "内部试验")
+    private java.math.BigDecimal lbsy;
+    /**工时(h)/来自科研报工，每次科研报工累加计时*/
+    @Excel(name = "工时(h)/来自科研报工，每次科研报工累加计时", width = 15)
+    @ApiModelProperty(value = "工时(h)/来自科研报工，每次科研报工累加计时")
+    private java.math.BigDecimal workhour;
+    /**责任部门/来自科研任务*/
+    @Excel(name = "责任部门/来自科研任务", width = 15)
+    @ApiModelProperty(value = "责任部门/来自科研任务")
+    private java.lang.String zrbm;
+    /**下达部门id/来自科研任务*/
+    @Excel(name = "下达部门id/来自科研任务", width = 15)
+    @ApiModelProperty(value = "下达部门id/来自科研任务")
+    private java.lang.Integer jycsid;
+    /**下达部门/来自科研任务*/
+    @Excel(name = "下达部门/来自科研任务", width = 15)
+    @ApiModelProperty(value = "下达部门/来自科研任务")
+    private java.lang.String jycs;
+    /**1：横向 2：纵向/来自科研任务*/
+    @Excel(name = "1：横向 2：纵向/来自科研任务", width = 15)
+    @ApiModelProperty(value = "1：横向 2：纵向/来自科研任务")
+    private java.lang.Integer hxzxid;
+    /**横向纵向/来自科研任务*/
+    @Excel(name = "横向纵向/来自科研任务", width = 15)
+    @ApiModelProperty(value = "横向纵向/来自科研任务")
+    private java.lang.String hxzxname;
+    /**任务类型/来自科研任务*/
+    @Excel(name = "任务类型/来自科研任务", width = 15)
+    @ApiModelProperty(value = "任务类型/来自科研任务")
+    private java.lang.String tasktype;
+    /**审计审价/来自科研任务*/
+    @Excel(name = "审计审价/来自科研任务", width = 15)
+    @ApiModelProperty(value = "审计审价/来自科研任务")
+    private java.lang.String auditprice;
+    /**任务状态/来自科研任务*/
+    @Excel(name = "任务状态/来自科研任务", width = 15)
+    @ApiModelProperty(value = "任务状态/来自科研任务")
+    private java.lang.String iflag;
+    /**提出单位简称/来自科研任务*/
+    @Excel(name = "提出单位简称/来自科研任务", width = 15)
+    @ApiModelProperty(value = "提出单位简称/来自科研任务")
+    private java.lang.String brief;
+    /**父级任务/来自科研任务*/
+    @Excel(name = "父级任务/来自科研任务", width = 15)
+    @ApiModelProperty(value = "父级任务/来自科研任务")
+    private java.lang.String reftaskno;
+    /**批产任务号/来自科研任务*/
+    @Excel(name = "批产任务号/来自科研任务", width = 15)
+    @ApiModelProperty(value = "批产任务号/来自科研任务")
+    private java.lang.String pccode;
+    /**备产任务号/来自科研任务*/
+    @Excel(name = "备产任务号/来自科研任务", width = 15)
+    @ApiModelProperty(value = "备产任务号/来自科研任务")
+    private java.lang.String bccode;
+    /**备料任务号/来自科研任务*/
+    @Excel(name = "备料任务号/来自科研任务", width = 15)
+    @ApiModelProperty(value = "备料任务号/来自科研任务")
+    private java.lang.String blcode;
+    /**业务员/来自科研任务*/
+    @Excel(name = "业务员/来自科研任务", width = 15)
+    @ApiModelProperty(value = "业务员/来自科研任务")
+    private java.lang.String businessman;
+    /**设计工时*/
+    @Excel(name = "设计工时", width = 15)
+    @ApiModelProperty(value = "设计工时")
+    private java.math.BigDecimal sjgs;
+    /**生产工时*/
+    @Excel(name = "生产工时", width = 15)
+    @ApiModelProperty(value = "生产工时")
+    private java.math.BigDecimal scgs;
+    /**是否是汇集之后的数据：0汇集计算之前的；1汇集计算之后的*/
+    @Excel(name = "是否是汇集之后的数据：0汇集计算之前的；1汇集计算之后的", width = 15)
+    @ApiModelProperty(value = "是否是汇集之后的数据：0汇集计算之前的；1汇集计算之后的")
+    private java.lang.String status;
+    /**占组批百分比*/
+    @Excel(name = "占组批百分比", width = 15)
+    @ApiModelProperty(value = "占组批百分比")
+    private java.math.BigDecimal proportion;
+    /**材料预算*/
+    @Excel(name = "材料预算", width = 15)
+    @ApiModelProperty(value = "材料预算")
+    private java.math.BigDecimal clys;
+    /**外协预算*/
+    @Excel(name = "外协预算", width = 15)
+    @ApiModelProperty(value = "外协预算")
+    private java.math.BigDecimal wxys;
+    /**用于判断是一级还是二级*/
+    @ApiModelProperty(value = "用于判断是一级还是二级")
+    private java.lang.Integer ji;
+}