修复合同额二级图表bug

module_kzks/src/main/java/org/jeecg/modules/Index/entity/dto/IndexInfoParamDto.java

@@ -2,10 +2,10 @@ package org.jeecg.modules.Index.entity.dto;
 
 import lombok.Data;
 
-import java.util.Date;
+import java.io.Serializable;
 
 @Data
-public class IndexInfoParamDto {
+public class IndexInfoParamDto implements Serializable {
 
 
     /*年/月*/

module_kzks/src/main/java/org/jeecg/modules/Index/entity/pojo/ContractAmount.java

@@ -2,11 +2,12 @@ package org.jeecg.modules.Index.entity.pojo;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /*首页图表合同纵轴数据*/
 @Data
-public class ContractAmount {
+public class ContractAmount implements Serializable {
 
     /*合同额*/
     private BigDecimal contractAmount;

module_kzks/src/main/java/org/jeecg/modules/Index/entity/vo/ContractChartInfoVo.java

@@ -2,11 +2,12 @@ package org.jeecg.modules.Index.entity.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
 @Data
-public class ContractChartInfoVo {
+public class ContractChartInfoVo implements Serializable {
 
     /*横坐标集合*/
     private List<String> xAxisData;

module_kzks/src/main/java/org/jeecg/modules/Index/entity/vo/IndexChartInfoVo.java

@@ -2,12 +2,13 @@ package org.jeecg.modules.Index.entity.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
 @Data
 /*首页图表响应实体*/
-public class  IndexChartInfoVo<T> {
+public class  IndexChartInfoVo<T> implements Serializable {
 
     /*横坐标集合*/
     private List<String> xAxisData;

module_kzks/src/main/java/org/jeecg/modules/Index/entity/vo/ResultEightCost.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.Index.entity.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -13,7 +14,7 @@ import java.util.List;
  * @des 成本的返回结果的实体
  */
 @Data
-public class ResultEightCost {
+public class ResultEightCost implements Serializable {
 
     /** 名字 */
     private String name;

module_kzks/src/main/java/org/jeecg/modules/Index/service/impl/IndexServiceImpl.java

@@ -702,19 +702,19 @@ public class IndexServiceImpl implements IndexService {
     @Override
     public ContractChartInfoVo getContractAmountInfo(HttpServletRequest request, IndexInfoParamDto indexInfoParamDto) {
 
-        ContractChartInfoVo resultl;
+        ContractChartInfoVo result;
         switch (indexInfoParamDto.getTime()) {
             case "year":
-                resultl = getContractAmountInfo(request, indexInfoParamDto, YEAR);
+                result = getContractAmountInfo(request, indexInfoParamDto, YEAR);
                 break;
             case "month":
-                resultl = getContractAmountInfo(request, indexInfoParamDto, MONTH);
+                result = getContractAmountInfo(request, indexInfoParamDto, MONTH);
                 break;
             default:
-                resultl = null;
+                result = null;
         }
 
-        return resultl;
+        return result;
     }
 
     public ContractChartInfoVo getContractAmountInfo(HttpServletRequest request, IndexInfoParamDto indexInfoParamDto, String Time) {
@@ -724,6 +724,9 @@ public class IndexServiceImpl implements IndexService {
         Date endDate = dateFormat(indexInfoParamDto.getEndDate(), Time);
         List<Date> pastDates = getPastDates(beginDate, endDate, Time);
 
+        String string = indexInfoParamDto.toString();
+
+
         List<BigDecimal> contractAmount = new ArrayList<>();
         ArrayList<Long> contractTotal = new ArrayList<>();
         ArrayList<String> xAxisData = new ArrayList<>();
@@ -764,7 +767,7 @@ public class IndexServiceImpl implements IndexService {
                 stringBuilder.append(departName).append("|");
             }
             depart = stringBuilder.toString();
-            Object cacheObject = redisUtil.get(CacheKey.CONTRACT_CHART_INFO_DATA_REDIS_KEY + depart + ":" + role);
+            Object cacheObject = redisUtil.get(CacheKey.CONTRACT_CHART_INFO_DATA_REDIS_KEY + depart + ":" + role +":"+string);
             ContractChartInfoVo Object = JSONObject.parseObject(JSONObject.toJSONString(cacheObject), new TypeReference<ContractChartInfoVo>() {
             });
             if (ObjectUtils.isNotEmpty(cacheObject)) {
@@ -781,7 +784,7 @@ public class IndexServiceImpl implements IndexService {
 
         if (depart == null) {
             depart = "Boss";
-            Object cacheObject = redisUtil.get(CacheKey.CONTRACT_CHART_INFO_DATA_REDIS_KEY + depart + ":" + role);
+            Object cacheObject = redisUtil.get(CacheKey.CONTRACT_CHART_INFO_DATA_REDIS_KEY + depart + ":" + role+":"+string);
             ContractChartInfoVo Object = JSONObject.parseObject(JSONObject.toJSONString(cacheObject), new TypeReference<ContractChartInfoVo>() {
             });
             if (ObjectUtils.isNotEmpty(cacheObject)) {
@@ -824,7 +827,7 @@ public class IndexServiceImpl implements IndexService {
         newResVo.setContractAmount(contractAmount);
         newResVo.setContractTotal(contractTotal);
 
-        redisUtil.set(CacheKey.CONTRACT_CHART_INFO_DATA_REDIS_KEY + depart + ":" + role, newResVo, 1000L * 60 * 60 * 2);
+        redisUtil.set(CacheKey.CONTRACT_CHART_INFO_DATA_REDIS_KEY + depart + ":" + role +":" + string, newResVo, 1000L * 60 * 60 * 2);
         return newResVo;
     }
 

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -17,6 +17,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.Md5Util;
 import org.jeecg.modules.mesInfoInstallationcost.service.IMesInfoInstallationcostService;
 import org.jeecg.modules.projectCost.service.IProjectCostService;
 import org.jeecg.modules.projectCost.vo.ProjectCostVO;
@@ -103,6 +104,8 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                        HttpServletRequest req) {
+
+
         ProjectCostHuijiSumVO sumVO = new ProjectCostHuijiSumVO();
 
         CompletableFuture<ProjectCostHuiji> huijiFuture = CompletableFuture.supplyAsync(() -> {

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/entity/ProjectCostHuiji.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -32,186 +33,276 @@ import lombok.experimental.Accessors;
 public class ProjectCostHuiji implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.Integer id;
-	/**任务号/来自科研任务*/
-	@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")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="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;
-	/**成本进度*/
-	@Excel(name = "成本进度", width = 15)
+    /**
+     * 成本进度
+     */
+    @Excel(name = "成本进度", width = 15)
     @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)
+    /**
+     * 单台收入/（合同额or预估价）/研制数量
+     */
+    @Excel(name = "单台收入/（合同额or预估价）/研制数量", 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)
+    /**
+     * 利润额/（合同额or预估价）-总成本额
+     */
+    @Excel(name = "利润额/（合同额or预估价）-总成本额", width = 15)
     @ApiModelProperty(value = "利润额/（合同额or预估价）-总成本额")
     private java.math.BigDecimal lre;
-	/**利润率/ 利润额/（合同额or预估价）*100%*/
-	@Excel(name = "利润率/ 利润额/（合同额or预估价）*100%", width = 15)
+    /**
+     * 利润率/ 利润额/（合同额or预估价）*100%
+     */
+    @Excel(name = "利润率/ 利润额/（合同额or预估价）*100%", 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;
-	/**专用费*/
-	@Excel(name = "专用费", width = 15)
+    /**
+     * 专用费
+     */
+    @Excel(name = "专用费", width = 15)
     @ApiModelProperty(value = "专用费")
     private java.math.BigDecimal zyf;
-	/**事务费*/
-	@Excel(name = "事务费", width = 15)
+    /**
+     * 事务费
+     */
+    @Excel(name = "事务费", width = 15)
     @ApiModelProperty(value = "事务费")
     private java.math.BigDecimal swf;
-	/**外协费*/
-	@Excel(name = "外协费", width = 15)
+    /**
+     * 外协费
+     */
+    @Excel(name = "外协费", width = 15)
     @ApiModelProperty(value = "外协费")
     private java.math.BigDecimal wxf;
-	/**燃料动力费/（材料费+外协费+事务费+专用费）×1.5%*/
-	@Excel(name = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%", width = 15)
+    /**
+     * 燃料动力费/（材料费+外协费+事务费+专用费）×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)
+    /**
+     * 固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%
+     */
+    @Excel(name = "固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%", width = 15)
     @ApiModelProperty(value = "固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%")
     private java.math.BigDecimal gdzczj;
-	/**工资及劳务费/（材料费+外协费+事务费+专用费）×17%*/
-	@Excel(name = "工资及劳务费/（材料费+外协费+事务费+专用费）×17%", width = 15)
+    /**
+     * 工资及劳务费/（材料费+外协费+事务费+专用费）×17%
+     */
+    @Excel(name = "工资及劳务费/（材料费+外协费+事务费+专用费）×17%", width = 15)
     @ApiModelProperty(value = "工资及劳务费/（材料费+外协费+事务费+专用费）×17%")
     private java.math.BigDecimal gzjlwf;
-	/**管理费/（材料费+外协费+事务费+专用费）×5%*/
-	@Excel(name = "管理费/（材料费+外协费+事务费+专用费）×5%", width = 15)
+    /**
+     * 管理费/（材料费+外协费+事务费+专用费）×5%
+     */
+    @Excel(name = "管理费/（材料费+外协费+事务费+专用费）×5%", width = 15)
     @ApiModelProperty(value = "管理费/（材料费+外协费+事务费+专用费）×5%")
     private java.math.BigDecimal glf;
-	/**装机成本/ mes装机信息卡的采购单价*数量*/
-	@Excel(name = "装机成本/ mes装机信息卡的采购单价*数量", width = 15)
+    /**
+     * 装机成本/ mes装机信息卡的采购单价*数量
+     */
+    @Excel(name = "装机成本/ mes装机信息卡的采购单价*数量", width = 15)
     @ApiModelProperty(value = "装机成本/ mes装机信息卡的采购单价*数量")
     private java.math.BigDecimal zjcb;
-	/**内部试验*/
-	@Excel(name = "内部试验", width = 15)
+    /**
+     * 内部试验
+     */
+    @Excel(name = "内部试验", width = 15)
     @ApiModelProperty(value = "内部试验")
     private java.math.BigDecimal lbsy;
-	/**工时(h)/来自科研报工，每次科研报工累加计时*/
-	@Excel(name = "工时(h)/来自科研报工，每次科研报工累加计时", width = 15)
+    /**
+     * 工时(h)/来自科研报工，每次科研报工累加计时
+     */
+    @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)
+    /**
+     * 下达部门id/来自科研任务
+     */
+    @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)
+    /**
+     * 1：横向 2：纵向/来自科研任务
+     */
+    @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 businessman;
-	/**设计工时*/
-	@Excel(name = "设计工时", width = 15)
+    /**
+     * 设计工时
+     */
+    @Excel(name = "设计工时", width = 15)
     @ApiModelProperty(value = "设计工时")
     private java.math.BigDecimal sjgs;
-	/**生产工时*/
-	@Excel(name = "生产工时", width = 15)
+    /**
+     * 生产工时
+     */
+    @Excel(name = "生产工时", width = 15)
     @ApiModelProperty(value = "生产工时")
     private java.math.BigDecimal scgs;