辅材申请-总仓详情接口中可以返回多条物流信息

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

 package com.starcharge.wios.controller;
 package com.starcharge.wios.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.ihidea.component.api.v2.BaseResponse;
 import com.ihidea.component.api.v2.BaseResponse;
 import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.session.SessionInfo;
 import com.ihidea.core.support.session.SessionInfo;
 import com.starcharge.wios.auth.service.TokenService;
 import com.starcharge.wios.auth.service.TokenService;
 import com.starcharge.wios.convert.TauxiliarymaterialsConvert;
 import com.starcharge.wios.convert.TauxiliarymaterialsConvert;
+import com.starcharge.wios.dao.entity.Delivery;
 import com.starcharge.wios.dao.entity.Tauxiliarymaterials;
 import com.starcharge.wios.dao.entity.Tauxiliarymaterials;
 import com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria;
 import com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria;
+import com.starcharge.wios.dao.mappers.DeliveryMapper;
 import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper;
 import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper;
 import com.starcharge.wios.dto.TauxiliarymaterialsCheckDto;
 import com.starcharge.wios.dto.TauxiliarymaterialsCheckDto;
 import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
 import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
@@ -30,8 +33,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.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -49,6 +51,8 @@ public class TauxiliarymaterialsController {
     private TokenService tokenService;
     private TokenService tokenService;
     @Autowired
     @Autowired
     private TauxiliarymaterialsMapper tauxiliarymaterialsMapper;
     private TauxiliarymaterialsMapper tauxiliarymaterialsMapper;
+    @Autowired
+    private DeliveryMapper deliveryMapper;
 
 
     public void UpdateColumns(Tauxiliarymaterials tauxiliarymaterials){
     public void UpdateColumns(Tauxiliarymaterials tauxiliarymaterials){
         SessionInfo sessionInfo = tokenService.getUser();
         SessionInfo sessionInfo = tokenService.getUser();
@@ -80,7 +84,21 @@ public class TauxiliarymaterialsController {
     @GetMapping("/detail")
     @GetMapping("/detail")
     @ApiOperation(value = "查询辅材申请详情")
     @ApiOperation(value = "查询辅材申请详情")
     public BaseResponse<Tauxiliarymaterials> detail(@RequestParam int id){
     public BaseResponse<Tauxiliarymaterials> detail(@RequestParam int id){
-        return new BaseResponse(this.tauxiliarymaterialsMapper.selectByPrimaryKey(id));
+        Tauxiliarymaterials tauxiliarymaterials=this.tauxiliarymaterialsMapper.selectByPrimaryKey(id);
+        if (tauxiliarymaterials.getLogisticOrder()!=null){
+            List<String> listLogistic=new ArrayList<>();
+           String [] list=tauxiliarymaterials.getLogisticOrder().split(",");
+           for (String list1:list){
+               if (!"<string>".equals(list1) && !"".equals(list1) && list1!=null){
+                   Delivery delivery=deliveryMapper.selectByLogisticOrder(list1);
+                   if (delivery!=null){
+                       listLogistic.add(list1+"-"+delivery.getLogisticCompany());
+                   }
+               }
+           }
+            tauxiliarymaterials.setLogisticIdAndCompany(listLogistic);
+        }
+        return new BaseResponse(tauxiliarymaterials);
     }
     }
 
 
     @PostMapping("/query")
     @PostMapping("/query")

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

@@ -10,6 +10,8 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
 *@description:: 辅材申请
 *@description:: 辅材申请
@@ -284,4 +286,11 @@ public class Tauxiliarymaterials  extends PageVo implements Serializable{
     @NotEmpty(groups = {CreateEntityGroup.class})
     @NotEmpty(groups = {CreateEntityGroup.class})
     @NotNull(groups = {CreateEntityGroup.class})
     @NotNull(groups = {CreateEntityGroup.class})
     private String warehouseId;
     private String warehouseId;
+    /**
+     * 物流id和服务商
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "物流id和服务商")
+    private List<String> logisticIdAndCompany;
 }
 }
\ No newline at end of file

src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.java

@@ -30,4 +30,6 @@ public interface DeliveryMapper {
     int updateByPrimaryKey(Delivery record);
     int updateByPrimaryKey(Delivery record);
 
 
     List<Delivery> selectDeliveryList(Delivery delivery);
     List<Delivery> selectDeliveryList(Delivery delivery);
+
+    Delivery selectByLogisticOrder(String logisticOrder);
 }
 }
\ No newline at end of file

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

@@ -130,6 +130,12 @@
     from t_delivery
     from t_delivery
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </select>
   </select>
+  <select id="selectByLogisticOrder" parameterType="string" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_delivery
+    where logistic_order = #{logisticOrder,jdbcType=VARCHAR}
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from t_delivery
     delete from t_delivery
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}