销售订单报表查询

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/controller/SoSoDetailsController.java

@@ -1,8 +1,6 @@
 package org.jeecg.modules.report.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -16,7 +14,6 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.report.entity.SoSoDetails;
 import org.jeecg.modules.report.service.ISoSoDetailsService;
-import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -177,7 +174,11 @@ public class SoSoDetailsController extends JeecgController<SoSoDetails, ISoSoDet
 	 @AutoLog(value = "订单统计报表查询")
 	 @ApiOperation(value="订单统计报表查询", notes="订单统计报表查询")
 	 @GetMapping(value = "/getSO_SOMainReport")
-	 public Result<List<JSONObject>> getSO_SOMainReport(Map<String,Object> map){
+	 public Result<List<JSONObject>> getSO_SOMainReport(String vendorType,String startYearMonth,String endYearMonth){
+		 Map<String, Object> map = new HashMap<>();
+		 map.put("startYearMonth",startYearMonth);
+		 map.put("endYearMonth",endYearMonth);
+		 map.put("vendorType",vendorType);
 		 Result<List<JSONObject>> result =new Result<>();
 		 try {
 			 List<Map<String,Object>> list=soSoDetailsService.getSO_SOMainReport(map);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/xml/SoSoDetailsMapper.xml

@@ -23,7 +23,7 @@
             and (v.cVenAbbName='宁波森语' or  v.cVenAbbName='马菲羊' or  v.cVenAbbName='森语集团')
         </if>
         <if test="map.vendorType!=null and map.vendorType!='' and map.vendorType=='外部'">
-            and v.cVenAbbName  <![CDATA[ <> ]]> '宁波森语' and  v.cVenAbbName <![CDATA[ <> ]]> '马菲羊' and  v.cVenAbbName <![CDATA[ <> ]]> '森语集团')
+            and (v.cVenAbbName  <![CDATA[ <> ]]> '宁波森语' and  v.cVenAbbName <![CDATA[ <> ]]> '马菲羊' and  v.cVenAbbName <![CDATA[ <> ]]> '森语集团')
         </if>
         GROUP BY de.cDepName,ss.cCusCode,v.cVenAbbName,convert(char(7),ss.dPreDateBT,120),ssd.iNatUnitPrice
         ORDER BY