修改

pom.xml

@@ -203,7 +203,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>DIL_APP_CID</param>
+                        <param>log_result</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/aspect/LogAspect.java

@@ -140,6 +140,17 @@ public class LogAspect {
                                 logResult.setFilePath(logPrefix + format.format(beginTime));
                                 logResult.setInsertUsername("" + map.get("userId"));
                                 logResult.setRemark("自动记录");
+                                String resultStr = JSON.toJSONString(map);
+                                String info1 = null;
+                                String info2 = null;
+                                if (resultStr.length() > 3000) {
+                                    info1 = resultStr.substring(0,3000);
+                                    info2 = resultStr.substring(3000);
+                                }else{
+                                    info1 = resultStr.toString();
+                                }
+                                logResult.setDatagram1(info1);
+                                logResult.setDatagram2(info2);
                                 logResults.add(logResult);
                             }
                         }

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

@@ -152,6 +152,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查车牌号-内部")
+    @PostMapping("/getCapacityByLikeInner")
+    public RESTfulResult getCapacityByLikeInner(@RequestBody(required = false) Map<String, Object> map) {
+        List<Map<String, Object>> list = universalMapper.getCapacityByLikeInner(map);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查快捷需求code")
     @PostMapping("/getCategoryCodeByLike")
     public RESTfulResult getCategoryCodeByLike(@RequestBody(required = false) Map<String, Object> map) {
@@ -434,4 +441,5 @@ public class UniversalController extends BaseRESTfulController {
         List<Map<String, Object>> list = universalMapper.getTransOrderByJobNumber(map);
         return success(list);
     }
+
 }

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

@@ -124,4 +124,5 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getTransOrderByJobNumber(Map<String, Object> map);
 
+    List<Map<String, Object>> getCapacityByLikeInner(Map<String, Object> map);
 }

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

