QuietShadow 3 лет назад
Родитель
Сommit
1a19abe94c

+ 31 - 7
src/main/java/com/steerinfo/ems/emsprodplanround/mapper/EmsProdplanRoundMapper.xml

@@ -36,17 +36,18 @@
     <result column="GOINFO" jdbcType="VARCHAR" property="goinfo"/>
     <result column="FETCH_PLAN_WEIGHT" jdbcType="DECIMAL" property="fetchPlanWeight"/>
     <result column="ASCRIPTION" jdbcType="VARCHAR" property="ascription"/>
+    <result column="TAG" jdbcType="VARCHAR" property="tag"/>
   </resultMap>
   <sql id="columns">
     ID, MAY, SQNO, UNITID, DESCRIBE, STATE, GRADES, PLAN_WEIGHT, SPECIFICATIONS, LENGTHS, 
     CHEMICAL_STANDARD, SURFACE_STANDARD, MEMO, ISSUED_TIME, CREATEMAN, CREATETIME, UPDATEMAN, 
-    UPDATETIME, TRANSPORT_TYPE, PURPOSE, WORKPROC_TYPE, MSG_FLAG, READ_FLAG,PARENTID,IATERAL_AREA,LENGTH_TIMES_WIDTH,DIMENSION,STATUS,ERR_MSG,GOINFO,FETCH_PLAN_WEIGHT,DELIVERY_DATE,AUDITSTATE,ASCRIPTION
+    UPDATETIME, TRANSPORT_TYPE, PURPOSE, WORKPROC_TYPE, MSG_FLAG, READ_FLAG,PARENTID,IATERAL_AREA,LENGTH_TIMES_WIDTH,DIMENSION,STATUS,ERR_MSG,GOINFO,FETCH_PLAN_WEIGHT,DELIVERY_DATE,AUDITSTATE,ASCRIPTION,TAG
   </sql>
   <sql id="columns_alias">
     t.ID, t.MAY, t.SQNO, t.UNITID, t.DESCRIBE, t.STATE, t.GRADES, t.PLAN_WEIGHT, t.SPECIFICATIONS, 
     t.LENGTHS, t.CHEMICAL_STANDARD, t.SURFACE_STANDARD, t.MEMO, t.ISSUED_TIME, t.CREATEMAN, 
     t.CREATETIME, t.UPDATEMAN, t.UPDATETIME, t.TRANSPORT_TYPE, t.PURPOSE, t.WORKPROC_TYPE, 
-    t.MSG_FLAG, t.READ_FLAG,t.PARENTID,GOINFO,FETCH_PLAN_WEIGHT,
+    t.MSG_FLAG, t.READ_FLAG,t.PARENTID,GOINFO,FETCH_PLAN_WEIGHT,t.TAG
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM EMS_PRODPLAN_ROUND
@@ -128,6 +129,9 @@
       <if test="parentid != null and parentid != '' ">
         and PARENTID = #{parentid}
       </if>
+      <if test="tag != null and tag != '' ">
+        and TAG = #{tag}
+      </if>
       ORDER BY CREATETIME DESC
     </where>
   </sql>
@@ -202,6 +206,9 @@
       <if test="readFlag != null and readFlag != ''">
         and READ_FLAG LIKE '%${readFlag}%'
       </if>
+      <if test="tag != null and tag != ''">
+        and TAG LIKE '%${tag}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -277,6 +284,9 @@
       <if test="readFlag != null and readFlag != ''">
         or READ_FLAG = #{readFlag}
       </if>
