优化代码

java110-db/src/main/resources/mapper/common/CarInoutDetailServiceDaoImplMapper.xml

@@ -93,10 +93,11 @@
         machineCode,t.car_inout,t.car_inout carInout,t.detail_id,t.detail_id detailId,t.car_num,t.car_num
         carNum,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
         from car_inout_detail t
-        left join car_inout ci on t.inout_id = ci.inout_id and ci.state = '0'
+        left join car_inout ci on t.inout_id = ci.inout_id and ci.status_cd = '0'
         where 1 =1
-        <if test="state !=null and state != ''">
-            and ci.state = #{state}
+        <if test='state !=null and state == "100301"'>
+            and t.state = #{state}
+            and ci.state = '100300'
         </if>
         <if test="inoutId !=null and inoutId != ''">
             and t.inout_id= #{inoutId}

service-user/src/main/java/com/java110/user/cmd/car/QueryWaitPayFeeTempCarCmd.java

@@ -6,6 +6,7 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.machine.CarInoutDetailDto;
+import com.java110.dto.machine.CarInoutDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.ownerCarOpenUser.OwnerCarOpenUserDto;
 import com.java110.intf.common.ICarInoutDetailInnerServiceSMO;
@@ -62,7 +63,7 @@ public class QueryWaitPayFeeTempCarCmd extends Cmd {
 
         CarInoutDetailDto carInoutDetailDto = new CarInoutDetailDto();
         carInoutDetailDto.setMachineId(reqJson.getString("machineId"));
-        carInoutDetailDto.setState(CarInoutDetailDto.STATE_IN_FAIL);
+        carInoutDetailDto.setState(CarInoutDto.STATE_IN_FAIL);
         carInoutDetailDto.setCarInout(CarInoutDetailDto.CAR_INOUT_OUT);
         carInoutDetailDto.setPage(1);
         carInoutDetailDto.setRow(1);