kangwei: 一般固废:运输记录,添加运输单位，卸车地点

@@ -57,8 +57,6 @@ public class AjhWasteSolidTransportController {
 	@Autowired
 	private IAjhWasteSolidTransportService ajhWasteSolidTransportService;
 	@Autowired
-	private ICommonSqlService commonSqlService;
-	@Autowired
 	private ISysDepartService departService;
 	/**
 	 * <pre>

@@ -52,6 +52,16 @@ public class AjhWasteSolidTransport {
 	@Excel(name = "车辆型号", width = 15)
     @ApiModelProperty(value = "车辆型号")
 	private String carModel;
+
+	/**运输时间*/
+	@Excel(name = "运输单位", width = 15)
+	@ApiModelProperty(value = "运输单位")
+	private String transportDepart;
+
+	@Excel(name = "卸车地点", width = 15)
+	@ApiModelProperty(value = "卸车地点")
+	private String destination;
+
 	/**运输时间*/
 	@Excel(name = "运输时间", width = 15)
     @ApiModelProperty(value = "运输时间")

@@ -26,7 +26,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @Accessors(chain = true)
 @ApiModel(value="danger_inspect_info对象", description="检查内容对象")
 public class DangerInspectInfo {
-    
+
 	/**id*/
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "id")
@@ -47,8 +47,6 @@ public class DangerInspectInfo {
 	@Excel(name = "检查方法", width = 15)
     @ApiModelProperty(value = "检查方法")
 	private String inspectMethod;
-
-
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")

+package com.skua.modules.safe.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.skua.core.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 风险分级管控清单
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="danger_level_manage对象", description="风险分级管控清单")
+public class DangerLevelManageResultVO {
+
+	/**id*/
+	@TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**厂区*/
+	@Excel(name = "厂区", width = 15,dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
+    @ApiModelProperty(value = "厂区")
+	@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
+	private String departId;
+	/**风险点类型*/
+	@Excel(name = "风险点类型", width = 15 ,dicCode = "dangerType")
+    @ApiModelProperty(value = "风险点类型")
+	@Dict(dicCode = "dangerType")
+	private String dangerType;
+	/**风险点名称*/
+	@Excel(name = "风险点名称", width = 15)
+    @ApiModelProperty(value = "风险点名称")
+	private String dangerName;
+	/**危险源内容*/
+	@Excel(name = "危险源内容", width = 15)
+    @ApiModelProperty(value = "危险源内容")
+	private String dangerContent;
+	/**安全态（标准情况）*/
+	@Excel(name = "安全态（标准情况）", width = 15)
+    @ApiModelProperty(value = "安全态（标准情况）")
+	private String dangerStandard;
+	/**风险等级*/
+	@Excel(name = "风险等级", width = 15 ,dicCode = "dangerLevel")
+    @ApiModelProperty(value = "风险等级")
+	@Dict(dicCode = "dangerLevel")
+	private String dangerLevel;
+	/**主要后果*/
+	@Excel(name = "主要后果", width = 15)
+    @ApiModelProperty(value = "主要后果")
+	private String dangerResult;
+	/**管控措施*/
+	@Excel(name = "管控措施", width = 15)
+    @ApiModelProperty(value = "管控措施")
+	private String dangerWay;
+	/**管控层级*/
+	@Excel(name = "管控层级", width = 15,dicCode = "dangerRank")
+    @ApiModelProperty(value = "管控层级")
+	@Dict(dicCode = "dangerRank")
+	private String dangerRank;
+	/**责任部门*/
+	@Excel(name = "责任部门", width = 15)
+    @ApiModelProperty(value = "责任部门")
+	private String dangerDept;
+	/**责任人*/
+	@Excel(name = "责任人", width = 15)
+    @ApiModelProperty(value = "责任人")
+	private String dangerUser;
+	/**安全四色图*/
+	//@Excel(name = "安全四色图", width = 15)
+    @ApiModelProperty(value = "安全四色图")
+	private String dangerFour;
+
+	@Excel(name = "风险点位置", width = 15,dicCode = "id",dicText = "struct_name",dictTable = "sys_struct_dict")
+	@ApiModelProperty(value = "风险点位置")
+	@Dict(dicCode = "id",dicText = "struct_name",dictTable = "sys_struct_dict")
+	private String dangerPlace;
+
+	@Excel(name = "关联设备", width = 15,dicCode = "id",dicText = "equipment_name",dictTable = "equipment_info")
+	@ApiModelProperty(value = "关联设备")
+	@Dict(dicCode = "id",dicText = "equipment_name",dictTable = "equipment_info")
+	private String equipInfoId;
+
+	@Excel(name = "是否共享", width = 15)
+	@ApiModelProperty(value = "是否共享")
+	private String share;
+
+	//@Excel(name = "二维码", width = 15)
+	@ApiModelProperty(value = "二维码")
+	private String qrCode;
+
+	/**创建人Id*/
+    @ApiModelProperty(value = "创建人Id")
+	private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**修改人Id*/
+    @ApiModelProperty(value = "修改人Id")
+	private String updateBy;
+	/**修改时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+	private String createDept;
+	/**所属公司*/
+    @ApiModelProperty(value = "所属公司")
+	private String createCmpy;
+	/**删除标识，1有效，0删除*/
+    @ApiModelProperty(value = "删除标识，1有效，0删除")
+	private Integer delFlag;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "厂区名称")
+	private String departName;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "关联设备名称")
+	private String equipmentName;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "风险等级名称")
+	private String dangerLevelName;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "风险类型名称")
+	private String dangerTypeName;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "风险位置名称")
+	private String dangerPlaceName;
+
+
+
+
+
+}

@@ -19,15 +19,10 @@ import java.util.List;
 @Accessors(chain = true)
 @ApiModel(value="danger_level_manage对象", description="风险分级管控清单")
 public class DangerLevelManageVO  extends DangerLevelManage {
-
-
     @ApiModelProperty(value = "上次巡检时间")
     private String lastInspectionTime;
-
-
     @ApiModelProperty(value = "上次巡检状态 ")
     private String lastInspectionStatus;
-
     @ApiModelProperty(value = "上次巡检编号 ")
     private  String  lastInspectionRecordId;