退货管理的列表查询和详情，采用发货管理的列表查询和详情接口

2fc917b1 · zhangqiliang · baf1d27c · 2fc917b1 · 2fc917b1 · 2fc917b1
--- a/src/main/java/com/starcharge/wios/controller/DeliveryController.java
+++ b/src/main/java/com/starcharge/wios/controller/DeliveryController.java
@@ -20,6 +20,7 @@ import com.starcharge.wios.validation.ParamsValidate;
 import com.starcharge.wios.validation.UpdateEntityGroup;
 import com.starcharge.wios.vo.DeliveryAddVo;
 import com.starcharge.wios.vo.DeliveryExcelVo;
+import io.netty.util.internal.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -32,6 +33,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 /**
@@ -92,7 +94,16 @@ public class DeliveryController {
    @GetMapping("/detail")
    @ApiOperation(value = "发货详情")
    public BaseResponse<Delivery> getdetail(@RequestParam int id){
-        return new BaseResponse(this.deliveryMapper.selectByPrimaryKey(id));
+        Delivery delivery=this.deliveryMapper.selectByPrimaryKey(id);
+        if (!StringUtil.isNullOrEmpty(delivery.getRejectMaterial())){
+            String [] rejectMaterial=delivery.getRejectMaterial().split(",");
+            List<String> list=new ArrayList<>();
+            for (String rejectMaterials:rejectMaterial){
+                list.add(rejectMaterials);
+            }
+            delivery.setRejectMaterialList(list);
+        }
+        return new BaseResponse(delivery);
    }
    @GetMapping("/delete")
    @ApiOperation(value = "删除发货信息")

--- a/src/main/java/com/starcharge/wios/dao/entity/Delivery.java
+++ b/src/main/java/com/starcharge/wios/dao/entity/Delivery.java
@@ -12,6 +12,7 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 /**
 *@description:: $discription$
@@ -187,6 +188,77 @@ public class Delivery extends PageVo implements Serializable {
     */
    @ApiModelProperty(value = "收货人")
    private String receiver;
+    /**
+     * 申请表
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "申请表")
+    private String remarks;
+    /**
+     * 退货材料
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货材料")
+    private String rejectMaterial;
+    /**
+     * 退货材料数组
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货材料数组")
+    private List<String> rejectMaterialList;
+    /**
+     * 退货原因
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货原因")
+    private String reason;
+    /**
+     * 退货状态 已申请 已驳回 已通过 已关闭
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货状态 已申请 已驳回 已通过 已关闭")
+    private String status;
+    /**
+     * 退货的审批时间
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货的审批时间")
+    private String checkTime;
+    /**
+     * 退货的审核人
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货的审核人")
+    private String checkUser;
+    /**
+     * 退货的审核人姓名
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货的审核人姓名")
+    private String checkUserName;
+    /**
+     * 退货的审核意见
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货的审核意见")
+    private String checkSuggestion;
+    /**
+     * 车企单号
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "车企单号")
+    private String outOrderId;
    private static final long serialVersionUID = 1L;

--- a/src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml
+++ b/src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml
@@ -23,6 +23,15 @@
    <result column="arrival_warehouse" jdbcType="VARCHAR" property="arrivalWarehouse" />
    <result column="arrival_warehouse_id" jdbcType="VARCHAR" property="arrivalWarehouseId" />
    <result column="receiver" jdbcType="VARCHAR" property="receiver" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="reject_material" jdbcType="VARCHAR" property="rejectMaterial" />
+    <result column="reason" jdbcType="VARCHAR" property="reason" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="check_time" jdbcType="VARCHAR" property="checkTime" />
+    <result column="check_user" jdbcType="VARCHAR" property="checkUser" />
+    <result column="check_user_name" jdbcType="VARCHAR" property="checkUserName" />
+    <result column="check_suggestion" jdbcType="VARCHAR" property="checkSuggestion" />
+    <result column="out_order_id" jdbcType="VARCHAR" property="outOrderId" />
  </resultMap>
  <sql id="Example_Where_Clause">
    <where>
@@ -86,7 +95,7 @@
    id, delivery_order, install_order, product_batch, quantity, material_category, material_code, 
    material_name, material_company, logistic_order, logistic_company, logistic_status, 
    team, isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, arrival_warehouse, 
-    arrival_warehouse_id, receiver
+    arrival_warehouse_id, receiver,remarks,reject_material,reason,status,check_time,check_user,check_user_name,check_suggestion
  </sql>
  <select id="selectDeliveryList" parameterType="com.starcharge.wios.dao.entity.Delivery" resultMap="BaseResultMap">
@@ -135,9 +144,14 @@
  </select>
  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
    select
-    <include refid="Base_Column_List" />
+      t.id, t.delivery_order, t.install_order, t.product_batch, t.quantity, t.material_category, t.material_code,
-    from t_delivery
+      t.material_name, t.material_company, t.logistic_order, t.logistic_company, t.logistic_status,
-    where id = #{id,jdbcType=INTEGER}
+      t.team, t.isproduct, t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME, t.arrival_warehouse,
+      t.arrival_warehouse_id, t.receiver,t.remarks,t.reject_material,t.reason,t.status,t.check_time,t.check_user,t.check_user_name,t.check_suggestion,
+      e.out_order_id
+    from t_delivery t
+    left join t_order e  on e.id = t.install_order
+    where t.id = #{id,jdbcType=INTEGER}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
    delete from t_delivery