巡查任务去除多余表关联，中台dev环境时地址修改

guoshilong

2024-03-25 257474e2663a0428cd82970f11b52ec0d1d6b470

巡查任务去除多余表关联，中台dev环境时地址修改

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

@@ -113,7 +113,7 @@
        <if test="patrolRecord.endTime!=null and patrolRecord.endTime!=''">
            and record.create_time &lt;= #{patrolRecord.endTime}
        </if>
        ORDER BY record.create_time DESC
        ORDER BY record.update_time DESC
    </select>
    <select id="getDetail" resultMap="selectPatrolRecordList">
        SELECT

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

@@ -5,14 +5,29 @@
    <!--自定义分页查询-->
    <select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
        SELECT
        spt.*,spt2.name as patrolTypeName,
        route.ROUTE_COORDINATES routeRange,
        spt.id,
        spt.start_time,
        spt.end_time,
        spt.to_user_id,
        spt.state,
        spt.create_time,
        spt.project_id,
        spt.reservoir_name,
        spt.title,
        spt.content,
        spt.task_type,
        spt.patrol_group_item_id,
        spt.problem_count,
        spt.report_problem_count,
        spt.patrol_role,


        spt2.name as patrolTypeName,
        u.real_name toUserName,
        u2.real_name createUserName,
        arb."res_loc"  regionName
        FROM sm_patrol_task spt
        left join sm_patrol_type spt2 on spt.task_type = spt2.id
        LEFT JOIN sm_patrol_route route ON route.id = spt.route_id
        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

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java

@@ -42,14 +42,11 @@
public class SjztmdServiceImpl implements ISjztmdService {

    //总计
//    private final String RIBAO_SHEET1_TOTAL_URL = "/services/1234567890ABCDEFGHIJKLMN/ribao_sheet1/api?small_start_stag=0&small_end_stag=2&mid_start_stag=0&mid_end_stag=2&big_start_stag=0&big_end_stag=2";
    private final String RIBAO_SHEET1_TOTAL_URL = "/services/1234567890ABCDEFGHIJKLMN/ribao_sheet1/api?small_start_stag=0&mid_start_stag=0&big_start_stag=0";
    private final String RIBAO_SHEET1_OVER_NORM_POOL_STAG = "/services/1234567890ABCDEFGHIJKLMN/ribao/sheet1_over_norm_pool_stag/api?";
    //中大型水库
//    private final String RIBAO_SHEET2_ZDX_URL = "/services/1234567890ABCDEFGHIJKLMN/ribao/sheet2_zdx/api?mid_start_stag=0&mid_end_stag=2&big_start_stag=0&big_end_stag=2";
    private final String RIBAO_SHEET2_ZDX_URL = "/services/1234567890ABCDEFGHIJKLMN/ribao/sheet2_zdx/api?mid_start_stag=0&big_start_stag=0";
    //超汛明细
//    private final String RIBAO_SHEET3_OVER_STAG_LIST_URL = "/services/1234567890ABCDEFGHIJKLMN/ribao/sheet3_over_stag_list/api?small_start_stag=0&small_end_stag=2&mid_start_stag=0&mid_end_stag=2&big_start_stag=0&big_end_stag=2";
    private final String RIBAO_SHEET3_OVER_STAG_LIST_URL = "/services/1234567890ABCDEFGHIJKLMN/ribao/sheet3_over_stag_list/api?small_start_stag=0&mid_start_stag=0&big_start_stag=0";
    //省直管
    private final String SZ_INFO = "/services/1234567890ABCDEFGHIJKLMN/ribao/shengzh_new_rz/api";

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/constant/ZtApiUrlConstant.java

@@ -10,7 +10,7 @@
    /**
     * 请求头url 前缀（dev）
     */
    public static final String url_prefix_dev = "http://10.10.2.192";
    public static final String url_prefix_dev = "http://10.42.6.192";

    /**
     * 请求头url 前缀（prod）