Browse Source

1.修改签收列表导出超时

dist.1.3.0
pref_mail@163.com 7 months ago
parent
commit
4a7e372dfc
  1. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  3. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
  4. 718
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@ -433,7 +433,7 @@ public class DistributionSignforController extends BladeController {
@GetMapping("/export-distributionSignforOwn")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入distributionSignfor")
public void exportDistributionSignforOwn(@ApiIgnore @RequestParam Map<String, Object> distributionSignfor, BladeUser bladeUser, HttpServletResponse response) {
public void exportDistributionSignforOwn(DistributionSignforVO distributionSignfor, HttpServletResponse response) {
List<DistributionSignforOwnExcel> list = distributionSignforService.exportDistributionSignforOwn(distributionSignfor);
ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "已签收管理数据表", list, DistributionSignforOwnExcel.class);
}

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@ -386,7 +386,7 @@
and ldr.mall_name like concat('%',#{param.mallName},'%')
</if>
<if test="param.ids != null">and lds.id in
<if test="param.ids != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.ids)">and lds.id in
<foreach collection="param.ids" separator="," close=")" open="(" item="a">
#{a}
</foreach>

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java

@ -68,7 +68,7 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
*
* @param distributionSignfor@return
*/
List<DistributionSignforOwnExcel> exportDistributionSignforOwn(Map<String, Object> distributionSignfor);
List<DistributionSignforOwnExcel> exportDistributionSignforOwn(DistributionSignforVO distributionSignfor);
/**
* 签收订单统计
*

718
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save