修改

src/main/java/com/steerinfo/dil/controller/TmstruckReceiptResultController.java

@@ -156,6 +156,18 @@ public class TmstruckReceiptResultController extends BaseRESTfulController {
         return receiptPhoto;
     }
 
+    @ApiOperation(value = "获取抵达作业照片")
+    @PostMapping("/getArrivalPhotoPlus")
+    public Map<String, Object> getArrivalPhotoPlus(@RequestParam String orderNumber){
+        return tmstruckReceiptResultService.getArrivalPhotoPlus(orderNumber);
+    }
+
+    @ApiOperation(value = "获取签收作业照片")
+    @PostMapping("/getReceivePhotoPlus")
+    public Map<String, Object> getReceivePhotoPlus(@RequestParam String orderNumber){
+        return tmstruckReceiptResultService.getReceivePhotoPlus(orderNumber);
+    }
+
     @ApiOperation(value="展示收货实绩信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(470)", value = "表头", required = false, dataType = "Interger")

src/main/java/com/steerinfo/dil/mapper/TmstruckReceiptResultMapper.java

@@ -40,4 +40,8 @@ public interface TmstruckReceiptResultMapper extends IBaseMapper<TmstruckReceipt
     String getReceivingPhoto(String orderNumber);
 
     List<Map<String,Object>> getChildPhoto(String orderNumber);
+
+    Map<String, Object> getArrivalPhotoPlus(String orderNumber);
+
+    Map<String, Object> getReceivePhotoPlus(String orderNumber);
 }

src/main/java/com/steerinfo/dil/model/TmstruckReceiptResult.java

@@ -22,34 +22,40 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
     private BigDecimal resultTotalId;
 
     /**
-     * 空货箱照片(RESULT_EMPTY_CONTAINER_PHOTO,VARCHAR,100)
+     * 收货打卡地址(RESULT_ARRIVAL_ADDRESS,VARCHAR,500)
      */
-    @ApiModelProperty(value="空货箱照片",required=false)
+    @ApiModelProperty(value="收货打卡地址",required=false)
+    private String resultArrivalAddress;
+
+    /**
+     * 空货箱照片(所有照片都存放在这里)(RESULT_EMPTY_CONTAINER_PHOTO,VARCHAR,1200)
+     */
+    @ApiModelProperty(value="空货箱照片(所有照片都存放在这里)",required=false)
     private String resultEmptyContainerPhoto;
 
     /**
-     * 已签字的送货单照片(RESULT_SIGNED_NOTE_PHOTO,VARCHAR,100)
+     * 已签字的送货单照片(RESULT_SIGNED_NOTE_PHOTO,VARCHAR,200)
      */
     @ApiModelProperty(value="已签字的送货单照片",required=false)
     private String resultSignedNotePhoto;
 
     /**
-     * 客户签收单照片(RESULT_RECEIVE_NOTE_PHOTO,VARCHAR,100)
+     * 客户签收单照片(RESULT_RECEIVE_NOTE_PHOTO,VARCHAR,200)
      */
     @ApiModelProperty(value="客户签收单照片",required=false)
     private String resultReceiveNotePhoto;
 
     /**
-     * 异地库ID(WAREHOUSE_ID,DECIMAL,38)
+     * 运输距离(ORDER_MILEAGE,DECIMAL,0)
      */
-    @ApiModelProperty(value="异地库ID",required=false)
-    private BigDecimal warehouseId;
+    @ApiModelProperty(value="运输距离",required=false)
+    private BigDecimal orderMileage;
 
     /**
-     * 异地库ID(ORDER_MILEAGE,DECIMAL,38)
+     * 异地库ID(WAREHOUSE_ID,DECIMAL,38)
      */
     @ApiModelProperty(value="异地库ID",required=false)
-    private BigDecimal  orderMileage;
+    private BigDecimal warehouseId;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
@@ -80,27 +86,26 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
      */
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
-    /**
-     * 收货状态(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="收货状态",required=false)
+
+    @ApiModelProperty(value="",required=false)
     private BigDecimal status;
 
-    /**
-     * 抵达收货点的地址(RESULT_ARRIVAL_ADDRESS,VARCHAR,100)
-     */
-    @ApiModelProperty(value="抵达收货点的地址",required=false)
-    private String resultArrivalAddress;
+    @ApiModelProperty(value="",required=false)
+    private String photo1;
 
-    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value="",required=false)
+    private String photo2;
 
-    public BigDecimal getOrderMileage() {
-        return orderMileage;
-    }
+    @ApiModelProperty(value="",required=false)
+    private String photo3;
 
-    public void setOrderMileage(BigDecimal orderMileage) {
-        this.orderMileage = orderMileage;
-    }
+    @ApiModelProperty(value="",required=false)
+    private String photo4;
+
+    @ApiModelProperty(value="",required=false)
+    private String photo5;
+
+    private static final long serialVersionUID = 1L;
 
     @Override
     public BigDecimal getId() {
@@ -128,6 +133,14 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
         this.resultTotalId = resultTotalId;
     }
 
+    public String getResultArrivalAddress() {
+        return resultArrivalAddress;
+    }
+
+    public void setResultArrivalAddress(String resultArrivalAddress) {
+        this.resultArrivalAddress = resultArrivalAddress == null ? null : resultArrivalAddress.trim();
+    }
+
     public String getResultEmptyContainerPhoto() {
         return resultEmptyContainerPhoto;
     }
@@ -152,12 +165,12 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
         this.resultReceiveNotePhoto = resultReceiveNotePhoto == null ? null : resultReceiveNotePhoto.trim();
     }
 
