|
|
@@ -16,9 +16,7 @@ import org.slf4j.LoggerFactory;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
public class EquipmentMaintenancePlanJob extends BaseJob2 {
|
|
|
|
|
|
@@ -84,10 +82,24 @@ public class EquipmentMaintenancePlanJob extends BaseJob2 {
|
|
|
" (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_)";
|
|
|
+ " AND jlb.period_num = plan.period_num AND jlb.ji_hua_nian_du_=plan.ji_hua_nian_du_)" +
|
|
|
+ " ORDER BY she_bei_bian_hao_,ji_hua_zong_wai_j DESC";
|
|
|
|
|
|
|
|
|
List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(querySql, queryParam);
|
|
|
+ Iterator<Map<String, Object>> iterator = list.iterator();
|
|
|
+ Set<Object> uk = new HashSet<>();
|
|
|
+ while(iterator.hasNext()){
|
|
|
+ Map<String, Object> i = iterator.next();
|
|
|
+ Object sheBeiBianHao = i.get("she_bei_bian_hao_");
|
|
|
+ if(uk.contains(sheBeiBianHao)){
|
|
|
+ iterator.remove();
|
|
|
+ logger.error(String.format("removed duplicate data %s", sheBeiBianHao));
|
|
|
+ }else{
|
|
|
+ uk.add(sheBeiBianHao);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return list;
|
|
|
}
|
|
|
|