重新生成实体

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

@@ -15,18 +15,22 @@
     <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" />
+    <result column="METER_TYPE_NAME" jdbcType="VARCHAR" property="meterTypeName" />
+    <result column="SPOT_TYPE_NO" jdbcType="VARCHAR" property="spotTypeNo" />
+    <result column="SPOT_TYPE_NAME" jdbcType="VARCHAR" property="spotTypeName" />
+    <result column="IS_ALLOW_OWN_TARE" jdbcType="VARCHAR" property="isAllowOwnTare" />
   </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, METER_TYPE_NAME,
-    METER_SORT
+    UPDATE_MAN_NAME, UPDATE_TIME, IS_NEED_DOOR, IS_ALLOW_TERM_TARE, IS_APP_USED, METER_TYPE, 
+    METER_SORT, METER_TYPE_NAME, SPOT_TYPE_NO, SPOT_TYPE_NAME, IS_ALLOW_OWN_TARE
   </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_TYPE_NAME, t.METER_SORT
+    t.IS_APP_USED, t.METER_TYPE, t.METER_SORT, t.METER_TYPE_NAME, t.SPOT_TYPE_NO, t.SPOT_TYPE_NAME, 
+    t.IS_ALLOW_OWN_TARE
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_BASE_METERTYPE_CONF
@@ -75,11 +79,20 @@
       <if test="meterType != null and meterType != ''">
         and METER_TYPE = #{meterType}
       </if>
+      <if test="meterSort != null and meterSort != ''">
+        and METER_SORT = #{meterSort}
+      </if>
       <if test="meterTypeName != null and meterTypeName != ''">
         and METER_TYPE_NAME = #{meterTypeName}
       </if>
-      <if test="meterSort != null and meterSort != ''">
-        and METER_SORT = #{meterSort}
+      <if test="spotTypeNo != null and spotTypeNo != ''">
+        and SPOT_TYPE_NO = #{spotTypeNo}
+      </if>
+      <if test="spotTypeName != null and spotTypeName != ''">
+        and SPOT_TYPE_NAME = #{spotTypeName}
+      </if>
+      <if test="isAllowOwnTare != null and isAllowOwnTare != ''">
+        and IS_ALLOW_OWN_TARE = #{isAllowOwnTare}
       </if>
     </where>
   </sql>
@@ -124,11 +137,20 @@
       <if test="meterType != null and meterType != ''">
         and METER_TYPE LIKE '%${meterType}%'
       </if>
+      <if test="meterSort != null and meterSort != ''">
+        and METER_SORT LIKE '%${meterSort}%'
+      </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 test="spotTypeNo != null and spotTypeNo != ''">
+        and SPOT_TYPE_NO LIKE '%${spotTypeNo}%'
+      </if>
+      <if test="spotTypeName != null and spotTypeName != ''">
+        and SPOT_TYPE_NAME LIKE '%${spotTypeName}%'
+      </if>
+      <if test="isAllowOwnTare != null and isAllowOwnTare != ''">
+        and IS_ALLOW_OWN_TARE LIKE '%${isAllowOwnTare}%'
       </if>
     </where>
   </sql>
@@ -175,24 +197,37 @@
       <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>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        or METER_TYPE_NAME = #{meterTypeName}
+      </if>
+      <if test="spotTypeNo != null and spotTypeNo != ''">
+        or SPOT_TYPE_NO = #{spotTypeNo}
+      </if>
+      <if test="spotTypeName != null and spotTypeName != ''">
+        or SPOT_TYPE_NAME = #{spotTypeName}
+      </if>
+      <if test="isAllowOwnTare != null and isAllowOwnTare != ''">
+        or IS_ALLOW_OWN_TARE = #{isAllowOwnTare}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasemetertypeconf.model.MeterBaseMetertypeConf">
     insert into METER_BASE_METERTYPE_CONF (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, METER_TYPE_NAME, METER_SORT)
+      METER_TYPE, METER_SORT, METER_TYPE_NAME, 
+      SPOT_TYPE_NO, SPOT_TYPE_NAME, IS_ALLOW_OWN_TARE
+      )
     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}, #{meterTypeName,jdbcType=VARCHAR}, #{meterSort,jdbcType=VARCHAR})
+      #{meterType,jdbcType=VARCHAR}, #{meterSort,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, 
+      #{spotTypeNo,jdbcType=VARCHAR}, #{spotTypeName,jdbcType=VARCHAR}, #{isAllowOwnTare,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasemetertypeconf.model.MeterBaseMetertypeConf">
     insert into METER_BASE_METERTYPE_CONF
@@ -236,12 +271,21 @@
       <if test="meterType != null">
         METER_TYPE,
       </if>
-      <if test="meterTypeName != null">
-        METER_TYPE_Name,
-      </if>
       <if test="meterSort != null">
         METER_SORT,
       </if>