-    public BigDecimal getStatus() {
-        return status;
+    public BigDecimal getOrderMileage() {
+        return orderMileage;
     }
 
-    public void setStatus(BigDecimal status) {
-        this.status = status;
+    public void setOrderMileage(BigDecimal orderMileage) {
+        this.orderMileage = orderMileage;
     }
 
     public BigDecimal getWarehouseId() {
@@ -208,12 +221,52 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
-    public String getResultArrivalAddress() {
-        return resultArrivalAddress;
+    public BigDecimal getStatus() {
+        return status;
     }
 
-    public void setResultArrivalAddress(String resultArrivalAddress) {
-        this.resultArrivalAddress = resultArrivalAddress == null ? null : resultArrivalAddress.trim();
+    public void setStatus(BigDecimal status) {
+        this.status = status;
+    }
+
+    public String getPhoto1() {
+        return photo1;
+    }
+
+    public void setPhoto1(String photo1) {
+        this.photo1 = photo1 == null ? null : photo1.trim();
+    }
+
+    public String getPhoto2() {
+        return photo2;
+    }
+
+    public void setPhoto2(String photo2) {
+        this.photo2 = photo2 == null ? null : photo2.trim();
+    }
+
+    public String getPhoto3() {
+        return photo3;
+    }
+
+    public void setPhoto3(String photo3) {
+        this.photo3 = photo3 == null ? null : photo3.trim();
+    }
+
+    public String getPhoto4() {
+        return photo4;
+    }
+
+    public void setPhoto4(String photo4) {
+        this.photo4 = photo4 == null ? null : photo4.trim();
+    }
+
+    public String getPhoto5() {
+        return photo5;
+    }
+
+    public void setPhoto5(String photo5) {
+        this.photo5 = photo5 == null ? null : photo5.trim();
     }
 
     @Override
@@ -224,16 +277,23 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
         sb.append("Hash = ").append(hashCode());
         sb.append(", resultId=").append(resultId);
         sb.append(", resultTotalId=").append(resultTotalId);
+        sb.append(", resultArrivalAddress=").append(resultArrivalAddress);
         sb.append(", resultEmptyContainerPhoto=").append(resultEmptyContainerPhoto);
         sb.append(", resultSignedNotePhoto=").append(resultSignedNotePhoto);
         sb.append(", resultReceiveNotePhoto=").append(resultReceiveNotePhoto);
+        sb.append(", orderMileage=").append(orderMileage);
         sb.append(", warehouseId=").append(warehouseId);
         sb.append(", insertUsername=").append(insertUsername);
         sb.append(", insertTime=").append(insertTime);
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
-        sb.append(", resultArrivalAddress=").append(resultArrivalAddress);
+        sb.append(", status=").append(status);
+        sb.append(", photo1=").append(photo1);
+        sb.append(", photo2=").append(photo2);
+        sb.append(", photo3=").append(photo3);
+        sb.append(", photo4=").append(photo4);
+        sb.append(", photo5=").append(photo5);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/ITmstruckReceiptResultService.java

@@ -39,4 +39,8 @@ public interface ITmstruckReceiptResultService{
     List<Map<String, Object>> getReceivingResult(Map<String, Object> mapValue);
 
     String getReceivingPhoto(String orderNumber);
+
+    Map<String, Object> getArrivalPhotoPlus(String orderNumber);
+
+    Map<String, Object> getReceivePhotoPlus(String orderNumber);
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckReceiptResultServiceImpl.java

@@ -96,6 +96,16 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
         return tmstruckReceiptResultMapper.getReceivingPhoto(orderNumber);
     }
 
+    @Override
+    public Map<String, Object> getArrivalPhotoPlus(String orderNumber) {
+        return tmstruckReceiptResultMapper.getArrivalPhotoPlus(orderNumber);
+    }
+
+    @Override
+    public Map<String, Object> getReceivePhotoPlus(String orderNumber) {
+        return tmstruckReceiptResultMapper.getReceivePhotoPlus(orderNumber);
+    }
+
     /**
      * 查询所有收货实绩
      * @param map

src/main/java/com/steerinfo/route/controller/TmstruckArrivalResultController.java

@@ -87,6 +87,25 @@ public class TmstruckArrivalResultController extends BaseRESTfulController {
 
     }
 
+    @PostMapping(value = "/addtmstruckArrivalResultApp")
+    public RESTfulResult addtmstruckArrivalResultApp(@RequestBody(required=false)Map<String,Object>  map ,String orderNumber, String resultArrivalAddress, String file) throws Exception {
+        TmstruckArrivalResult tmstruckArrivalResult = new TmstruckArrivalResult();
+        tmstruckArrivalResult.setResultArrivalAddress(resultArrivalAddress);
+        tmstruckArrivalResult.setResultFullContainerPhoto(file);
+        tmstruckArrivalResult.setPhoto1(""+map.get("photo1"));
+        tmstruckArrivalResult.setPhoto2(""+map.get("photo2"));
+        tmstruckArrivalResult.setPhoto3(""+map.get("photo3"));
+        tmstruckArrivalResult.setPhoto4(""+map.get("photo4"));
+        tmstruckArrivalResult.setPhoto5(""+map.get("photo5"));
+        if(map.get("arrivalTime")!=null){
+            tmstruckArrivalResult.setInsertTime(new Date((Long)map.get("arrivalTime")));
+            tmstruckArrivalResult.setUpdateTime(new Date());
+        }
+        int i = tmstruckArrivalResultService.addtmstruckArrivalResult(orderNumber,tmstruckArrivalResult);
+        return success(i);
+
+    }
+
     @ApiOperation(value="展示抵达实绩信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(136)", value = "表头", required = false, dataType = "Interger")

src/main/java/com/steerinfo/route/model/TmstruckArrivalResult.java

@@ -3,7 +3,6 @@ package com.steerinfo.route.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -28,13 +27,13 @@ public class TmstruckArrivalResult implements IBasePO<BigDecimal> {
     private BigDecimal resultTotalId;
 
     /**
-     * 抵达收货点的地址(RESULT_ARRIVAL_ADDRESS,VARCHAR,20)
+     * 抵达打卡的地址(RESULT_ARRIVAL_ADDRESS,VARCHAR,500)
      */
-    @ApiModelProperty(value="抵达收货点的地址",required=false)
+    @ApiModelProperty(value="抵达打卡的地址",required=false)
     private String resultArrivalAddress;
 
     /**
-     * 满货箱照片(RESULT_FULL_CONTAINER_PHOTO,VARCHAR,100)
+     * 满货箱照片(RESULT_FULL_CONTAINER_PHOTO,VARCHAR,800)
      */
     @ApiModelProperty(value="满货箱照片",required=false)
     private String resultFullContainerPhoto;
@@ -69,6 +68,21 @@ public class TmstruckArrivalResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    @ApiModelProperty(value="",required=false)
+    private String photo1;
+
+    @ApiModelProperty(value="",required=false)
+    private String photo2;
+
+    @ApiModelProperty(value="",required=false)
+    private String photo3;
+
+    @ApiModelProperty(value="",required=false)
+    private String photo4;
+
+    @ApiModelProperty(value="",required=false)
+    private String photo5;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -161,6 +175,46 @@ public class TmstruckArrivalResult implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public String getPhoto1() {
+        return photo1;
+    }
+
+    public void setPhoto1(String photo1) {
+        this.photo1 = photo1 == null ? null : photo1.trim();
+    }
+
+    public String getPhoto2() {
+        return photo2;
+    }
+
+    public void setPhoto2(String photo2) {
+        this.photo2 = photo2 == null ? null : photo2.trim();
+    }
+
+    public String getPhoto3() {
+        return photo3;
+    }
+
+    public void setPhoto3(String photo3) {
+        this.photo3 = photo3 == null ? null : photo3.trim();
+    }
+
+    public String getPhoto4() {
+        return photo4;
+    }
+
+    public void setPhoto4(String photo4) {
+        this.photo4 = photo4 == null ? null : photo4.trim();
+    }
+
+    public String getPhoto5() {
+        return photo5;
+    }
+
+    public void setPhoto5(String photo5) {
+        this.photo5 = photo5 == null ? null : photo5.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -177,6 +231,11 @@ public class TmstruckArrivalResult implements IBasePO<BigDecimal> {
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", photo1=").append(photo1);
+        sb.append(", photo2=").append(photo2);
+        sb.append(", photo3=").append(photo3);
+        sb.append(", photo4=").append(photo4);
+        sb.append(", photo5=").append(photo5);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/route/model/TmstruckReceiptResult.java

@@ -3,7 +3,6 @@ package com.steerinfo.route.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -22,23 +21,35 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
     private BigDecimal resultTotalId;
 
     /**
-     * 空货箱照片(RESULT_EMPTY_CONTAINER_PHOTO,VARCHAR,100)
+     * 收货打卡地址(RESULT_ARRIVAL_ADDRESS,VARCHAR,500)
      */
-    @ApiModelProperty(value="空货箱照片",required=false)
+    @ApiModelProperty(value="收货打卡地址",required=false)
+    private String resultArrivalAddress;
+
+    /**
+     * 空货箱照片(所有照片都存放在这里)(RESULT_EMPTY_CONTAINER_PHOTO,VARCHAR,1200)
+     */
+    @ApiModelProperty(value="空货箱照片(所有照片都存放在这里)",required=false)
     private String resultEmptyContainerPhoto;
 
     /**
-     * 已签字的送货单照片(RESULT_SIGNED_NOTE_PHOTO,VARCHAR,100)
+     * 已签字的送货单照片(RESULT_SIGNED_NOTE_PHOTO,VARCHAR,200)
      */
     @ApiModelProperty(value="已签字的送货单照片",required=false)
     private String resultSignedNotePhoto;
 
     /**
-     * 客户签收单照片(RESULT_RECEIVE_NOTE_PHOTO,VARCHAR,100)
+     * 客户签收单照片(RESULT_RECEIVE_NOTE_PHOTO,VARCHAR,200)
      */
     @ApiModelProperty(value="客户签收单照片",required=false)
     private String resultReceiveNotePhoto;
 
+    /**
+     * 运输距离(ORDER_MILEAGE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输距离",required=false)
+    private Short orderMileage;
+
     /**
      * 异地库ID(WAREHOUSE_ID,DECIMAL,38)
      */
@@ -74,17 +85,24 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
      */
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
-    /**
-     * 收货状态(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="收货状态",required=false)
-    private BigDecimal status;
 
-    /**
-     * 抵达收货点的地址(RESULT_ARRIVAL_ADDRESS,VARCHAR,100)
-     */
-    @ApiModelProperty(value="抵达收货点的地址",required=false)
-    private String resultArrivalAddress;
+    @ApiModelProperty(value="",required=false)
+    private Short status;
+
+    @ApiModelProperty(value="",required=false)
+    private String photo1;
+
+    @ApiModelProperty(value="",required=false)
+    private String photo2;
+
+    @ApiModelProperty(value="",required=false)
+    private String photo3;
+
+    @ApiModelProperty(value="",required=false)
+    private String photo4;
+
+    @ApiModelProperty(value="",required=false)
+    private String photo5;
 
     private static final long serialVersionUID = 1L;
 
@@ -114,6 +132,14 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
         this.resultTotalId = resultTotalId;
     }
 
+    public String getResultArrivalAddress() {
+        return resultArrivalAddress;
+    }
+
+    public void setResultArrivalAddress(String resultArrivalAddress) {
+        this.resultArrivalAddress = resultArrivalAddress == null ? null : resultArrivalAddress.trim();
+    }
+
     public String getResultEmptyContainerPhoto() {
         return resultEmptyContainerPhoto;
     }
@@ -138,12 +164,12 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
         this.resultReceiveNotePhoto = resultReceiveNotePhoto == null ? null : resultReceiveNotePhoto.trim();
     }
 
-    public BigDecimal getStatus() {
-        return status;
+    public Short getOrderMileage() {
+        return orderMileage;
     }
 
-    public void setStatus(BigDecimal status) {
-        this.status = status;
+    public void setOrderMileage(Short orderMileage) {
+        this.orderMileage = orderMileage;
     }
 
     public BigDecimal getWarehouseId() {
@@ -194,12 +220,52 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
-    public String getResultArrivalAddress() {
-        return resultArrivalAddress;
+    public Short getStatus() {
+        return status;
     }
 
-    public void setResultArrivalAddress(String resultArrivalAddress) {
-        this.resultArrivalAddress = resultArrivalAddress == null ? null : resultArrivalAddress.trim();
+    public void setStatus(Short status) {
+        this.status = status;
+    }
+
+    public String getPhoto1() {
+        return photo1;
+    }
+
+    public void setPhoto1(String photo1) {
+        this.photo1 = photo1 == null ? null : photo1.trim();
+    }
+
+    public String getPhoto2() {
+        return photo2;
+    }
+
+    public void setPhoto2(String photo2) {
+        this.photo2 = photo2 == null ? null : photo2.trim();
+    }
+
+    public String getPhoto3() {
+        return photo3;
+    }
+
+    public void setPhoto3(String photo3) {
+        this.photo3 = photo3 == null ? null : photo3.trim();
+    }
+
+    public String getPhoto4() {
+        return photo4;
+    }
+
+    public void setPhoto4(String photo4) {
+        this.photo4 = photo4 == null ? null : photo4.trim();
+    }
+
+    public String getPhoto5() {
+        return photo5;
+    }
+
+    public void setPhoto5(String photo5) {
+        this.photo5 = photo5 == null ? null : photo5.trim();
     }
 
     @Override
@@ -210,16 +276,23 @@ public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
         sb.append("Hash = ").append(hashCode());
         sb.append(", resultId=").append(resultId);
         sb.append(", resultTotalId=").append(resultTotalId);
+        sb.append(", resultArrivalAddress=").append(resultArrivalAddress);
         sb.append(", resultEmptyContainerPhoto=").append(resultEmptyContainerPhoto);
         sb.append(", resultSignedNotePhoto=").append(resultSignedNotePhoto);
         sb.append(", resultReceiveNotePhoto=").append(resultReceiveNotePhoto);
+        sb.append(", orderMileage=").append(orderMileage);
         sb.append(", warehouseId=").append(warehouseId);
         sb.append(", insertUsername=").append(insertUsername);
         sb.append(", insertTime=").append(insertTime);
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
-        sb.append(", resultArrivalAddress=").append(resultArrivalAddress);
+        sb.append(", status=").append(status);
+        sb.append(", photo1=").append(photo1);
+        sb.append(", photo2=").append(photo2);
+        sb.append(", photo3=").append(photo3);
+        sb.append(", photo4=").append(photo4);
+        sb.append(", photo5=").append(photo5);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/resources/com/steerinfo/dil/mapper/TmstruckReceiptResultMapper.xml

@@ -3,36 +3,42 @@
 <mapper namespace="com.steerinfo.dil.mapper.TmstruckReceiptResultMapper">
   <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckReceiptResult">
     <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
-    
     <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
+    <result column="RESULT_ARRIVAL_ADDRESS" jdbcType="VARCHAR" property="resultArrivalAddress" />
     <result column="RESULT_EMPTY_CONTAINER_PHOTO" jdbcType="VARCHAR" property="resultEmptyContainerPhoto" />
     <result column="RESULT_SIGNED_NOTE_PHOTO" jdbcType="VARCHAR" property="resultSignedNotePhoto" />
     <result column="RESULT_RECEIVE_NOTE_PHOTO" jdbcType="VARCHAR" property="resultReceiveNotePhoto" />
-    <result column="WAREHOUSE_ID" jdbcType="DECIMAL" property="warehouseId" />
     <result column="ORDER_MILEAGE" jdbcType="DECIMAL" property="orderMileage" />
+    <result column="WAREHOUSE_ID" jdbcType="DECIMAL" property="warehouseId" />
     <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
     <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="STATUS" jdbcType="DECIMAL" property="status" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-    <result column="RESULT_ARRIVAL_ADDRESS" jdbcType="VARCHAR" property="resultArrivalAddress" />
+    <result column="STATUS" jdbcType="DECIMAL" property="status" />
+    <result column="PHOTO1" jdbcType="VARCHAR" property="photo1" />
+    <result column="PHOTO2" jdbcType="VARCHAR" property="photo2" />
+    <result column="PHOTO3" jdbcType="VARCHAR" property="photo3" />
+    <result column="PHOTO4" jdbcType="VARCHAR" property="photo4" />
+    <result column="PHOTO5" jdbcType="VARCHAR" property="photo5" />
   </resultMap>
   <sql id="columns">
-    RESULT_ID, RESULT_TOTAL_ID, RESULT_EMPTY_CONTAINER_PHOTO, RESULT_SIGNED_NOTE_PHOTO,
-    RESULT_RECEIVE_NOTE_PHOTO, WAREHOUSE_ID,ORDER_MILEAGE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME,STATUS, INSERT_UPDATE_REMARK, RESULT_ARRIVAL_ADDRESS
+    RESULT_ID, RESULT_TOTAL_ID, RESULT_ARRIVAL_ADDRESS, RESULT_EMPTY_CONTAINER_PHOTO,
+    RESULT_SIGNED_NOTE_PHOTO, RESULT_RECEIVE_NOTE_PHOTO, ORDER_MILEAGE, WAREHOUSE_ID,
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    STATUS, PHOTO1, PHOTO2, PHOTO3, PHOTO4, PHOTO5
   </sql>
   <sql id="columns_alias">
-    t.RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_EMPTY_CONTAINER_PHOTO, t.RESULT_SIGNED_NOTE_PHOTO,
-    t.RESULT_RECEIVE_NOTE_PHOTO, t.WAREHOUSE_ID,ORDER_MILEAGE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
-    t.UPDATE_TIME,STATUS, t.INSERT_UPDATE_REMARK, t.RESULT_ARRIVAL_ADDRESS
+    t.RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_ARRIVAL_ADDRESS, t.RESULT_EMPTY_CONTAINER_PHOTO,
+    t.RESULT_SIGNED_NOTE_PHOTO, t.RESULT_RECEIVE_NOTE_PHOTO, t.ORDER_MILEAGE, t.WAREHOUSE_ID,
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
+    t.STATUS, t.PHOTO1, t.PHOTO2, t.PHOTO3, t.PHOTO4, t.PHOTO5
   </sql>
   <sql id="select">
-    SELECT <include refid="columns" /> FROM TMSTRUCK_RECEIPT_RESULT
+    SELECT <include refid="columns"/> FROM TMSTRUCK_RECEIPT_RESULT
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM TMSTRUCK_RECEIPT_RESULT t
+    SELECT <include refid="columns_alias"/> FROM TMSTRUCK_RECEIPT_RESULT t
   </sql>
   <sql id="where">
     <where>
@@ -42,6 +48,9 @@
       <if test="resultTotalId != null">
         and RESULT_TOTAL_ID = #{resultTotalId}
       </if>
+      <if test="resultArrivalAddress != null and resultArrivalAddress != ''">
+        and RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress}
+      </if>
       <if test="resultEmptyContainerPhoto != null and resultEmptyContainerPhoto != ''">
         and RESULT_EMPTY_CONTAINER_PHOTO = #{resultEmptyContainerPhoto}
       </if>
@@ -51,12 +60,12 @@
       <if test="resultReceiveNotePhoto != null and resultReceiveNotePhoto != ''">
         and RESULT_RECEIVE_NOTE_PHOTO = #{resultReceiveNotePhoto}
       </if>
-      <if test="warehouseId != null">
-        and WAREHOUSE_ID = #{warehouseId}
-      </if>
       <if test="orderMileage != null">
         and ORDER_MILEAGE = #{orderMileage}
       </if>
+      <if test="warehouseId != null">
+        and WAREHOUSE_ID = #{warehouseId}
+      </if>
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME = #{insertUsername}
       </if>
@@ -69,14 +78,26 @@
       <if test="updateTime != null">
         and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
       </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
       <if test="status != null">
         and STATUS = #{status}
       </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      <if test="photo1 != null and photo1 != ''">
+        and PHOTO1 = #{photo1}
       </if>
-      <if test="resultArrivalAddress != null and resultArrivalAddress != ''">
-        and RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress}
+      <if test="photo2 != null and photo2 != ''">
+        and PHOTO2 = #{photo2}
+      </if>
+      <if test="photo3 != null and photo3 != ''">
+        and PHOTO3 = #{photo3}
+      </if>
+      <if test="photo4 != null and photo4 != ''">
+        and PHOTO4 = #{photo4}
+      </if>
+      <if test="photo5 != null and photo5 != ''">
+        and PHOTO5 = #{photo5}
       </if>
     </where>
   </sql>
@@ -88,6 +109,9 @@
       <if test="resultTotalId != null">
         and RESULT_TOTAL_ID = #{resultTotalId}
       </if>
+      <if test="resultArrivalAddress != null and resultArrivalAddress != ''">
+        and RESULT_ARRIVAL_ADDRESS LIKE '%${resultArrivalAddress}%'
+      </if>
       <if test="resultEmptyContainerPhoto != null and resultEmptyContainerPhoto != ''">
         and RESULT_EMPTY_CONTAINER_PHOTO LIKE '%${resultEmptyContainerPhoto}%'
       </if>
@@ -97,12 +121,12 @@
       <if test="resultReceiveNotePhoto != null and resultReceiveNotePhoto != ''">
         and RESULT_RECEIVE_NOTE_PHOTO LIKE '%${resultReceiveNotePhoto}%'
       </if>
-      <if test="warehouseId != null">
-        and WAREHOUSE_ID = #{warehouseId}
-      </if>
       <if test="orderMileage != null">
         and ORDER_MILEAGE = #{orderMileage}
       </if>
+      <if test="warehouseId != null">
+        and WAREHOUSE_ID = #{warehouseId}
+      </if>
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME LIKE '%${insertUsername}%'
       </if>
@@ -115,14 +139,26 @@
       <if test="updateTime != null">
         and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
       </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
       <if test="status != null">
         and STATUS = #{status}
       </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      <if test="photo1 != null and photo1 != ''">
+        and PHOTO1 LIKE '%${photo1}%'
       </if>
-      <if test="resultArrivalAddress != null and resultArrivalAddress != ''">
-        and RESULT_ARRIVAL_ADDRESS LIKE '%${resultArrivalAddress}%'
+      <if test="photo2 != null and photo2 != ''">
+        and PHOTO2 LIKE '%${photo2}%'
+      </if>
+      <if test="photo3 != null and photo3 != ''">
+        and PHOTO3 LIKE '%${photo3}%'
+      </if>
+      <if test="photo4 != null and photo4 != ''">
+        and PHOTO4 LIKE '%${photo4}%'
+      </if>
+      <if test="photo5 != null and photo5 != ''">
+        and PHOTO5 LIKE '%${photo5}%'
       </if>
     </where>
   </sql>
@@ -136,6 +172,9 @@
     <if test="resultTotalId != null">
       or RESULT_TOTAL_ID = #{resultTotalId}
     </if>
+    <if test="resultArrivalAddress != null and resultArrivalAddress != ''">
+      or RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress}
+    </if>
     <if test="resultEmptyContainerPhoto != null and resultEmptyContainerPhoto != ''">
       or RESULT_EMPTY_CONTAINER_PHOTO = #{resultEmptyContainerPhoto}
     </if>
@@ -145,12 +184,12 @@
     <if test="resultReceiveNotePhoto != null and resultReceiveNotePhoto != ''">
       or RESULT_RECEIVE_NOTE_PHOTO = #{resultReceiveNotePhoto}
     </if>
-    <if test="warehouseId != null">
-      or WAREHOUSE_ID = #{warehouseId}
-    </if>
     <if test="orderMileage != null">
       or ORDER_MILEAGE = #{orderMileage}
     </if>
+    <if test="warehouseId != null">
+      or WAREHOUSE_ID = #{warehouseId}
+    </if>
     <if test="insertUsername != null and insertUsername != ''">
       or INSERT_USERNAME = #{insertUsername}
     </if>
@@ -163,27 +202,43 @@
     <if test="updateTime != null">
       or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
     </if>
-    <if test="status != null">
-      or STATUS = '#{status}'
-    </if>
     <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
       or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
     </if>
-    <if test="resultArrivalAddress != null and resultArrivalAddress != ''">
-      or RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress}
+    <if test="status != null">
+      or STATUS = #{status}
+    </if>
+    <if test="photo1 != null and photo1 != ''">
+      or PHOTO1 = #{photo1}
+    </if>
+    <if test="photo2 != null and photo2 != ''">
+      or PHOTO2 = #{photo2}
+    </if>
+    <if test="photo3 != null and photo3 != ''">
+      or PHOTO3 = #{photo3}
+    </if>
+    <if test="photo4 != null and photo4 != ''">
+      or PHOTO4 = #{photo4}
+    </if>
+    <if test="photo5 != null and photo5 != ''">
+      or PHOTO5 = #{photo5}
     </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckReceiptResult">
-    insert into TMSTRUCK_RECEIPT_RESULT (RESULT_ID, RESULT_TOTAL_ID, RESULT_EMPTY_CONTAINER_PHOTO,
-                                         RESULT_SIGNED_NOTE_PHOTO, RESULT_RECEIVE_NOTE_PHOTO,
-                                         WAREHOUSE_ID,ORDER_MILEAGE, INSERT_USERNAME, INSERT_TIME,
-                                         UPDATE_USERNAME, UPDATE_TIME,STATUS, INSERT_UPDATE_REMARK,
-                                         RESULT_ARRIVAL_ADDRESS)
-    values (#{resultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{resultEmptyContainerPhoto,jdbcType=VARCHAR},
-            #{resultSignedNotePhoto,jdbcType=VARCHAR}, #{resultReceiveNotePhoto,jdbcType=VARCHAR},
-            #{warehouseId,jdbcType=DECIMAL},#{orderMileage,jdbcType=DECIMAL},  #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-            #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},#{status,jdbcType=DECIMAL}, #{insertUpdateRemark,jdbcType=VARCHAR},
-            #{resultArrivalAddress,jdbcType=VARCHAR})
+    insert into TMSTRUCK_RECEIPT_RESULT (RESULT_ID, RESULT_TOTAL_ID, RESULT_ARRIVAL_ADDRESS,
+                                         RESULT_EMPTY_CONTAINER_PHOTO, RESULT_SIGNED_NOTE_PHOTO,
+                                         RESULT_RECEIVE_NOTE_PHOTO, ORDER_MILEAGE, WAREHOUSE_ID,
+                                         INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                         UPDATE_TIME, INSERT_UPDATE_REMARK, STATUS,
+                                         PHOTO1, PHOTO2, PHOTO3,
+                                         PHOTO4, PHOTO5)
+    values (#{resultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{resultArrivalAddress,jdbcType=VARCHAR},
+            #{resultEmptyContainerPhoto,jdbcType=VARCHAR}, #{resultSignedNotePhoto,jdbcType=VARCHAR},
+            #{resultReceiveNotePhoto,jdbcType=VARCHAR}, #{orderMileage,jdbcType=DECIMAL}, #{warehouseId,jdbcType=DECIMAL},
+            #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{status,jdbcType=DECIMAL},
+            #{photo1,jdbcType=VARCHAR}, #{photo2,jdbcType=VARCHAR}, #{photo3,jdbcType=VARCHAR},
+            #{photo4,jdbcType=VARCHAR}, #{photo5,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckReceiptResult">
     insert into TMSTRUCK_RECEIPT_RESULT
@@ -194,6 +249,9 @@
       <if test="resultTotalId != null">
         RESULT_TOTAL_ID,
       </if>
+      <if test="resultArrivalAddress != null">
+        RESULT_ARRIVAL_ADDRESS,
+      </if>
       <if test="resultEmptyContainerPhoto != null">
         RESULT_EMPTY_CONTAINER_PHOTO,
       </if>
@@ -203,12 +261,12 @@
       <if test="resultReceiveNotePhoto != null">
         RESULT_RECEIVE_NOTE_PHOTO,
       </if>
-      <if test="warehouseId != null">
-        WAREHOUSE_ID,
-      </if>
       <if test="orderMileage != null">
         ORDER_MILEAGE,
       </if>
+      <if test="warehouseId != null">
+        WAREHOUSE_ID,
+      </if>
       <if test="insertUsername != null">
         INSERT_USERNAME,
       </if>
@@ -221,14 +279,26 @@
       <if test="updateTime != null">
         UPDATE_TIME,
       </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
       <if test="status != null">
         STATUS,
       </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
+      <if test="photo1 != null">
+        PHOTO1,
       </if>
-      <if test="resultArrivalAddress != null">
-        RESULT_ARRIVAL_ADDRESS,
+      <if test="photo2 != null">
+        PHOTO2,
+      </if>
+      <if test="photo3 != null">
+        PHOTO3,
+      </if>
+      <if test="photo4 != null">
+        PHOTO4,
+      </if>
+      <if test="photo5 != null">
+        PHOTO5,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -238,6 +308,9 @@
       <if test="resultTotalId != null">
         #{resultTotalId,jdbcType=DECIMAL},
       </if>
+      <if test="resultArrivalAddress != null">
+        #{resultArrivalAddress,jdbcType=VARCHAR},
+      </if>
       <if test="resultEmptyContainerPhoto != null">
         #{resultEmptyContainerPhoto,jdbcType=VARCHAR},
       </if>
@@ -247,12 +320,12 @@
       <if test="resultReceiveNotePhoto != null">
         #{resultReceiveNotePhoto,jdbcType=VARCHAR},
       </if>
-      <if test="warehouseId != null">
-        #{warehouseId,jdbcType=DECIMAL},
-      </if>
       <if test="orderMileage != null">
         #{orderMileage,jdbcType=DECIMAL},
       </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=DECIMAL},
+      </if>
       <if test="insertUsername != null">
         #{insertUsername,jdbcType=VARCHAR},
       </if>
@@ -265,32 +338,49 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=TIMESTAMP},
-      </if>
       <if test="insertUpdateRemark != null">
         #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
-      <if test="resultArrivalAddress != null">
-        #{resultArrivalAddress,jdbcType=VARCHAR},
+      <if test="status != null">
+        #{status,jdbcType=DECIMAL},
+      </if>
+      <if test="photo1 != null">
+        #{photo1,jdbcType=VARCHAR},
+      </if>
+      <if test="photo2 != null">
+        #{photo2,jdbcType=VARCHAR},
+      </if>
+      <if test="photo3 != null">
+        #{photo3,jdbcType=VARCHAR},
+      </if>
+      <if test="photo4 != null">
+        #{photo4,jdbcType=VARCHAR},
+      </if>
+      <if test="photo5 != null">
+        #{photo5,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckReceiptResult">
     update TMSTRUCK_RECEIPT_RESULT
     set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+        RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress,jdbcType=VARCHAR},
         RESULT_EMPTY_CONTAINER_PHOTO = #{resultEmptyContainerPhoto,jdbcType=VARCHAR},
         RESULT_SIGNED_NOTE_PHOTO = #{resultSignedNotePhoto,jdbcType=VARCHAR},
         RESULT_RECEIVE_NOTE_PHOTO = #{resultReceiveNotePhoto,jdbcType=VARCHAR},
-        WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
         ORDER_MILEAGE = #{orderMileage,jdbcType=DECIMAL},
+        WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
         INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-        STATUS = #{status,jdbcType=DECIMAL},
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-        RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress,jdbcType=VARCHAR}
+        STATUS = #{status,jdbcType=DECIMAL},
+        PHOTO1 = #{photo1,jdbcType=VARCHAR},
+        PHOTO2 = #{photo2,jdbcType=VARCHAR},
+        PHOTO3 = #{photo3,jdbcType=VARCHAR},
+        PHOTO4 = #{photo4,jdbcType=VARCHAR},
+        PHOTO5 = #{photo5,jdbcType=VARCHAR}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckReceiptResult">
@@ -299,6 +389,9 @@
       <if test="resultTotalId != null">
         RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
       </if>
+      <if test="resultArrivalAddress != null">
+        RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress,jdbcType=VARCHAR},
+      </if>
       <if test="resultEmptyContainerPhoto != null">
         RESULT_EMPTY_CONTAINER_PHOTO = #{resultEmptyContainerPhoto,jdbcType=VARCHAR},
       </if>
@@ -308,12 +401,12 @@
       <if test="resultReceiveNotePhoto != null">
         RESULT_RECEIVE_NOTE_PHOTO = #{resultReceiveNotePhoto,jdbcType=VARCHAR},
       </if>
-      <if test="warehouseId != null">
-        WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
-      </if>
       <if test="orderMileage != null">
         ORDER_MILEAGE = #{orderMileage,jdbcType=DECIMAL},
       </if>
+      <if test="warehouseId != null">
+        WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
+      </if>
       <if test="insertUsername != null">
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
       </if>
@@ -326,118 +419,156 @@
       <if test="updateTime != null">
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         STATUS = #{status,jdbcType=DECIMAL},
       </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      <if test="photo1 != null">
+        PHOTO1 = #{photo1,jdbcType=VARCHAR},
       </if>
-      <if test="resultArrivalAddress != null">
-        RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress,jdbcType=VARCHAR},
+      <if test="photo2 != null">
+        PHOTO2 = #{photo2,jdbcType=VARCHAR},
+      </if>
+      <if test="photo3 != null">
+        PHOTO3 = #{photo3,jdbcType=VARCHAR},
+      </if>
+      <if test="photo4 != null">
+        PHOTO4 = #{photo4,jdbcType=VARCHAR},
+      </if>
+      <if test="photo5 != null">
+        PHOTO5 = #{photo5,jdbcType=VARCHAR},
       </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
+    <include refid="select"/>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="where" />
+    <include refid="select"/>
+    <include refid="where"/>
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="whereLike" />
+    <include refid="select"/>
+    <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into TMSTRUCK_RECEIPT_RESULT
     (RESULT_ID,
-    RESULT_TOTAL_ID, RESULT_EMPTY_CONTAINER_PHOTO,
-    RESULT_SIGNED_NOTE_PHOTO, RESULT_RECEIVE_NOTE_PHOTO,
-    WAREHOUSE_ID,ORDER_MILEAGE, INSERT_USERNAME,
+    RESULT_TOTAL_ID, RESULT_ARRIVAL_ADDRESS,
+    RESULT_EMPTY_CONTAINER_PHOTO, RESULT_SIGNED_NOTE_PHOTO,
+    RESULT_RECEIVE_NOTE_PHOTO, ORDER_MILEAGE,
+    WAREHOUSE_ID, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, STATUS,INSERT_UPDATE_REMARK,
-    RESULT_ARRIVAL_ADDRESS)
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    STATUS, PHOTO1, PHOTO2,
+    PHOTO3, PHOTO4, PHOTO5
+    )
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
-    #{item.resultTotalId,jdbcType=DECIMAL}, #{item.resultEmptyContainerPhoto,jdbcType=VARCHAR},
-    #{item.resultSignedNotePhoto,jdbcType=VARCHAR}, #{item.resultReceiveNotePhoto,jdbcType=VARCHAR},
-    #{item.warehouseId,jdbcType=DECIMAL},#{item.orderMileage,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.resultTotalId,jdbcType=DECIMAL}, #{item.resultArrivalAddress,jdbcType=VARCHAR},
+    #{item.resultEmptyContainerPhoto,jdbcType=VARCHAR}, #{item.resultSignedNotePhoto,jdbcType=VARCHAR},
+    #{item.resultReceiveNotePhoto,jdbcType=VARCHAR}, #{item.orderMileage,jdbcType=DECIMAL},
+    #{item.warehouseId,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP},#{item.status,jdbcType=DECIMAL}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-    #{item.resultArrivalAddress,jdbcType=VARCHAR} from dual
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.status,jdbcType=DECIMAL}, #{item.photo1,jdbcType=VARCHAR}, #{item.photo2,jdbcType=VARCHAR},
+    #{item.photo3,jdbcType=VARCHAR}, #{item.photo4,jdbcType=VARCHAR}, #{item.photo5,jdbcType=VARCHAR}
+    from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
     update TMSTRUCK_RECEIPT_RESULT
     set
     RESULT_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
     </foreach>
     ,RESULT_TOTAL_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
     </foreach>
