[task-1330] 设备维护添加每周1,4的维护周期

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/CommonInsertJob.java

@@ -21,7 +21,7 @@ import java.util.Map;
 
 public class CommonInsertJob extends BaseJob2 {
 
-    private static final Logger logger = LoggerFactory.getLogger(EquipmentMaintenancePlanJob.class);
+    private static final Logger logger = LoggerFactory.getLogger(CommonInsertJob.class);
     public static final String PLAN_DATE = "plan-date";
     public static final String SQL_CODE = "sql_code_";
     private ICommonDao<?> commonDao = AppUtil.getBean(ICommonDao.class);

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/EquipmentMaintenancePlanJob.java

@@ -81,7 +81,8 @@ public class EquipmentMaintenancePlanJob  extends BaseJob2 {
                 "       (wei_hu_zhou_qi_c_ ='每周1,3,5' AND FIND_IN_SET(WEEKDAY(#{p0}),'0,2,4')=0) OR " +
                 "       (wei_hu_zhou_qi_c_ ='每周2,4' AND FIND_IN_SET(WEEKDAY(#{p0}),'1,3')=0) OR " +
                 "       (wei_hu_zhou_qi_c_ ='每周1-5' AND FIND_IN_SET(WEEKDAY(#{p0}),'5,6')>0) OR " +
-                "       (wei_hu_zhou_qi_c_ ='每周1-6' AND FIND_IN_SET(WEEKDAY(#{p0}),'6')>0)) ) plan " +
+                "       (wei_hu_zhou_qi_c_ ='每周1-6' AND FIND_IN_SET(WEEKDAY(#{p0}),'6')>0) OR" +
+                "       (wei_hu_zhou_qi_c_ ='每周1,4' AND FIND_IN_SET(WEEKDAY(#{p0}),'0,3')=0) )) plan " +
                 "        WHERE NOT EXISTS (SELECT 1 FROM `t_mjsbwhbyjlby` jlb WHERE jlb.she_bei_bian_hao_ = plan.she_bei_bian_hao_ AND jlb.zhu_zhou_qi_ = plan.zhu_zhou_qi_ " +
                 "        AND jlb.period_num = plan.period_num AND jlb.ji_hua_nian_du_=plan.ji_hua_nian_du_)";