+    <if test="tag != null and tag != ''">
+      or TAG = #{tag}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.ems.emsprodplanround.model.EmsProdplanRound">
     insert into EMS_PRODPLAN_ROUND (ID, MAY, SQNO, 
@@ -286,7 +296,7 @@
       MEMO, ISSUED_TIME, CREATEMAN, 
       CREATETIME, UPDATEMAN, UPDATETIME, 
       TRANSPORT_TYPE, PURPOSE, WORKPROC_TYPE,
-      MSG_FLAG, READ_FLAG,PARENTID,IATERAL_AREA,LENGTH_TIMES_WIDTH,DIMENSION,GOINFO,DELIVERY_DATE,AUDITSTATE,ASCRIPTION)
+      MSG_FLAG, READ_FLAG,PARENTID,IATERAL_AREA,LENGTH_TIMES_WIDTH,DIMENSION,GOINFO,DELIVERY_DATE,AUDITSTATE,ASCRIPTION,TAG)
     values (#{id,jdbcType=VARCHAR}, #{may,jdbcType=TIMESTAMP}, #{sqno,jdbcType=DECIMAL},
       #{unitid,jdbcType=VARCHAR}, #{describe,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, 
       #{grades,jdbcType=VARCHAR}, #{planWeight,jdbcType=DECIMAL}, #{specifications,jdbcType=VARCHAR}, 
@@ -297,7 +307,7 @@
       #{msgFlag,jdbcType=VARCHAR}, #{readFlag,jdbcType=VARCHAR},#{parentid,jdbcType=VARCHAR},
       #{iateralArea,jdbcType=VARCHAR},#{lengthTimesWidth,jdbcType=VARCHAR},
       #{dimension,jdbcType=VARCHAR},#{goinfo,jdbcType=VARCHAR},
-      #{deliveryDate,jdbcType=TIMESTAMP},#{auditState,jdbcType=VARCHAR},#{ascription,jdbcType=VARCHAR})
+      #{deliveryDate,jdbcType=TIMESTAMP},#{auditState,jdbcType=VARCHAR},#{ascription,jdbcType=VARCHAR},#{tag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.emsprodplanround.model.EmsProdplanRound">
     insert into EMS_PRODPLAN_ROUND
@@ -371,6 +381,9 @@
       <if test="readFlag != null">
         READ_FLAG,
       </if>
+      <if test="tag != null">
+        TAG,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -448,6 +461,9 @@
       <if test="fetchPlanWeight != null ">
         #{fetchPlanWeight,jdbcType=DECIMAL}
       </if>
+      <if test="tag != null ">
+        #{tag,jdbcType=VARCHAR}
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.emsprodplanround.model.EmsProdplanRound">
@@ -476,7 +492,8 @@
       IATERAL_AREA = #{iateralArea,jdbcType=VARCHAR},
       LENGTH_TIMES_WIDTH = #{lengthTimesWidth,jdbcType=VARCHAR},
       DIMENSION = #{dimension,jdbcType=VARCHAR},
-      GOINFO = #{goinfo,jdbcType=VARCHAR}
+      GOINFO = #{goinfo,jdbcType=VARCHAR},
+    TAG = #{tag,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.emsprodplanround.model.EmsProdplanRound">
@@ -551,6 +568,9 @@
       <if test="parentid != null and parentid != ''">
        PARENTID = #{parentid,jdbcType=VARCHAR}
       </if>
+      <if test="tag != null and tag != ''">
+        TAG = #{tag,jdbcType=VARCHAR}
+      </if>
     </set>
     where ID = #{id,jdbcType=VARCHAR}
   </update>
@@ -576,7 +596,7 @@
       MEMO, ISSUED_TIME, CREATEMAN, 
       CREATETIME, UPDATEMAN, UPDATETIME, 
       TRANSPORT_TYPE, PURPOSE, WORKPROC_TYPE, 
-      MSG_FLAG, READ_FLAG)
+      MSG_FLAG, READ_FLAG,TAG)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.id,jdbcType=VARCHAR}, 
@@ -587,7 +607,7 @@
       #{item.memo,jdbcType=VARCHAR}, #{item.issuedTime,jdbcType=TIMESTAMP}, #{item.createman,jdbcType=VARCHAR}, 
       #{item.createtime,jdbcType=TIMESTAMP}, #{item.updateman,jdbcType=VARCHAR}, #{item.updatetime,jdbcType=TIMESTAMP}, 
       #{item.transportType,jdbcType=VARCHAR}, #{item.purpose,jdbcType=VARCHAR}, #{item.workprocType,jdbcType=VARCHAR}, 
-      #{item.msgFlag,jdbcType=VARCHAR}, #{item.readFlag,jdbcType=VARCHAR} from dual  
+      #{item.msgFlag,jdbcType=VARCHAR}, #{item.readFlag,jdbcType=VARCHAR}, #{item.tag,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -685,6 +705,10 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
           when #{item.id,jdbcType=VARCHAR} then #{item.readFlag,jdbcType=VARCHAR}
        </foreach>
+    ,TAG=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+      when #{item.id,jdbcType=VARCHAR} then #{item.tag,jdbcType=VARCHAR}
+    </foreach>
      where ID in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.id,jdbcType=VARCHAR}

+ 12 - 0
src/main/java/com/steerinfo/ems/emsprodplanround/model/EmsProdplanRound.java

@@ -181,6 +181,9 @@ public class EmsProdplanRound implements IBasePO<String> {
 
     @ApiModelProperty(value = "去向", required =  true)
     private String goinfo;
+
+    @ApiModelProperty(value = "应急标识", required =  true)
+    private String tag;
     @ApiModelProperty
     private BigDecimal  fetchPlanWeight;
     //交货时间
@@ -473,6 +476,14 @@ public class EmsProdplanRound implements IBasePO<String> {
         this.readFlag = readFlag == null ? null : readFlag.trim();
     }
 
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -503,6 +514,7 @@ public class EmsProdplanRound implements IBasePO<String> {
         sb.append(", msgFlag=").append(msgFlag);
         sb.append(", readFlag=").append(readFlag);
         sb.append(",parentid=").append(parentid);
+        sb.append(",tag=").append(tag);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();