+    ,RESULT_ARRIVAL_ADDRESS=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultArrivalAddress,jdbcType=VARCHAR}
+    </foreach>
     ,RESULT_EMPTY_CONTAINER_PHOTO=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEmptyContainerPhoto,jdbcType=VARCHAR}
     </foreach>
     ,RESULT_SIGNED_NOTE_PHOTO=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultSignedNotePhoto,jdbcType=VARCHAR}
     </foreach>
     ,RESULT_RECEIVE_NOTE_PHOTO=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultReceiveNotePhoto,jdbcType=VARCHAR}
     </foreach>
-    ,WAREHOUSE_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.warehouseId,jdbcType=DECIMAL}
-    </foreach>
     ,ORDER_MILEAGE=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.orderMileage,jdbcType=DECIMAL}
     </foreach>
+    ,WAREHOUSE_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.warehouseId,jdbcType=DECIMAL}
+    </foreach>
     ,INSERT_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
     </foreach>
     ,INSERT_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
     </foreach>
     ,UPDATE_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
     </foreach>
     ,UPDATE_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
     </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
     ,STATUS=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.status,jdbcType=DECIMAL}
     </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    ,PHOTO1=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.photo1,jdbcType=VARCHAR}
     </foreach>
-    ,RESULT_ARRIVAL_ADDRESS=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultArrivalAddress,jdbcType=VARCHAR}
+    ,PHOTO2=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.photo2,jdbcType=VARCHAR}
+    </foreach>
+    ,PHOTO3=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.photo3,jdbcType=VARCHAR}
+    </foreach>
+    ,PHOTO4=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.photo4,jdbcType=VARCHAR}
+    </foreach>
+    ,PHOTO5=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.photo5,jdbcType=VARCHAR}
     </foreach>
     where RESULT_ID in
