缺少meterTypeName字段

src/main/java/com/steerinfo/baseinfo/meterbasemetertypeconf/mapper/MeterBaseMetertypeConfMapper.xml

@@ -15,17 +15,18 @@
     <result column="IS_ALLOW_TERM_TARE" jdbcType="VARCHAR" property="isAllowTermTare" />
     <result column="IS_APP_USED" jdbcType="VARCHAR" property="isAppUsed" />
     <result column="METER_TYPE" jdbcType="VARCHAR" property="meterType" />
+    <result column="METER_TYPE_NAME" jdbcType="VARCHAR" property="meterTypeName" />
     <result column="METER_SORT" jdbcType="VARCHAR" property="meterSort" />
   </resultMap>
   <sql id="columns">
     METER_TYPE_NO, VALUE_FLAG, MEMO, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
-    UPDATE_MAN_NAME, UPDATE_TIME, IS_NEED_DOOR, IS_ALLOW_TERM_TARE, IS_APP_USED, METER_TYPE, 
+    UPDATE_MAN_NAME, UPDATE_TIME, IS_NEED_DOOR, IS_ALLOW_TERM_TARE, IS_APP_USED, METER_TYPE, METER_TYPE_NAME,
     METER_SORT
   </sql>
   <sql id="columns_alias">
     t.METER_TYPE_NO, t.VALUE_FLAG, t.MEMO, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, 
     t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.IS_NEED_DOOR, t.IS_ALLOW_TERM_TARE, 
-    t.IS_APP_USED, t.METER_TYPE, t.METER_SORT
+    t.IS_APP_USED, t.METER_TYPE, t.METER_TYPE_NAME, t.METER_SORT
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_BASE_METERTYPE_CONF
@@ -74,6 +75,9 @@
       <if test="meterType != null and meterType != ''">
         and METER_TYPE = #{meterType}
       </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME = #{meterTypeName}
+      </if>
       <if test="meterSort != null and meterSort != ''">
         and METER_SORT = #{meterSort}
       </if>
@@ -120,6 +124,9 @@
       <if test="meterType != null and meterType != ''">
         and METER_TYPE LIKE '%${meterType}%'
       </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME LIKE '%${meterTypeName}%'
+      </if>
       <if test="meterSort != null and meterSort != ''">
         and METER_SORT LIKE '%${meterSort}%'
       </if>
@@ -168,6 +175,9 @@
       <if test="meterType != null and meterType != ''">
         or METER_TYPE = #{meterType}
       </if>
+    <if test="meterTypeName != null and meterTypeName != ''">
+      or METER_TYPE_NAME = #{meterTypeName}
+    </if>
       <if test="meterSort != null and meterSort != ''">
         or METER_SORT = #{meterSort}
       </if>
@@ -177,12 +187,12 @@
       CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
       UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
       IS_NEED_DOOR, IS_ALLOW_TERM_TARE, IS_APP_USED, 
