'销售1.5bug'

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

@@ -65,4 +65,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     // 根据销售订单主键展示销售基本信息、物资信息
     List<Map<String, Object>> getSaleOrderAndMaterialById(Map<String,Object> mapValue);
+
+    // 销售订单物资
+    List<Map<String, Object>> getSaleMaterial(Map<String,Object> loserMap);
 }

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

@@ -411,6 +411,20 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         List<Map<String, Object>> resultList = amsSaleOrderMapper.getSaleOrderListBySaleCompanyes(map);
         String statusStr;
         for (Map<String, Object> resultMap : resultList) {
+            BigDecimal saleOrderId = (BigDecimal) resultMap.get("saleOrderId");
+            Map<String,Object> loserMap = new HashMap<>();
+            loserMap.put("saleOrderId",saleOrderId);
+            loserMap.put("con",map.get("con"));
+            // 物资
+            List<Map<String,Object>> materialList = amsSaleOrderMapper.getSaleMaterial(loserMap);
+            if (materialList != null && materialList.size() > 0) {
+                Map<String, Object> materialMap = materialList.get(0);
+                String materialName = (String) materialMap.get("materialName");
+                if (materialList.size() != 1) {
+                    materialName += "...";
+                }
+                resultMap.put("materialName",materialName);
+            }
             BigDecimal saleOrderStatus = (BigDecimal) resultMap.get("saleOrderStatus");
 //            if (saleOrderStatus.intValue() == 2) {
 //                statusStr = "销售公司已审核";

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

@@ -1608,7 +1608,9 @@
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
-    a_s_order.SALE_ORDER_STATUS "saleOrderStatus"
+    a_s_order.SALE_ORDER_STATUS "saleOrderStatus",
+    a_s_order.SALE_ORDER_STATUS "statusStr",
+    a_s_order.INSERT_UPDATE_REMARK "materialName"
     from AMS_SALE_ORDER a_s_order
     left join RMS_SHIPPER r_shipper
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
@@ -1874,4 +1876,16 @@
       </if>
     </where>
   </select>
+
+  <select id="getSaleMaterial" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+        RM.MATERIAL_NAME AS "materialName"
+    FROM AMS_SALE_MATERIAL ASM
+      LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    WHERE ASM.SALE_ORDER_ID = #{saleOrderId}
+<if test="con != null" >
+  AND RM.MATERIAL_NAME LIKE #{con}
+</if>
+  </select>
 </mapper>