浏览代码

[task-1875]冰箱自动开的记录,按字段填入表单,目前仅备注字段有值
[task-1870]自动产生的冰箱监控记录中的监测时间调整

szjbdgzl 1 年之前
父节点
当前提交
cee7a56616

+ 4 - 4
ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/BinXiangJob.java

@@ -148,7 +148,6 @@ public class BinXiangJob extends AbstractJob {
                     if (BeanUtils.isNotEmpty(eqMap)){
                         String diDian = StringUtil.defaultString(eqMap.get("location").toString(),"");
                         String deptId = StringUtil.defaultString(map.get("dept_id_").toString(),"");
-                        String caiJiShiJian = StringUtil.defaultString(map.get("cai_ji_shi_jian_").toString(),"");
 
                         Map<String,Object> data = new HashMap<>();
                         data.put("id_", pId);
@@ -190,13 +189,14 @@ public class BinXiangJob extends AbstractJob {
                         data.put("fang_jian_", fangJian);
                         data.put("shi_fou_guo_shen_", "已完成");
                         data.put("wen_kong_zhi_fan_", min + "~" + max + "℃");
-                        data.put("shi_ji_shi_jian_", caiJiShiJian);
+                        data.put("shi_ji_shi_jian_", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(map.get("cai_ji_shi_jian_")));
+                        data.put("bian_zhi_shi_jian", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(map.get("cai_ji_shi_jian_")));
                         data.put("gang_wei_", gangWei);
                         data.put("bian_zhi_ren_", "1");
                         //data.put("bei_zhu_", sheBeiId + sheBeiMingCheng+",采集时间:"+ caiJiShiJian + ",温度:"+ wenDu + "℃");
                         data.put("config_id_", subId);
-                        data.put("yue_ri_qi_", new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
-                        data.put("shi_jian_shi_fen_", new SimpleDateFormat("HH:mm").format(new Date()));
+                        data.put("yue_ri_qi_", new SimpleDateFormat("yyyy-MM-dd").format(map.get("cai_ji_shi_jian_")));
+                        data.put("shi_jian_shi_fen_", new SimpleDateFormat("HH:mm").format(map.get("cai_ji_shi_jian_")));
                         commonDao.execute(buildInsertSql(data,"t_bxwdjkjlb"));
                     }
                 }