退货管理接口中加上申请材料字段

src/main/java/com/starcharge/wios/dao/entity/Reject.java

@@ -213,6 +213,13 @@ public class Reject extends PageVo implements Serializable {
      */
      */
     @ApiModelProperty(value = "申请表")
     @ApiModelProperty(value = "申请表")
     private String remarks;
     private String remarks;
+    /**
+     * 退货材料
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货材料")
+    private String rejectMaterial;
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 

src/main/java/com/starcharge/wios/dao/mappers/RejectMapper.xml

@@ -27,6 +27,7 @@
     <result column="UPDATED_BY" jdbcType="VARCHAR" property="updatedBy" />
     <result column="UPDATED_BY" jdbcType="VARCHAR" property="updatedBy" />
     <result column="UPDATED_TIME" jdbcType="TIMESTAMP" property="updatedTime" />
     <result column="UPDATED_TIME" jdbcType="TIMESTAMP" property="updatedTime" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="reject_material" jdbcType="VARCHAR" property="rejectMaterial" />
   </resultMap>
   </resultMap>
   <sql id="Example_Where_Clause">
   <sql id="Example_Where_Clause">
     <where>
     <where>
@@ -90,7 +91,7 @@
     id, reject_order, install_order, product_batch, quantity, material_category, material_code, 
     id, reject_order, install_order, product_batch, quantity, material_category, material_code, 
     material_name, material_company, logistic_order, logistic_company, warehouse_name, 
     material_name, material_company, logistic_order, logistic_company, warehouse_name, 
     warehouse_id, reason, status, check_time, check_user, check_user_name, check_suggestion, 
     warehouse_id, reason, status, check_time, check_user, check_user_name, check_suggestion, 
-    isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME,remarks
+    isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME,remarks,reject_material
   </sql>
   </sql>
 
 
   <select id="selectRejectList" parameterType="com.starcharge.wios.dao.entity.Reject" resultMap="BaseResultMap">
   <select id="selectRejectList" parameterType="com.starcharge.wios.dao.entity.Reject" resultMap="BaseResultMap">
@@ -253,6 +254,9 @@
       <if test="remarks != null">
       <if test="remarks != null">
         remarks,
         remarks,
       </if>
       </if>
+      <if test="rejectMaterial != null">
+        reject_material,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="rejectOrder != null">
       <if test="rejectOrder != null">
@@ -327,6 +331,9 @@
       <if test="remarks != null">
       <if test="remarks != null">
         #{remarks,jdbcType=VARCHAR},
         #{remarks,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="rejectMaterial != null">
+        #{rejectMaterial,jdbcType=VARCHAR},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <select id="countByExample" parameterType="com.starcharge.wios.dao.entity.RejectCriteria" resultType="java.lang.Long">
   <select id="countByExample" parameterType="com.starcharge.wios.dao.entity.RejectCriteria" resultType="java.lang.Long">
@@ -518,7 +525,10 @@
         UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP},
         UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP},
       </if>
       </if>
       <if test="remarks != null">
       <if test="remarks != null">
-        reason = #{remarks,jdbcType=VARCHAR},
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="rejectMaterial != null">
+        reject_material = #{rejectMaterial,jdbcType=VARCHAR},
       </if>
       </if>
     </set>
     </set>
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}

src/main/java/com/starcharge/wios/vo/RejectAddVo.java

@@ -163,7 +163,12 @@ public class RejectAddVo {
      * @mbg.generated
      * @mbg.generated
      */
      */
     @ApiModelProperty(value = "申请表")
     @ApiModelProperty(value = "申请表")
-    @NotNull(groups = CreateEntityGroup.class)
-    @NotEmpty(groups = CreateEntityGroup.class)
     private String remarks;
     private String remarks;
+    /**
+     * 退货材料
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货材料")
+    private String rejectMaterial;
 }
 }