@@ -3,78 +3,95 @@ 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 = "日志表;外键ID和外键类型为查询参数。")
+@ApiModel(value="日志表;外键ID和外键类型为查询参数。")
 public class LogResult implements IBasePO<BigDecimal> {
     /**
      * 主键序列号:SEQ_LOG_RESULT(LOG_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value = "主键序列号:SEQ_LOG_RESULT", required = true)
+    @ApiModelProperty(value="主键序列号:SEQ_LOG_RESULT",required=true)
     private BigDecimal logId;
 
     /**
      * 日志内容(LOG_CONTENT,VARCHAR,510)
      */
-    @ApiModelProperty(value = "日志内容", required = true)
+    @ApiModelProperty(value="日志内容",required=true)
     private String logContent;
 
     /**
      * 外键ID(FOREIGN_KEY_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value = "外键ID", required = false)
+    @ApiModelProperty(value="外键ID",required=false)
     private BigDecimal foreignKeyId;
 
     /**
      * 外键类型(FOREIGN_KEY_TYPE,VARCHAR,255)
      */
-    @ApiModelProperty(value = "外键类型", required = false)
+    @ApiModelProperty(value="外键类型",required=false)
     private String foreignKeyType;
 
     /**
      * 方法名，包含完整路径(METHOD_NAME,VARCHAR,255)
      */
-    @ApiModelProperty(value = "方法名，包含完整路径", required = false)
+    @ApiModelProperty(value="方法名，包含完整路径",required=false)
     private String methodName;
 
     /**
      * 方法描述(METHOD_DESCRIPTION,VARCHAR,50)
      */
-    @ApiModelProperty(value = "方法描述", required = false)
+    @ApiModelProperty(value="方法描述",required=false)
     private String methodDescription;
 
     /**
      * 执行时长(EXE_COST,DECIMAL,38)
      */
-    @ApiModelProperty(value = "执行时长", required = false)
+    @ApiModelProperty(value="执行时长",required=false)
     private BigDecimal exeCost;
 
     /**
      * 文件路径(FILE_PATH,VARCHAR,255)
      */
-    @ApiModelProperty(value = "文件路径", required = false)
+    @ApiModelProperty(value="文件路径",required=false)
     private String filePath;
 
     /**
      * 新增时间(INSERT_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value = "新增时间", required = false)
+    @ApiModelProperty(value="新增时间",required=false)
     private Date insertTime;
 
     /**
      * 新增用户(INSERT_USERNAME,VARCHAR,255)
      */
-    @ApiModelProperty(value = "新增用户", required = false)
+    @ApiModelProperty(value="新增用户",required=false)
     private String insertUsername;
 
     /**
      * 备注(REMARK,VARCHAR,255)
      */
-    @ApiModelProperty(value = "备注", required = false)
+    @ApiModelProperty(value="备注",required=false)
     private String remark;
 
+    /**
+     * 报文1(DATAGRAM1,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="报文1",required=false)
+    private String datagram1;
+
+    /**
+     * 报文2(DATAGRAM2,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="报文2",required=false)
+    private String datagram2;
+
+    /**
+     * 报文3(DATAGRAM3,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="报文3",required=false)
+    private String datagram3;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -175,6 +192,30 @@ public class LogResult implements IBasePO<BigDecimal> {
         this.remark = remark == null ? null : remark.trim();
     }
 
+    public String getDatagram1() {
+        return datagram1;
+    }
+
+    public void setDatagram1(String datagram1) {
+        this.datagram1 = datagram1 == null ? null : datagram1.trim();
+    }
+
+    public String getDatagram2() {
+        return datagram2;
+    }
+
+    public void setDatagram2(String datagram2) {
+        this.datagram2 = datagram2 == null ? null : datagram2.trim();
+    }
+
+    public String getDatagram3() {
+        return datagram3;
+    }
+
+    public void setDatagram3(String datagram3) {
+        this.datagram3 = datagram3 == null ? null : datagram3.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -192,6 +233,9 @@ public class LogResult implements IBasePO<BigDecimal> {
         sb.append(", insertTime=").append(insertTime);
         sb.append(", insertUsername=").append(insertUsername);
         sb.append(", remark=").append(remark);
+        sb.append(", datagram1=").append(datagram1);
+        sb.append(", datagram2=").append(datagram2);
+        sb.append(", datagram3=").append(datagram3);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/resources/application-prod.yml

@@ -33,8 +33,8 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:8060}
-#      url: ${RMSFEIGN_URL:localhost:8060}
+#    url: ${RMSFEIGN_URL:172.16.90.202:8060}
+      url: ${RMSFEIGN_URL:172.16.90.202:8060}
   EmsFeign:
     url: ${EMSFEIGN_URL:172.16.90.202:80}
   SSOFeign:

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

@@ -2,35 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.LogResultMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.LogResult">
-        <id column="LOG_ID" jdbcType="DECIMAL" property="logId"/>
-        <result column="LOG_CONTENT" jdbcType="VARCHAR" property="logContent"/>
-        <result column="FOREIGN_KEY_ID" jdbcType="DECIMAL" property="foreignKeyId"/>
-        <result column="FOREIGN_KEY_TYPE" jdbcType="VARCHAR" property="foreignKeyType"/>
-        <result column="METHOD_NAME" jdbcType="VARCHAR" property="methodName"/>
-        <result column="METHOD_DESCRIPTION" jdbcType="VARCHAR" property="methodDescription"/>
-        <result column="EXE_COST" jdbcType="DECIMAL" property="exeCost"/>
-        <result column="FILE_PATH" jdbcType="TIMESTAMP" property="filePath"/>
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
-        <result column="REMARK" jdbcType="VARCHAR" property="remark"/>
+        <id column="LOG_ID" jdbcType="DECIMAL" property="logId" />
+        <result column="LOG_CONTENT" jdbcType="VARCHAR" property="logContent" />
+        <result column="FOREIGN_KEY_ID" jdbcType="DECIMAL" property="foreignKeyId" />
+        <result column="FOREIGN_KEY_TYPE" jdbcType="VARCHAR" property="foreignKeyType" />
+        <result column="METHOD_NAME" jdbcType="VARCHAR" property="methodName" />
+        <result column="METHOD_DESCRIPTION" jdbcType="VARCHAR" property="methodDescription" />
+        <result column="EXE_COST" jdbcType="DECIMAL" property="exeCost" />
+        <result column="FILE_PATH" jdbcType="VARCHAR" property="filePath" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="REMARK" jdbcType="VARCHAR" property="remark" />
+        <result column="DATAGRAM1" jdbcType="VARCHAR" property="datagram1" />
+        <result column="DATAGRAM2" jdbcType="VARCHAR" property="datagram2" />
+        <result column="DATAGRAM3" jdbcType="VARCHAR" property="datagram3" />
     </resultMap>
     <sql id="columns">
         LOG_ID, LOG_CONTENT, FOREIGN_KEY_ID, FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
-        EXE_COST, FILE_PATH, INSERT_TIME, INSERT_USERNAME, REMARK
+    EXE_COST, FILE_PATH, INSERT_TIME, INSERT_USERNAME, REMARK, DATAGRAM1, DATAGRAM2,
+    DATAGRAM3
     </sql>
     <sql id="columns_alias">
         t.LOG_ID, t.LOG_CONTENT, t.FOREIGN_KEY_ID, t.FOREIGN_KEY_TYPE, t.METHOD_NAME, t.METHOD_DESCRIPTION,
-        t.EXE_COST, t.FILE_PATH, t.INSERT_TIME, t.INSERT_USERNAME, t.REMARK
+    t.EXE_COST, t.FILE_PATH, t.INSERT_TIME, t.INSERT_USERNAME, t.REMARK, t.DATAGRAM1,
+    t.DATAGRAM2, t.DATAGRAM3
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM LOG_RESULT
+        SELECT <include refid="columns"/> FROM LOG_RESULT
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM LOG_RESULT t
+        SELECT <include refid="columns_alias"/> FROM LOG_RESULT t
     </sql>
     <sql id="where">
         <where>
@@ -55,8 +56,8 @@
             <if test="exeCost != null">
                 and EXE_COST = #{exeCost}
             </if>
-            <if test="filePath != null">
-                and TO_CHAR(FILE_PATH,'yyyy-MM-dd') = #{filePath}
+            <if test="filePath != null and filePath != ''">
+                and FILE_PATH = #{filePath}
             </if>
             <if test="insertTime != null">
                 and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
@@ -67,6 +68,15 @@
             <if test="remark != null and remark != ''">
                 and REMARK = #{remark}
             </if>
+            <if test="datagram1 != null and datagram1 != ''">
+                and DATAGRAM1 = #{datagram1}
+            </if>
+            <if test="datagram2 != null and datagram2 != ''">
+                and DATAGRAM2 = #{datagram2}
+            </if>
+            <if test="datagram3 != null and datagram3 != ''">
+                and DATAGRAM3 = #{datagram3}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -92,8 +102,8 @@
             <if test="exeCost != null">
                 and EXE_COST = #{exeCost}
             </if>
-            <if test="filePath != null">
-                and TO_CHAR(FILE_PATH,'yyyy-MM-dd') = #{filePath}
+            <if test="filePath != null and filePath != ''">
+                and FILE_PATH LIKE '%${filePath}%'
             </if>
             <if test="insertTime != null">
                 and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
@@ -104,6 +114,15 @@
             <if test="remark != null and remark != ''">
                 and REMARK LIKE '%${remark}%'
             </if>
+            <if test="datagram1 != null and datagram1 != ''">
+                and DATAGRAM1 LIKE '%${datagram1}%'
+            </if>
+            <if test="datagram2 != null and datagram2 != ''">
+                and DATAGRAM2 LIKE '%${datagram2}%'
+            </if>
+            <if test="datagram3 != null and datagram3 != ''">
+                and DATAGRAM3 LIKE '%${datagram3}%'
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -131,8 +150,8 @@
         <if test="exeCost != null">
             or EXE_COST = #{exeCost}
         </if>
-        <if test="filePath != null">
-            or TO_CHAR(FILE_PATH,'yyyy-MM-dd') = '#{filePath}'
+        <if test="filePath != null and filePath != ''">
+            or FILE_PATH = #{filePath}
         </if>
         <if test="insertTime != null">
             or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
@@ -143,16 +162,27 @@
         <if test="remark != null and remark != ''">
             or REMARK = #{remark}
         </if>
+        <if test="datagram1 != null and datagram1 != ''">
+            or DATAGRAM1 = #{datagram1}
+        </if>
+        <if test="datagram2 != null and datagram2 != ''">
+            or DATAGRAM2 = #{datagram2}
+        </if>
+        <if test="datagram3 != null and datagram3 != ''">
+            or DATAGRAM3 = #{datagram3}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.LogResult">
         insert into LOG_RESULT (LOG_ID, LOG_CONTENT, FOREIGN_KEY_ID,
-        FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
-        EXE_COST, FILE_PATH, INSERT_TIME,
-        INSERT_USERNAME, REMARK)
+                                FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
+                                EXE_COST, FILE_PATH, INSERT_TIME,
+                                INSERT_USERNAME, REMARK, DATAGRAM1,
+                                DATAGRAM2, DATAGRAM3)
         values (#{logId,jdbcType=DECIMAL}, #{logContent,jdbcType=VARCHAR}, #{foreignKeyId,jdbcType=DECIMAL},
-        #{foreignKeyType,jdbcType=VARCHAR}, #{methodName,jdbcType=VARCHAR}, #{methodDescription,jdbcType=VARCHAR},
-        #{exeCost,jdbcType=DECIMAL}, #{filePath,jdbcType=TIMESTAMP}, #{insertTime,jdbcType=TIMESTAMP},
-        #{insertUsername,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
+                #{foreignKeyType,jdbcType=VARCHAR}, #{methodName,jdbcType=VARCHAR}, #{methodDescription,jdbcType=VARCHAR},
+                #{exeCost,jdbcType=DECIMAL}, #{filePath,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{insertUsername,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{datagram1,jdbcType=VARCHAR},
+                #{datagram2,jdbcType=VARCHAR}, #{datagram3,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.LogResult">
         insert into LOG_RESULT
@@ -190,6 +220,15 @@
             <if test="remark != null">
                 REMARK,
             </if>
+            <if test="datagram1 != null">
+                DATAGRAM1,
+            </if>
+            <if test="datagram2 != null">
+                DATAGRAM2,
+            </if>
+            <if test="datagram3 != null">
+                DATAGRAM3,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="logId != null">
@@ -214,7 +253,7 @@
                 #{exeCost,jdbcType=DECIMAL},
             </if>
             <if test="filePath != null">
-                #{filePath,jdbcType=TIMESTAMP},
+                #{filePath,jdbcType=VARCHAR},
             </if>
             <if test="insertTime != null">
                 #{insertTime,jdbcType=TIMESTAMP},
@@ -225,20 +264,32 @@
             <if test="remark != null">
                 #{remark,jdbcType=VARCHAR},
             </if>
+            <if test="datagram1 != null">
+                #{datagram1,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram2 != null">
+                #{datagram2,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram3 != null">
+                #{datagram3,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.LogResult">
         update LOG_RESULT
         set LOG_CONTENT = #{logContent,jdbcType=VARCHAR},
-        FOREIGN_KEY_ID = #{foreignKeyId,jdbcType=DECIMAL},
-        FOREIGN_KEY_TYPE = #{foreignKeyType,jdbcType=VARCHAR},
-        METHOD_NAME = #{methodName,jdbcType=VARCHAR},
-        METHOD_DESCRIPTION = #{methodDescription,jdbcType=VARCHAR},
-        EXE_COST = #{exeCost,jdbcType=DECIMAL},
-        FILE_PATH = #{filePath,jdbcType=TIMESTAMP},
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-        REMARK = #{remark,jdbcType=VARCHAR}
+            FOREIGN_KEY_ID = #{foreignKeyId,jdbcType=DECIMAL},
+            FOREIGN_KEY_TYPE = #{foreignKeyType,jdbcType=VARCHAR},
+            METHOD_NAME = #{methodName,jdbcType=VARCHAR},
+            METHOD_DESCRIPTION = #{methodDescription,jdbcType=VARCHAR},
+            EXE_COST = #{exeCost,jdbcType=DECIMAL},
+            FILE_PATH = #{filePath,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            REMARK = #{remark,jdbcType=VARCHAR},
+            DATAGRAM1 = #{datagram1,jdbcType=VARCHAR},
+            DATAGRAM2 = #{datagram2,jdbcType=VARCHAR},
+            DATAGRAM3 = #{datagram3,jdbcType=VARCHAR}
         where LOG_ID = #{logId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.LogResult">
@@ -263,7 +314,7 @@
                 EXE_COST = #{exeCost,jdbcType=DECIMAL},
             </if>
             <if test="filePath != null">
-                FILE_PATH = #{filePath,jdbcType=TIMESTAMP},
+                FILE_PATH = #{filePath,jdbcType=VARCHAR},
             </if>
             <if test="insertTime != null">
                 INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
@@ -274,6 +325,15 @@
             <if test="remark != null">
                 REMARK = #{remark,jdbcType=VARCHAR},
             </if>
+            <if test="datagram1 != null">
+                DATAGRAM1 = #{datagram1,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram2 != null">
+                DATAGRAM2 = #{datagram2,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram3 != null">
+                DATAGRAM3 = #{datagram3,jdbcType=VARCHAR},
+            </if>
         </set>
         where LOG_ID = #{logId,jdbcType=DECIMAL}
     </update>
@@ -295,73 +355,86 @@
         LOG_CONTENT, FOREIGN_KEY_ID, FOREIGN_KEY_TYPE,
         METHOD_NAME, METHOD_DESCRIPTION,
         EXE_COST, FILE_PATH, INSERT_TIME,
-        INSERT_USERNAME, REMARK)
+        INSERT_USERNAME, REMARK, DATAGRAM1,
+        DATAGRAM2, DATAGRAM3)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.logId,jdbcType=DECIMAL},
-        #{item.logContent,jdbcType=VARCHAR}, #{item.foreignKeyId,jdbcType=DECIMAL},
-        #{item.foreignKeyType,jdbcType=VARCHAR},
+        #{item.logContent,jdbcType=VARCHAR}, #{item.foreignKeyId,jdbcType=DECIMAL}, #{item.foreignKeyType,jdbcType=VARCHAR},
         #{item.methodName,jdbcType=VARCHAR}, #{item.methodDescription,jdbcType=VARCHAR},
-        #{item.exeCost,jdbcType=DECIMAL}, #{item.filePath,jdbcType=TIMESTAMP}, #{item.insertTime,jdbcType=TIMESTAMP},
-        #{item.insertUsername,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR} from dual
+        #{item.exeCost,jdbcType=DECIMAL}, #{item.filePath,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR}, #{item.datagram1,jdbcType=VARCHAR},
+        #{item.datagram2,jdbcType=VARCHAR}, #{item.datagram3,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
         update LOG_RESULT
         set
         LOG_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
             when #{item.logId,jdbcType=DECIMAL} then #{item.logId,jdbcType=DECIMAL}
         </foreach>
         ,LOG_CONTENT=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
             when #{item.logId,jdbcType=DECIMAL} then #{item.logContent,jdbcType=VARCHAR}
         </foreach>
         ,FOREIGN_KEY_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
             when #{item.logId,jdbcType=DECIMAL} then #{item.foreignKeyId,jdbcType=DECIMAL}
         </foreach>
         ,FOREIGN_KEY_TYPE=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
             when #{item.logId,jdbcType=DECIMAL} then #{item.foreignKeyType,jdbcType=VARCHAR}
         </foreach>
         ,METHOD_NAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
             when #{item.logId,jdbcType=DECIMAL} then #{item.methodName,jdbcType=VARCHAR}
         </foreach>
         ,METHOD_DESCRIPTION=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
             when #{item.logId,jdbcType=DECIMAL} then #{item.methodDescription,jdbcType=VARCHAR}
         </foreach>
         ,EXE_COST=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
             when #{item.logId,jdbcType=DECIMAL} then #{item.exeCost,jdbcType=DECIMAL}
         </foreach>
         ,FILE_PATH=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-            when #{item.logId,jdbcType=DECIMAL} then #{item.filePath,jdbcType=TIMESTAMP}
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.filePath,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
             when #{item.logId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
             when #{item.logId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
         </foreach>
         ,REMARK=
-        <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
             when #{item.logId,jdbcType=DECIMAL} then #{item.remark,jdbcType=VARCHAR}
         </foreach>
+        ,DATAGRAM1=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.datagram1,jdbcType=VARCHAR}
+        </foreach>
+        ,DATAGRAM2=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.datagram2,jdbcType=VARCHAR}
+        </foreach>
+        ,DATAGRAM3=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.datagram3,jdbcType=VARCHAR}
+        </foreach>
         where LOG_ID in
-        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.logId,jdbcType=DECIMAL}
         </foreach>
     </update>
     <delete id="batchDelete" parameterType="java.util.List">
         delete from LOG_RESULT
         where LOG_ID in
-        <foreach close=")" collection="list" item="id" open="(" separator=",">
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

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

@@ -2172,5 +2172,84 @@
         )
         WHERE "count" > 0
     </select>
+    <select id="getCapacityByLikeInner" resultType="java.util.Map">
+        select * from (
+        select * from (
+        select * from (
+        select rownum rowno,t.* from (
+        SELECT DISTINCT
+        RCA .CAPACITY_ID "capacityId",
+        RCA .CAPACITY_ID "id",
+        RCA .CAPACITY_ID "value",
+        CASE WHEN RCA.REMARK1 is null
+        then RCA.CAPACITY_NUMBER
+        else RCA.REMARK1
+        end "label",
+        CASE WHEN RCA.REMARK1 is null
+        then RCA.CAPACITY_NUMBER
+        else RCA.REMARK1
+        end "text",
+        CASE WHEN RCA.REMARK1 is null
+        then RCA.CAPACITY_NUMBER
+        else RCA.REMARK1
+        end "remark1",
+        CASE WHEN RCA.REMARK1 is null
+        then RCA.CAPACITY_NUMBER
+        else RCA.REMARK1
+        end "capacityNumber",
+        'capacityNumber' "prop"
+        FROM
+        RMS_CAPACITY RCA
+        WHERE RCA .DELETED = 0
+        <if test="index!=null and index!=''">
+            AND REGEXP_LIKE(
+            CASE WHEN RCA.REMARK1 is null
+            then RCA.CAPACITY_NUMBER
+            else RCA.REMARK1
+            end, #{index}
+            )
+        </if>
+        <if test="capacityId!=null and capacityId!=''">
+            AND RCA .CAPACITY_ID = #{capacityId}
+        </if>
+        )t)t1
+        <where>
+            <if test="lastIndex!=null">
+                and t1.id > #{lastIndex}
+            </if>
+        </where>
+        FETCH NEXT 10 ROWS ONLY)
+        <if test="id!=null and id.size>0">
+            UNION
+            SELECT DISTINCT
+            0 rowno,
+            RCA .CAPACITY_ID "capacityId",
+            RCA .CAPACITY_ID "id",
+            RCA .CAPACITY_ID "value",
+            CASE WHEN RCA.REMARK1 is null
+            then RCA.CAPACITY_NUMBER
+            else RCA.REMARK1
+            end "label",
+            CASE WHEN RCA.REMARK1 is null
+            then RCA.CAPACITY_NUMBER
+            else RCA.REMARK1
+            end "text",
+            CASE WHEN RCA.REMARK1 is null
+            then RCA.CAPACITY_NUMBER
+            else RCA.REMARK1
+            end "remark1",
+            CASE WHEN RCA.REMARK1 is null
+            then RCA.CAPACITY_NUMBER
+            else RCA.REMARK1
+            end "capacityNumber",
+            'capacityNumber' "prop"
+            FROM RMS_CAPACITY RCA
+            WHERE RCA .CAPACITY_ID in
+            <foreach collection="id" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        )
+    </select>
 
 </mapper>