三保未执行消息提醒

qushaowei

2023-11-22 dd28194577a2bfaf16b72137f5dbb3021b72b3fd

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml

@@ -20,23 +20,23 @@
            t2.team_id as teamId,
            t2.use_id as useId,
            t3.id as inspectionCycleId,
            concat(t3.code, '/', t3.name) as inspectionCycleName,
            t3.name as inspectionCycleName,
            t3.effective_time as effectiveTime,
            t3.unit as unit,
            t4.id as inspectionStandardId,
            t4.num as inspectionStandardNum,
            t1.create_by as createBy,
            t1.create_time as createTime,
            t2.use_id as useId,
            t6.depart_name as useDepartName,
            t2.team_id as teamId,
            t7.name as teamName,
            t4.assign_mode as assignMode,
            t8.item_text as assignModeName,
            t1.inspection_user_id as inspectionUserId,
            t9.realname as inspectionUserName,
            t1.actual_end_time as actualEndTime,
            t1.actual_start_time as actualStartTime
            t1.actual_start_time as actualStartTime,
            t1.inspection_order_uda1 AS repairConfirmPerson,
            t1.repair_confirm_date as repairConfirmDate
        FROM
            mom_eam_inspection_order t1
        LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
@@ -60,8 +60,8 @@
    <select id="getInspectionCycleByEqId"  parameterType="Map" resultType="org.jeecg.modules.eam.model.InspectionCycleVo">
        SELECT DISTINCT
            t1.inspection_cycle_id AS value,
            concat(t3.code, '/', t3.name) as text,
            concat(t3.code, '/', t3.name) as title
            t3.name as text,
            t3.name as title
        FROM
            mom_eam_daily_inspection_standard_detail t1
        LEFT JOIN mom_eam_daily_inspection_standard t2 ON t1.daily_inspection_standard_id = t2.id
@@ -83,6 +83,7 @@
            t1.photo,
            t1.inspection_project_id as inspectionProjectId,
            t3.num as inspectionProjectNum,
            t3.name as inspectionProjectName,
            t3.detection_standard as detectionStandard,
            t3.acceptability_limit AS acceptabilityLimit,
            t3.inspection_method as inspectionMethod,
@@ -113,6 +114,7 @@
            t1.photo,
            t1.inspection_project_id AS inspectionProjectId,
            t3.num AS inspectionProjectNum,
            t3.name as inspectionProjectName,
            t3.detection_standard AS detectionStandard,
            t3.acceptability_limit AS acceptabilityLimit,
            t3.inspection_method AS inspectionMethod,
@@ -132,20 +134,36 @@
        </if>
    </select>

<!--    <select id="findUserList"  parameterType="Map" resultType="Map">-->
<!--        SELECT-->
<!--            t1.id,-->
<!--            t1.username,-->
<!--            t1.realname,-->
<!--            t3.name as teamName-->
<!--        FROM-->
<!--            sys_user t1-->
<!--        LEFT JOIN mom_base_team_class t2 ON t1.team_class_id = t2.id-->
<!--        left join mom_base_team t3 on t2.team_id = t3.id-->
<!--        where t1.del_flag = 0 and t2.del_flag = 0 and t3.id = #{params.teamId}-->
<!--        <if test="params.num!=null and params.num!= ''">-->
<!--            and t3.num like concat('%',#{params.num},'%')-->
<!--        </if>-->
<!--        <if test="params.username!=null and params.username!= ''">-->
<!--            and t1.username like concat('%',#{params.username},'%')-->
<!--        </if>-->
<!--        <if test="params.realname!=null and params.realname!= ''">-->
<!--            and t1.realname like concat('%',#{params.realname},'%')-->
<!--        </if>-->
<!--        ORDER BY t1.create_time desc-->
<!--    </select>-->
    <select id="findUserList"  parameterType="Map" resultType="Map">
        SELECT
            t1.id,
            t1.username,
            t1.realname,
            t3.name as teamName
        t1.id,
        t1.username,
        t1.realname
        FROM
            sys_user t1
        LEFT JOIN mom_base_team_class t2 ON t1.team_class_id = t2.id
        left join mom_base_team t3 on t2.team_id = t3.id
        where t1.del_flag = 0 and t2.del_flag = 0 and t3.id = #{params.teamId}
        <if test="params.num!=null and params.num!= ''">
            and t3.num like concat('%',#{params.num},'%')
        </if>
        sys_user t1
        where t1.del_flag = 0
        <if test="params.username!=null and params.username!= ''">
            and t1.username like concat('%',#{params.username},'%')
        </if>