adhada

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

@@ -5,11 +5,7 @@ import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.AmsDispatchSaleOrderMapper;
-import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
 import com.steerinfo.dil.model.AmsDispatchSaleOrder;
-import com.steerinfo.dil.model.AmsSaleOrder;
-import com.steerinfo.dil.model.AmsSaleOrderCarrier;
-import com.steerinfo.dil.model.AmsSaleOrderMaterial;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.service.impl.AmsDispatchSaleOrderServiceImpl;
 import com.steerinfo.dil.service.impl.AmsSaleOrderCarrierServiceImpl;
@@ -17,12 +13,10 @@ import com.steerinfo.dil.service.impl.AmsSaleOrderMaterialServiceImpl;
 import com.steerinfo.dil.util.*;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-//import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,6 +28,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+//import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
+
 /**
  * AmsSaleOrder RESTful接口：
  * @author generator
@@ -487,7 +483,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                             String consigneeSsoId,
                                             String con,
                                             String startTime,
-                                            String endTime
+                                            String endTime,
+                                            String saler
                                             ){
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId",consigneeSsoId);
@@ -495,6 +492,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con",con);
         }
+        if (saler != null && !"".equals(saler) && !"null".equals(saler)){
+            mapValue.put("saler",saler);
+        }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfoes(mapValue);
@@ -514,13 +514,17 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                 String consigneeSsoId,
                                                 String con,
                                                 String startTime,
-                                                String endTime){
+                                                String endTime,
+                                                String saler){
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con",con);
         }
+        if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            mapValue.put("saler",saler);
+        }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReportedes(mapValue);
@@ -544,7 +548,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                          @RequestParam(required = false) Integer saleType,
                                                          String consigneeSsoId,
                                                          @RequestParam(required = false) String startTime,
-                                                         @RequestParam(required = false)String endTime
+                                                         @RequestParam(required = false)String endTime,
+                                                         String saler
                                                          ) {
         if (con != null  && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con", con);
@@ -555,6 +560,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         if (consigneeSsoId != null  && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
+        if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            mapValue.put("saler",saler);
+        }
         mapValue.put("saleType",saleType);
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
 //        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
@@ -1067,7 +1075,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                             String con,
                                                   String consigneeSsoId,
                                                   @RequestParam(required = false) String startTime,
-                                                  @RequestParam(required = false) String endTime
+                                                  @RequestParam(required = false) String endTime,String saler
     ) {
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con", con);
@@ -1075,6 +1083,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId", consigneeSsoId);
         }
+        if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            mapValue.put("saler", saler);
+        }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:

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

@@ -1527,6 +1527,8 @@
     ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    LEFT JOIN RMS_SALER R_SALER
+    ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS=0 and a_s_order.DELETED=0
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
@@ -1534,6 +1536,9 @@
     <if test="consigneeSsoId != null" >
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>
+    <if test="saler != null" >
+      and  R_SALER.SALER_NAME = #{saler}
+    </if>
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
     </if>
@@ -1555,10 +1560,10 @@
           "materialName" like '%${item}%'
         </foreach>
       </if>
-      <if test="materialSpecification != null">
+      <if test="specificationModel != null">
         and
-        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
-          "materialSpecification" like '%${item}%'
+        <foreach collection="specificationModel" item="item" open="(" separator="or" close=")">
+          "specificationModel" like '%${item}%'
         </foreach>
       </if>
       <if test="materialModel != null">
@@ -1661,6 +1666,8 @@
     ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    LEFT JOIN RMS_SALER R_SALER
+    ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS=1
     and a_s_order.DELETED = 0
     <if test="con != null">
@@ -1675,6 +1682,9 @@
     </if>
     <if test="consigneeSsoId != null">
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
+    </if>
+    <if test="saler != null" >
+      and  R_SALER.SALER_NAME = #{saler}
     </if>
         )
     <where>
@@ -1935,6 +1945,8 @@
     ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    LEFT JOIN RMS_SALER R_SALER
+    ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is null
     and a_s_order.DELETED = 0
@@ -1957,6 +1969,9 @@
     <if test="saleType == null">
       and a_s_order.SALE_TYPE is null
     </if>
+    <if test="saler != null" >
+      and  R_SALER.SALER_NAME = #{saler}
+    </if>
     <if test="consigneeSsoId != null">
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>
@@ -3804,12 +3819,17 @@
     ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    LEFT JOIN RMS_SALER R_SALER
+    ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.DELETED = 1
     and a_s_order.SALE_TYPE = 1
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
+    <if test="saler != null" >
+      and  R_SALER.SALER_NAME = #{saler}
+    </if>
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
     </if>