Merge remote-tracking branch 'origin/matser' into matser

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

@@ -79,8 +79,8 @@ public class BinXiangJob extends AbstractJob {
     }
 
     private void addWenDuSkData(String sheBeiBianHao,String deptId) throws Exception {
-        String roomSql = " select b.yuan_she_bei_bian,b.di_dian_,f.id_ fang_jian_id_,f.fang_jian_ming_,q.id_ qu_yu_id_,q.qu_yu_ming_cheng_ " +
-                " FROM t_sbdj b,t_jjqfjb f,t_qypzb q where yuan_she_bei_bian='%s' and b.cun_fang_wei_zhi_=f.id_ and f.qu_yu_id_=q.id_";
+        String roomSql = "  select b.deviceno1_,b.di_dian_,f.id_ fang_jian_id_,f.fang_jian_ming_,q.id_ qu_yu_id_,q.qu_yu_ming_cheng_ " +
+                " FROM t_sshjpzxq b,t_jjqfjb f,t_qypzb q where b.deviceno1_='%s' and b.fang_jian_id_=f.id_ and f.qu_yu_id_=q.id_";
         roomSql = String.format(roomSql,sheBeiBianHao);
         Map<String,Object> room = commonDao.queryOne(roomSql);
         if (BeanUtils.isNotEmpty(room)){
@@ -135,8 +135,9 @@ public class BinXiangJob extends AbstractJob {
                     String pId = UniqueIdUtil.getId();
                     String sheBeiId = StringUtil.defaultString(map.get("she_bei_bian_hao_").toString(),"");
 
-                    String eqSql = " select b.yuan_she_bei_bian,b.she_bei_ming_cheng_,b.di_dian_,f.id_ fang_jian_id_,f.fang_jian_ming_,f.fang_jian_ming_ha,q.id_ qu_yu_id_,q.qu_yu_ming_cheng_ " +
-                            " FROM t_sbdj b,t_jjqfjb f,t_qypzb q where yuan_she_bei_bian='%s' and she_bei_zhuang_ta='合格' and b.cun_fang_wei_zhi_=f.id_ and f.qu_yu_id_=q.id_ limit 1";
+                    String eqSql = "  select b.deviceno1_ she_bei_bian_hao_,b.devicename1_ she_bei_ming_cheng_,b.di_dian_," +
+                            "f.id_ fang_jian_id_,f.fang_jian_ming_,f.fang_jian_ming_ha,q.id_ qu_yu_id_,q.qu_yu_ming_cheng_ " +
+                            "FROM t_sshjpzxq b,t_jjqfjb f,t_qypzb q where b.deviceno1_='%s' and b.fang_jian_id_=f.id_ and f.qu_yu_id_=q.id_ LIMIT 1";
                     eqSql = String.format(eqSql,sheBeiId);
                     Map<String,Object> eqMap = commonDao.queryOne(eqSql);
                     if (BeanUtils.isNotEmpty(eqMap)){
@@ -171,6 +172,7 @@ public class BinXiangJob extends AbstractJob {
                         data.put("bing_xiang_bian_h", sheBeiId+" "+sheBeiMingCheng);
                         data.put("qu_yu_ming_cheng_", quYuMingCheng);
                         data.put("fang_jian_", fangJian);
+                        data.put("shi_fou_guo_shen_", "已完成");
                         commonDao.execute(buildInsertSql(data,"t_bxwdjkjlb"));
                     }
                 }