巡查任务修改

guoshilong

2023-07-27 4c7c186136a68213cd39557e35ad42081eb61995

巡查任务修改

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

@@ -7,10 +7,7 @@
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.service.IPatrolTaskService;
import cn.gistack.sm.patrol.vo.BladeFlowPage;
import cn.gistack.sm.patrol.vo.BladeFlowTask;
import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.patrol.vo.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -315,5 +312,17 @@
        return R.data(pageList);
    }

    @GetMapping("getTaskStatusCount")
    public R getTaskStatusCount(PatrolTaskVO patrolTaskVO){
        List<TaskStatusCount> list = patrolTaskService.getTaskStatusCount(patrolTaskVO);
        return R.data(list);
    }

    @GetMapping("getTaskTypeCount")
    public R getTaskTypeCount(PatrolTaskVO patrolTaskVO){
        List<TaskStatusCount> list = patrolTaskService.getTaskTypeCount(patrolTaskVO);
        return R.data(list);
    }


}

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

@@ -4,6 +4,7 @@
import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskStatisticsVO;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.patrol.vo.TaskStatusCount;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -128,4 +129,8 @@
     * @return
     */
    List<PatrolTaskReport> getTownReportList( @Param("patrolTaskReport")PatrolTaskReport patrolTaskReport);

    List<TaskStatusCount> getTaskStatusCount(@Param("vo") PatrolTaskVO patrolTaskVO);

    List<TaskStatusCount> getTaskTypeCount(@Param("vo") PatrolTaskVO patrolTaskVO);
}

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

@@ -16,6 +16,12 @@
        LEFT JOIN blade_user u ON u.id = spt.to_user_id
        LEFT JOIN blade_user u2 ON u2.id = spt.create_user
        LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = spt.project_id

        left join SJZT_MD."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
        left join SJZT_MD."att_ad_base" aa on aab."p_ad_code" = aa."ad_code"
        left join SJZT_MD."att_ad_base" ab on aa."p_ad_code" = ab."ad_code"
        left join SJZT_MD."att_ad_base" ac on ab."p_ad_code" = ac."ad_code"

        WHERE spt.is_deleted = 0
        <if test="patrolTask.title !=null and patrolTask.title!=''">
            AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
