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

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceSimMapper.xml

@@ -57,7 +57,7 @@
             WHERE dsim.id = dsys.sim_iccid
         )
         <if test="queryPage.simId != null and queryPage.simId != ''">
-            and dsim.id = #{queryPage.simId}
+            and dsys.sim_iccid = #{queryPage.simId}
         </if>
         <if test="queryPage.mercId != null">
             and di.merc_id = #{queryPage.mercId}
@@ -83,7 +83,7 @@
             WHERE dsim.id = dsys.sim_iccid
         )
         <if test="queryPage.simId != null and queryPage.simId != ''">
-            and dsim.id = #{queryPage.simId}
+            and dsys.sim_iccid = #{queryPage.simId}
         </if>
         <if test="queryPage.mercId != null">
             and di.merc_id = #{queryPage.mercId}

device-api-service/src/main/java/com/xy/service/DeviceSimServiceImpl.java

@@ -402,7 +402,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                 DeviceSim deviceSim = new DeviceSim()
                         .setId(uploadSim.getSimId().trim().replace("\"", "").replace("'", ""))
                         .setType(uploadSim.getType())
-                        .setActivateTime(Emptys.check(uploadSim.getActivateTime()) ? LocalDate.parse(uploadSim.getActivateTime(), df).atTime(0, 0, 0) : null)
+                        .setActivateTime(Emptys.check(uploadSim.getActivateTime()) ? DataTime.toLocal(uploadSim.getActivateTime()) : null)
                         .setTimeout(Emptys.check(uploadSim.getTimeout()) ? LocalDate.parse(uploadSim.getTimeout(), df).atTime(0, 0, 0) : null)
                         .setLastRenewalTime(Emptys.check(uploadSim.getLastRenewalTime()) ? LocalDate.parse(uploadSim.getLastRenewalTime(), df).atTime(0, 0, 0) : null)
                         .setCreateTime(now)