|
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
|
|
@@ -95,6 +96,37 @@ public class StatisticalReportController extends BaseRESTfulController {
|
|
return success(pageList);
|
|
return success(pageList);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @ApiOperation(value="查询销售统计报表筛选过后的总净重")
|
|
|
|
+ @ApiImplicitParams({
|
|
|
|
+ @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
|
|
|
|
+ @ApiImplicitParam(name = "apiId(423)", value = "动态表头", required = false, dataType = "Integer"),
|
|
|
|
+ @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
|
|
|
|
+ @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
|
|
|
|
+ @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
|
|
|
|
+ })
|
|
|
|
+ @PostMapping("/getAllSaleReportTotal")
|
|
|
|
+ public RESTfulResult getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
|
|
|
|
+ String startTime,
|
|
|
|
+ String endTime,
|
|
|
|
+ String carrierSsoId
|
|
|
|
+ ){
|
|
|
|
+ if(carrierSsoId != null){
|
|
|
|
+ if(!"null".equals(carrierSsoId)){
|
|
|
|
+ mapValue.put("carrierSsoId", carrierSsoId);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ DataChange.queryDataByTwoDate(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
|
|
|
|
+ List<Map<String, Object>> allReport = statisticalReportService.getAllSaleReportNum(mapValue);
|
|
|
|
+ //获取销售统计报表筛选过后的总净重
|
|
|
|
+ BigDecimal AllResultNetWeight = new BigDecimal(0);
|
|
|
|
+ for (Map<String, Object> stringObjectMap : allReport) {
|
|
|
|
+ if(stringObjectMap.get("resultNetWeight")!=null) {
|
|
|
|
+ AllResultNetWeight = AllResultNetWeight.add(new BigDecimal(stringObjectMap.get("resultNetWeight").toString()));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return success(AllResultNetWeight);
|
|
|
|
+ }
|
|
|
|
+
|
|
@ApiOperation(value="查询零星物资进厂统计报表")
|
|
@ApiOperation(value="查询零星物资进厂统计报表")
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
|
|
@ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
|