``

ruoyi-admin/pom.xml

@@ -60,7 +60,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
 
     </dependencies>

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysReport.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-06-20
  */
+@Data
 public class SysReport extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -99,6 +101,10 @@ public class SysReport extends BaseEntity
     @Excel(name = "施工内容二")
     private String contentTwo;
 
+    /** 施工描述 */
+    @Excel(name = "施工内容二")
+    private String contentDes;
+
     /** 状态 */
     @Excel(name = "状态")
     private String status;
@@ -111,206 +117,13 @@ public class SysReport extends BaseEntity
     @Excel(name = "审核部门")
     private String auditDept;
 
+    @Excel(name = "审核部门")
+    private String dept;
 
 
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setPlanId(Long planId) 
-    {
-        this.planId = planId;
-    }
-
-    public Long getPlanId() 
-    {
-        return planId;
-    }
-    public void setLane(String lane) 
-    {
-        this.lane = lane;
-    }
-
-    public String getLane() 
-    {
-        return lane;
-    }
-    public void setStartTime(Date startTime) 
-    {
-        this.startTime = startTime;
-    }
-
-    public Date getStartTime() 
-    {
-        return startTime;
-    }
-    public void setEndTime(Date endTime) 
-    {
-        this.endTime = endTime;
-    }
-
-    public Date getEndTime() 
-    {
-        return endTime;
-    }
-    public void setManageUser(String manageUser) 
-    {
-        this.manageUser = manageUser;
-    }
-
-    public String getManageUser() 
-    {
-        return manageUser;
-    }
-    public void setManagePhone(String managePhone) 
-    {
-        this.managePhone = managePhone;
-    }
-
-    public String getManagePhone() 
-    {
-        return managePhone;
-    }
-    public void setSaveUser(String saveUser) 
-    {
-        this.saveUser = saveUser;
-    }
-
-    public String getSaveUser() 
-    {
-        return saveUser;
-    }
-    public void setSavePhone(String savePhone) 
-    {
-        this.savePhone = savePhone;
-    }
-
-    public String getSavePhone() 
-    {
-        return savePhone;
-    }
-    public void setCreateUser(String createUser) 
-    {
-        this.createUser = createUser;
-    }
-
-    public String getCreateUser() 
-    {
-        return createUser;
-    }
-    public void setUpdateUser(String updateUser) 
-    {
-        this.updateUser = updateUser;
-    }
-
-    public String getUpdateUser() 
-    {
-        return updateUser;
-    }
-    public void setIsMerge(String isMerge) 
-    {
-        this.isMerge = isMerge;
-    }
-
-    public String getIsMerge() 
-    {
-        return isMerge;
-    }
-
-
-
-    public String getSection() {
-        return section;
-    }
-
-    public void setSection(String section) {
-        this.section = section;
-    }
-
-    public String getDirection() {
-        return direction;
-    }
-
-    public void setDirection(String direction) {
-        this.direction = direction;
-    }
-
-    public String getStartKm() {
-        return startKm;
-    }
-
-    public void setStartKm(String startKm) {
-        this.startKm = startKm;
-    }
-
-    public String getStartHectometer() {
-        return startHectometer;
-    }
-
-    public void setStartHectometer(String startHectometer) {
-        this.startHectometer = startHectometer;
-    }
-
-    public String getEndKm() {
-        return endKm;
-    }
-
-    public void setEndKm(String endKm) {
-        this.endKm = endKm;
-    }
-
-    public String getEndHectometer() {
-        return endHectometer;
-    }
-
-    public void setEndHectometer(String endHectometer) {
-        this.endHectometer = endHectometer;
-    }
-
-    public String getContentOne() {
-        return contentOne;
-    }
-
-    public void setContentOne(String contentOne) {
-        this.contentOne = contentOne;
-    }
-
-    public String getContentTwo() {
-        return contentTwo;
-    }
-
-    public void setContentTwo(String contentTwo) {
-        this.contentTwo = contentTwo;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getClashId() {
-        return clashId;
-    }
 
-    public void setClashId(String clashId) {
-        this.clashId = clashId;
-    }
 
-    public String getAuditDept() {
-        return auditDept;
-    }
 
-    public void setAuditDept(String auditDept) {
-        this.auditDept = auditDept;
-    }
 
     @Override
     public String toString() {

ruoyi-admin/src/main/resources/mapper/system/SysReportMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="planId"    column="plan_id"    />
         <result property="lane"    column="lane"    />
+        <result property="dept"    column="dept"    />
         <result property="startTime"    column="start_time"    />
         <result property="endTime"    column="end_time"    />
         <result property="manageUser"    column="manage_user"    />
@@ -27,16 +28,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endHectometer"    column="end_hectometer"    />
         <result property="contentOne"    column="content_one"    />
         <result property="contentTwo"    column="content_two"    />
+        <result property="contentDes"    column="content_des"    />
         <result property="auditDept"    column="audit_dept"    />
         <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectSysReportVo">
-        select a.id, a.plan_id, a.lane, a.start_time, a.end_time, a.manage_user, a.manage_phone, a.save_user, a.save_phone,
-               a.create_user, a.create_time, a.update_user, a.update_time, a.is_merge,a.status,a.audit_dept,b.section,b.direction,b.start_km,b.start_hectometer,
-               b.end_km,b.end_hectometer,b.content_one,b.content_two
+        select a.id, a.plan_id, a.lane,a.dept, a.start_time, a.end_time, a.manage_user, a.manage_phone, a.save_user, a.save_phone,
+               a.create_user, a.create_time, a.update_user, a.update_time, a.is_merge,a.status,a.audit_dept,a.section,a.direction,a.start_km,a.start_hectometer,
+               a.end_km,a.end_hectometer,a.content_one,a.content_two,a.content_des
         from
-        sys_report a left join sys_plan b on a.plan_id = b.id
+        sys_report a
     </sql>
 
     <select id="selectSysReportList" parameterType="SysReport" resultMap="SysReportResult">
@@ -79,7 +81,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="isMerge != null">is_merge,</if>
             <if test="status != null">status,</if>
-            <if test="auditDept != null">#{audit_dept},</if>
+            <if test="auditDept != null">audit_dept,</if>
+            <if test="dept != null">dept,</if>
+            <if test="section != null">section,</if>
+            <if test="direction != null">direction,</if>
+            <if test="startKm != null">start_km,</if>
+            <if test="startHectometer != null">start_hectometer,</if>
+            <if test="endKm != null">end_km,</if>
+            <if test="endHectometer != null">end_hectometer,</if>
+            <if test="contentOne != null">content_one,</if>
+            <if test="contentTwo != null">content_two,</if>
+            <if test="contentDes != null">content_des,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="planId != null">#{planId},</if>
@@ -97,6 +109,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isMerge != null">#{isMerge},</if>
             <if test="status != null">#{status},</if>
             <if test="auditDept != null">#{auditDept},</if>
+            <if test="dept != null">#{dept},</if>
+            <if test="section != null">#{section},</if>
+            <if test="direction != null">#{direction},</if>
+            <if test="startKm != null">#{startKm},</if>
+            <if test="startHectometer != null">#{startHectometer},</if>
+            <if test="endKm != null">#{endKm},</if>
+            <if test="endHectometer != null">#{endHectometer},</if>
+            <if test="contentOne != null">#{contentOne},</if>
+            <if test="contentTwo != null">#{contentTwo},</if>
+            <if test="contentDes != null">#{contentDes},</if>
          </trim>
     </insert>
 
@@ -118,6 +140,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isMerge != null">is_merge = #{isMerge},</if>
             <if test="status != null">status = #{status},</if>
             <if test="auditDept != null">audit_dept = #{auditDept},</if>
+            <if test="section != null">section = #{section},</if>
+            <if test="direction != null">direction = #{direction},</if>
+            <if test="startKm != null">start_km = #{startKm},</if>
+            <if test="startHectometer != null">start_hectometer = #{startHectometer},</if>
+            <if test="endKm != null">end_km = #{endKm},</if>
+            <if test="endHectometer != null">end_hectometer = #{endHectometer},</if>
+            <if test="contentOne != null">content_one = #{contentOne},</if>
+            <if test="contentTwo != null">content_two = #{contentTwo},</if>
+            <if test="contentDes != null">content_des = #{contentDes},</if>
+            <if test="dept != null">dept = #{dept},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-ui/src/views/home/index.vue

@@ -23,7 +23,8 @@
                                                   font-weight: 400;
                                                   text-align: left;
                                                   color: #ffffff;
-                                                  line-height: 40rem;
+                                                  margin-top: 10rem;
+                                                  /*line-height: 100%;*/
                                                   margin-left:15rem">{{user.nickName}}</div>
                                       <div style="margin-left:5rem" > <img src="@/assets/images/images/exit.png" @click="logout"/>  </div>
                                 </div>
@@ -141,11 +142,15 @@ export default {
     }
 
    .left_menu{
+       div:hover{
+         cursor: pointer;
+       }
           background-color: #001529;
           width:7%;
           height:100%
    }
 
+
    .icon_font{
           font-size: 14rem;
           color:#ffffff

ruoyi-ui/src/views/report/add.vue

@@ -352,7 +352,8 @@ export default {
 
 
     this.form.lane = this.$route.query.lane;
-    this.roadlan = (this.form.lane ?? "").split(",")
+    this.roadlan = this.form.lane?this.form.lane.split(","):[]
+    // console.log(this.roadlan)
 
     listDept({ parentId: 101 }).then((res) => {
       //  console.log(res)