430最终问题项修改

qushaowei

2024-09-29 454545bd4207d99d153e263c68f821f856f0e884

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

@@ -6,7 +6,7 @@
        select
        t1.id id,
        t1.code code,
        concat(t1.cycle,t2.item_text) name,
        t1.cycle name,
        t1.version version,
        t1.create_by createBy,
        t1.create_time createTime,
@@ -20,6 +20,8 @@
        t1.arrange_way arrangeWay,
        t1.audit_status auditStatus,
        t1.first_inspection_time as firstInspectionTime,
        t1.take_effect_time as takeEffectTime,
        t1.lose_efficacy_time as loseEfficacyTime,
        CONVERT(  VARCHAR(100), t1.first_inspection_time, 23 ) firstInspectionTime1,
        CONVERT(  VARCHAR(100), t1.first_inspection_time, 8 ) firstInspectionTime2,
        t1.lead_time leadTime,
@@ -80,4 +82,18 @@
      where t2.version_status='2'
      and t1.del_flag=0
   </select>

    <select id="getInspectionOrder" resultType="org.jeecg.modules.eam.entity.InspectionCycle">
      select DISTINCT t1.num inspectionStandardNum,
      t1.equipment_id,
      t2.daily_inspection_standard_id inspectionStandardId,
      t3.*,
      t4.team_id teamId
      from mom_eam_daily_inspection_standard t1
            left join mom_eam_daily_inspection_standard_detail t2 on t1.id = t2.daily_inspection_standard_id
            left join mom_eam_inspection_cycle t3 on t3.id = t2.inspection_cycle_id
            left join mom_eam_equipment t4 on t4.id = t1.equipment_id
            where t1.version_status = 2 and t1.status = 1 and t1.del_flag=0 and t3.name is not NULL
   </select>

</mapper>