退货管理申请退货优化

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

@@ -95,16 +95,7 @@ public class DeliveryController {
     @GetMapping("/detail")
     @GetMapping("/detail")
     @ApiOperation(value = "发货详情")
     @ApiOperation(value = "发货详情")
     public BaseResponse<Delivery> getdetail(@RequestParam int id){
     public BaseResponse<Delivery> getdetail(@RequestParam int 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);
+        return new BaseResponse(this.deliveryMapper.selectByPrimaryKey(id));
     }
     }
     @GetMapping("/delete")
     @GetMapping("/delete")
     @ApiOperation(value = "删除发货信息")
     @ApiOperation(value = "删除发货信息")

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

@@ -88,8 +88,8 @@ public class RejectController {
     }
     }
     @GetMapping("/detail")
     @GetMapping("/detail")
     @ApiOperation(value = "退货详情")
     @ApiOperation(value = "退货详情")
-    public BaseResponse<Reject> getdetail(@RequestParam int id){
-        Delivery delivery=this.deliveryMapper.selectByPrimaryKey(id);
+    public BaseResponse<Delivery> getdetail(@RequestParam int id){
+        /*Delivery delivery=this.deliveryMapper.selectByPrimaryKey(id);
         if (!StringUtil.isNullOrEmpty(delivery.getRejectMaterial())){
         if (!StringUtil.isNullOrEmpty(delivery.getRejectMaterial())){
             String [] rejectMaterial=delivery.getRejectMaterial().split(",");
             String [] rejectMaterial=delivery.getRejectMaterial().split(",");
             List<String> list=new ArrayList<>();
             List<String> list=new ArrayList<>();
@@ -97,8 +97,8 @@ public class RejectController {
                 list.add(rejectMaterials);
                 list.add(rejectMaterials);
             }
             }
             delivery.setRejectMaterialList(list);
             delivery.setRejectMaterialList(list);
-        }
-        return new BaseResponse(delivery);
+        }*/
+        return new BaseResponse(this.deliveryMapper.selectByPrimaryKey(id));
     }
     }
    /* @GetMapping("/delete")
    /* @GetMapping("/delete")
     @ApiOperation(value = "删除退货信息")
     @ApiOperation(value = "删除退货信息")

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

@@ -203,13 +203,6 @@ public class Delivery extends PageVo implements Serializable {
     @ApiModelProperty(value = "退货材料")
     @ApiModelProperty(value = "退货材料")
     private String rejectMaterial;
     private String rejectMaterial;
     /**
     /**
-     * 退货材料数组
-     *
-     * @mbg.generated
-     */
-    @ApiModelProperty(value = "退货材料数组")
-    private List<String> rejectMaterialList;
-    /**
      * 退货原因
      * 退货原因
      *
      *
      * @mbg.generated
      * @mbg.generated

src/main/java/com/starcharge/wios/dto/DeliveryUpdateDTO.java

@@ -201,13 +201,6 @@ public class DeliveryUpdateDTO{
     @ApiModelProperty(value = "退货材料")
     @ApiModelProperty(value = "退货材料")
     private String rejectMaterial;
     private String rejectMaterial;
     /**
     /**
-     * 退货材料数组
-     *
-     * @mbg.generated
-     */
-    @ApiModelProperty(value = "退货材料数组")
-    private List<String> rejectMaterialList;
-    /**
      * 退货原因
      * 退货原因
      *
      *
      * @mbg.generated
      * @mbg.generated