Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-09-04 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8

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

@@ -48,8 +48,7 @@
        point_obj_type,point_obj_id,point_obj_name
        ) select t.inspection_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id,
        t.point_obj_type,t.point_obj_id,t.point_obj_name
        from
        business_inspection_point t where 1=1
        from business_inspection_point t where 1=1
        <if test="inspectionId !=null and inspectionId != ''">
            and t.inspection_id= #{inspectionId}
        </if>
@@ -74,15 +73,17 @@
        t.inspection_id,t.inspection_id inspectionId,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,
        t.point_obj_type,t.point_obj_id,t.point_obj_name,
        t.point_obj_type pointObjType,t.point_obj_id pointObjId,t.point_obj_name pointObjName
        t.point_obj_type,t.point_obj_type pointObjType,td.name pointTypeName,t.point_obj_id,
        t.point_obj_id pointObjId,t.point_obj_name,t.point_obj_name pointObjName
        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 c.status_cd = '0'
            and c.inspection_route_id is null
        </if>
        where 1 =1
        left join t_dict td on t.point_obj_type = td.status_cd and td.table_name = 'inspection_point' and
        td.table_columns = 'point_obj_type'
        where 1 = 1
        <if test="inspectionId !=null and inspectionId != ''">
            and t.inspection_id= #{inspectionId}
        </if>
@@ -126,7 +127,7 @@
        <if test="pointObjName !=null and pointObjName != ''">
            , t.point_obj_name= #{pointObjName}
        </if>
        <if test="remark !=null and remark != ''">
        <if test="remark !=null ">
            , t.remark= #{remark}
        </if>
        <if test="inspectionName !=null and inspectionName != ''">
@@ -183,12 +184,14 @@
        t.inspection_id,t.inspection_id inspectionId,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,
        t.point_obj_type,t.point_obj_id,t.point_obj_name,
        t.point_obj_type pointObjType,t.point_obj_id pointObjId,t.point_obj_name pointObjName
        t.point_obj_type,t.point_obj_type pointObjType,td.name pointTypeName,t.point_obj_id,
        t.point_obj_id pointObjId,t.point_obj_name,t.point_obj_name pointObjName
        from inspection_point t
        left join inspection_route_point_rel c on t.inspection_id = c.inspection_id and c.status_cd = '0' and
        c.inspection_route_id = #{inspectionRouteId}
        where 1 =1
        left join t_dict td on t.point_obj_type = td.status_cd and td.table_name = 'inspection_point' and
        td.table_columns = 'point_obj_type'
        where 1 = 1
        <if test="relationship != null  and  relationship == 1">
            and c.inspection_id is not null
        </if>
@@ -264,7 +267,7 @@
        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,
        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