diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index e9389dff13..c4d1ff394d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java @@ -60,7 +60,7 @@ public interface BaseVehicleOutFeign { @PostMapping("/exportExcel") @ApiOperation(value = "车辆销售台账列表导出") @ResponseBody - public void exportExcel(@RequestBody String[] sids); + public void exportExcel(@RequestBody BaseVehicleOutQuery baseVehicleOutQuery); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java index ab53fc144a..3d5273605c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java @@ -72,9 +72,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign { } @Override - public void exportExcel(String[] sids) { + public void exportExcel(BaseVehicleOutQuery baseVehicleOutQuery) { //得到所有要导出的数据 - List baseVehicleOutVoExecls = baseVehicleOutService.listExcel(sids); + List baseVehicleOutVoExecls = baseVehicleOutService.listExcel(baseVehicleOutQuery); //定义导出的excel名字 String excelName = "车辆销售台账管理列表"; String fileNameURL = ""; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index a5a738695a..71e65689fd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -1122,15 +1122,11 @@ public class BaseVehicleOutService extends MybatisBaseService listExcel(String[] sids) { + public List listExcel(BaseVehicleOutQuery baseVehicleOutQuery) { List baseVehicleOutVoExecls = new ArrayList<>(); - int id = 1; - for (String sid : sids) { - BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(sid); - baseVehicleOutVoExecl.setRankNo(id); - id = id + 1; - baseVehicleOutVoExecls.add(baseVehicleOutVoExecl); - } + /*BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(baseVehicleOutQuery); + baseVehicleOutVoExecl.setRankNo(id); + baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);*/ return baseVehicleOutVoExecls; } } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java index 633d900e6d..e369e9ff58 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java @@ -134,4 +134,6 @@ public class FinCollectionConfirmation extends BaseEntity { private String staffDeptName; @ApiModelProperty("销售专员部门sid") private String staffDeptSid; + @ApiModelProperty("下载次数") + private String downNum; // 下载次数 } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java index 2f6d6de5d7..91473454d9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java @@ -92,4 +92,6 @@ public class FinCollectionConfirmationVo implements Vo { @ApiModelProperty("单据编号") private String billNo; + @ApiModelProperty("下载次数") + private String downNum; // 下载次数 } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index 90e9d72a85..7ff09e0da4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -113,4 +113,7 @@ public interface FinCollectionConfirmationMapper extends BaseMapper