巡检任务添加字段，添加详情页

guoshilong

2023-04-04 a9e1499b7ac94fceb5edcdf47d6c66f560b4112f

巡检任务添加字段，添加详情页

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java

@@ -43,12 +43,12 @@
   }

    /**
     * 获取所有巡查类型
     * 获取所有巡查记录
     */
    @ApiOperation(value="获取所有巡查类型", notes="获取所有巡查类型")
    @GetMapping(value = "/all")
   public R getAll(){
       List<PatrolRecord> list = patrolRecordService.list();
   public R getAll(PatrolRecord patrolRecord){
       List<PatrolRecord> list = patrolRecordService.list(Condition.getQueryWrapper(patrolRecord));
       return R.data(list);
   }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java

@@ -96,4 +96,32 @@
     */
    @ApiModelProperty(value = "路线空间数据")
    private String routeCoordinates;

    /**
     * 实际巡查开始时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "实际巡查开始时间")
    private String realStartTime;

    /**
     * 实际巡查结束时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "实际巡查结束时间")
    private String realEndTime;

    /**
     * 里程
     */
    @ApiModelProperty(value = "里程")
    private String mile;

    /**
     * 问题数量
     */
    @ApiModelProperty(value = "问题数量")
    private Integer problemCount;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml

@@ -24,16 +24,17 @@
        <result column="create_user" property="createUser"/>
        <result column="create_dept" property="createDept"/>

        <result column="update_time" property="updateTime"/>

    </resultMap>

    <select id="selectPatrolRecord" resultMap="selectPatrolRecordList">
        SELECT record.id,record.patrol_type,record.device_ids,
        record.images,
        record.content,record.status,record.item_id,record.task_id,record.patrol_route,dmgeo.ST_AsGeoJSON(task.route_coordinates) taskRoute
        SELECT record.id,record.patrol_type,record.device_ids,record.images,record.content,record.status,record.item_id,record.task_id,record.patrol_route,record.update_time,
        dmgeo.ST_AsGeoJSON(task.route_coordinates) taskRoute,item.items_name itemsName,item.description
        FROM SM_PATROL_RECORD record
        LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type
        LEFT JOIN sm_patrol_task task ON task.id = record.task_id
        LEFT JOIN sm_patrol_route route ON route.id = task.route_id
        LEFT JOIN sm_patrol_group_item item ON item.id = record.item_id
        WHERE record.is_deleted = 0
        <if test="patrolRecord.status !=null and patrolRecord.status != '' ">
            AND record.status = #{patrolRecord.status}
@@ -41,15 +42,18 @@
        <if test="patrolRecord.patrolType !=null and patrolRecord.patrolType !=''">
            AND record.patrolType = #{patrolRecord.patrolType}
        </if>
        <if test="patrolRecord.taskId !=null and patrolRecord.taskId !=''">
            AND record.task_id = #{patrolRecord.taskId}
        </if>
    </select>
    <select id="getDetail" resultMap="selectPatrolRecordList">
        SELECT record.id,record.patrol_type,record.device_ids,
        record.images,
        record.content,record.status,record.item_id,record.task_id,record.patrol_route,route.ROUTE_COORDINATES taskRoute
        SELECT
            record.id,record.patrol_type,record.images,record.content,record.status,record.item_id,record.content,record.task_id,record.patrol_route,
            item.description
        FROM SM_PATROL_RECORD record
        LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type
        LEFT JOIN sm_patrol_task task ON task.id = record.task_id
        LEFT JOIN sm_patrol_route route ON route.id = task.route_id
        LEFT JOIN sm_patrol_group_item item ON item.id = record.item_id
        WHERE record.is_deleted = 0
        AND record.id =#{id}
    </select>
@@ -58,8 +62,8 @@
    </select>

    <select id="getByTaskIdAndItemId" resultMap="selectPatrolRecordList">
        SELECT r.id,r.patrol_type,r.device_ids,r.images,r.content,r.status,r.item_id,r.task_id,
                    c.name groupName,c.id groupId,c.items_name itemsName,c.description,t.update_time,t.to_user_id
        SELECT r.id,r.patrol_type,r.device_ids,r.images,r.content,r.status,r.item_id,r.task_id,r.update_time,
                    c.name groupName,c.id groupId,c.items_name itemsName,c.description,t.to_user_id
        FROM BLADEX.SM_PATROL_RECORD r
        LEFT JOIN
        (SELECT g.ID,g.NAME,a.id itemId, a.items_name,description FROM

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml

@@ -5,7 +5,8 @@
    <!--自定义分页查询-->
    <select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
        SELECT
        spt.id,spt.title,spt.start_time,spt.end_time,spt.content,spt.to_user_id,spt.state,spt.source,spt.project_id,spt.task_type,spt.PATROL_GROUP_ITEM_ID,
        spt.id,spt.title,spt.start_time,spt.end_time,spt.content,spt.to_user_id,spt.state,spt.source,spt.project_id,spt.task_type,spt.PATROL_GROUP_ITEM_ID,spt.problem_count,spt.real_start_time,spt.real_end_time,spt.mile,
        DATEDIFF(ss,spt.REAL_START_TIME,spt.REAL_END_TIME) timeGap,
        dmgeo.ST_AsGeoJSON(spt.route_coordinates) AS route_coordinates,
        spt2.name as patrolTypeName,
        route.ROUTE_COORDINATES routeRange
@@ -85,6 +86,18 @@
        <if test="patrolTask.routeId !=null and patrolTask.routeId !=''">
            route_id = #{patrolTask.routeId},
        </if>
        <if test="patrolTask.realStartTime !=null and patrolTask.realStartTime !=''">
            real_start_time = #{patrolTask.realStartTime},
        </if>
        <if test="patrolTask.realEndTime !=null and patrolTask.realEndTime !=''">
            real_end_time = #{patrolTask.realEndTime},
        </if>
        <if test="patrolTask.mile !=null and patrolTask.mile !=''">
            mile = #{patrolTask.mile},
        </if>
        <if test="patrolTask.problemCount !=null and patrolTask.problemCount !=''">
            problem_count = #{patrolTask.problemCount},
        </if>
        update_time = #{patrolTask.updateTime}
        where id=#{patrolTask.id}
    </update>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java

@@ -59,10 +59,10 @@
     */
    @Override
    public Boolean savePatrolTask(PatrolTask patrolTask) {
        patrolTask.setId(IdWorker.getId());
        // 设置基础信息
        EnhancementServicesTool enhancementServicesTool = new EnhancementServicesTool();
        enhancementServicesTool.resolveEntity(patrolTask);
        patrolTask.setId(IdWorker.getId());
        // 新增
        Integer save = baseMapper.savePatrolTask(patrolTask);
        //返回

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java

@@ -21,4 +21,9 @@
     * 巡查路线
     */
    private String routeRange;

    /**
     * 历时
     */
    private Integer timeGap;
}