|
@@ -39,6 +39,7 @@ public class BmstrainStatementController extends BaseRESTfulController {
|
|
|
|
|
|
/**
|
|
|
* 展示火运账单列表
|
|
|
+ *
|
|
|
* @param mapValue
|
|
|
* @param pageNum
|
|
|
* @param pageSize
|
|
@@ -52,10 +53,10 @@ public class BmstrainStatementController extends BaseRESTfulController {
|
|
|
@ApiImplicitParam(name = "apiId", value = "121", required = false, dataType = "BigDecimal")
|
|
|
})
|
|
|
@PostMapping("/getTrainStatementList")
|
|
|
- public RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String,Object> mapValue,
|
|
|
- Integer pageNum,
|
|
|
- Integer pageSize,
|
|
|
- Integer apiId) {
|
|
|
+ public RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
|
|
|
+ Integer pageNum,
|
|
|
+ Integer pageSize,
|
|
|
+ Integer apiId) {
|
|
|
List<Map<String, Object>> list = bmstrainStatementService.getTrainStatementList(mapValue);
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
//分页查询数据
|
|
@@ -66,6 +67,7 @@ public class BmstrainStatementController extends BaseRESTfulController {
|
|
|
|
|
|
/**
|
|
|
* 生成火运费账单
|
|
|
+ *
|
|
|
* @param mapList
|
|
|
* @return
|
|
|
*/
|
|
@@ -74,13 +76,14 @@ public class BmstrainStatementController extends BaseRESTfulController {
|
|
|
@ApiImplicitParam(name = "mapList", value = "详单列表", required = false, dataType = "java.util.List"),
|
|
|
})
|
|
|
@PostMapping("/addTrainStatement")
|
|
|
- public RESTfulResult addTrainStatement(@RequestBody List<Map<String,Object>> mapList) {
|
|
|
+ public RESTfulResult addTrainStatement(@RequestBody List<Map<String, Object>> mapList) {
|
|
|
int code1 = bmstrainStatementService.insertSelective(mapList);
|
|
|
return success(code1);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 展示账单下的详单
|
|
|
+ *
|
|
|
* @param batchId
|
|
|
* @param mapVal
|
|
|
* @param pageNum
|
|
@@ -89,7 +92,7 @@ public class BmstrainStatementController extends BaseRESTfulController {
|
|
|
* @param statementId
|
|
|
* @return
|
|
|
*/
|
|
|
- @ApiOperation(value="展示账单下的详单", notes="分页查询")
|
|
|
+ @ApiOperation(value = "展示账单下的详单", notes = "分页查询")
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "batchId", value = "批次id", required = false, dataType = "BigDecimal"),
|
|
|
@ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
|
|
@@ -97,17 +100,18 @@ public class BmstrainStatementController extends BaseRESTfulController {
|
|
|
@ApiImplicitParam(name = "apiId", value = "118", required = false, dataType = "BigDecimal"),
|
|
|
})
|
|
|
@PostMapping(value = "/getComplateTrainDetailsList")
|
|
|
- public RESTfulResult getComplateTrainDetailsList(BigDecimal batchId, @RequestBody(required = false) Map<String,Object> mapVal,
|
|
|
- Integer pageNum,
|
|
|
- Integer pageSize,
|
|
|
- Integer apiId,
|
|
|
- BigDecimal statementId){
|
|
|
- if (mapVal==null) {
|
|
|
+ public RESTfulResult getComplateTrainDetailsList(BigDecimal batchId,
|
|
|
+ @RequestBody(required = false) Map<String, Object> mapVal,
|
|
|
+ Integer pageNum,
|
|
|
+ Integer pageSize,
|
|
|
+ Integer apiId,
|
|
|
+ BigDecimal statementId) {
|
|
|
+ if (mapVal == null) {
|
|
|
mapVal = new HashMap<>();
|
|
|
}
|
|
|
- mapVal.put("batchId",batchId);
|
|
|
- mapVal.put("statementId",statementId);
|
|
|
- List<Map<String,Object>> list = bmstrainStatementService.getComplateTrainDetailsList(mapVal);
|
|
|
+ mapVal.put("batchId", batchId);
|
|
|
+ mapVal.put("statementId", statementId);
|
|
|
+ List<Map<String, Object>> list = bmstrainStatementService.getComplateTrainDetailsList(mapVal);
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
//分页查询数据
|
|
|
List<Map<String, Object>> columnList = bmstrainStatementService.getComplateTrainDetailsList(mapVal);
|
|
@@ -117,6 +121,7 @@ public class BmstrainStatementController extends BaseRESTfulController {
|
|
|
|
|
|
/**
|
|
|
* 展示火运实绩
|
|
|
+ *
|
|
|
* @param detailsId
|
|
|
* @param mapVal
|
|
|
* @param pageNum
|
|
@@ -124,24 +129,24 @@ public class BmstrainStatementController extends BaseRESTfulController {
|
|
|
* @param apiId
|
|
|
* @return
|
|
|
*/
|
|
|
- @ApiOperation(value="展示火运实绩", notes="分页查询")
|
|
|
+ @ApiOperation(value = "展示火运实绩", notes = "分页查询")
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "detailsId", value = "详单id", required = false, dataType = "BigDecimal"),
|
|
|
@ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
|
|
|
@ApiImplicitParam(name = "apiId", value = "122", required = false, dataType = "BigDecimal"),
|
|
|
})
|
|
|
- @PostMapping(value = "/getTrainResultList")
|
|
|
- public RESTfulResult getTrainResultList( @RequestBody(required = false) Map<String,Object> mapVal,
|
|
|
+ @PostMapping(value = "/getStatementTrainResultList")
|
|
|
+ public RESTfulResult getStatementTrainResultList(@RequestBody(required = false) Map<String, Object> mapVal,
|
|
|
Integer pageNum,
|
|
|
Integer pageSize,
|
|
|
Integer apiId,
|
|
|
- Integer detailsId){
|
|
|
- if (mapVal==null) {
|
|
|
+ Integer detailsId) {
|
|
|
+ if (mapVal == null) {
|
|
|
mapVal = new HashMap<>();
|
|
|
}
|
|
|
- mapVal.put("detailsId",detailsId);
|
|
|
- List<Map<String,Object>> list = bmstrainStatementService.getTrainResultList(mapVal);
|
|
|
+ mapVal.put("detailsId", detailsId);
|
|
|
+ List<Map<String, Object>> list = bmstrainStatementService.getTrainResultList(mapVal);
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
//分页查询数据
|
|
|
List<Map<String, Object>> columnList = bmstrainStatementService.getTrainResultList(mapVal);
|