wenhongquan 3 years ago
parent
commit
53de7a0a27

+ 14 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/TblTask.java

@@ -107,6 +107,19 @@ public class TblTask extends BaseEntity
     @Excel(name = "设施编号")
     private String taskFacilitieCode;
 
+    @Excel(name = "区属")
+    private String taskArea;
+
+
+
+    public String getTaskArea() {
+        return taskArea;
+    }
+
+    public void setTaskArea(String taskArea) {
+        this.taskArea = taskArea;
+    }
+
 
 
 
@@ -335,6 +348,7 @@ public class TblTask extends BaseEntity
             .append("remark", getRemark())
                 .append("taskFacilitieCode", getTaskFacilitieCode())
                 .append("taskDeptRange", getTaskDeptRange())
+                .append("taskArea", getTaskArea())
             .toString();
     }
 }

+ 6 - 1
ruoyi-system/src/main/resources/mapper/system/TblTaskMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="taskName"    column="task_name"    />
         <result property="taskContent"    column="task_content"    />
         <result property="taskAddr"    column="task_addr"    />
+        <result property="taskArea"    column="task_area"    />
         <result property="taskLocation"    column="task_location"    />
         <result property="taskCode"    column="task_code"    />
         <result property="taskType"    column="task_type"    />
@@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTblTaskVo">
-        select task_id, task_name, task_content, task_addr, task_location, task_code, task_type, task_event_type, task_event_category, task_from_remark, task_addr_road, task_other_id, task_time, create_time, task_req_complete_time, update_time, status, task_creater, task_reporter, task_pics, task_videos, task_complain_connect, remark,task_dept_range,task_facilitie_code from tbl_task
+        select task_id, task_name, task_content, task_addr, task_location, task_code, task_type, task_event_type, task_event_category, task_from_remark, task_addr_road, task_other_id, task_time, create_time, task_req_complete_time, update_time, status, task_creater, task_reporter, task_pics, task_videos, task_complain_connect, remark,task_dept_range,task_facilitie_code,task_area  from tbl_task
     </sql>
 
     <select id="selectTblTaskList" parameterType="TblTask" resultMap="TblTaskResult">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskComplainConnect != null  and taskComplainConnect != ''"> and task_complain_connect = #{taskComplainConnect}</if>
             <if test="taskDeptRange != null  and taskDeptRange != ''"> and task_dept_range = #{taskDeptRange}</if>
             <if test="taskFacilitieCode != null  and taskFacilitieCode != ''"> and task_facilitie_code = #{taskFacilitieCode}</if>
+            <if test="taskArea != null  and taskArea != ''"> and task_area = #{taskArea}</if>
         </where>
     </select>
     
@@ -95,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
             <if test="taskDeptRange != null">task_dept_range,</if>
             <if test="taskFacilitieCode != null">task_facilitie_code,</if>
+            <if test="taskArea != null">task_area,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskName != null">#{taskName},</if>
@@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
             <if test="taskDeptRange != null">#{taskDeptRange},</if>
             <if test="taskFacilitieCode != null">#{taskFacilitieCode},</if>
+            <if test="taskArea != null">#{taskArea},</if>
          </trim>
     </insert>
 
@@ -151,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
             <if test="taskDeptRange != null">task_dept_range = #{taskDeptRange},</if>
             <if test="taskFacilitieCode != null">task_facilitie_code = #{taskFacilitieCode},</if>
+            <if test="taskArea != null">task_area = #{taskArea},</if>
         </trim>
         where task_id = #{taskId}
     </update>

BIN
ruoyi/uploadPath/upload/2022/06/01/icon128_20220601082905A010.png


BIN
ruoyi/uploadPath/upload/2022/06/01/icon128_20220601100554A011.png