|
@@ -327,7 +327,7 @@ public class EquipmentMaintenancePlanJob extends AbstractJob {
|
|
|
" FROM `t_mjsbwhjhb` jhb,`t_mjsbwhjhzb` jhzb,`v_device_devicemaintenance` device " +
|
|
" FROM `t_mjsbwhjhb` jhb,`t_mjsbwhjhzb` jhzb,`v_device_devicemaintenance` device " +
|
|
|
" WHERE jhb.shi_fou_guo_shen_='已完成' AND jhb.zhi_xing_zhuang_t='正常' " +
|
|
" WHERE jhb.shi_fou_guo_shen_='已完成' AND jhb.zhi_xing_zhuang_t='正常' " +
|
|
|
" AND jhb.id_ = jhzb.parent_id_ " +
|
|
" AND jhb.id_ = jhzb.parent_id_ " +
|
|
|
- " AND device.wei_hu_lei_xing_ IS NOT NULL" +
|
|
|
|
|
|
|
+ " AND device.wei_hu_lei_xing_ IS NOT NULL AND device.wei_hu_lei_xing_ <> '按需保养' " +
|
|
|
" AND jhzb.she_bei_bian_hao_ = device.id_ AND device.id_ NOT IN " +
|
|
" AND jhzb.she_bei_bian_hao_ = device.id_ AND device.id_ NOT IN " +
|
|
|
" (SELECT id_ FROM v_device_devicemaintenance WHERE " +
|
|
" (SELECT id_ FROM v_device_devicemaintenance WHERE " +
|
|
|
" (wei_hu_lei_xing_ ='日保养' AND FIND_IN_SET(WEEKDAY(#{p0})+1,ri_qi_shu_zi_)=0 ) OR" +
|
|
" (wei_hu_lei_xing_ ='日保养' AND FIND_IN_SET(WEEKDAY(#{p0})+1,ri_qi_shu_zi_)=0 ) OR" +
|