危险作业id返回

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HazardousOperation.java

@@ -1,11 +1,10 @@
 package com.hbt.safety.supervision.pojo;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hbt.common.core.annotation.Excel;
 import com.hbt.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 危险作业对象 hazardous_operation
@@ -14,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @date 2023-02-14
  */
 @ApiModel
+@Data
 public class HazardousOperation extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -30,9 +30,14 @@ public class HazardousOperation extends BaseEntity
     @ApiModelProperty(value = "危险作业等级")
     private String operationLevel;
 
-    /** 企业id */
-    @ApiModelProperty(value = "企业id")
-    private Long enterpriseId;
+    /** 责任企业id */
+    @ApiModelProperty(value = "责任企业id")
+    private int enterpriseId;
+
+    /** 责任企业 */
+    @ApiModelProperty(value = "责任企业")
+    private String enterprise;
+
 
     /** 作业内容 */
     @ApiModelProperty(value = "作业内容")
@@ -61,119 +66,4 @@ public class HazardousOperation extends BaseEntity
     /** 作业地点 */
     @ApiModelProperty(value = "作业地点")
     private String operationSite;
-
-    public void setId(int id)
-    {
-        this.id = id;
-    }
-
-    public int getId()
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setEnterpriseId(Long enterpriseId) 
-    {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public Long getEnterpriseId() 
-    {
-        return enterpriseId;
-    }
-    public void setOperationContent(String operationContent) 
-    {
-        this.operationContent = operationContent;
-    }
-
-    public String getOperationContent() 
-    {
-        return operationContent;
-    }
-    public void setOperationLongitude(String operationLongitude) 
-    {
-        this.operationLongitude = operationLongitude;
-    }
-
-    public String getOperationLongitude() 
-    {
-        return operationLongitude;
-    }
-    public void setOperationLatitude(String operationLatitude) 
-    {
-        this.operationLatitude = operationLatitude;
-    }
-
-    public String getOperationLatitude() 
-    {
-        return operationLatitude;
-    }
-    public void setOperationType(int operationType)
-    {
-        this.operationType = operationType;
-    }
-
-    public int getOperationType()
-    {
-        return operationType;
-    }
-    public void setOperationStart(Date operationStart) 
-    {
-        this.operationStart = operationStart;
-    }
-
-    public Date getOperationStart() 
-    {
-        return operationStart;
-    }
-    public void setOperationEnd(Date operationEnd) 
-    {
-        this.operationEnd = operationEnd;
-    }
-
-    public Date getOperationEnd() 
-    {
-        return operationEnd;
-    }
-
-    public String getOperationLevel() {
-        return operationLevel;
-    }
-
-    public void setOperationLevel(String operationLevel) {
-        this.operationLevel = operationLevel;
-    }
-
-    public String getOperationSite() {
-        return operationSite;
-    }
-
-    public void setOperationSite(String operationSite) {
-        this.operationSite = operationSite;
-    }
-
-    @Override
-    public String toString() {
-        return "HazardousOperation{" +
-                "id=" + id +
-                ", name='" + name + '\'' +
-                ", operationLevel='" + operationLevel + '\'' +
-                ", enterpriseId=" + enterpriseId +
-                ", operationContent='" + operationContent + '\'' +
-                ", operationLongitude='" + operationLongitude + '\'' +
-                ", operationLatitude='" + operationLatitude + '\'' +
-                ", operationType=" + operationType +
-                ", operationStart=" + operationStart +
-                ", operationEnd=" + operationEnd +
-                ", operationSite='" + operationSite + '\'' +
-                '}';
-    }
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HazardousOperationServiceImpl.java

@@ -220,7 +220,7 @@ public class HazardousOperationServiceImpl implements IHazardousOperationService
             int finalI = i;
             // 筛选 当前作业结束时间大于等于当前周的作业，即为进行中、待开始的作业
             int count = (int) operationWeekList.stream().filter(s -> finalI <= s).count();
-            weekDateVo.setWeek(i);
+            weekDateVo.setDate(i+"");
             weekDateVo.setCount(count);
             weekDates.add(weekDateVo);
         }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HazardousOperationMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectHazardousOperation">
         select distinct(a.id) id, a.name name, a.operation_level operationLevel, a.enterprise_id enterpriseId, a.operation_content operationContent, a.operation_type operationType, a.operation_start operationStart, a.operation_end operationEnd,a.operation_site operationSite,
-        e.name
+        e.name enterprise
         from hazardous_operation as a
         left join enterprise_information as e on a.enterprise_id = e.id
     </sql>
@@ -101,7 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="hazardousOperationManagement" resultType="HazardousOperation">
-        select id, name,operation_start operationStart ,operation_end operationEnd from hazardous_operation
+        select distinct(a.id) id, a.name name, a.operation_level operationLevel, a.enterprise_id enterpriseId, a.operation_content operationContent, a.operation_type operationType, a.operation_start operationStart, a.operation_end operationEnd,a.operation_site operationSite,
+                       e.name enterprise
+        from hazardous_operation as a
+                 left join enterprise_information as e on a.enterprise_id = e.id
     </select>
 
     <select id="hazardousOperationVariationTendency" resultType="java.util.Date">