HUJIANGUO 3 лет назад
Родитель
Сommit
8e2e48446b

+ 3 - 3
pom.xml

@@ -106,8 +106,8 @@
                 <version>3.0</version>
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>dil</user>
-                    <password>Dil123789</password>
+                    <user>dagang</user>
+                    <password>root123</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
@@ -128,10 +128,10 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.2.6.RELEASE</version>
                 <executions>
                     <execution>
                         <goals>

+ 1 - 1
src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.java

@@ -1,6 +1,6 @@
 package com.steerinfo.dil.mapper;
 
-import com.steerinfo.dil.model.OmstruckOrder;
+
 import com.steerinfo.dil.model.OmstruckOrderMaterial;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;

+ 14 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckTotalResultMapper.java

@@ -0,0 +1,14 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmstruckTotalResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmstruckTotalResultMapper extends IBaseMapper<TmstruckTotalResult, BigDecimal> {
+    //生成主键id
+    @Select("select seq_TMSTRUCK_TOTALRESULT.nextval from dual")
+    BigDecimal selectTmstruckTotalResultId();
+}

+ 19 - 5
src/main/java/com/steerinfo/dil/model/OmstruckOrderMaterial.java

@@ -3,32 +3,31 @@ package com.steerinfo.dil.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;
 
 @ApiModel(value="运输订单物资中间表")
 public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(ORDER_MATERIAL_ID,DECIMAL,38)
+     * 主键ID(ORDER_MATERIAL_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal orderMaterialId;
 
     /**
-     * 订单id(ORDER_ID,DECIMAL,38)
+     * 订单id(ORDER_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="订单id",required=false)
     private BigDecimal orderId;
 
     /**
-     * 钢材物资ID(MATERIAL_ID,DECIMAL,38)
+     * 钢材物资ID(MATERIAL_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="钢材物资ID",required=false)
     private BigDecimal materialId;
 
     /**
-     * 物资件数(ORDER_MATERIAL_NUMBER,DECIMAL,38)
+     * 物资件数(ORDER_MATERIAL_NUMBER,DECIMAL,0)
      */
     @ApiModelProperty(value="物资件数",required=false)
     private BigDecimal orderMaterialNumber;
@@ -75,6 +74,12 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="物资指向:0:物资主表(原料用);1:物资子表(钢材用)",required=false)
     private BigDecimal materialDirection;
 
