fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TblMaintainController.java

@@ -2,6 +2,12 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.quartz.task.RyTask;
+import com.ruoyi.system.domain.TblMaintainLog;
+import com.ruoyi.system.domain.TblTask;
+import com.ruoyi.system.domain.TblTaskLog;
+import com.ruoyi.system.service.ITblMaintainLogService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +40,13 @@ public class TblMaintainController extends BaseController
     @Autowired
     private ITblMaintainService tblMaintainService;
 
+
+    @Autowired
+    private ITblMaintainLogService tblMaintainLogService;
+
+    @Autowired
+    private RyTask ryTask;
+
     /**
      * 查询养护计划列表
      */
@@ -101,4 +114,83 @@ public class TblMaintainController extends BaseController
     {
         return toAjax(tblMaintainService.deleteTblMaintainByIds(ids));
     }
+
+
+    /***
+     * 任务派发
+     * @param tblMaintainLog
+     * @return
+     */
+    @PostMapping("/distributed")
+    public AjaxResult maintainDistributed(@RequestBody TblMaintainLog tblMaintainLog){
+        if(tblMaintainLog==null || tblMaintainLog.getMaintainId()==null || tblMaintainLog.getLogDes()==null){
+            return error("表单不完整");
+        }
+
+        TblMaintain maintain = tblMaintainService.selectTblMaintainById(tblMaintainLog.getMaintainId());
+        if(maintain==null){
+            return error("计划不存在");
+        }
+        maintain.setStatus(2L);
+        tblMaintainLog.setMaintainStatus(2L);
+        tblMaintainLogService.insertTblMaintainLog(tblMaintainLog);
+        tblMaintainService.updateTblMaintain(maintain);
+        //发送钉钉通知
+        ryTask.setNotice("011544081228132554,013303042738042020",null,"计划派单通知","http://www.baidu.com");
+
+
+        return success("成功");
+    }
+
+    /***
+     * 执行反馈
+     * @param tblMaintainLog
+     * @return
+     */
+    @PostMapping("/feedback")
+    public AjaxResult maintainFeedback(@RequestBody TblMaintainLog tblMaintainLog){
+        if(tblMaintainLog==null || tblMaintainLog.getMaintainId()==null || tblMaintainLog.getLogDes()==null){
+            return error("表单不完整");
+        }
+
+        TblMaintain maintain = tblMaintainService.selectTblMaintainById(tblMaintainLog.getMaintainId());
+        if(maintain==null){
+            return error("计划不存在");
+        }
+        maintain.setStatus(3L);
+        tblMaintainLog.setMaintainStatus(3L);
+        tblMaintainLogService.insertTblMaintainLog(tblMaintainLog);
+        tblMaintainService.updateTblMaintain(maintain);
+        //发送钉钉通知
+        ryTask.setNotice("011544081228132554,013303042738042020",null,"计划反馈通知","http://www.baidu.com");
+
+
+        return success("成功");
+    }
+
+    /***
+     * 养护成果上传
+     * @param tblMaintainLog
+     * @return
+     */
+    @PostMapping("/complete")
+    public AjaxResult maintainComplete(@RequestBody TblMaintainLog tblMaintainLog){
+        if(tblMaintainLog==null || tblMaintainLog.getMaintainId()==null || tblMaintainLog.getLogDes()==null){
+            return error("表单不完整");
+        }
+
+        TblMaintain maintain = tblMaintainService.selectTblMaintainById(tblMaintainLog.getMaintainId());
+        if(maintain==null){
+            return error("计划不存在");
+        }
+        maintain.setStatus(4L);
+        tblMaintainLog.setMaintainStatus(4L);
+        tblMaintainLogService.insertTblMaintainLog(tblMaintainLog);
+        tblMaintainService.updateTblMaintain(maintain);
+        //发送钉钉通知
+        ryTask.setNotice("011544081228132554,013303042738042020",null,"计划反馈通知","http://www.baidu.com");
+
+
+        return success("成功");
+    }
 }

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -111,7 +111,7 @@ public class RyTask
 
             msg.setActionCard(new OapiMessageCorpconversationAsyncsendV2Request.ActionCard());
             msg.getActionCard().setTitle(title);
