优化daima

java110-bean/src/main/java/com/java110/dto/machine/CarInoutDetailDto.java

@@ -39,6 +39,8 @@ public class CarInoutDetailDto extends CarInoutDto implements Serializable {
 
     private String configId;
 
+    private String photoJpg;
+
     public String getInoutId() {
         return inoutId;
     }
@@ -164,4 +166,12 @@ public class CarInoutDetailDto extends CarInoutDto implements Serializable {
     public void setInState(String inState) {
         this.inState = inState;
     }
+
+    public String getPhotoJpg() {
+        return photoJpg;
+    }
+
+    public void setPhotoJpg(String photoJpg) {
+        this.photoJpg = photoJpg;
+    }
 }

java110-bean/src/main/java/com/java110/po/car/CarInoutDetailPo.java

@@ -31,6 +31,8 @@ public class CarInoutDetailPo implements Serializable {
 
     private String carTypeName;
 
+    private String photoJpg;
+
     public String getDetailId() {
         return detailId;
     }
@@ -134,4 +136,12 @@ public class CarInoutDetailPo implements Serializable {
     public void setCarTypeName(String carTypeName) {
         this.carTypeName = carTypeName;
     }
+
+    public String getPhotoJpg() {
+        return photoJpg;
+    }
+
+    public void setPhotoJpg(String photoJpg) {
+        this.photoJpg = photoJpg;
+    }
 }

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

@@ -8,9 +8,9 @@
     <!-- 保存车辆进出明细信息 add by wuxw 2018-07-03 -->
     <insert id="saveCarInoutDetailInfo" parameterType="Map">
         insert into car_inout_detail(
-        inout_id,machine_id,machine_code,car_inout,pa_id,detail_id,car_num,community_id,remark,state,car_type,car_type_name
+        inout_id,machine_id,machine_code,car_inout,pa_id,detail_id,car_num,community_id,remark,state,car_type,car_type_name,photo_jpg
         ) values (
-        #{inoutId},#{machineId},#{machineCode},#{carInout},#{paId},#{detailId},#{carNum},#{communityId},#{remark},#{state},#{carType},#{carTypeName}
+        #{inoutId},#{machineId},#{machineCode},#{carInout},#{paId},#{detailId},#{carNum},#{communityId},#{remark},#{state},#{carType},#{carTypeName},#{photoJpg}
         )
     </insert>
 
@@ -21,7 +21,7 @@
         machineCode,t.car_inout,t.car_inout carInout,t.pa_id,t.pa_id paId,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.state,
         ci.in_time inTime,ci.out_time outTime,max(cip.real_charge) realCharge,ci.pa_id paId,td.name stateName,t.remark,t.car_type carType
-        ,pa.num areaNum,tcfc.fee_name feeName,tcfc.config_id configId,t.car_type_name carTypeName,ci.state inState
+        ,pa.num areaNum,tcfc.fee_name feeName,tcfc.config_id configId,t.car_type_name carTypeName,ci.state inState,t.photo_jpg photoJpg
         from car_inout_detail t
         left join car_inout ci on t.inout_id = ci.inout_id and ci.status_cd = '0' and t.community_id = ci.community_id
         left join car_inout_payment cip on cip.inout_id = ci.inout_id and cip.community_id = ci.community_id
@@ -119,6 +119,9 @@
         <if test="remark !=null and remark != ''">
             , t.remark= #{remark}
         </if>
+        <if test="photoJpg !=null and photoJpg != ''">
+            , t.photo_jpg= #{photoJpg}
+        </if>
         where 1=1
         <if test="detailId !=null and detailId != ''">
             and t.detail_id= #{detailId}

service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java

@@ -251,6 +251,7 @@ public class MachineUploadCarLogCmd extends Cmd {
         carInoutDetailPo.setMachineId(machineDto.getMachineId());
         carInoutDetailPo.setPaId(carInoutDtos.get(0).getPaId());
         carInoutDetailPo.setRemark(reqJson.getString("remark"));
+        carInoutDetailPo.setPhotoJpg(reqJson.getString("photoJpg"));
         carInoutDetailPo.setState(state);
         if(CAR_TYPE_NO_DATA.equals(tempCar)){
             carInoutDetailPo.setCarType(OwnerCarDto.LEASE_TYPE_TEMP);
@@ -444,6 +445,7 @@ public class MachineUploadCarLogCmd extends Cmd {
         carInoutDetailPo.setPaId(paId);
         carInoutDetailPo.setState(state);
         carInoutDetailPo.setRemark(reqJson.getString("remark"));
+        carInoutDetailPo.setPhotoJpg(reqJson.getString("photoJpg"));
         if(CAR_TYPE_NO_DATA.equals(tempCar)){
             carInoutDetailPo.setCarType(OwnerCarDto.LEASE_TYPE_TEMP);
             carInoutDetailPo.setCarTypeName("临时车");
@@ -472,7 +474,7 @@ public class MachineUploadCarLogCmd extends Cmd {
             throw new CmdException("保存入记录明细失败");
         }
         //月租车
-        if (!OwnerCarDto.LEASE_TYPE_TEMP.equals(tempCar)) {
+        if (!OwnerCarDto.LEASE_TYPE_TEMP.equals(carInoutDetailPo.getCarType())) {
             return;
         }