Merge remote-tracking branch 'origin/master'

java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -121,8 +121,10 @@
         left join t_dict t2 on t.state=t2.status_cd and t2.table_name='owner_car' and t2.table_columns = 'state'
         left join building_owner bow on t.owner_id = bow.member_id and bow.status_cd = '0' and bow.community_id =
         t.community_id
-        where
-        t.status_cd = '0'
+        where 1=1
+        <if test="statusCd !=null and statusCd != ''">
+            and  t.status_cd = #{statusCd}
+        </if>
         <if test="carColor !=null and carColor != ''">
             and t.car_color= #{carColor}
         </if>

service-api/src/main/java/com/java110/api/listener/machineTranslate/MachineUploadCarLogListener.java

@@ -104,7 +104,7 @@ public class MachineUploadCarLogListener extends BaseMachineListener {
                 machineDto.setDirection("3306");
             } else {
                 CarInoutDto tmpCarInoutDto = new CarInoutDto();
-                tmpCarInoutDto.setInoutId(reqJson.getString("inoutId"));
+                tmpCarInoutDto.setInoutId(carInoutDtos.get(0).getInoutId());
                 tmpCarInoutDto.setCommunityId(reqJson.getString("communityId"));
                 machineTranslateBMOImpl.modifyCarInout(reqJson, context, tmpCarInoutDto, "100500", reqJson.getString("outTime"));
                 machineDto.setDirection("3307");

service-job/src/main/java/com/java110/job/task/car/CarToMachineTemplate.java

@@ -77,6 +77,10 @@ public class CarToMachineTemplate extends TaskSystemQuartz {
 
                 ownerCarDto.setbId(tmpOrderDto.getbId());
 
+                if(BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_CAR.equals(tmpOrderDto.getBusinessTypeCd())){
+                    ownerCarDto.setStatusCd("1");
+                }
+
                 List<OwnerCarDto> ownerCarDtos = null;