+      <if test="meterTypeName != null">
+        METER_TYPE_NAME,
+      </if>
+      <if test="spotTypeNo != null">
+        SPOT_TYPE_NO,
+      </if>
+      <if test="spotTypeName != null">
+        SPOT_TYPE_NAME,
+      </if>
+      <if test="isAllowOwnTare != null">
+        IS_ALLOW_OWN_TARE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="meterTypeNo != null">
@@ -283,11 +327,20 @@
       <if test="meterType != null">
         #{meterType,jdbcType=VARCHAR},
       </if>
+      <if test="meterSort != null">
+        #{meterSort,jdbcType=VARCHAR},
+      </if>
       <if test="meterTypeName != null">
         #{meterTypeName,jdbcType=VARCHAR},
       </if>
-      <if test="meterSort != null">
-        #{meterSort,jdbcType=VARCHAR},
+      <if test="spotTypeNo != null">
+        #{spotTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="spotTypeName != null">
+        #{spotTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="isAllowOwnTare != null">
+        #{isAllowOwnTare,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -305,8 +358,11 @@
       IS_ALLOW_TERM_TARE = #{isAllowTermTare,jdbcType=VARCHAR},
       IS_APP_USED = #{isAppUsed,jdbcType=VARCHAR},
       METER_TYPE = #{meterType,jdbcType=VARCHAR},
+      METER_SORT = #{meterSort,jdbcType=VARCHAR},
       METER_TYPE_NAME = #{meterTypeName,jdbcType=VARCHAR},
-      METER_SORT = #{meterSort,jdbcType=VARCHAR}
+      SPOT_TYPE_NO = #{spotTypeNo,jdbcType=VARCHAR},
+      SPOT_TYPE_NAME = #{spotTypeName,jdbcType=VARCHAR},
+      IS_ALLOW_OWN_TARE = #{isAllowOwnTare,jdbcType=VARCHAR}
     where METER_TYPE_NO = #{meterTypeNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasemetertypeconf.model.MeterBaseMetertypeConf">
@@ -348,11 +404,20 @@
       <if test="meterType != null">
         METER_TYPE = #{meterType,jdbcType=VARCHAR},
       </if>
+      <if test="meterSort != null">
+        METER_SORT = #{meterSort,jdbcType=VARCHAR},
+      </if>
       <if test="meterTypeName != null">
         METER_TYPE_NAME = #{meterTypeName,jdbcType=VARCHAR},
       </if>
-      <if test="meterSort != null">
-        METER_SORT = #{meterSort,jdbcType=VARCHAR},
+      <if test="spotTypeNo != null">
+        SPOT_TYPE_NO = #{spotTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="spotTypeName != null">
+        SPOT_TYPE_NAME = #{spotTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="isAllowOwnTare != null">
+        IS_ALLOW_OWN_TARE = #{isAllowOwnTare,jdbcType=VARCHAR},
       </if>
     </set>
     where METER_TYPE_NO = #{meterTypeNo,jdbcType=VARCHAR}
@@ -376,8 +441,9 @@
       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_TYPE_NAME, METER_SORT
-      )
+      IS_APP_USED, METER_TYPE, METER_SORT, 
+      METER_TYPE_NAME, SPOT_TYPE_NO, SPOT_TYPE_NAME, 
+      IS_ALLOW_OWN_TARE)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.meterTypeNo,jdbcType=VARCHAR}, 
@@ -385,8 +451,9 @@
       #{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.meterTypeName,jdbcType=VARCHAR}, #{item.meterSort,jdbcType=VARCHAR}
-       from dual  
+      #{item.isAppUsed,jdbcType=VARCHAR}, #{item.meterType,jdbcType=VARCHAR}, #{item.meterSort,jdbcType=VARCHAR}, 
+      #{item.meterTypeName,jdbcType=VARCHAR}, #{item.spotTypeNo,jdbcType=VARCHAR}, #{item.spotTypeName,jdbcType=VARCHAR}, 
+      #{item.isAllowOwnTare,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -444,14 +511,26 @@
        <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}
        </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>
+       ,SPOT_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METER_TYPE_NO" close="end">
+          when #{item.meterTypeNo,jdbcType=VARCHAR} then #{item.spotTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SPOT_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METER_TYPE_NO" close="end">
+          when #{item.meterTypeNo,jdbcType=VARCHAR} then #{item.spotTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,IS_ALLOW_OWN_TARE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METER_TYPE_NO" close="end">
+          when #{item.meterTypeNo,jdbcType=VARCHAR} then #{item.isAllowOwnTare,jdbcType=VARCHAR}
+       </foreach>
      where METER_TYPE_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.meterTypeNo,jdbcType=VARCHAR}

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

