3.26

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -629,7 +629,13 @@ public class UniversalController extends BaseRESTfulController {
            failed();
        }
        return success(carrier);
+    }
 
+    @ApiOperation(value = "质保书前端展示")
+    @PostMapping("/getWarranty")
+    public RESTfulResult getWarranty(@RequestParam("orderNumber") String orderNumber){
 
+       List<String> list = universalService.getWarrantyAndPrint(orderNumber);
+        return success(list);
     }
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -139,4 +139,5 @@ public interface UniversalMapper {
 
     Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
 
+    List<Map<String,Object>> getWarranty(String orderNumber);
 }

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -15,4 +15,6 @@ public interface UniversalService {
 
     //查询路段顺序及当前路段顺序号
     Map<String, Object> getNowLineMes(Map<String, Object> map);
+
+    List<String> getWarrantyAndPrint(String orderNumber);
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -5,7 +5,11 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.InputStream;
 import java.math.BigDecimal;
+import java.sql.Blob;
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +52,26 @@ public class UniversalServiceImpl implements UniversalService {
         return null;
     }
 
+    @Override
+    public  List<String> getWarrantyAndPrint(String orderNumber) {
+        List<Map<String,Object>> warrantyCode = universalMapper.getWarranty(orderNumber);
+        List<String> list = new ArrayList<>();
+        String content = null;
+        for(Map<String,Object> code:warrantyCode){
+            Blob blob = (Blob) code.get("warrantyCode");
+            try {
+               content = new String(blob.getBytes((long)1, (int)blob.length()));
+               String string = content.substring(0,content.length()-2);
+               System.out.println(string);
+               list.add(string);
+            } catch (SQLException throwables) {
+                throwables.printStackTrace();
+            }
+        }
+
+        return list;
+    }
+
 
     /**
      * sha1加密字符串

src/main/resources/application-dev.yml

@@ -22,18 +22,18 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    url: ${WMSFEIGN_URL:localhost:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:localhost:8006}
 server:
   port: 8019

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -161,7 +161,7 @@
                      ON RCC.CAPACITY_ID = RC.CAPACITY_ID
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RCC.CARRIER_ID
-                 WHERE RC.CAPACITY_TYPE_ID = 1 AND RC.CAPACITY_SSO_ID is not NULL
+                 WHERE RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
                 and RCC.CARRIER_ID = #{carrierId}
             </if>
@@ -749,4 +749,12 @@
         where r_carrier.CARRIER_SSO_ID = #{carrierSsoId}
 
     </select>
+
+    <select id="getWarranty" resultType="java.util.Map" parameterType="java.lang.String">
+        select oom.WARRANTY_CODE "warrantyCode"
+        from OMSTRUCK_ORDER oo
+        left join OMSTRUCK_ORDER_MATERIAL oom
+        on oom.ORDER_ID = oo.ORDER_ID
+        where oo.ORDER_NUMBER = #{orderNumber}
+    </select>
 </mapper>