-      METER_TYPE, METER_SORT)
+      METER_TYPE, METER_TYPE_NAME, METER_SORT)
     values (#{meterTypeNo,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
       #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{isNeedDoor,jdbcType=VARCHAR}, #{isAllowTermTare,jdbcType=VARCHAR}, #{isAppUsed,jdbcType=VARCHAR}, 
-      #{meterType,jdbcType=VARCHAR}, #{meterSort,jdbcType=VARCHAR})
+      #{meterType,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, #{meterSort,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasemetertypeconf.model.MeterBaseMetertypeConf">
     insert into METER_BASE_METERTYPE_CONF
@@ -226,6 +236,9 @@
       <if test="meterType != null">
         METER_TYPE,
       </if>
+      <if test="meterTypeName != null">
+        METER_TYPE_Name,
+      </if>
       <if test="meterSort != null">
         METER_SORT,
       </if>
@@ -270,6 +283,9 @@
       <if test="meterType != null">
         #{meterType,jdbcType=VARCHAR},
       </if>
+      <if test="meterTypeName != null">
+        #{meterTypeName,jdbcType=VARCHAR},
+      </if>
       <if test="meterSort != null">
         #{meterSort,jdbcType=VARCHAR},
       </if>
@@ -289,6 +305,7 @@
       IS_ALLOW_TERM_TARE = #{isAllowTermTare,jdbcType=VARCHAR},
       IS_APP_USED = #{isAppUsed,jdbcType=VARCHAR},
       METER_TYPE = #{meterType,jdbcType=VARCHAR},
+      METER_TYPE_NAME = #{meterTypeName,jdbcType=VARCHAR},
       METER_SORT = #{meterSort,jdbcType=VARCHAR}
     where METER_TYPE_NO = #{meterTypeNo,jdbcType=VARCHAR}
   </update>
@@ -331,6 +348,9 @@
       <if test="meterType != null">
         METER_TYPE = #{meterType,jdbcType=VARCHAR},
       </if>
+      <if test="meterTypeName != null">
+        METER_TYPE = #{meterTypeName,jdbcType=VARCHAR},
+      </if>
       <if test="meterSort != null">
         METER_SORT = #{meterSort,jdbcType=VARCHAR},
       </if>
@@ -356,7 +376,7 @@
       CREATE_MAN_NAME, CREATE_TIME, 
       UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
       IS_NEED_DOOR, IS_ALLOW_TERM_TARE, 
-      IS_APP_USED, METER_TYPE, METER_SORT
+      IS_APP_USED, METER_TYPE, METER_TYPE_NAME, METER_SORT
       )
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
@@ -365,7 +385,7 @@
       #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
       #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
       #{item.isNeedDoor,jdbcType=VARCHAR}, #{item.isAllowTermTare,jdbcType=VARCHAR}, 
-      #{item.isAppUsed,jdbcType=VARCHAR}, #{item.meterType,jdbcType=VARCHAR}, #{item.meterSort,jdbcType=VARCHAR}
+      #{item.isAppUsed,jdbcType=VARCHAR}, #{item.meterType,jdbcType=VARCHAR}, #{item.meterTypeName,jdbcType=VARCHAR}, #{item.meterSort,jdbcType=VARCHAR}
        from dual  
    </foreach> )
   </insert>
@@ -424,6 +444,10 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case METER_TYPE_NO" close="end">
           when #{item.meterTypeNo,jdbcType=VARCHAR} then #{item.meterType,jdbcType=VARCHAR}
        </foreach>
+      ,METER_TYPE_NAME=
+      <foreach collection="list" item="item" index="index" separator=" " open="case METER_TYPE_NO" close="end">
+        when #{item.meterTypeNo,jdbcType=VARCHAR} then #{item.meterTypeName,jdbcType=VARCHAR}
+      </foreach>
        ,METER_SORT=
        <foreach collection="list" item="item" index="index" separator=" " open="case METER_TYPE_NO" close="end">
           when #{item.meterTypeNo,jdbcType=VARCHAR} then #{item.meterSort,jdbcType=VARCHAR}

src/main/java/com/steerinfo/baseinfo/meterbasemetertypeconf/model/MeterBaseMetertypeConf.java

@@ -85,6 +85,12 @@ public class MeterBaseMetertypeConf implements IBasePO<String> {
     @ApiModelProperty(value="业务类型分类：0=厂内；1=进出厂；2=非计量",required=false)
     private String meterType;
 
+    /**
+     * 计量业务名称，取基础数据表
+     */
+    @ApiModelProperty(value="计量业务名称，取基础数据表",required=false)
+    private String meterTypeName;
+
     /**
      * 业务类型展示顺序(METER_SORT,VARCHAR,1)
      */
@@ -207,6 +213,14 @@ public class MeterBaseMetertypeConf implements IBasePO<String> {
         this.meterType = meterType == null ? null : meterType.trim();
     }
 
+    public String getMeterTypeName() {
+        return meterTypeName;
+    }
+
+    public void setMeterTypeName(String meterTypeName) {
+        this.meterTypeName = meterTypeName == null ? null : meterTypeName.trim();
+    }
+
     public String getMeterSort() {
         return meterSort;
     }
@@ -234,6 +248,7 @@ public class MeterBaseMetertypeConf implements IBasePO<String> {
         sb.append(", isAllowTermTare=").append(isAllowTermTare);
         sb.append(", isAppUsed=").append(isAppUsed);
         sb.append(", meterType=").append(meterType);
+        sb.append(", meterTypeName=").append(meterTypeName);
         sb.append(", meterSort=").append(meterSort);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");