update datacenter$chip条件调整

src/main/java/com/uas/eis/serviceImpl/EDCBakServiceImpl.java

@@ -263,7 +263,7 @@ public class EDCBakServiceImpl implements EDCBakService {
                         }
 
                         //数据中心归档
-                        Sqls.add("MERGE INTO DATACENTER$CHIP A USING (SELECT  CHIPCODE_, OBJECT_RRN, PART_NAME, TEST_LOT, MAKE_LOT,CREATEDATE_ FROM  DATACENTER$MESTEMP WHERE OBJECT_RRN = "+map.get("OBJECT_RRN")+") B ON (A.CHIPCODE_= B.CHIPCODE_) " +
+                        Sqls.add("MERGE INTO DATACENTER$CHIP A USING (SELECT  CHIPCODE_, OBJECT_RRN, PART_NAME, TEST_LOT, MAKE_LOT,CREATEDATE_ FROM  DATACENTER$MESTEMP WHERE OBJECT_RRN = "+map.get("OBJECT_RRN")+") B ON (A.CHIPCODE_= B.CHIPCODE_ AND A.OBJECT_RRN= B.OBJECT_RRN ) " +
                                 " WHEN MATCHED THEN UPDATE SET A.OBJECT_RRN = B.OBJECT_RRN ,A.PART_NAME = B.PART_NAME, A.TEST_LOT = B.TEST_LOT , A.MAKE_LOT = B.MAKE_LOT " +
                                 " WHEN NOT MATCHED THEN INSERT (COUNTERPATH_, DATAPATH_ ,LOCALCOUNTERPATH_ , LOCALDATAPATH_,JDFPATH_,LOCALJDFPATH_,ID_, CHIPCODE_, OBJECT_RRN , PART_NAME ,TEST_LOT, MAKE_LOT,TESTDATE_,DATE_) VALUES ("+
                                 " '"+path1+"','"+path2+"','"+path3+"','"+path4+"','"+path5+"','"+path6+"',DATACENTERCHIP_SEQ.NEXTVAL, B.CHIPCODE_,B.OBJECT_RRN,B.PART_NAME,B.TEST_LOT,B.MAKE_LOT,B.CREATEDATE_,SYSDATE)"

src/main/java/com/uas/eis/task/ScheduleTask.java

@@ -53,7 +53,7 @@ public class ScheduleTask {
                 e.printStackTrace();
             }
         }
-        logger.info("Data文件解析执行结束:用时"+((new Date().getTime()-date.getTime())/1000));
+        logger.info("Data文件解析执行结束:用时"+((System.currentTimeMillis()-date.getTime())/1000));
     }
 
     /**
@@ -76,7 +76,7 @@ public class ScheduleTask {
         }catch (Exception e){
             e.printStackTrace();
         }
-        logger.info("文件归档结束:用时"+((new Date().getTime()-date.getTime())/1000));
+        logger.info("文件归档结束:用时"+((System.currentTimeMillis()-date.getTime())/1000));
     }
 
 }