dasad

pom.xml

@@ -112,7 +112,7 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-                        <param>AMS_SALE_ORDER</param><!--销售计划物资中间表-->
+                        <param>RMS_LINE_NODE_POINT</param><!--销售计划物资中间表-->
 <!--                        <param>AMSTRUCK_RAIL_DAYP·LAN</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
 <!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;-->
 <!--                        <param>RMS_RECEIVE_PLACE</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;-->

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

@@ -296,10 +296,13 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         String settleMentType = (String) mapvalue.get("requirementType");
         BigDecimal type = null;
         if("计重".equals(settleMentType)){
+            //在单价表里内转计重是2
             type = new BigDecimal(2);
         }else if("计时".equals(settleMentType)){
+            //在单价表里内转计时是5
             type = new BigDecimal(5);
         }else if("计次".equals(settleMentType)){
+            //在单价表里内转计时是6
             type = new BigDecimal(6);
         }
         mapvalue.put("type",type);
@@ -312,4 +315,28 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         }
 
     }
+
+    @ApiOperation(value = "承运起止范围与装货点")
+    @PostMapping("/getRangePoint")
+    public RESTfulResult getRangePoint(@RequestBody(required = false)Map<String,Object>mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       String con){
+        if (con != null && !con.equals("undefined")) {
+            mapValue.put("con","%" + con + "%");
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> rangePointList = amsContractTruckPriceService.getRangePoint(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,rangePointList);
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "插入承运起止范围与装货点")
+    @PostMapping("/insertLineNodePoint")
+    public RESTfulResult insertLineNodePoint(@RequestBody(required = false)Map<String,Object>map){
+        return success(amsContractTruckPriceService.insertLineNodePoint(map));
+    }
 }

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

@@ -59,5 +59,6 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
 
     List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue);
 
+    List<Map<String, Object>> getRangePoint(Map<String, Object> mapValue);
 
 }

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

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsLineNodePoint;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+
+
+@Mapper
+public interface RmsLineNodePointMapper extends IBaseMapper<RmsLineNodePoint, BigDecimal> {
+
+    @Select("select seq__rms_line_node_point.nextval from dual")
+    BigDecimal lineMaxId();
+}

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