-    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
       #{item.resultId,jdbcType=DECIMAL}
     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from TMSTRUCK_RECEIPT_RESULT
     where RESULT_ID in
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
   </delete>
@@ -1231,4 +1362,35 @@
                      on trr.RESULT_ID = trrc.RECEIPT_RESULT_ID
     where oo.ORDER_NUMBER = #{orderNumber}
   </select>
+  <select id="getArrivalPhotoPlus" parameterType="java.lang.String" resultType="java.util.Map">
+    select  tar.RESULT_FULL_CONTAINER_PHOTO "photos",
+            tar.PHOTO1 "photo1",
+            tar.PHOTO2 "photo2",
+            tar.PHOTO3 "photo3",
+            tar.PHOTO4 "photo4",
+            tar.PHOTO5 "photo5"
+    from TMSTRUCK_ARRIVAL_RESULT tar
+           left join TMSTRUCK_TOTAL_RESULT ttr
+                     on ttr.RESULT_TOTAL_ID = tar.RESULT_TOTAL_ID
+           left join OMSTRUCK_ORDER oo
+                     on oo.ORDER_ID = ttr.ORDER_ID
+    where oo.ORDER_NUMBER = #{orderNumber}
+      fetch next 1 rows only
+  </select>
+
+  <select id="getReceivePhotoPlus" parameterType="java.lang.String" resultType="java.util.Map">
+    select trr.RESULT_EMPTY_CONTAINER_PHOTO "photos",
+           trr.PHOTO1 "photo1",
+           trr.PHOTO2 "photo2",
+           trr.PHOTO3 "photo3",
+           trr.PHOTO4 "photo4",
+           trr.PHOTO5 "photo5"
+    from TMSTRUCK_RECEIPT_RESULT trr
+           left join TMSTRUCK_TOTAL_RESULT ttr
+                     on ttr.RESULT_TOTAL_ID = trr.RESULT_TOTAL_ID
+           left join OMSTRUCK_ORDER oo
+                     on oo.ORDER_ID = ttr.ORDER_ID
+    where oo.ORDER_NUMBER = #{orderNumber}
+      fetch next 1 rows only
+  </select>
 </mapper>