@@ -16,7 +16,7 @@ public class MeterBaseMetertypeConf implements IBasePO<String> {
     /**
      * 状态（0：无效；1：有效）(VALUE_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="状态（0：无效；1：有效）",required=true)
+    @ApiModelProperty(value="状态（0：无效；1：有效）",required=false)
     private String valueFlag;
 
     /**
@@ -28,13 +28,13 @@ public class MeterBaseMetertypeConf implements IBasePO<String> {
     /**
      * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="创建人编号",required=true)
+    @ApiModelProperty(value="创建人编号",required=false)
     private String createManNo;
 
     /**
      * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
      */
-    @ApiModelProperty(value="创建人姓名",required=true)
+    @ApiModelProperty(value="创建人姓名",required=false)
     private String createManName;
 
     /**
@@ -62,21 +62,21 @@ public class MeterBaseMetertypeConf implements IBasePO<String> {
     private Date updateTime;
 
     /**
-     * 业务类型是否需要进出厂(IS_NEED_DOOR,VARCHAR,1)
+     * 业务类型是否需要进出厂(0=不允许，1=允许)(IS_NEED_DOOR,VARCHAR,1)
      */
-    @ApiModelProperty(value="业务类型是否需要进出厂",required=false)
+    @ApiModelProperty(value="业务类型是否需要进出厂(0=不允许，1=允许)",required=false)
     private String isNeedDoor;
 
     /**
-     * 业务类型是否允许使用期限皮重(IS_ALLOW_TERM_TARE,VARCHAR,1)
+     * 业务类型是否允许使用期限皮重(0=不允许，1=允许)(IS_ALLOW_TERM_TARE,VARCHAR,1)
      */
-    @ApiModelProperty(value="业务类型是否允许使用期限皮重",required=false)
+    @ApiModelProperty(value="业务类型是否允许使用期限皮重(0=不允许，1=允许)",required=false)
     private String isAllowTermTare;
 
     /**
-     * 业务类型是否允许APP做预报(IS_APP_USED,VARCHAR,1)
+     * 业务类型是否允许APP做预报(0=不允许，1=允许)(IS_APP_USED,VARCHAR,1)
      */
-    @ApiModelProperty(value="业务类型是否允许APP做预报",required=false)
+    @ApiModelProperty(value="业务类型是否允许APP做预报(0=不允许，1=允许)",required=false)
     private String isAppUsed;
 
     /**
@@ -86,16 +86,34 @@ public class MeterBaseMetertypeConf implements IBasePO<String> {
     private String meterType;
 
     /**
-     * 计量业务名称，取基础数据表
+     * 业务类型展示顺序(METER_SORT,VARCHAR,1)
+     */
+    @ApiModelProperty(value="业务类型展示顺序",required=false)
+    private String meterSort;
+
+    /**
+     * 计量业务名称，取基础数据表(METER_TYPE_NAME,VARCHAR,20)
      */
     @ApiModelProperty(value="计量业务名称，取基础数据表",required=false)
     private String meterTypeName;
 
     /**
-     * 业务类型展示顺序(METER_SORT,VARCHAR,1)
+     * 计量点类型编号(SPOT_TYPE_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="业务类型展示顺序",required=false)
-    private String meterSort;
+    @ApiModelProperty(value="计量点类型编号",required=false)
+    private String spotTypeNo;
+
+    /**
+     * 计量点类型名称(SPOT_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量点类型名称",required=false)
+    private String spotTypeName;
+
+    /**
+     * 业务类型是否允许使用自重(0=不允许，1=允许)(IS_ALLOW_OWN_TARE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="业务类型是否允许使用自重(0=不允许，1=允许)",required=false)
+    private String isAllowOwnTare;
 
     private static final long serialVersionUID = 1L;
 
@@ -213,6 +231,14 @@ public class MeterBaseMetertypeConf implements IBasePO<String> {
         this.meterType = meterType == null ? null : meterType.trim();
     }
 
+    public String getMeterSort() {
+        return meterSort;
+    }
+
+    public void setMeterSort(String meterSort) {
+        this.meterSort = meterSort == null ? null : meterSort.trim();
+    }
+
     public String getMeterTypeName() {
         return meterTypeName;
     }
@@ -221,12 +247,28 @@ public class MeterBaseMetertypeConf implements IBasePO<String> {
         this.meterTypeName = meterTypeName == null ? null : meterTypeName.trim();
     }
 
-    public String getMeterSort() {
-        return meterSort;
+    public String getSpotTypeNo() {
+        return spotTypeNo;
     }
 
-    public void setMeterSort(String meterSort) {
-        this.meterSort = meterSort == null ? null : meterSort.trim();
+    public void setSpotTypeNo(String spotTypeNo) {
+        this.spotTypeNo = spotTypeNo == null ? null : spotTypeNo.trim();
+    }
+
+    public String getSpotTypeName() {
+        return spotTypeName;
+    }
+
+    public void setSpotTypeName(String spotTypeName) {
+        this.spotTypeName = spotTypeName == null ? null : spotTypeName.trim();
+    }
+
+    public String getIsAllowOwnTare() {
+        return isAllowOwnTare;
+    }
+
+    public void setIsAllowOwnTare(String isAllowOwnTare) {
+        this.isAllowOwnTare = isAllowOwnTare == null ? null : isAllowOwnTare.trim();
     }
 
     @Override
@@ -248,8 +290,11 @@ 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(", meterTypeName=").append(meterTypeName);
+        sb.append(", spotTypeNo=").append(spotTypeNo);
+        sb.append(", spotTypeName=").append(spotTypeName);
+        sb.append(", isAllowOwnTare=").append(isAllowOwnTare);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();