@@ -0,0 +1,184 @@
+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 RmsLineNodePoint implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(LINE_NODE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal lineNodeId;
+
+    /**
+     * 承运起止范围ID(TRANS_RANGE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="承运起止范围ID",required=false)
+    private BigDecimal transRangeId;
+
+    /**
+     * 装货点名称(LOAD_POINT_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="装货点名称",required=false)
+    private String loadPointName;
+
+    /**
+     * 卸货点名称(UNLOAD_POINT_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="卸货点名称",required=false)
+    private String unloadPointName;
+
+    /**
+     * 记录创建人(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;
+
+    /**
+     * 是否删除 0未删除，已已删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否删除 0未删除，已已删除",required=false)
+    private BigDecimal deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.lineNodeId;
+    }
+
+    @Override
+    public void setId(BigDecimal lineNodeId) {
+        this.lineNodeId = lineNodeId;
+    }
+
+    public BigDecimal getLineNodeId() {
+        return lineNodeId;
+    }
+
+    public void setLineNodeId(BigDecimal lineNodeId) {
+        this.lineNodeId = lineNodeId;
+    }
+
+    public BigDecimal getTransRangeId() {
+        return transRangeId;
+    }
+
+    public void setTransRangeId(BigDecimal transRangeId) {
+        this.transRangeId = transRangeId;
+    }
+
+    public String getLoadPointName() {
+        return loadPointName;
+    }
+
+    public void setLoadPointName(String loadPointName) {
+        this.loadPointName = loadPointName == null ? null : loadPointName.trim();
+    }
+
+    public String getUnloadPointName() {
+        return unloadPointName;
+    }
+
+    public void setUnloadPointName(String unloadPointName) {
+        this.unloadPointName = unloadPointName == null ? null : unloadPointName.trim();
+    }
+
+    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();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", lineNodeId=").append(lineNodeId);
+        sb.append(", transRangeId=").append(transRangeId);
+        sb.append(", loadPointName=").append(loadPointName);
+        sb.append(", unloadPointName=").append(unloadPointName);
+        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(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -56,4 +56,8 @@ public interface IAmsContractTruckPriceService {
 
     List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue);
 
+    List<Map<String, Object>> getRangePoint(Map<String, Object> mapValue);
+
+    int insertLineNodePoint(Map<String, Object> map);
+
 }

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

@@ -2,9 +2,11 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.AmsContaactPriceMaterialMapper;
 import com.steerinfo.dil.mapper.AmsContractTruckPriceMapper;
+import com.steerinfo.dil.mapper.RmsLineNodePointMapper;
 import com.steerinfo.dil.mapper.RmsReceivePlaceMapper;
 import com.steerinfo.dil.model.AmsContaactPriceMaterial;
 import com.steerinfo.dil.model.AmsContractTransportPrice;
+import com.steerinfo.dil.model.RmsLineNodePoint;
 import com.steerinfo.dil.model.RmsReceivePlace;
 import com.steerinfo.dil.service.IAmsContractTruckPriceService;
 import com.steerinfo.dil.util.DataChange;
@@ -44,6 +46,12 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
     @Autowired
     AmsContaactPriceMaterialMapper amsContaactPriceMaterialMapper;
 
+    //@Autowired
+    //private RmsLineNodePoint rmsLineNodePoint;
+
+    @Autowired
+    private RmsLineNodePointMapper rmsLineNodePointMapper;
+
     /**
      * 新增汽运单价
      * @Author zzd
@@ -612,4 +620,24 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
     public List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue) {
             return amsContractTruckPriceMapper.selectInwardPrice(mapvalue);
     }
+
+    @Override
+    public List<Map<String, Object>> getRangePoint(Map<String, Object> mapValue) {
+        return amsContractTruckPriceMapper.getRangePoint(mapValue);
+    }
+
+    @Override
+    public int insertLineNodePoint(Map<String, Object> map) {
+        RmsLineNodePoint rmsLineNodePoint = new RmsLineNodePoint();
+        BigDecimal rangeId = DataChange.dataToBigDecimal(map.get("rangeId"));
+        String loadName = (String)map.get("loadPointName");
+        String unloadName = (String)map.get("unloadPointName");
+        rmsLineNodePoint.setId(rmsLineNodePointMapper.lineMaxId());
+        rmsLineNodePoint.setTransRangeId(rangeId);
+        rmsLineNodePoint.setLoadPointName(loadName);
+        rmsLineNodePoint.setUnloadPointName(unloadName);
+        rmsLineNodePoint.setDeleted(new BigDecimal(0));
+        int i = rmsLineNodePointMapper.insertSelective(rmsLineNodePoint);
+        return i;
+    }
 }

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

@@ -47,6 +47,9 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
     @Autowired
     private AmstruckRequirementPlanMapper amstruckRequirementPlanMapper;
 
+    @Autowired
+    AmsContractTruckPriceServiceImpl amsContractTruckPriceService;
+
     @Override
     protected IBaseMapper<AmstruckInwardRequirement, BigDecimal> getMapper() {
         return amstruckInwardRequirementMapper;
@@ -153,6 +156,11 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
             amstruckRequirementMaterial.setInsertUsername("admin");
             amstruckRequirementMaterial.setInsertUpdateRemark(InsertUpdateRemark);
             result += amstruckRequirementMaterialMapper.insertSelective(amstruckRequirementMaterial);
+            if(mapValue.get("rangeId") != null){
+                //承运起止范围
+                requireMaterialMap.put("rangeId",mapValue.get("rangeId"));
+                amsContractTruckPriceService.insertLineNodePoint(requireMaterialMap);
+            }
         }
         return result;
     }

src/main/resources/bootstrap.yml

@@ -17,11 +17,11 @@ eureka:
   client:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
-    register-with-eureka: true #表示向EurekaServer注册自己 默认为true
-    fetch-registry: true #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 
   instance:
-    prefer-ip-address: true
+    prefer-ip-address: false
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
 

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

@@ -163,11 +163,14 @@
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="getMaterialName" resultType="java.util.Map" parameterType="decimal">
     select
-    rm.MATERIAL_NAME "materialName",
-    rm.MATERIAL_ID "materialId"
+    RMT.MATERIAL_TYPE_NAME "materialName",
+    RMT.MATERIAL_TYPE_ID "materialId"
     from AMS_CONTAACT_PRICE_MATERIAL acpr
-    left join RMS_MATERIAL RM
-    on rm.MATERIAL_ID = acpr.MATERIAL_ID
-    where PRICE_ID = #{priceId}
+    left join RMS_MATERIAL_TYPE RMT
+    on RMT.MATERIAL_TYPE_ID = acpr.MATERIAL_ID
+    where
+    RMT.MATERIAL_ISINWARD = 1
+    AND
+    PRICE_ID = #{priceId}
   </select>
 </mapper>

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

@@ -903,7 +903,10 @@
                            ON a_t_price.LINE_ID = RGR.TRANS_RANGE_ID
                  LEFT JOIN RMS_OIL_TYPE r_o_type
                            ON a_t_price.OIL_TYPE_ID = r_o_type.OIL_TYPE_ID
-        where TYPE in (2,5,6))
+        where TYPE in (2,5,6)
+        <if test="deleted != null">
+          and a_t_price.DELETED = #{deleted}
+        </if> )
   </select>
     <select id="selectInwardPrice" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
       select * from (select
@@ -928,4 +931,39 @@
       )
       Order by "priceDate" desc
     </select>
+    <select id="getRangePoint" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM
+        (SELECT RTR.TRANS_RANGE_VALUE "transRangeValue" ,
+                RLNP.LOAD_POINT_NAME "loadPointName" ,
+                RLNP.UNLOAD_POINT_NAME "unloadPointName",
+                RTR.TRANS_RANGE_ID  "transRangeId",
+                RLNP.LINE_NODE_ID   "lineNodeId"  FROM RMS_TRANS_RANGE RTR
+        LEFT JOIN RMS_LINE_NODE_POINT RLNP on RTR.TRANS_RANGE_ID = RLNP.TRANS_RANGE_ID
+        where RLNP.DELETED = 0
+        <if test="con != null">
+          AND
+          RTR.TRANS_RANGE_VALUE||RLNP.LOAD_POINT_NAME||RLNP.UNLOAD_POINT_NAME like #{con}
+        </if>
+        )
+        <where>
+          <if test="transRangeValue != null">
+            and
+            <foreach collection="transRangeValue" item="item" open="(" separator="or" close=")">
+              "transRangeValue" like '%${item}%'
+            </foreach>
+          </if>
+          <if test="loadPointName != null">
+            and
+            <foreach collection="loadPointName" item="item" open="(" separator="or" close=")">
+              "loadPointName" like '%${item}%'
+            </foreach>
+          </if>
+          <if test="loadPointName != null">
+            and
+            <foreach collection="loadPointName" item="item" open="(" separator="or" close=")">
+              "loadPointName" like '%${item}%'
+            </foreach>
+          </if>
+        </where>
+    </select>
 </mapper>

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

@@ -0,0 +1,344 @@
+<?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.RmsLineNodePointMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsLineNodePoint">
+    <id column="LINE_NODE_ID" jdbcType="DECIMAL" property="lineNodeId" />
+    <result column="TRANS_RANGE_ID" jdbcType="DECIMAL" property="transRangeId" />
+    <result column="LOAD_POINT_NAME" jdbcType="VARCHAR" property="loadPointName" />
+    <result column="UNLOAD_POINT_NAME" jdbcType="VARCHAR" property="unloadPointName" />
+    <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" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+  </resultMap>
+  <sql id="columns">
+    LINE_NODE_ID, TRANS_RANGE_ID, LOAD_POINT_NAME, UNLOAD_POINT_NAME, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+  </sql>
+  <sql id="columns_alias">
+    t.LINE_NODE_ID, t.TRANS_RANGE_ID, t.LOAD_POINT_NAME, t.UNLOAD_POINT_NAME, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_LINE_NODE_POINT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_LINE_NODE_POINT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="lineNodeId != null">
+        and LINE_NODE_ID = #{lineNodeId}
+      </if>
+      <if test="transRangeId != null">
+        and TRANS_RANGE_ID = #{transRangeId}
+      </if>
+      <if test="loadPointName != null and loadPointName != ''">
+        and LOAD_POINT_NAME = #{loadPointName}
+      </if>
+      <if test="unloadPointName != null and unloadPointName != ''">
+        and UNLOAD_POINT_NAME = #{unloadPointName}
+      </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>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="lineNodeId != null">
+        and LINE_NODE_ID = #{lineNodeId}
+      </if>
+      <if test="transRangeId != null">
+        and TRANS_RANGE_ID = #{transRangeId}
+      </if>
+      <if test="loadPointName != null and loadPointName != ''">
+        and LOAD_POINT_NAME LIKE '%${loadPointName}%'
+      </if>
+      <if test="unloadPointName != null and unloadPointName != ''">
+        and UNLOAD_POINT_NAME LIKE '%${unloadPointName}%'
+      </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>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from RMS_LINE_NODE_POINT
+    where LINE_NODE_ID = #{lineNodeId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_LINE_NODE_POINT
+    where 1!=1 
+      <if test="transRangeId != null">
+        or TRANS_RANGE_ID = #{transRangeId}
+      </if>
+      <if test="loadPointName != null and loadPointName != ''">
+        or LOAD_POINT_NAME = #{loadPointName}
+      </if>
+      <if test="unloadPointName != null and unloadPointName != ''">
+        or UNLOAD_POINT_NAME = #{unloadPointName}
+      </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>
+      <if test="deleted != null">
+        or DELETED = #{deleted}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsLineNodePoint">
+    insert into RMS_LINE_NODE_POINT (LINE_NODE_ID, TRANS_RANGE_ID, LOAD_POINT_NAME, 
+      UNLOAD_POINT_NAME, INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED)
+    values (#{lineNodeId,jdbcType=DECIMAL}, #{transRangeId,jdbcType=DECIMAL}, #{loadPointName,jdbcType=VARCHAR}, 
+      #{unloadPointName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
+      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{deleted,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsLineNodePoint">
+    insert into RMS_LINE_NODE_POINT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="lineNodeId != null">
+        LINE_NODE_ID,
+      </if>
+      <if test="transRangeId != null">
+        TRANS_RANGE_ID,
+      </if>
+      <if test="loadPointName != null">
+        LOAD_POINT_NAME,
+      </if>
+      <if test="unloadPointName != null">
+        UNLOAD_POINT_NAME,
+      </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>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="lineNodeId != null">
+        #{lineNodeId,jdbcType=DECIMAL},
+      </if>
+      <if test="transRangeId != null">
+        #{transRangeId,jdbcType=DECIMAL},
+      </if>
+      <if test="loadPointName != null">
+        #{loadPointName,jdbcType=VARCHAR},
+      </if>
+      <if test="unloadPointName != null">
+        #{unloadPointName,jdbcType=VARCHAR},
+      </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>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsLineNodePoint">
+    update RMS_LINE_NODE_POINT
+    set TRANS_RANGE_ID = #{transRangeId,jdbcType=DECIMAL},
+      LOAD_POINT_NAME = #{loadPointName,jdbcType=VARCHAR},
+      UNLOAD_POINT_NAME = #{unloadPointName,jdbcType=VARCHAR},
+      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},
+      DELETED = #{deleted,jdbcType=DECIMAL}
+    where LINE_NODE_ID = #{lineNodeId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsLineNodePoint">
+    update RMS_LINE_NODE_POINT
+    <set>
+      <if test="transRangeId != null">
+        TRANS_RANGE_ID = #{transRangeId,jdbcType=DECIMAL},
+      </if>
+      <if test="loadPointName != null">
+        LOAD_POINT_NAME = #{loadPointName,jdbcType=VARCHAR},
+      </if>
+      <if test="unloadPointName != null">
+        UNLOAD_POINT_NAME = #{unloadPointName,jdbcType=VARCHAR},
+      </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>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where LINE_NODE_ID = #{lineNodeId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where LINE_NODE_ID = #{lineNodeId,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 RMS_LINE_NODE_POINT 
+      (LINE_NODE_ID, 
+      TRANS_RANGE_ID, LOAD_POINT_NAME, 
+      UNLOAD_POINT_NAME, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.lineNodeId,jdbcType=DECIMAL}, 
+      #{item.transRangeId,jdbcType=DECIMAL}, #{item.loadPointName,jdbcType=VARCHAR}, 
+      #{item.unloadPointName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.deleted,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_LINE_NODE_POINT
+     set
+       LINE_NODE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case LINE_NODE_ID" separator=" ">
+          when #{item.lineNodeId,jdbcType=DECIMAL} then #{item.lineNodeId,jdbcType=DECIMAL}
+       </foreach>
+       ,TRANS_RANGE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case LINE_NODE_ID" separator=" ">
+          when #{item.lineNodeId,jdbcType=DECIMAL} then #{item.transRangeId,jdbcType=DECIMAL}
+       </foreach>
+       ,LOAD_POINT_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case LINE_NODE_ID" separator=" ">
+          when #{item.lineNodeId,jdbcType=DECIMAL} then #{item.loadPointName,jdbcType=VARCHAR}
+       </foreach>
+       ,UNLOAD_POINT_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case LINE_NODE_ID" separator=" ">
+          when #{item.lineNodeId,jdbcType=DECIMAL} then #{item.unloadPointName,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case LINE_NODE_ID" separator=" ">
+          when #{item.lineNodeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case LINE_NODE_ID" separator=" ">
+          when #{item.lineNodeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case LINE_NODE_ID" separator=" ">
+          when #{item.lineNodeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case LINE_NODE_ID" separator=" ">
+          when #{item.lineNodeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case LINE_NODE_ID" separator=" ">
+          when #{item.lineNodeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case LINE_NODE_ID" separator=" ">
+          when #{item.lineNodeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+     where LINE_NODE_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.lineNodeId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_LINE_NODE_POINT
+    where LINE_NODE_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>