Merge branch 'developer' into develop_dl_plan6

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -315,7 +315,7 @@ public class CarController extends AbstractBaseController {
 
 
         if(car.getIotCode()!=null){
-            Car ar= carMapper.getCarsByIotCode(car.getIotCode());
+            Car ar= carMapper.getCarsByIotCodeExcludeCarId(car.getIotCode(),car.getId());
             if(ar!=null){
                 throw new BadRequest("物联编码重复");
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/CarMapper.java

@@ -37,6 +37,8 @@ public interface CarMapper extends BaseMapper<Car> {
     List<String> getIotCodeList(@Param("id") String id);
 
     Car getCarsByIotCode(@Param("iotCode") String iotCode);
+    
+    Car getCarsByIotCodeExcludeCarId(@Param("iotCode") String iotCode, @Param("carId") Long carId);
 
     List<CarIndexVo> getCarsInfoByOrgCode(@Param("orgCode") String orgCode);
 

amos-boot-system-equip/src/main/resources/mapper/CarMapper.xml

@@ -247,6 +247,18 @@
 			AND
 			wc.iot_code = #{iotCode}
 	</select>
+	
+	<select id="getCarsByIotCodeExcludeCarId" resultType="com.yeejoin.equipmanage.common.entity.Car">
+		SELECT
+		  	wc.car_num
+		FROM
+			wl_car wc
+		WHERE
+			wc.iot_code IS NOT NULL
+			AND
+			wc.iot_code = #{iotCode}
+			AND wc.id != #{carId} 
+	</select>
 
     <select id="getCarsInfoByOrgCode" resultMap="carIotInfoMap">
 

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3144,5 +3144,16 @@
         </sql>
     </changeSet>
 
+    <changeSet author="ls" id="2022-06-01-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="jc_power_transfer_company_resources" columnName="arrival_time"/>
+            </not>
+        </preConditions>
+        <comment>jc_power_transfer_company_resources add column arrival_time  车辆到场时间</comment>
+        <sql>
+            ALTER TABLE jc_power_transfer_company_resources ADD arrival_time varchar(255) NULL COMMENT '车辆到场时间';
+        </sql>
+    </changeSet>
 </databaseChangeLog>