kangwei:工作进度统计-增加工单模块的统计

@@ -6,17 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.skua.core.aspect.annotation.Dict;
-import com.skua.tool.util.JSUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-
 /**
  * 物料(药剂)入库
  */

@@ -18,50 +18,50 @@ public class ProcessProgressVO {
 
     // 隐患记录：隐患排查ajh_rectification_info
     @ApiModelProperty(value = "隐患记录总数")
-    private String yhjlTotal;
+    private String yhjlTotalNum;
     @ApiModelProperty(value = "隐患记录处理数量")
     private String yhjlHandleNum;
 
 
     //危险作业：  dangerous_operation_manage
     @ApiModelProperty(value = "隐患记录总数")
-    private String wxrwTotal;
+    private String wxrwTotalNum;
     @ApiModelProperty(value = "隐患记录处理数量")
     private String wxrwHandleNum;
 
     //事故事件    emergency_risk_event
     @ApiModelProperty(value = "事故事件总数")
-    private String sgsjTotal;
+    private String sgsjTotalNum;
     @ApiModelProperty(value = "事故事件处理数量")
     private String sgsjHandleNum;
 
     ///设备维修：  equipment_repair
     @ApiModelProperty(value = "设备维修总数")
-    private String sbwxTotal;
+    private String sbwxTotalNum;
     @ApiModelProperty(value = "设备维修处理数量")
     private String sbwxHandleNum;
 
     //考核评价： data_assessment_socre_master
     @ApiModelProperty(value = "考核评价总数")
-    private String khpjTotal;
+    private String khpjTotalNum;
     @ApiModelProperty(value = "考核评价处理数量")
     private String khpjHandleNum;
 
     //问题上报：问题记录   problem_report_plan
     @ApiModelProperty(value = "问题上报总数")
-    private String wtsbTotal;
+    private String wtsbTotalNum;
     @ApiModelProperty(value = "隐患记录处理数量")
     private String wtsbHandleNum;
 
     //报警任务：alarm_record_history
     @ApiModelProperty(value = "报警任务总数")
-    private String bjrwTotal;
+    private String bjrwTotalNum;
     @ApiModelProperty(value = "报警任务处理数量")
     private String bjrwHandleNum;
 
     //维护任务：保养 equipment_maintain_task
     @ApiModelProperty(value = "维护任务总数")
-    private String whrwTotal;
+    private String whrwTotalNum;
     @ApiModelProperty(value = "维护任务处理数量")
     private String whrwHandleNum;
     @ApiModelProperty(value = "维护任务及时数量")
@@ -69,7 +69,7 @@ public class ProcessProgressVO {
 
     //巡检任务： inspection_task
     @ApiModelProperty(value = "巡检任务总数")
-    private String xjrwTotal;
+    private String xjrwTotalNum;
     @ApiModelProperty(value = "巡检任务处理数量")
     private String xjrwHandleNum;
     @ApiModelProperty(value = "巡检任务应急数量")