diff --git a/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardApplicationCustomersController.java b/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardApplicationCustomersController.java index 208a757..b35e89e 100644 --- a/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardApplicationCustomersController.java +++ b/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardApplicationCustomersController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.system.controller; +import java.math.BigDecimal; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -8,8 +9,11 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; + +import cn.hutool.core.date.DateUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; @@ -21,14 +25,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.system.dto.CardApplicationCustomersUpdateDTO; import org.jeecg.modules.system.entity.CardApplicationCustomers; +import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.service.ICardApplicationCustomersService; +import org.jeecg.modules.system.vo.CardApplicationCustomersVO; +import org.jeecg.modules.system.vo.CardDeliveryPersonVO; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -65,48 +74,49 @@ //@AutoLog(value = "办卡客户-分页列表查询") @Operation(summary="办卡客户-分页列表查询") @GetMapping(value = "/list") - public Result> queryPageList(CardApplicationCustomers cardApplicationCustomers, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(CardApplicationCustomers cardApplicationCustomers, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + // 参数校验 + if (pageNo <= 0) { + pageNo = 1; + } + if (pageSize <= 0 || pageSize > 100) { + pageSize = 10; + } + try { + // 构建查询条件 + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cardApplicationCustomers, req.getParameterMap()); + // 分页查询 + Page page = new Page<>(pageNo, pageSize); + IPage pageList = cardApplicationCustomersService.page(page, queryWrapper); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cardApplicationCustomers, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = cardApplicationCustomersService.page(page, queryWrapper); - return Result.OK(pageList); + // 转换为VO对象 + Page voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal()); + List voList = pageList.getRecords().stream().map(record -> { + CardApplicationCustomersVO vo = new CardApplicationCustomersVO(); + BeanUtils.copyProperties(record, vo); + //处理预约时间 + vo.setReservationTime(DateUtil.format(record.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); + //处理返还时间 + if (record.getRefundableTime() != null){ + vo.setRefundableTime(DateUtil.format(record.getRefundableTime(), "yyyy-MM-dd HH:mm:ss")); + } + //TODO:点击次数 + vo.setClickCount(0); + return vo; + }).collect(Collectors.toList()); + + voPage.setRecords(voList); + return Result.OK(voPage); + } catch (Exception e) { + log.error("查询办卡客户列表失败", e); + return Result.error("查询失败:" + e.getMessage()); + } } - /** - * 添加 - * - * @param cardApplicationCustomers - * @return - */ - @AutoLog(value = "办卡客户-添加") - @Operation(summary="办卡客户-添加") - @RequiresPermissions("org.jeecg.modules.system:card_application_customers:add") - @PostMapping(value = "/add") - public Result add(@RequestBody CardApplicationCustomers cardApplicationCustomers) { - cardApplicationCustomersService.save(cardApplicationCustomers); - - return Result.OK("添加成功!"); - } - - /** - * 编辑 - * - * @param cardApplicationCustomers - * @return - */ - @AutoLog(value = "办卡客户-编辑") - @Operation(summary="办卡客户-编辑") - @RequiresPermissions("org.jeecg.modules.system:card_application_customers:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody CardApplicationCustomers cardApplicationCustomers) { - cardApplicationCustomersService.updateById(cardApplicationCustomers); - return Result.OK("编辑成功!"); - } /** * 通过id删除 @@ -161,7 +171,6 @@ * @param request * @param cardApplicationCustomers */ - @RequiresPermissions("org.jeecg.modules.system:card_application_customers:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, CardApplicationCustomers cardApplicationCustomers) { return super.exportXls(request, cardApplicationCustomers, CardApplicationCustomers.class, "办卡客户"); @@ -174,10 +183,26 @@ * @param response * @return */ - @RequiresPermissions("org.jeecg.modules.system:card_application_customers:importExcel") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, CardApplicationCustomers.class); } + /** + * 派单 + */ + @PostMapping(value = "/dispatch") + public Result dispatch(@RequestBody CardApplicationCustomersUpdateDTO dto) { + if (StringUtils.isBlank(dto.getId())){ + return Result.error("ID不能为空"); + } + if (StringUtils.isBlank(dto.getCardDeliveryPerson())){ + return Result.error("指定送卡人不能为空"); + } + CardApplicationCustomers entry = cardApplicationCustomersService.getById(dto.getId()); + entry.setCardDeliveryPerson(dto.getCardDeliveryPerson()); + entry.setStatus("1"); //已派单 + cardApplicationCustomersService.updateById(entry); + return Result.OK("派单成功!"); + } }