@@ -41,6 +47,10 @@
        <if test="patrolTask.taskType != null and patrolTask.taskType !='' ">
            AND spt.task_type = #{patrolTask.taskType}
        </if>
        <if test="patrolTask.adCode != null and patrolTask.adCode != '' ">
            and (aab."ad_code" = #{patrolTask.adCode} or aa."ad_code" = #{patrolTask.adCode} or ab."ad_code" = #{patrolTask.adCode} or ac."ad_code" = #{patrolTask.adCode})
        </if>

    </select>
    <!--获取全部-->
    <select id="getAll" resultType="cn.gistack.sm.patrol.entity.PatrolTask">
@@ -465,4 +475,120 @@
    </select>


    <select id="getTaskStatusCount" resultType="cn.gistack.sm.patrol.vo.TaskStatusCount">

        SELECT '未完成' AS name,'1' AS value , count(*) as taskCount FROM YWXT.SM_PATROL_TASK T2
                    LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = T2.project_id
                    LEFT JOIN SJZT_MD."att_ad_base" aab ON aab."guid" = arb."interior_ad_guid"
                    LEFT JOIN SJZT_MD."att_ad_base" aa ON aab."p_ad_code" = aa."ad_code"
                    LEFT JOIN SJZT_MD."att_ad_base" ab ON aa."p_ad_code" = ab."ad_code"
                    LEFT JOIN SJZT_MD."att_ad_base" ac ON ab."p_ad_code" = ac."ad_code"
            WHERE T2.state = 1 AND T2.IS_DELETED = 0
            <if test="vo.adCode != null and vo.adCode != '' ">
                and (aab."ad_code" = #{vo.adCode} or aa."ad_code" = #{vo.adCode} or ab."ad_code" = #{vo.adCode} or ac."ad_code" = #{vo.adCode})
            </if>
            <if test="vo.startTime !=null and vo.startTime !=''">
                AND DATE_FORMAT(T2.start_time,'%Y-%m-%d') &gt;= #{vo.startTime}
            </if>
            <if test="vo.endTime !=null and vo.endTime !=''">
                AND DATE_FORMAT(T2.end_time,'%Y-%m-%d') &lt;= #{vo.endTime}
            </if>
            <if test="vo.reservoirName !=null and vo.reservoirName !='' ">
                AND T2.reservoir_name LIKE CONCAT('%',#{vo.reservoirName},'%')
            </if>
        UNION ALL
        SELECT '进行中' AS name,'2' AS value , count(*) as taskCount FROM YWXT.SM_PATROL_TASK T3
                LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = T3.project_id
                LEFT JOIN SJZT_MD."att_ad_base" aab ON aab."guid" = arb."interior_ad_guid"
                LEFT JOIN SJZT_MD."att_ad_base" aa ON aab."p_ad_code" = aa."ad_code"
                LEFT JOIN SJZT_MD."att_ad_base" ab ON aa."p_ad_code" = ab."ad_code"
                LEFT JOIN SJZT_MD."att_ad_base" ac ON ab."p_ad_code" = ac."ad_code"
                WHERE T3.state = 2 AND T3.IS_DELETED = 0
                <if test="vo.adCode != null and vo.adCode != '' ">
                    and (aab."ad_code" = #{vo.adCode} or aa."ad_code" = #{vo.adCode} or ab."ad_code" = #{vo.adCode} or ac."ad_code" = #{vo.adCode})
                </if>
                <if test="vo.startTime !=null and vo.startTime !=''">
                    AND DATE_FORMAT(T3.start_time,'%Y-%m-%d') &gt;= #{vo.startTime}
                </if>
                <if test="vo.endTime !=null and vo.endTime !=''">
                    AND DATE_FORMAT(T3.end_time,'%Y-%m-%d') &lt;= #{vo.endTime}
                </if>
                <if test="vo.reservoirName !=null and vo.reservoirName !='' ">
                    AND T3.reservoir_name LIKE CONCAT('%',#{vo.reservoirName},'%')
                </if>
        UNION ALL
        SELECT '已完成' AS name,'3' AS value , count(*) as taskCount FROM YWXT.SM_PATROL_TASK T4
                LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = T4.project_id
                LEFT JOIN SJZT_MD."att_ad_base" aab ON aab."guid" = arb."interior_ad_guid"
                LEFT JOIN SJZT_MD."att_ad_base" aa ON aab."p_ad_code" = aa."ad_code"
                LEFT JOIN SJZT_MD."att_ad_base" ab ON aa."p_ad_code" = ab."ad_code"
                LEFT JOIN SJZT_MD."att_ad_base" ac ON ab."p_ad_code" = ac."ad_code"
                WHERE T4.state = 3 AND T4.IS_DELETED = 0
                <if test="vo.adCode != null and vo.adCode != '' ">
                    and (aab."ad_code" = #{vo.adCode} or aa."ad_code" = #{vo.adCode} or ab."ad_code" = #{vo.adCode} or ac."ad_code" = #{vo.adCode})
                </if>
                <if test="vo.startTime !=null and vo.startTime !=''">
                    AND DATE_FORMAT(T4.start_time,'%Y-%m-%d') &gt;= #{vo.startTime}
                </if>
                <if test="vo.endTime !=null and vo.endTime !=''">
                    AND DATE_FORMAT(T4.end_time,'%Y-%m-%d') &lt;= #{vo.endTime}
                </if>
                <if test="vo.reservoirName !=null and vo.reservoirName !='' ">
                    AND T4.reservoir_name LIKE CONCAT('%',#{vo.reservoirName},'%')
                </if>
        UNION ALL
            SELECT '全部' AS name,'' AS value , count(*) as taskCount
            FROM YWXT.SM_PATROL_TASK T1
            LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = T1.project_id
            LEFT JOIN SJZT_MD."att_ad_base" aab ON aab."guid" = arb."interior_ad_guid"
            LEFT JOIN SJZT_MD."att_ad_base" aa ON aab."p_ad_code" = aa."ad_code"
            LEFT JOIN SJZT_MD."att_ad_base" ab ON aa."p_ad_code" = ab."ad_code"
            LEFT JOIN SJZT_MD."att_ad_base" ac ON ab."p_ad_code" = ac."ad_code"
            WHERE T1.IS_DELETED = 0
            <if test="vo.adCode != null and vo.adCode != '' ">
                and (aab."ad_code" = #{vo.adCode} or aa."ad_code" = #{vo.adCode} or ab."ad_code" = #{vo.adCode} or ac."ad_code" = #{vo.adCode})
            </if>
            <if test="vo.startTime !=null and vo.startTime !=''">
                AND DATE_FORMAT(T1.start_time,'%Y-%m-%d') &gt;= #{vo.startTime}
            </if>
            <if test="vo.endTime !=null and vo.endTime !=''">
                AND DATE_FORMAT(T1.end_time,'%Y-%m-%d') &lt;= #{vo.endTime}
            </if>
            <if test="vo.reservoirName !=null and vo.reservoirName !='' ">
                AND T1.reservoir_name LIKE CONCAT('%',#{vo.reservoirName},'%')
            </if>
    </select>


    <select id="getTaskTypeCount" resultType="cn.gistack.sm.patrol.vo.TaskStatusCount">

        SELECT
               SPT.NAME AS NAME,SPT.ID AS VALUE, ifnull(A.NUM,0) AS TaskCount
        FROM SM_PATROL_TYPE SPT
        LEFT JOIN (
            SELECT T.TASK_TYPE, COUNT(*) AS NUM FROM SM_PATROL_TASK T
            LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = T.project_id
            LEFT JOIN SJZT_MD."att_ad_base" aab ON aab."guid" = arb."interior_ad_guid"
            LEFT JOIN SJZT_MD."att_ad_base" aa ON aab."p_ad_code" = aa."ad_code"
            LEFT JOIN SJZT_MD."att_ad_base" ab ON aa."p_ad_code" = ab."ad_code"
            LEFT JOIN SJZT_MD."att_ad_base" ac ON ab."p_ad_code" = ac."ad_code"
            WHERE T.IS_DELETED = 0
            <if test="vo.adCode != null and vo.adCode != '' ">
                and (aab."ad_code" = #{vo.adCode} or aa."ad_code" = #{vo.adCode} or ab."ad_code" = #{vo.adCode} or ac."ad_code" = #{vo.adCode})
            </if>
            <if test="vo.startTime !=null and vo.startTime !=''">
                AND DATE_FORMAT(T.start_time,'%Y-%m-%d') &gt;= #{vo.startTime}
            </if>
            <if test="vo.endTime !=null and vo.endTime !=''">
                AND DATE_FORMAT(T.end_time,'%Y-%m-%d') &lt;= #{vo.endTime}
            </if>
            <if test="vo.reservoirName !=null and vo.reservoirName !='' ">
                AND T.reservoir_name LIKE CONCAT('%',#{vo.reservoirName},'%')
            </if>
            GROUP BY T.TASK_TYPE
        ) A ON A.task_type = spt.id
        WHERE SPT.IS_DELETED = 0
    </select>


</mapper>

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

@@ -6,6 +6,7 @@
import cn.gistack.sm.patrol.vo.BladeFlowTask;
import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.patrol.vo.TaskStatusCount;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;

@@ -76,4 +77,8 @@
    IPage<PatrolTaskReport> getTaskReportDetail(IPage<PatrolTaskReport> page, PatrolTaskReport patrolTaskReport);

    List<PatrolTaskReport> getTaskReportList(PatrolTaskReport patrolTaskReport);

    List<TaskStatusCount> getTaskStatusCount(PatrolTaskVO patrolTaskVO);

    List<TaskStatusCount> getTaskTypeCount(PatrolTaskVO patrolTaskVO);
}

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

@@ -17,6 +17,7 @@
import cn.gistack.sm.patrol.vo.BladeFlowTask;
import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.patrol.vo.TaskStatusCount;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.springblade.core.log.exception.ServiceException;
@@ -259,6 +260,16 @@
    }

    @Override
    public List<TaskStatusCount> getTaskStatusCount(PatrolTaskVO patrolTaskVO) {
        return baseMapper.getTaskStatusCount(patrolTaskVO);
    }

    @Override
    public List<TaskStatusCount> getTaskTypeCount(PatrolTaskVO patrolTaskVO) {
        return baseMapper.getTaskTypeCount(patrolTaskVO);
    }

    @Override
    public IPage<PatrolTaskReport> getTaskReportDetail(IPage<PatrolTaskReport> page, PatrolTaskReport patrolTaskReport) {

        List<PatrolTaskReport> list = new ArrayList();

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

@@ -62,4 +62,6 @@
     * 行政区划名
     */
    private String regionName;

    private String adCode;
}

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

New file
@@ -0,0 +1,22 @@
package cn.gistack.sm.patrol.vo;

import lombok.Data;

@Data
public class TaskStatusCount {

    /**
     * 状态名
     */
    private String name;

    /**
     * 状态
     */
    private String value;

    /**
     * 任务数量
     */
    private String taskCount;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java

@@ -53,13 +53,6 @@
    @ApiOperation(value = "中台水库-查询该行政区下的水库", notes = "中台水库-查询该行政区下的水库")
    @GetMapping(value = "/getListByRegion")
    public R getListByRegion(@ApiIgnore @RequestParam Map<String, Object> obj,Query query) {
        String code = obj.get("code").toString();
        if (code.substring(0,4).indexOf("00") > -1) {
            obj.put("code",code.substring(0,2));
        } else if (code.substring(0,6).indexOf("00") > -1) {
            obj.put("code",code.substring(0,4));
        }
//        List<AttResBase> list = attResBaseService.getListByRegion(obj);
        IPage<AttResBase> pageList = attResBaseService.getListByRegion(Condition.getPage(query),obj);
        return R.data(pageList);
    }

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml

@@ -11,12 +11,19 @@
        </if>
    </select>
    <select id="getListByRegion" resultType="cn.gistack.sm.sjztmd.entity.AttResBase">
        SELECT "guid","code","name","ad_guid","eng_scal","res_loc" FROM "att_res_base"
        WHERE "is_deleted"=0
         AND "ad_guid" LIKE CONCAT('%',#{obj.code},'%')
        SELECT arb."guid",arb."code",arb."name",arb."ad_guid",arb."eng_scal",arb."res_loc" FROM "att_res_base" arb
        left join "att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
        left join "att_ad_base" aa on aab."p_ad_code" = aa."ad_code"
        left join "att_ad_base" ab on aa."p_ad_code" = ab."ad_code"
        left join "att_ad_base" ac on ab."p_ad_code" = ac."ad_code"
        WHERE arb."is_deleted"=0
        <if test="obj.code != null and obj.code != '' ">
            and (aab."ad_code" = #{obj.code} or aa."ad_code" = #{obj.code} or ab."ad_code" = #{obj.code} or ac."ad_code" = #{obj.code})
        </if>
         <if test="obj.name !=null and obj.name !=''">
             AND "name" LIKE CONCAT('%',#{obj.name},'%')
         </if>

    </select>
    <select id="getDetailByCode" resultType="cn.gistack.sm.sjztmd.entity.AttResBase">
        SELECT * FROM "att_res_base"