From 19ec22b0ee5b395c8ff77d1fb8d138b43489bb85 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 17 Aug 2023 10:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=AE=A1=E6=89=B9=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E5=A4=8D=EF=BC=9B=E6=B7=BB=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExlTableDataController.java | 66 +++++++++++++------ .../exl/mapper/ExlTableConfMapper.java | 3 + .../TbsBudgetChangeOperationServiceImpl.java | 2 +- .../impl/TbsBudgetChangeServiceImpl.java | 2 +- .../mapper/exl/ExlTableConfMapper.xml | 7 +- 5 files changed, 56 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java b/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java index ee72da84..fe4ace84 100644 --- a/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java +++ b/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java @@ -25,6 +25,7 @@ import com.qs.serve.modules.exl.service.ExlColumnConfService; import com.qs.serve.modules.exl.service.ExlTableConfService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; import org.mybatis.spring.SqlSessionTemplate; import org.springframework.web.bind.annotation.*; @@ -66,6 +67,29 @@ public class ExlTableDataController { LambdaQueryWrapper columnLqw = new LambdaQueryWrapper<>(); columnLqw.eq(ExlColumnConf::getTableConfId,tableConfigId); List columnList = exlColumnConfService.list(columnLqw); + // query + Map queryMap = buildQueryMap(map, columnList); + String targetTableName = ExlConst.TABLE_NAME_PRE + tableConf.getTableName(); + Long count = exlTableConfMapper.countData(targetTableName,queryMap); + PageVo vo = new PageVo(); + vo.initPageByTotal(count); + if(count>0){ + // page + Integer pageSize = PageUtil.getPageSize(); + Integer startRow = PageUtil.getStartRow(); + queryMap.put("startRow",startRow); + queryMap.put("pageSize",pageSize); + List> list = exlTableConfMapper.listData(targetTableName,queryMap); + vo.setList(list); + }else { + vo.setList(new ArrayList()); + } + return R.ok(vo); + } + + @NotNull + private Map buildQueryMap(Map map, List columnList) { + Map queryMap = new HashMap<>(10); // condition List ge_conditions = new ArrayList<>(); List le_conditions = new ArrayList<>(); @@ -96,33 +120,33 @@ public class ExlTableDataController { } } } - // page - Integer pageSize = PageUtil.getPageSize(); - Integer startRow = PageUtil.getStartRow(); - // query - Map queryMap = new HashMap<>(10); - queryMap.put("startRow",startRow); - queryMap.put("pageSize",pageSize); queryMap.put("leList",le_conditions); queryMap.put("geList",ge_conditions); queryMap.put("eqList",eq_conditions); queryMap.put("likeList",like_conditions); - String targetTableName = ExlConst.TABLE_NAME_PRE + tableConf.getTableName(); - Long count = exlTableConfMapper.countData(targetTableName,queryMap); - PageVo vo = new PageVo(); - vo.initPageByTotal(count); - if(count>0){ - List> list = exlTableConfMapper.listData(targetTableName,queryMap); - vo.setList(list); - }else { - vo.setList(new ArrayList()); - } - return R.ok(vo); + return queryMap; } - - public R export(){ - return null; + /** + * 导出数据 + * @param map + * @return + */ + @GetMapping("/export") + public R export(@RequestParam Map map){ + String tableConfigId = map.get(ExlConst.TABLE_CONFIG_PARAM); + map.remove(ExlConst.TABLE_CONFIG_PARAM); + // table + ExlTableConf tableConf = exlTableConfService.getById(tableConfigId); + // columns + LambdaQueryWrapper columnLqw = new LambdaQueryWrapper<>(); + columnLqw.eq(ExlColumnConf::getTableConfId,tableConfigId); + List columnList = exlColumnConfService.list(columnLqw); + // query + Map queryMap = buildQueryMap(map, columnList); + String targetTableName = ExlConst.TABLE_NAME_PRE + tableConf.getTableName(); + List> list = exlTableConfMapper.listData(targetTableName,queryMap); + return R.ok(list); } /** diff --git a/src/main/java/com/qs/serve/modules/exl/mapper/ExlTableConfMapper.java b/src/main/java/com/qs/serve/modules/exl/mapper/ExlTableConfMapper.java index 138c79f0..3f170f04 100644 --- a/src/main/java/com/qs/serve/modules/exl/mapper/ExlTableConfMapper.java +++ b/src/main/java/com/qs/serve/modules/exl/mapper/ExlTableConfMapper.java @@ -19,6 +19,9 @@ public interface ExlTableConfMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "1") Long countData(@Param("tableName") String tableName,@Param("query")Map query); + @InterceptorIgnore(tenantLine = "1") + List> pageData(@Param("tableName") String tableName,@Param("query")Map query); + @InterceptorIgnore(tenantLine = "1") List> listData(@Param("tableName") String tableName,@Param("query")Map query); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java index 9d12e728..99c93eac 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java @@ -139,7 +139,7 @@ public class TbsBudgetChangeOperationServiceImpl implements SeeYonOperationServi tbsBudgetLogService.save(budgetLog); } if(changeItem.getNewPreDispatchAmount()!=null){ - item.setPreDispatchAmount(changeItem.getPreDispatchAmount()); + item.setPreDispatchAmount(changeItem.getNewPreDispatchAmount()); tbsScheduleItemBudgetService.updateById(item); } } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java index 031e42e0..9029b209 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java @@ -185,7 +185,7 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl select * from ${tableName} - limit #{query.startRow},#{query.pageSize} + +