|
|
@@ -8,6 +8,8 @@ import java.io.UnsupportedEncodingException;
|
|
|
import java.net.URLDecoder;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
@@ -20,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
|
+import org.jeecg.modules.system.util.JsonChangeUtils;
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
|
@@ -171,12 +174,15 @@ public class SoSoDetailsController extends JeecgController<SoSoDetails, ISoSoDet
|
|
|
* @param map startYearMonth endYearMonth vendorType
|
|
|
* @return
|
|
|
*/
|
|
|
+ @AutoLog(value = "订单统计报表查询")
|
|
|
+ @ApiOperation(value="订单统计报表查询", notes="订单统计报表查询")
|
|
|
@GetMapping(value = "/getSO_SOMainReport")
|
|
|
- public Result<List<Map<String,Object>>> getSO_SOMainReport(Map<String,Object> map){
|
|
|
- Result<List<Map<String,Object>>> result =new Result<>();
|
|
|
+ public Result<List<JSONObject>> getSO_SOMainReport(Map<String,Object> map){
|
|
|
+ Result<List<JSONObject>> result =new Result<>();
|
|
|
try {
|
|
|
List<Map<String,Object>> list=soSoDetailsService.getSO_SOMainReport(map);
|
|
|
- result.setResult(list);
|
|
|
+ List<JSONObject> resultList = JsonChangeUtils.toJSONObject(list);
|
|
|
+ result.setResult(resultList);
|
|
|
result.success("查询成功");
|
|
|
} catch (Exception e) {
|
|
|
result.error500("查询失败："+e.getMessage());
|
liuchaohui