-            msg.getActionCard().setMarkdown(content==null?"### 有新工单啦":content);
+            msg.getActionCard().setMarkdown(content==null?("### "+title):content);
             msg.getActionCard().setSingleTitle("测试测试"+new Date().getTime());
             msg.getActionCard().setSingleUrl(url);
             msg.setMsgtype("action_card");

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TblFacilitiesServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.TblFacilitiesMapper;
@@ -52,6 +55,8 @@ public class TblFacilitiesServiceImpl implements ITblFacilitiesService
     @Override
     public int insertTblFacilities(TblFacilities tblFacilities)
     {
+        tblFacilities.setCreateTime(new Date());
+        tblFacilities.setCreateBy(SecurityUtils.getUsername());
         return tblFacilitiesMapper.insertTblFacilities(tblFacilities);
     }
 
@@ -64,6 +69,8 @@ public class TblFacilitiesServiceImpl implements ITblFacilitiesService
     @Override
     public int updateTblFacilities(TblFacilities tblFacilities)
     {
+        tblFacilities.setUpdateTime(new Date());
+        tblFacilities.setUpdateBy(SecurityUtils.getUsername());
         return tblFacilitiesMapper.updateTblFacilities(tblFacilities);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TblMaintainServiceImpl.java

@@ -1,7 +1,9 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.TblMaintainLog;
 import com.ruoyi.system.domain.TblTask;
 import com.ruoyi.system.domain.TblTaskLog;
@@ -64,6 +66,8 @@ public class TblMaintainServiceImpl implements ITblMaintainService
     @Override
     public int insertTblMaintain(TblMaintain tblMaintain)
     {
+        tblMaintain.setCreateTime(new Date());
+        tblMaintain.setCreateBy(SecurityUtils.getUsername());
         return tblMaintainMapper.insertTblMaintain(tblMaintain);
     }
 
@@ -76,6 +80,8 @@ public class TblMaintainServiceImpl implements ITblMaintainService
     @Override
     public int updateTblMaintain(TblMaintain tblMaintain)
     {
+        tblMaintain.setUpdateTime(new Date());
+        tblMaintain.setUpdateBy(SecurityUtils.getUsername());
         return tblMaintainMapper.updateTblMaintain(tblMaintain);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TblTaskServiceImpl.java

@@ -3,7 +3,10 @@ package com.ruoyi.system.service.impl;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.TblTaskLog;
 import com.ruoyi.system.mapper.TblTaskLogMapper;
 import com.ruoyi.system.service.ITblTaskLogService;
@@ -77,6 +80,8 @@ public class TblTaskServiceImpl implements ITblTaskService
         }else{
             tblTask.setTaskCode(year+"001");
         }
+        tblTask.setCreateTime(new Date());
+        tblTask.setCreateBy(SecurityUtils.getUsername());
         return tblTaskMapper.insertTblTask(tblTask);
     }
 
@@ -90,6 +95,7 @@ public class TblTaskServiceImpl implements ITblTaskService
     public int updateTblTask(TblTask tblTask)
     {
         tblTask.setUpdateTime(DateUtils.getNowDate());
+        tblTask.setUpdateBy(SecurityUtils.getUsername());
         return tblTaskMapper.updateTblTask(tblTask);
     }
 

ruoyi-system/src/main/resources/mapper/system/TableDetectionMapper.xml

@@ -17,10 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="facilitiesId"    column="facilities_id"    />
         <result property="ext1"    column="ext1"    />
         <result property="ext2"    column="ext2"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectTableDetectionVo">
