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

src/main/java/com/starcharge/wios/controller/RejectController.java

@@ -19,6 +19,7 @@ import com.starcharge.wios.vo.RejectCheckVo;
 import com.starcharge.wios.vo.RejectExcelVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -40,6 +41,7 @@ import java.util.List;
 @RestController
 @RequestMapping("api/reject")
 @Api(tags = "退货管理接口")
+@Slf4j
 public class RejectController {
     @Autowired
     private TokenService tokenService;

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

@@ -206,6 +206,13 @@ public class Reject extends PageVo implements Serializable {
      */
     @ApiModelProperty(value = "审核意见")
     private String checkSuggestion;
+    /**
+     * 申请表
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "申请表")
+    private String remarks;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -26,6 +26,7 @@
     <result column="CREATED_TIME" jdbcType="TIMESTAMP" property="createdTime" />
     <result column="UPDATED_BY" jdbcType="VARCHAR" property="updatedBy" />
     <result column="UPDATED_TIME" jdbcType="TIMESTAMP" property="updatedTime" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -89,7 +90,7 @@
     id, reject_order, install_order, product_batch, quantity, material_category, material_code, 
     material_name, material_company, logistic_order, logistic_company, warehouse_name, 
     warehouse_id, reason, status, check_time, check_user, check_user_name, check_suggestion, 
-    isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME
+    isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME,remarks
   </sql>
 
   <select id="selectRejectList" parameterType="com.starcharge.wios.dao.entity.Reject" resultMap="BaseResultMap">
@@ -164,7 +165,7 @@
       reason, status, check_time, 
       check_user, check_user_name, check_suggestion, 
       isproduct, CREATED_BY, CREATED_TIME, 
-      UPDATED_BY, UPDATED_TIME)
+      UPDATED_BY, UPDATED_TIME,remarks)
     values (#{rejectOrder,jdbcType=VARCHAR}, #{installOrder,jdbcType=VARCHAR}, #{productBatch,jdbcType=VARCHAR}, 
       #{quantity,jdbcType=INTEGER}, #{materialCategory,jdbcType=VARCHAR}, #{materialCode,jdbcType=VARCHAR}, 
       #{materialName,jdbcType=VARCHAR}, #{materialCompany,jdbcType=VARCHAR}, #{logisticOrder,jdbcType=VARCHAR}, 
@@ -172,7 +173,7 @@
       #{reason,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{checkTime,jdbcType=TIMESTAMP}, 
       #{checkUser,jdbcType=VARCHAR}, #{checkUserName,jdbcType=VARCHAR}, #{checkSuggestion,jdbcType=VARCHAR}, 
       #{isproduct,jdbcType=INTEGER}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP}, 
-      #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=TIMESTAMP})
+      #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=TIMESTAMP},#{remarks,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.starcharge.wios.dao.entity.Reject">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
@@ -249,6 +250,9 @@
       <if test="updatedTime != null">
         UPDATED_TIME,
       </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="rejectOrder != null">
@@ -320,6 +324,9 @@
       <if test="updatedTime != null">
         #{updatedTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.starcharge.wios.dao.entity.RejectCriteria" resultType="java.lang.Long">
@@ -510,6 +517,9 @@
       <if test="updatedTime != null">
         UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="remarks != null">
+        reason = #{remarks,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -537,7 +547,8 @@
       CREATED_BY = #{createdBy,jdbcType=VARCHAR},
       CREATED_TIME = #{createdTime,jdbcType=TIMESTAMP},
       UPDATED_BY = #{updatedBy,jdbcType=VARCHAR},
-      UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP}
+      UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP},
+      remarks = #{remarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file

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

@@ -157,4 +157,13 @@ public class RejectAddVo {
     @NotNull(groups = CreateEntityGroup.class)
     @Range(min=0,max = 1,message = "是否产品或辅料只可填0或1",groups = {CreateEntityGroup.class,UpdateEntityGroup.class})
     private Integer isproduct;
+    /**
+     * 申请表
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "申请表")
+    @NotNull(groups = CreateEntityGroup.class)
+    @NotEmpty(groups = CreateEntityGroup.class)
+    private String remarks;
 }