退货管理详情接口添加信息

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

@@ -17,6 +17,7 @@ import com.starcharge.wios.validation.UpdateEntityGroup;
 import com.starcharge.wios.vo.RejectAddVo;
 import com.starcharge.wios.vo.RejectAddVo;
 import com.starcharge.wios.vo.RejectCheckVo;
 import com.starcharge.wios.vo.RejectCheckVo;
 import com.starcharge.wios.vo.RejectExcelVo;
 import com.starcharge.wios.vo.RejectExcelVo;
+import io.netty.util.internal.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -71,7 +73,16 @@ public class RejectController {
     @GetMapping("/detail")
     @GetMapping("/detail")
     @ApiOperation(value = "退货详情")
     @ApiOperation(value = "退货详情")
     public BaseResponse<Reject> getdetail(@RequestParam int id){
     public BaseResponse<Reject> getdetail(@RequestParam int id){
-        return new BaseResponse(this.rejectMapper.selectByPrimaryKey(id));
+        Reject reject=this.rejectMapper.selectByPrimaryKey(id);
+        if (!StringUtil.isNullOrEmpty(reject.getRejectMaterial())){
+            String [] rejectMaterial=reject.getRejectMaterial().split(",");
+            List<String> list=new ArrayList<>();
+           for (String rejectMaterials:rejectMaterial){
+               list.add(rejectMaterials);
+           }
+            reject.setRejectMaterialList(list);
+        }
+        return new BaseResponse(reject);
     }
     }
     @GetMapping("/delete")
     @GetMapping("/delete")
     @ApiOperation(value = "删除退货信息")
     @ApiOperation(value = "删除退货信息")

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

@@ -8,6 +8,7 @@ import org.hibernate.validator.constraints.Range;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
 /**
 *@description:: $discription$
 *@description:: $discription$
@@ -220,6 +221,27 @@ public class Reject extends PageVo implements Serializable {
      */
      */
     @ApiModelProperty(value = "退货材料")
     @ApiModelProperty(value = "退货材料")
     private String rejectMaterial;
     private String rejectMaterial;
+    /**
+     * 退货材料数组
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货材料数组")
+    private List<String> rejectMaterialList;
+    /**
+     * 申请团队
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "申请团队")
+    private String team;
+    /**
+     * 物流状态
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "物流状态")
+    private String logisticStatus;
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 

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

@@ -141,9 +141,13 @@
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     select
-    <include refid="Base_Column_List" />
-    from t_reject
-    where id = #{id,jdbcType=INTEGER}
+      t.id, t.reject_order, t.install_order, t.product_batch, t.quantity, t.material_category, t.material_code,
+      t.material_name, t.material_company, t.logistic_order, t.logistic_company, t.warehouse_name,
+      t.warehouse_id, t.reason, t.status, t.check_time, t.check_user, t.check_user_name, t.check_suggestion,
+      t.isproduct, t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME,t.remarks,t.reject_material,d.team,d.logistic_status
+    from t_reject t
+    left join t_delivery d on d.install_order = t.install_order
+    where t.id = #{id,jdbcType=INTEGER}
   </select>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from t_reject
     delete from t_reject