+    /**
+     * 物资装卸货优先级(MATERIAL_PRIORITY,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资装卸货优先级",required=false)
+    private BigDecimal materialPriority;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -175,6 +180,14 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         this.materialDirection = materialDirection;
     }
 
+    public BigDecimal getMaterialPriority() {
+        return materialPriority;
+    }
+
+    public void setMaterialPriority(BigDecimal materialPriority) {
+        this.materialPriority = materialPriority;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -192,6 +205,7 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", materialDirection=").append(materialDirection);
+        sb.append(", materialPriority=").append(materialPriority);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

+ 183 - 0
src/main/java/com/steerinfo/dil/model/TmstruckTotalResult.java

@@ -0,0 +1,183 @@
+package com.steerinfo.dil.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;
+
+@ApiModel(value="实绩总表")
+public class TmstruckTotalResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_TOTAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultTotalId;
+
+    /**
+     * 订单ID(ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="订单ID",required=false)
+    private BigDecimal orderId;
+
+    /**
+     * 运输总时长(RESULT_DURATION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输总时长",required=false)
+    private Short resultDuration;
+
+    /**
+     * 运输标准时长(STANDARD_DATA_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运输标准时长",required=false)
+    private BigDecimal standardDataId;
+
+    /**
+     * 运输时长异常值(RESULT_OUTLIER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输时长异常值",required=false)
+    private Short resultOutlier;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultTotalId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultTotalId) {
+        this.resultTotalId = resultTotalId;
+    }
+
+    public BigDecimal getResultTotalId() {
+        return resultTotalId;
+    }
+
+    public void setResultTotalId(BigDecimal resultTotalId) {
+        this.resultTotalId = resultTotalId;
+    }
+
+    public BigDecimal getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(BigDecimal orderId) {
+        this.orderId = orderId;
+    }
+
+    public Short getResultDuration() {
+        return resultDuration;
+    }
+
+    public void setResultDuration(Short resultDuration) {
+        this.resultDuration = resultDuration;
+    }
+
+    public BigDecimal getStandardDataId() {
+        return standardDataId;
+    }
+
+    public void setStandardDataId(BigDecimal standardDataId) {
+        this.standardDataId = standardDataId;
+    }
+
+    public Short getResultOutlier() {
+        return resultOutlier;
+    }
+
+    public void setResultOutlier(Short resultOutlier) {
+        this.resultOutlier = resultOutlier;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultTotalId=").append(resultTotalId);
+        sb.append(", orderId=").append(orderId);
+        sb.append(", resultDuration=").append(resultDuration);
+        sb.append(", standardDataId=").append(standardDataId);
+        sb.append(", resultOutlier=").append(resultOutlier);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 26 - 12
src/main/java/com/steerinfo/dil/service/impl/AmstruckSporadicOrderServiceImpl.java

@@ -2,8 +2,10 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
+import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
 import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.OmstruckOrderMaterial;
+import com.steerinfo.dil.model.TmstruckTotalResult;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.model.AmstruckSporadicOrder;
 import com.steerinfo.dil.mapper.AmstruckSporadicOrderMapper;
@@ -39,6 +41,8 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
     OmstruckOrderMapper omstruckOrderMapper;
     @Autowired
     OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
+    @Autowired
+    TmstruckTotalResultMapper tmstruckTotalResultMapper;
 
 
     /**
@@ -61,8 +65,6 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         BigDecimal orderType = new BigDecimal((Integer) mapValue.get("orderType"));
         // 得到运输路径
         BigDecimal lineId = new BigDecimal((Integer) mapValue.get("lineId"));
-        // 得到运输路径
-        BigDecimal unloadPointId = new BigDecimal((Integer) mapValue.get("unloadPointId"));
         BigDecimal sporadicOrderId = amstruckSporadicOrderMapper.selectSporadicOrderId();
         AmstruckSporadicOrder amstruckSporadicOrder = new AmstruckSporadicOrder();
         amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
@@ -87,25 +89,32 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         omstruckOrder.setInsertUsername("admin");
         omstruckOrder.setInsertUpdateRemark("无");
         omstruckOrder.setLineId(lineId);
-        omstruckOrder.setUnloadPointId(unloadPointId);
+        //新增总实绩id
+        TmstruckTotalResult tmstruckTotalResult=new TmstruckTotalResult();
+        tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectTmstruckTotalResultId());
+        tmstruckTotalResult.setOrderId(omstruckOrder.getOrderId());
+        //新增总实绩
+        result += tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
         result += amstruckSporadicOrderMapper.insertSelective(amstruckSporadicOrder);
         result += omstruckOrderMapper.insertSelective(omstruckOrder);
         for (Map<String, Object> map : mapList) {
             BigDecimal materialId = new BigDecimal((Integer) map.get("materialId"));
-            Double materialWeight = (Double) map.get("orderMaterialWeight");
-            Double materialNumber = (Double) map.get("orderMaterialNumber");
+            BigDecimal materialWeight = DataChange.dataToBigDecimal(map.get("orderMaterialWeight"));
+            BigDecimal materialNumber =DataChange.dataToBigDecimal(map.get("orderMaterialNumber"));
             OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
             BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
             omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
             omstruckOrderMaterial.setOrderId(orderId);
             omstruckOrderMaterial.setMaterialId(materialId);
+            //设置物资装货优先级
+            omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(map.get("materialPriority")));
             omstruckOrderMaterial.setInsertUsername("admin");
             omstruckOrderMaterial.setInsertTime(new Date());
-            if (materialWeight != null && materialWeight.toString().length() != 0) {
-                omstruckOrderMaterial.setOrderMaterialWeight(new BigDecimal(materialWeight));
+            if (materialWeight != null) {
+                omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
             }
-            if (materialNumber != null && materialNumber.toString().length() != 0) {
-                omstruckOrderMaterial.setOrderMaterialNumber(new BigDecimal(materialNumber));
+            if (materialNumber != null) {
+                omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
             }
             result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
         }
@@ -122,10 +131,15 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         int result = 0;
         // 遍历
         for (Map<String, Object> map : mapList) {
-            BigDecimal sporadicOrderId = DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
-            AmstruckSporadicOrder amstruckSporadicOrder = amstruckSporadicOrderMapper.selectByPrimaryKey(sporadicOrderId);
+            OmstruckOrder omstruckOrder=new OmstruckOrder();
+            omstruckOrder.setOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+            omstruckOrder.setOrderStatus(new BigDecimal(3));
+            //修改零星物资订单状态
+            AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
+            amstruckSporadicOrder.setSporadicOrderId(DataChange.dataToBigDecimal(map.get("sporadicOrderId")));
             amstruckSporadicOrder.setIssueStatus(new BigDecimal(1));
-            result += amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
+            result +=amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
+            result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         }
         return result;
     }

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -67,4 +67,4 @@ server:
 #  正式
 #  port: 8079
 #  测试
-  port: 8015
+  port: 8015

+ 2 - 1
src/main/resources/com/steerinfo/dil/mapper/AmstruckSporadicOrderMapper.xml

@@ -418,7 +418,8 @@
         RCO.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
         RCA.CARRIER_NAME AS "carrierName",
         ASO.INSERT_TIME AS "insertTime",
-        OO.ORDER_TYPE AS "type"
+        OO.ORDER_TYPE AS "type",
+        OO.ORDER_ID "orderId"
         FROM AMSTRUCK_SPORADIC_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RCO
         ON ASO.RECEIVE_UNIT_ID = RCO.CONSIGNEE_ID

+ 61 - 36
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.xml

@@ -13,22 +13,23 @@
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="MATERIAL_DIRECTION" jdbcType="DECIMAL" property="materialDirection" />
+    <result column="MATERIAL_PRIORITY" jdbcType="DECIMAL" property="materialPriority" />
   </resultMap>
   <sql id="columns">
-    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    MATERIAL_DIRECTION
+    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    MATERIAL_DIRECTION, MATERIAL_PRIORITY
   </sql>
   <sql id="columns_alias">
-    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.MATERIAL_DIRECTION
+    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT,
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
+    t.MATERIAL_DIRECTION, t.MATERIAL_PRIORITY
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM OMSTRUCK_ORDER_MATERIAL
+    SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER_MATERIAL
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM OMSTRUCK_ORDER_MATERIAL t
+    SELECT <include refid="columns_alias" /> FROM OMSTRUCK_ORDER_MATERIAL t
   </sql>
   <sql id="where">
     <where>
@@ -65,6 +66,9 @@
       <if test="materialDirection != null">
         and MATERIAL_DIRECTION = #{materialDirection}
       </if>
+      <if test="materialPriority != null">
+        and MATERIAL_PRIORITY = #{materialPriority}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -102,9 +106,12 @@
       <if test="materialDirection != null">
         and MATERIAL_DIRECTION = #{materialDirection}
       </if>
+      <if test="materialPriority != null">
+        and MATERIAL_PRIORITY = #{materialPriority}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </delete>
@@ -141,18 +148,21 @@
     <if test="materialDirection != null">
       or MATERIAL_DIRECTION = #{materialDirection}
     </if>
+    <if test="materialPriority != null">
+      or MATERIAL_PRIORITY = #{materialPriority}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL (ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID,
                                          ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
                                          INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                         UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_DIRECTION
-    )
+                                         UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_DIRECTION,
+                                         MATERIAL_PRIORITY)
     values (#{orderMaterialId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
             #{orderMaterialNumber,jdbcType=DECIMAL}, #{orderMaterialWeight,jdbcType=DECIMAL},
             #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
-            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{materialDirection,jdbcType=DECIMAL}
-           )
+            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{materialDirection,jdbcType=DECIMAL},
+            #{materialPriority,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL
@@ -190,6 +200,9 @@
       <if test="materialDirection != null">
         MATERIAL_DIRECTION,
       </if>
+      <if test="materialPriority != null">
+        MATERIAL_PRIORITY,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderMaterialId != null">
@@ -225,6 +238,9 @@
       <if test="materialDirection != null">
         #{materialDirection,jdbcType=DECIMAL},
       </if>
+      <if test="materialPriority != null">
+        #{materialPriority,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -238,7 +254,8 @@
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-        MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL}
+        MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL},
+        MATERIAL_PRIORITY = #{materialPriority,jdbcType=DECIMAL}
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -274,20 +291,23 @@
       <if test="materialDirection != null">
         MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL},
       </if>
+      <if test="materialPriority != null">
+        MATERIAL_PRIORITY = #{materialPriority,jdbcType=DECIMAL},
+      </if>
     </set>
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
     where ORDER_MATERIAL_ID = #{orderMaterialId,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 OMSTRUCK_ORDER_MATERIAL
@@ -296,7 +316,8 @@
     ORDER_MATERIAL_WEIGHT, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK,
-    MATERIAL_DIRECTION)
+    MATERIAL_DIRECTION, MATERIAL_PRIORITY
+    )
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.orderMaterialId,jdbcType=DECIMAL},
@@ -304,69 +325,73 @@
     #{item.orderMaterialWeight,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-    #{item.materialDirection,jdbcType=DECIMAL} from dual
+    #{item.materialDirection,jdbcType=DECIMAL}, #{item.materialPriority,jdbcType=DECIMAL}
+    from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
     update OMSTRUCK_ORDER_MATERIAL
     set
     ORDER_MATERIAL_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialId,jdbcType=DECIMAL}
     </foreach>
     ,ORDER_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
     </foreach>
     ,MATERIAL_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
     </foreach>
     ,ORDER_MATERIAL_NUMBER=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialNumber,jdbcType=DECIMAL}
     </foreach>
     ,ORDER_MATERIAL_WEIGHT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialWeight,jdbcType=DECIMAL}
     </foreach>
     ,INSERT_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
     </foreach>
     ,INSERT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
     </foreach>
     ,UPDATE_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
     </foreach>
     ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
     </foreach>
     ,INSERT_UPDATE_REMARK=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
     </foreach>
     ,MATERIAL_DIRECTION=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialDirection,jdbcType=DECIMAL}
     </foreach>
+    ,MATERIAL_PRIORITY=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialPriority,jdbcType=DECIMAL}
+    </foreach>
     where ORDER_MATERIAL_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.orderMaterialId,jdbcType=DECIMAL}
     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
-
   <!-- 友情提示!!!-->
   <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
 

+ 345 - 0
src/main/resources/com/steerinfo/dil/mapper/TmstruckTotalResultMapper.xml

@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmstruckTotalResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckTotalResult">
+    <id column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
+    <result column="ORDER_ID" jdbcType="DECIMAL" property="orderId" />
+    <result column="RESULT_DURATION" jdbcType="DECIMAL" property="resultDuration" />
+    <result column="STANDARD_DATA_ID" jdbcType="DECIMAL" property="standardDataId" />
+    <result column="RESULT_OUTLIER" jdbcType="DECIMAL" property="resultOutlier" />
+    <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="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    RESULT_TOTAL_ID, ORDER_ID, RESULT_DURATION, STANDARD_DATA_ID, RESULT_OUTLIER, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.RESULT_TOTAL_ID, t.ORDER_ID, t.RESULT_DURATION, t.STANDARD_DATA_ID, t.RESULT_OUTLIER, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM TMSTRUCK_TOTAL_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM TMSTRUCK_TOTAL_RESULT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="orderId != null">
+        and ORDER_ID = #{orderId}
+      </if>
+      <if test="resultDuration != null">
+        and RESULT_DURATION = #{resultDuration}
+      </if>
+      <if test="standardDataId != null">
+        and STANDARD_DATA_ID = #{standardDataId}
+      </if>
+      <if test="resultOutlier != null">
+        and RESULT_OUTLIER = #{resultOutlier}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="orderId != null">
+        and ORDER_ID = #{orderId}
+      </if>
+      <if test="resultDuration != null">
+        and RESULT_DURATION = #{resultDuration}
+      </if>
+      <if test="standardDataId != null">
+        and STANDARD_DATA_ID = #{standardDataId}
+      </if>
+      <if test="resultOutlier != null">
+        and RESULT_OUTLIER = #{resultOutlier}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from TMSTRUCK_TOTAL_RESULT
+    where RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSTRUCK_TOTAL_RESULT
+    where 1!=1 
+      <if test="orderId != null">
+        or ORDER_ID = #{orderId}
+      </if>
+      <if test="resultDuration != null">
+        or RESULT_DURATION = #{resultDuration}
+      </if>
+      <if test="standardDataId != null">
+        or STANDARD_DATA_ID = #{standardDataId}
+      </if>
+      <if test="resultOutlier != null">
+        or RESULT_OUTLIER = #{resultOutlier}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckTotalResult">
+    insert into TMSTRUCK_TOTAL_RESULT (RESULT_TOTAL_ID, ORDER_ID, RESULT_DURATION, 
+      STANDARD_DATA_ID, RESULT_OUTLIER, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    values (#{resultTotalId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{resultDuration,jdbcType=DECIMAL}, 
+      #{standardDataId,jdbcType=DECIMAL}, #{resultOutlier,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckTotalResult">
+    insert into TMSTRUCK_TOTAL_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID,
+      </if>
+      <if test="orderId != null">
+        ORDER_ID,
+      </if>
+      <if test="resultDuration != null">
+        RESULT_DURATION,
+      </if>
+      <if test="standardDataId != null">
+        STANDARD_DATA_ID,
+      </if>
+      <if test="resultOutlier != null">
+        RESULT_OUTLIER,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="resultTotalId != null">
+        #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="orderId != null">
+        #{orderId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultDuration != null">
+        #{resultDuration,jdbcType=DECIMAL},
+      </if>
+      <if test="standardDataId != null">
+        #{standardDataId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultOutlier != null">
+        #{resultOutlier,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckTotalResult">
+    update TMSTRUCK_TOTAL_RESULT
+    set ORDER_ID = #{orderId,jdbcType=DECIMAL},
+      RESULT_DURATION = #{resultDuration,jdbcType=DECIMAL},
+      STANDARD_DATA_ID = #{standardDataId,jdbcType=DECIMAL},
+      RESULT_OUTLIER = #{resultOutlier,jdbcType=DECIMAL},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckTotalResult">
+    update TMSTRUCK_TOTAL_RESULT
+    <set>
+      <if test="orderId != null">
+        ORDER_ID = #{orderId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultDuration != null">
+        RESULT_DURATION = #{resultDuration,jdbcType=DECIMAL},
+      </if>
+      <if test="standardDataId != null">
+        STANDARD_DATA_ID = #{standardDataId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultOutlier != null">
+        RESULT_OUTLIER = #{resultOutlier,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into TMSTRUCK_TOTAL_RESULT 
+      (RESULT_TOTAL_ID, 
+      ORDER_ID, RESULT_DURATION, STANDARD_DATA_ID, 
+      RESULT_OUTLIER, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.resultTotalId,jdbcType=DECIMAL}, 
+      #{item.orderId,jdbcType=DECIMAL}, #{item.resultDuration,jdbcType=DECIMAL}, #{item.standardDataId,jdbcType=DECIMAL}, 
+      #{item.resultOutlier,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update TMSTRUCK_TOTAL_RESULT
+     set
+       RESULT_TOTAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
+          when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
+       </foreach>
+       ,ORDER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
+          when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_DURATION=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
+          when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.resultDuration,jdbcType=DECIMAL}
+       </foreach>
+       ,STANDARD_DATA_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
+          when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.standardDataId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_OUTLIER=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
+          when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.resultOutlier,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
+          when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
+          when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
+          when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
+          when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
+          when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where RESULT_TOTAL_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.resultTotalId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSTRUCK_TOTAL_RESULT
+    where RESULT_TOTAL_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+  
+</mapper>