Merge branch 'back' of https://github.com/java110/MicroCommunity into back

曾成

2020-03-28 983acc56b667c90804dbf5f46dae8f0161876380

 java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml

@@ -7,10 +7,10 @@
    <!-- 保存巡检点信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessInspectionInfo" parameterType="Map">
        insert into business_inspection_point
                (inspection_id,machine_id,operate,remark,inspection_name,community_id,b_id)
            values
                (#{inspectionId},#{machineId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId})
       </insert>
        (inspection_id,machine_id,operate,remark,inspection_name,community_id,b_id)
        values
        (#{inspectionId},#{machineId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId})
    </insert>


    <!-- 查询巡检点信息（Business） add by wuxw 2018-07-03 -->
@@ -48,10 +48,10 @@
    <!-- 保存巡检点信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveInspectionInfoInstance" parameterType="Map">
        insert into
            inspection_point(
                inspection_id,machine_id,remark,status_cd,inspection_name,community_id,b_id
            ) select t.inspection_id,t.machine_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id from
            business_inspection_point t where 1=1
        inspection_point(
        inspection_id,machine_id,remark,status_cd,inspection_name,community_id,b_id
        ) select t.inspection_id,t.machine_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id from
        business_inspection_point t where 1=1
        <if test="inspectionId !=null and inspectionId != ''">
            and t.inspection_id= #{inspectionId}
        </if>
@@ -78,19 +78,20 @@
    <!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
    <select id="getInspectionInfo" parameterType="Map" resultType="Map">
        select
            t.inspection_id,t.inspection_id inspectionId,t.machine_id,
            t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
            t.inspection_name,t.inspection_name inspectionName,t.community_id,
            t.community_id communityId,t.b_id,t.b_id bId,
            m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id locationObjId,m.machine_id machineId,
            d.name locationTypeName
        t.inspection_id,t.inspection_id inspectionId,t.machine_id,
        t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
        t.inspection_name,t.inspection_name inspectionName,t.community_id,
        t.community_id communityId,t.b_id,t.b_id bId,
        m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
        locationObjId,m.machine_id machineId,
        d.name locationTypeName
        from inspection_point t
        inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
        inner join t_dict d on d.status_cd = m.location_type_cd
        <if test="inspectionRouteId != null  and  inspectionRouteId != ''">
            left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
            and t.status_cd = '0'
            and t.inspection_route_id is null
            and c.status_cd = '0'
            and c.inspection_route_id is null
        </if>
        where 1 =1
        <if test="inspectionId !=null and inspectionId != ''">
@@ -157,8 +158,8 @@
        from inspection_point t
        <if test="inspectionRouteId != null  and  inspectionRouteId != ''">
            left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
            and t.status_cd = '0'
            and t.inspection_route_id is null
            and c.status_cd = '0'
            and c.inspection_route_id is null
        </if>
        where 1 =1
        <if test="inspectionId !=null and inspectionId != ''">
@@ -186,4 +187,98 @@

    </select>


    <!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
    <select id="getInspectionRelationShipInfo" parameterType="Map" resultType="Map">
        select
        t.inspection_id,t.inspection_id inspectionId,t.machine_id,
        t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
        t.inspection_name,t.inspection_name inspectionName,t.community_id,
        t.community_id communityId,t.b_id,t.b_id bId,
        m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
        locationObjId,m.machine_id machineId,
        d.name locationTypeName
        from inspection_point t
        inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
        inner join t_dict d on d.status_cd = m.location_type_cd
        left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
        where 1 =1
        <if test="relationship != null  and  relationship == '1'">
            and c.status_cd = '0'
            and c.inspection_route_id = #{inspectionRouteId}
            and c.inspection_id is not null
        </if>
        <if test="relationship != null  and  relationship == '0'">
            and c.inspection_route_id = #{inspectionRouteId}
            and c.inspection_id is null
        </if>
        <if test="inspectionId !=null and inspectionId != ''">
            and t.inspection_id= #{inspectionId}
        </if>
        <if test="machineCode !=null and machineCode != ''">
            and m.machine_code= #{machineCode}
        </if>
        <if test="remark !=null and remark != ''">
            and t.remark= #{remark}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
        <if test="inspectionName !=null and inspectionName != ''">
            and t.inspection_name like concat('%',#{inspectionName},'%')
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
        group by t.inspection_id
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>
    </select>

    <!-- 查询巡检点数量 add by wuxw 2018-07-03 -->
    <select id="queryInspectionsRelationShipCount" parameterType="Map" resultType="Map">
        select count(1) count
        from inspection_point t
        inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
        inner join t_dict d on d.status_cd = m.location_type_cd
        left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
        where 1 =1

        <if test="relationship != null  and  relationship == '1'">
            and c.status_cd = '0'
            and c.inspection_route_id = #{inspectionRouteId}
            and c.inspection_id is not null
        </if>
        <if test="relationship != null  and  relationship == '0'">
            and c.inspection_route_id = #{inspectionRouteId}
            and c.inspection_id is null
        </if>
        <if test="inspectionId !=null and inspectionId != ''">
            and t.inspection_id= #{inspectionId}
        </if>
        <if test="machineId !=null and machineId != ''">
            and t.machine_id= #{machineId}
        </if>
        <if test="remark !=null and remark != ''">
            and t.remark= #{remark}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
        <if test="inspectionName !=null and inspectionName != ''">
            and t.inspection_name= #{inspectionName}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
    </select>

</mapper>