|
@@ -280,7 +280,7 @@ public class EquipmentMaintenancePlanJob extends AbstractJob {
|
|
|
String startData = item.get("ji_hua_ri_qi_").toString();
|
|
String startData = item.get("ji_hua_ri_qi_").toString();
|
|
|
LocalDate start = LocalDate.parse(startData, FMT);
|
|
LocalDate start = LocalDate.parse(startData, FMT);
|
|
|
//开始计算
|
|
//开始计算
|
|
|
- int cycleMonths = Integer.parseInt(item.get("zhou_qi_").toString());
|
|
|
|
|
|
|
+ int cycleMonths = Integer.parseInt(item.get("jian_ding_zhou_qi").toString());
|
|
|
if (cycleMonths <= 0) {
|
|
if (cycleMonths <= 0) {
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
@@ -331,7 +331,7 @@ public class EquipmentMaintenancePlanJob extends AbstractJob {
|
|
|
.map(map -> String.valueOf(map.get("she_bei_bian_hao_")))
|
|
.map(map -> String.valueOf(map.get("she_bei_bian_hao_")))
|
|
|
.collect(Collectors.joining(","));
|
|
.collect(Collectors.joining(","));
|
|
|
String date = LocalDate.now().toString();
|
|
String date = LocalDate.now().toString();
|
|
|
- String sql = "select * from t_xzjlb where find_in_set(she_bei_id_,'"+ids+"') and bian_zhi_shi_jian like '%"+date+"'%";
|
|
|
|
|
|
|
+ String sql = "select * from t_xzjlb where find_in_set(she_bei_id_,'"+ids+"') and shi_shi_ri_qi_ = '" + date + "'";
|
|
|
List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
|
|
List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
|
|
|
if(Collections.isNotEmpty(list)){
|
|
if(Collections.isNotEmpty(list)){
|
|
|
Set<String> bCodes = list.stream()
|
|
Set<String> bCodes = list.stream()
|
|
@@ -352,6 +352,7 @@ public class EquipmentMaintenancePlanJob extends AbstractJob {
|
|
|
map.put("di_dian_",item.get("di_dian_").toString());
|
|
map.put("di_dian_",item.get("di_dian_").toString());
|
|
|
map.put("bian_zhi_ren_",item.get("fu_ze_ren_").toString());
|
|
map.put("bian_zhi_ren_",item.get("fu_ze_ren_").toString());
|
|
|
map.put("bian_zhi_shi_jian",date+" 06:00");
|
|
map.put("bian_zhi_shi_jian",date+" 06:00");
|
|
|
|
|
+ map.put("shi_shi_ri_qi_",date);
|
|
|
map.put("she_bei_id_",item.get("she_bei_bian_hao_").toString());
|
|
map.put("she_bei_id_",item.get("she_bei_bian_hao_").toString());
|
|
|
map.put("she_bei_bian_hao_",item.get("yuan_she_bei_bian").toString());
|
|
map.put("she_bei_bian_hao_",item.get("yuan_she_bei_bian").toString());
|
|
|
map.put("she_bei_ming_chen",item.get("she_bei_ming_chen").toString());
|
|
map.put("she_bei_ming_chen",item.get("she_bei_ming_chen").toString());
|
|
@@ -367,7 +368,7 @@ public class EquipmentMaintenancePlanJob extends AbstractJob {
|
|
|
map.put("ji_hua_ri_qi_",item.get("ji_hua_ri_qi_").toString());
|
|
map.put("ji_hua_ri_qi_",item.get("ji_hua_ri_qi_").toString());
|
|
|
map.put("ji_hua_zi_biao_id",item.get("zid_").toString());
|
|
map.put("ji_hua_zi_biao_id",item.get("zid_").toString());
|
|
|
map.put("ji_hua_zhu_biao_i",item.get("fid_").toString());
|
|
map.put("ji_hua_zhu_biao_i",item.get("fid_").toString());
|
|
|
- map.put("shi_fou_guo_shen_-shen","待处理");
|
|
|
|
|
|
|
+ map.put("shi_fou_guo_shen_","待处理");
|
|
|
result.add(id);
|
|
result.add(id);
|
|
|
commonDao.execute(this.buildInsertSql(map, "t_xzjlb"));
|
|
commonDao.execute(this.buildInsertSql(map, "t_xzjlb"));
|
|
|
}
|
|
}
|