src/main/resources/com/steerinfo/route/mapper/TmstruckArrivalResultMapper.xml

@@ -12,14 +12,21 @@
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="PHOTO1" jdbcType="VARCHAR" property="photo1" />
+    <result column="PHOTO2" jdbcType="VARCHAR" property="photo2" />
+    <result column="PHOTO3" jdbcType="VARCHAR" property="photo3" />
+    <result column="PHOTO4" jdbcType="VARCHAR" property="photo4" />
+    <result column="PHOTO5" jdbcType="VARCHAR" property="photo5" />
   </resultMap>
   <sql id="columns">
     RESULT_ID, POINT_ID, RESULT_TOTAL_ID, RESULT_ARRIVAL_ADDRESS, RESULT_FULL_CONTAINER_PHOTO, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+    PHOTO1, PHOTO2, PHOTO3, PHOTO4, PHOTO5
   </sql>
   <sql id="columns_alias">
     t.RESULT_ID, t.POINT_ID, t.RESULT_TOTAL_ID, t.RESULT_ARRIVAL_ADDRESS, t.RESULT_FULL_CONTAINER_PHOTO, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
+    t.PHOTO1, t.PHOTO2, t.PHOTO3, t.PHOTO4, t.PHOTO5
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM TMSTRUCK_ARRIVAL_RESULT
@@ -59,6 +66,21 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
       </if>
