wenhongquan 3 years ago
parent
commit
476ac35a40

+ 6 - 0
ruoyi-system/pom.xml

@@ -23,6 +23,12 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>alibaba-dingtalk-service-sdk</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+
     </dependencies>
 
 </project>

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

@@ -98,6 +98,18 @@ public class TblTask extends BaseEntity
     @Excel(name = "任务投诉人电话")
     private String taskComplainConnect;
 
+
+
+    @Excel(name = "班组区域")
+    private String taskDeptRange;
+
+
+    @Excel(name = "设施编号")
+    private String taskFacilitieCode;
+
+
+
+
     public void setTaskId(Long taskId) 
     {
         this.taskId = taskId;
@@ -279,6 +291,22 @@ public class TblTask extends BaseEntity
         return taskComplainConnect;
     }
 
+    public String getTaskDeptRange() {
+        return taskDeptRange;
+    }
+
+    public void setTaskDeptRange(String taskDeptRange) {
+        this.taskDeptRange = taskDeptRange;
+    }
+
+    public String getTaskFacilitieCode() {
+        return taskFacilitieCode;
+    }
+
+    public void setTaskFacilitieCode(String taskFacilitieCode) {
+        this.taskFacilitieCode = taskFacilitieCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -305,6 +333,8 @@ public class TblTask extends BaseEntity
             .append("taskVideos", getTaskVideos())
             .append("taskComplainConnect", getTaskComplainConnect())
             .append("remark", getRemark())
+                .append("taskFacilitieCode", getTaskFacilitieCode())
+                .append("taskDeptRange", getTaskDeptRange())
             .toString();
     }
 }

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

@@ -28,10 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="taskVideos"    column="task_videos"    />
         <result property="taskComplainConnect"    column="task_complain_connect"    />
         <result property="remark"    column="remark"    />
+        <result property="taskDeptRange"    column="task_dept_range"    />
+        <result property="taskFacilitieCode"    column="task_facilitie_code"    />
     </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 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 from tbl_task
     </sql>
 
     <select id="selectTblTaskList" parameterType="TblTask" resultMap="TblTaskResult">
@@ -56,6 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskPics != null  and taskPics != ''"> and task_pics = #{taskPics}</if>
             <if test="taskVideos != null  and taskVideos != ''"> and task_videos = #{taskVideos}</if>
             <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>
         </where>
     </select>
     
@@ -89,6 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskVideos != null">task_videos,</if>
             <if test="taskComplainConnect != null">task_complain_connect,</if>
             <if test="remark != null">remark,</if>
+            <if test="taskDeptRange != null">task_dept_range,</if>
+            <if test="taskFacilitieCode != null">task_facilitie_code,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskName != null">#{taskName},</if>
@@ -113,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskVideos != null">#{taskVideos},</if>
             <if test="taskComplainConnect != null">#{taskComplainConnect},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="taskDeptRange != null">#{taskDeptRange},</if>
+            <if test="taskFacilitieCode != null">#{taskFacilitieCode},</if>
          </trim>
     </insert>
 
@@ -141,6 +149,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskVideos != null">task_videos = #{taskVideos},</if>
             <if test="taskComplainConnect != null">task_complain_connect = #{taskComplainConnect},</if>
             <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>
         </trim>
         where task_id = #{taskId}
     </update>

BIN
ruoyi/uploadPath/upload/2022/05/31/icon128_20220531155758A003.png


BIN
ruoyi/uploadPath/upload/2022/05/31/icon128_20220531160031A004.png


BIN
ruoyi/uploadPath/upload/2022/05/31/icon128_20220531160034A005.png


BIN
ruoyi/uploadPath/upload/2022/05/31/icon128_20220531160415A006.png


BIN
ruoyi/uploadPath/upload/2022/05/31/icon128_20220531160435A007.png


BIN
ruoyi/uploadPath/upload/2022/05/31/icon128_20220531160518A008.png


BIN
ruoyi/uploadPath/upload/2022/05/31/icon128_20220531160521A009.png


BIN
ruoyi/uploadPath/upload/2022/05/31/icon16_20220531155706A001.png


BIN
ruoyi/uploadPath/upload/2022/05/31/icon16_20220531155712A002.png