-        select id, detection_type, detection_year, detection_month, detection_week, detection_dept, detection_remark, detection_des, status, facilities_id, ext1, ext2 from table_detection
+        select id, detection_type, detection_year, detection_month, detection_week, detection_dept, detection_remark, detection_des, status, facilities_id, ext1, ext2, create_time, update_time,create_by,update_by from table_detection
     </sql>
 
     <select id="selectTableDetectionList" parameterType="TableDetection" resultMap="TableDetectionResult">
@@ -59,6 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facilitiesId != null">facilities_id,</if>
             <if test="ext1 != null">ext1,</if>
             <if test="ext2 != null">ext2,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="detectionType != null">#{detectionType},</if>
@@ -72,6 +80,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facilitiesId != null">#{facilitiesId},</if>
             <if test="ext1 != null">#{ext1},</if>
             <if test="ext2 != null">#{ext2},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
          </trim>
     </insert>
 
@@ -89,6 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facilitiesId != null">facilities_id = #{facilitiesId},</if>
             <if test="ext1 != null">ext1 = #{ext1},</if>
             <if test="ext2 != null">ext2 = #{ext2},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-system/src/main/resources/mapper/system/TblMaintainMapper.xml

@@ -18,10 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="ext2"    column="ext2"    />
         <result property="status"    column="status"    />
         <result property="facilitiesId"    column="facilities_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectTblMaintainVo">
-        select id, maintain_type, maintain_count, maintain_unit, maintain_year, maintain_month, maintain_des, maintain_remark, maintain_report_np, ext1, ext2, status, facilities_id from tbl_maintain
+        select id, maintain_type, maintain_count, maintain_unit, maintain_year, maintain_month, maintain_des, maintain_remark, maintain_report_np, ext1, ext2, status, facilities_id, create_time, update_time,create_by,update_by from tbl_maintain
     </sql>
 
     <select id="selectTblMaintainList" parameterType="TblMaintain" resultMap="TblMaintainResult">
@@ -62,6 +66,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ext2 != null">ext2,</if>
             <if test="status != null">status,</if>
             <if test="facilitiesId != null">facilities_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="maintainType != null">#{maintainType},</if>
@@ -76,6 +84,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ext2 != null">#{ext2},</if>
             <if test="status != null">#{status},</if>
             <if test="facilitiesId != null">#{facilitiesId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
          </trim>
     </insert>
 
@@ -94,6 +106,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ext2 != null">ext2 = #{ext2},</if>
             <if test="status != null">status = #{status},</if>
             <if test="facilitiesId != null">facilities_id = #{facilitiesId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-system/src/main/resources/mapper/system/TblTaskMapper.xml

@@ -20,8 +20,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="taskOtherId"    column="task_other_id"    />
         <result property="taskTime"    column="task_time"    />
         <result property="createTime"    column="create_time"    />
-        <result property="taskReqCompleteTime"    column="task_req_complete_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="taskReqCompleteTime"    column="task_req_complete_time"    />
         <result property="status"    column="status"    />
         <result property="taskCreater"    column="task_creater"    />
         <result property="taskReporter"    column="task_reporter"    />
@@ -34,7 +36,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,task_area  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,create_by,update_by, 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">
@@ -95,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="taskReqCompleteTime != null">task_req_complete_time,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
             <if test="status != null">status,</if>
             <if test="taskCreater != null">task_creater,</if>
             <if test="taskReporter != null">task_reporter,</if>
@@ -122,6 +126,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="taskReqCompleteTime != null">#{taskReqCompleteTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
             <if test="status != null">#{status},</if>
             <if test="taskCreater != null">#{taskCreater},</if>
             <if test="taskReporter != null">#{taskReporter},</if>
@@ -153,6 +159,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="taskReqCompleteTime != null">task_req_complete_time = #{taskReqCompleteTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
             <if test="status != null">status = #{status},</if>
             <if test="taskCreater != null">task_creater = #{taskCreater},</if>
             <if test="taskReporter != null">task_reporter = #{taskReporter},</if>