+      <if test="photo1 != null and photo1 != ''">
+        and PHOTO1 = #{photo1}
+      </if>
+      <if test="photo2 != null and photo2 != ''">
+        and PHOTO2 = #{photo2}
+      </if>
+      <if test="photo3 != null and photo3 != ''">
+        and PHOTO3 = #{photo3}
+      </if>
+      <if test="photo4 != null and photo4 != ''">
+        and PHOTO4 = #{photo4}
+      </if>
+      <if test="photo5 != null and photo5 != ''">
+        and PHOTO5 = #{photo5}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -93,6 +115,21 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
       </if>
+      <if test="photo1 != null and photo1 != ''">
+        and PHOTO1 LIKE '%${photo1}%'
+      </if>
+      <if test="photo2 != null and photo2 != ''">
+        and PHOTO2 LIKE '%${photo2}%'
+      </if>
+      <if test="photo3 != null and photo3 != ''">
+        and PHOTO3 LIKE '%${photo3}%'
+      </if>
+      <if test="photo4 != null and photo4 != ''">
+        and PHOTO4 LIKE '%${photo4}%'
+      </if>
+      <if test="photo5 != null and photo5 != ''">
+        and PHOTO5 LIKE '%${photo5}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -129,16 +166,35 @@
     <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
       or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
     </if>
+    <if test="photo1 != null and photo1 != ''">
+      or PHOTO1 = #{photo1}
+    </if>
+    <if test="photo2 != null and photo2 != ''">
+      or PHOTO2 = #{photo2}
+    </if>
+    <if test="photo3 != null and photo3 != ''">
+      or PHOTO3 = #{photo3}
+    </if>
+    <if test="photo4 != null and photo4 != ''">
+      or PHOTO4 = #{photo4}
+    </if>
+    <if test="photo5 != null and photo5 != ''">
+      or PHOTO5 = #{photo5}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.route.model.TmstruckArrivalResult">
     insert into TMSTRUCK_ARRIVAL_RESULT (RESULT_ID, POINT_ID, RESULT_TOTAL_ID,
                                          RESULT_ARRIVAL_ADDRESS, RESULT_FULL_CONTAINER_PHOTO,
                                          INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                         UPDATE_TIME, INSERT_UPDATE_REMARK)
+                                         UPDATE_TIME, INSERT_UPDATE_REMARK, PHOTO1,
+                                         PHOTO2, PHOTO3, PHOTO4,
+                                         PHOTO5)
     values (#{resultId,jdbcType=DECIMAL}, #{pointId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL},
             #{resultArrivalAddress,jdbcType=VARCHAR}, #{resultFullContainerPhoto,jdbcType=VARCHAR},
             #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
-            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{photo1,jdbcType=VARCHAR},
+            #{photo2,jdbcType=VARCHAR}, #{photo3,jdbcType=VARCHAR}, #{photo4,jdbcType=VARCHAR},
+            #{photo5,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.route.model.TmstruckArrivalResult">
     insert into TMSTRUCK_ARRIVAL_RESULT
@@ -173,6 +229,21 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK,
       </if>
+      <if test="photo1 != null">
+        PHOTO1,
+      </if>
+      <if test="photo2 != null">
+        PHOTO2,
+      </if>
+      <if test="photo3 != null">
+        PHOTO3,
+      </if>
+      <if test="photo4 != null">
+        PHOTO4,
+      </if>
+      <if test="photo5 != null">
+        PHOTO5,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resultId != null">
@@ -205,6 +276,21 @@
       <if test="insertUpdateRemark != null">
         #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="photo1 != null">
+        #{photo1,jdbcType=VARCHAR},
+      </if>
+      <if test="photo2 != null">
+        #{photo2,jdbcType=VARCHAR},
+      </if>
+      <if test="photo3 != null">
+        #{photo3,jdbcType=VARCHAR},
+      </if>
+      <if test="photo4 != null">
+        #{photo4,jdbcType=VARCHAR},
+      </if>
+      <if test="photo5 != null">
+        #{photo5,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.route.model.TmstruckArrivalResult">
@@ -217,7 +303,12 @@
         INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        PHOTO1 = #{photo1,jdbcType=VARCHAR},
+        PHOTO2 = #{photo2,jdbcType=VARCHAR},
+        PHOTO3 = #{photo3,jdbcType=VARCHAR},
+        PHOTO4 = #{photo4,jdbcType=VARCHAR},
+        PHOTO5 = #{photo5,jdbcType=VARCHAR}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.route.model.TmstruckArrivalResult">
@@ -250,6 +341,21 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="photo1 != null">
+        PHOTO1 = #{photo1,jdbcType=VARCHAR},
+      </if>
+      <if test="photo2 != null">
+        PHOTO2 = #{photo2,jdbcType=VARCHAR},
+      </if>
+      <if test="photo3 != null">
+        PHOTO3 = #{photo3,jdbcType=VARCHAR},
+      </if>
+      <if test="photo4 != null">
+        PHOTO4 = #{photo4,jdbcType=VARCHAR},
+      </if>
+      <if test="photo5 != null">
+        PHOTO5 = #{photo5,jdbcType=VARCHAR},
+      </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
@@ -271,16 +377,18 @@
     POINT_ID, RESULT_TOTAL_ID, RESULT_ARRIVAL_ADDRESS,
     RESULT_FULL_CONTAINER_PHOTO, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK
-    )
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    PHOTO1, PHOTO2, PHOTO3,
+    PHOTO4, PHOTO5)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
     #{item.pointId,jdbcType=DECIMAL}, #{item.resultTotalId,jdbcType=DECIMAL}, #{item.resultArrivalAddress,jdbcType=VARCHAR},
     #{item.resultFullContainerPhoto,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    from dual
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.photo1,jdbcType=VARCHAR}, #{item.photo2,jdbcType=VARCHAR}, #{item.photo3,jdbcType=VARCHAR},
+    #{item.photo4,jdbcType=VARCHAR}, #{item.photo5,jdbcType=VARCHAR} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -326,22 +434,32 @@
     <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
     </foreach>
+    ,PHOTO1=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.photo1,jdbcType=VARCHAR}
+    </foreach>
+    ,PHOTO2=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.photo2,jdbcType=VARCHAR}
+    </foreach>
+    ,PHOTO3=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.photo3,jdbcType=VARCHAR}
+    </foreach>
+    ,PHOTO4=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.photo4,jdbcType=VARCHAR}
+    </foreach>
+    ,PHOTO5=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.photo5,jdbcType=VARCHAR}
+    </foreach>
     where RESULT_ID in
     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
       #{item.resultId,jdbcType=DECIMAL}
     </foreach>
   </update>
-  <update id="updateTown" parameterType="string">
-    update RMS_RECEIVE_ADDRESS set ADDRESS_TOWN='${city}'  where ADDRESS_DISTRICT ='${item}'
-  </update>
   <delete id="batchDelete" parameterType="java.util.List">
-    delete from TMSTRUCK_ARRIVAL_RESULT
-    where RESULT_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->