From 4600d0f1f952d36c6d52fcb2be8b82ffbfde0043 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 24 Sep 2024 11:49:48 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/第二阶段.sql | 3 +- .../StandardSolicitOpinionsController.java | 195 +++++++++--------- ...StandardSolicitOpinionsTermController.java | 181 ++++++++-------- .../entity/StandardSolicitOpinions.java | 39 +++- .../entity/StandardSolicitOpinionsTerm.java | 1 - .../StandardSolicitOpinionsService.java | 39 +++- .../StandardSolicitOpinionsTermService.java | 10 + 7 files changed, 262 insertions(+), 206 deletions(-) diff --git a/db/第二阶段.sql b/db/第二阶段.sql index e636ccf1..ad09324c 100644 --- a/db/第二阶段.sql +++ b/db/第二阶段.sql @@ -38,9 +38,10 @@ create table laws_standard_solicit_opinions standard_name varchar(200) comment '标准名称', applicable_market varchar(4) comment '适用市场', start_time datetime comment '开始日期', - end_time datetime comment '结束日期', + end_time datetime comment '截止日期', number varchar(500) comment '征求意见反馈单编号', file varchar(500) comment '意见反馈表', + process_complete_time datetime comment '流程完成日期', create_by varchar(36) comment '创建人id', create_time datetime comment '创建时间', update_by varchar(36) comment '修改人id', diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsController.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsController.java index 1bf518d3..bf8d91ec 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsController.java @@ -52,108 +52,107 @@ public class StandardSolicitOpinionsController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(standardSolicitOpinions, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); - IPage pageList = standardSolicitOpinionsService.page(page, queryWrapper); + IPage pageList = standardSolicitOpinionsService.pageList(page, standardSolicitOpinions, req); return Result.OK(pageList); } - /** - * 列表查询 - */ - @ApiOperation(value = "标准征求意见-列表查询", notes = "标准征求意见-列表查询") - @GetMapping(value = "/list") - public Result> queryList(StandardSolicitOpinions standardSolicitOpinions, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(standardSolicitOpinions, req.getParameterMap()); - List list = standardSolicitOpinionsService.list(queryWrapper); - return Result.OK(list); - } - - /** - * 添加 - */ - @AutoLog(value = "标准征求意见-添加") - @ApiOperation(value = "标准征求意见-添加", notes = "标准征求意见-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody StandardSolicitOpinions standardSolicitOpinions) { - standardSolicitOpinionsService.add(standardSolicitOpinions); - return Result.OK(ResultCommon.OK); - } - - /** - * 编辑 - */ - @AutoLog(value = "标准征求意见-编辑") - @ApiOperation(value = "标准征求意见-编辑", notes = "标准征求意见-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody StandardSolicitOpinions standardSolicitOpinions) { - standardSolicitOpinionsService.editById(standardSolicitOpinions); - return Result.OK(ResultCommon.EDIT_OK); - } - - /** - * 通过id删除 - */ - @AutoLog(value = "标准征求意见-通过id删除") - @ApiOperation(value = "标准征求意见-通过id删除", notes = "标准征求意见-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - String id = map.getId(); - if (StringUtils.isBlank(id)) { - return Result.error("请选择数据"); - } - standardSolicitOpinionsService.deleteById(id); - return Result.OK(ResultCommon.SUCCESSFULLY_DELETED); - } - - /** - * 批量删除 - */ - @AutoLog(value = "标准征求意见-批量删除") - @ApiOperation(value = "标准征求意见-批量删除", notes = "标准征求意见-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - String ids = map.getIds(); - if (StringUtils.isBlank(ids)) { - return Result.error(ResultCommon.PLEASE_SELECT_DATA); - } - List idList = Arrays.asList(map.getIds().split(",")); - this.standardSolicitOpinionsService.deleteByIds(idList); - return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK); - } - - /** - * 通过id查询 - */ - @AutoLog(value = "标准征求意见-通过id查询") - @ApiOperation(value = "标准征求意见-通过id查询", notes = "标准征求意见-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id") String id) { - StandardSolicitOpinions standardSolicitOpinions = standardSolicitOpinionsService.queryById(id); - if (standardSolicitOpinions == null) { - return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND); - } - return Result.OK(standardSolicitOpinions); - } - - /** - * 导出excel - */ - @ApiOperation(value = "标准征求意见-导出excel") - @GetMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, StandardSolicitOpinions standardSolicitOpinions) { - return super.exportXls(request, standardSolicitOpinions, StandardSolicitOpinions.class, "标准征求意见"); - } - - /** - * 通过excel导入数据 - */ - @ApiOperation(value = "标准征求意见-通过excel导入数据") - @PostMapping(value = "/importExcel") - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, StandardSolicitOpinions.class); - } + ///** + // * 列表查询 + // */ + //@ApiOperation(value = "标准征求意见-列表查询", notes = "标准征求意见-列表查询") + //@GetMapping(value = "/list") + //public Result> queryList(StandardSolicitOpinions standardSolicitOpinions, + // HttpServletRequest req) { + // QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(standardSolicitOpinions, req.getParameterMap()); + // List list = standardSolicitOpinionsService.list(queryWrapper); + // return Result.OK(list); + //} + // + ///** + // * 添加 + // */ + //@AutoLog(value = "标准征求意见-添加") + //@ApiOperation(value = "标准征求意见-添加", notes = "标准征求意见-添加") + //@PostMapping(value = "/add") + //public Result add(@Validated @RequestBody StandardSolicitOpinions standardSolicitOpinions) { + // standardSolicitOpinionsService.add(standardSolicitOpinions); + // return Result.OK(ResultCommon.OK); + //} + // + ///** + // * 编辑 + // */ + //@AutoLog(value = "标准征求意见-编辑") + //@ApiOperation(value = "标准征求意见-编辑", notes = "标准征求意见-编辑") + //@PostMapping(value = "/edit") + //public Result edit(@Validated @RequestBody StandardSolicitOpinions standardSolicitOpinions) { + // standardSolicitOpinionsService.editById(standardSolicitOpinions); + // return Result.OK(ResultCommon.EDIT_OK); + //} + // + ///** + // * 通过id删除 + // */ + //@AutoLog(value = "标准征求意见-通过id删除") + //@ApiOperation(value = "标准征求意见-通过id删除", notes = "标准征求意见-通过id删除") + //@PostMapping(value = "/delete") + //public Result delete(@RequestBody IdMapBody map) { + // String id = map.getId(); + // if (StringUtils.isBlank(id)) { + // return Result.error("请选择数据"); + // } + // standardSolicitOpinionsService.deleteById(id); + // return Result.OK(ResultCommon.SUCCESSFULLY_DELETED); + //} + // + ///** + // * 批量删除 + // */ + //@AutoLog(value = "标准征求意见-批量删除") + //@ApiOperation(value = "标准征求意见-批量删除", notes = "标准征求意见-批量删除") + //@PostMapping(value = "/deleteBatch") + //public Result deleteBatch(@RequestBody IdsMapBody map) { + // String ids = map.getIds(); + // if (StringUtils.isBlank(ids)) { + // return Result.error(ResultCommon.PLEASE_SELECT_DATA); + // } + // List idList = Arrays.asList(map.getIds().split(",")); + // this.standardSolicitOpinionsService.deleteByIds(idList); + // return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK); + //} + // + ///** + // * 通过id查询 + // */ + //@AutoLog(value = "标准征求意见-通过id查询") + //@ApiOperation(value = "标准征求意见-通过id查询", notes = "标准征求意见-通过id查询") + //@GetMapping(value = "/queryById") + //public Result queryById(@RequestParam(name = "id") String id) { + // StandardSolicitOpinions standardSolicitOpinions = standardSolicitOpinionsService.queryById(id); + // if (standardSolicitOpinions == null) { + // return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + // } + // return Result.OK(standardSolicitOpinions); + //} + // + ///** + // * 导出excel + // */ + //@ApiOperation(value = "标准征求意见-导出excel") + //@GetMapping(value = "/exportXls") + //public ModelAndView exportXls(HttpServletRequest request, StandardSolicitOpinions standardSolicitOpinions) { + // return super.exportXls(request, standardSolicitOpinions, StandardSolicitOpinions.class, "标准征求意见"); + //} + // + ///** + // * 通过excel导入数据 + // */ + //@ApiOperation(value = "标准征求意见-通过excel导入数据") + //@PostMapping(value = "/importExcel") + //public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + // return super.importExcel(request, response, StandardSolicitOpinions.class); + //} } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsTermController.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsTermController.java index 261850bf..ef03ffa8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsTermController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsTermController.java @@ -31,128 +31,121 @@ import java.util.List; * 标准征求意见条款关联表(StandardSolicitOpinionsTerm)表控制层 * * @author lijiarao - * @since 2024-09-20 14:13:55 + * @since 2024-09-24 10:37:40 */ @Slf4j @Api(tags = "标准征求意见条款关联表") @RestController @RequestMapping("standardSolicitOpinionsTerm") -public class StandardSolicitOpinionsTermController extends JeroController { +public class StandardSolicitOpinionsTermController extends JeroController{ /** * 服务对象 */ @Resource - private StandardSolicitOpinionsTermService standardSolicitOpinionsTermService; + private StandardSolicitOpinionsTermService lawsStandardSolicitOpinionsTermService; /** * 分页列表查询 */ @ApiOperation(value = "标准征求意见条款关联表-分页列表查询") @GetMapping(value = "/page") - public Result> queryPageList(StandardSolicitOpinionsTerm standardSolicitOpinionsTerm, + public Result> queryPageList(StandardSolicitOpinionsTerm lawsStandardSolicitOpinionsTerm, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(standardSolicitOpinionsTerm, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); - IPage pageList = standardSolicitOpinionsTermService.page(page, queryWrapper); + IPage pageList = lawsStandardSolicitOpinionsTermService.pageList(page, lawsStandardSolicitOpinionsTerm, req); return Result.OK(pageList); } - /** - * 列表查询 - */ - @ApiOperation(value = "标准征求意见条款关联表-列表查询", notes = "标准征求意见条款关联表-列表查询") - @GetMapping(value = "/list") - public Result> queryList(StandardSolicitOpinionsTerm standardSolicitOpinionsTerm, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(standardSolicitOpinionsTerm, req.getParameterMap()); - List list = standardSolicitOpinionsTermService.list(queryWrapper); - return Result.OK(list); - } + ///** + // * 添加 + // */ + //@AutoLog(value = "标准征求意见条款关联表-添加") + //@ApiOperation(value = "标准征求意见条款关联表-添加", notes = "标准征求意见条款关联表-添加") + //@PostMapping(value = "/add") + //public Result add(@Validated @RequestBody StandardSolicitOpinionsTerm lawsStandardSolicitOpinionsTerm) { + // lawsStandardSolicitOpinionsTermService.add(lawsStandardSolicitOpinionsTerm); + // return Result.OK(ResultCommon.OK); + //} + // + ///** + // * 编辑 + // */ + //@AutoLog(value = "标准征求意见条款关联表-编辑") + //@ApiOperation(value = "标准征求意见条款关联表-编辑", notes = "标准征求意见条款关联表-编辑") + //@PostMapping(value = "/edit") + //public Result edit(@Validated @RequestBody StandardSolicitOpinionsTerm lawsStandardSolicitOpinionsTerm) { + // lawsStandardSolicitOpinionsTermService.editById(lawsStandardSolicitOpinionsTerm); + // return Result.OK(ResultCommon.EDIT_OK); + //} + // + ///** + // * 通过id删除 + // */ + //@AutoLog(value = "标准征求意见条款关联表-通过id删除") + //@ApiOperation(value = "标准征求意见条款关联表-通过id删除", notes = "标准征求意见条款关联表-通过id删除") + //@PostMapping(value = "/delete") + //public Result delete(@RequestBody IdMapBody map) { + // String id = map.getId(); + // if (StringUtils.isBlank(id)) { + // return Result.error("请选择数据"); + // } + // lawsStandardSolicitOpinionsTermService.deleteById(id); + // return Result.OK(ResultCommon.SUCCESSFULLY_DELETED); + //} + // + ///** + // * 批量删除 + // */ + //@AutoLog(value = "标准征求意见条款关联表-批量删除") + //@ApiOperation(value = "标准征求意见条款关联表-批量删除", notes = "标准征求意见条款关联表-批量删除") + //@PostMapping(value = "/deleteBatch") + //public Result deleteBatch(@RequestBody IdsMapBody map) { + // String ids = map.getIds(); + // if (StringUtils.isBlank(ids)) { + // return Result.error(ResultCommon.PLEASE_SELECT_DATA); + // } + // List idList = Arrays.asList(map.getIds().split(",")); + // this.lawsStandardSolicitOpinionsTermService.deleteByIds(idList); + // return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK); + //} + // + ///** + // * 通过id查询 + // */ + //@AutoLog(value = "标准征求意见条款关联表-通过id查询") + //@ApiOperation(value = "标准征求意见条款关联表-通过id查询", notes = "标准征求意见条款关联表-通过id查询") + //@GetMapping(value = "/queryById") + //public Result queryById(@RequestParam(name = "id") String id) { + // StandardSolicitOpinionsTerm lawsStandardSolicitOpinionsTerm = lawsStandardSolicitOpinionsTermService.queryById(id); + // if (lawsStandardSolicitOpinionsTerm == null) { + // return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + // } + // return Result.OK(lawsStandardSolicitOpinionsTerm); + //} - /** - * 添加 - */ - @AutoLog(value = "标准征求意见条款关联表-添加") - @ApiOperation(value = "标准征求意见条款关联表-添加", notes = "标准征求意见条款关联表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { - standardSolicitOpinionsTermService.add(standardSolicitOpinionsTerm); - return Result.OK(ResultCommon.OK); - } - - /** - * 编辑 - */ - @AutoLog(value = "标准征求意见条款关联表-编辑") - @ApiOperation(value = "标准征求意见条款关联表-编辑", notes = "标准征求意见条款关联表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { - standardSolicitOpinionsTermService.editById(standardSolicitOpinionsTerm); - return Result.OK(ResultCommon.EDIT_OK); - } - - /** - * 通过id删除 - */ - @AutoLog(value = "标准征求意见条款关联表-通过id删除") - @ApiOperation(value = "标准征求意见条款关联表-通过id删除", notes = "标准征求意见条款关联表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - String id = map.getId(); - if (StringUtils.isBlank(id)) { - return Result.error("请选择数据"); - } - standardSolicitOpinionsTermService.deleteById(id); - return Result.OK(ResultCommon.SUCCESSFULLY_DELETED); - } - - /** - * 批量删除 - */ - @AutoLog(value = "标准征求意见条款关联表-批量删除") - @ApiOperation(value = "标准征求意见条款关联表-批量删除", notes = "标准征求意见条款关联表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - String ids = map.getIds(); - if (StringUtils.isBlank(ids)) { - return Result.error(ResultCommon.PLEASE_SELECT_DATA); - } - List idList = Arrays.asList(map.getIds().split(",")); - this.standardSolicitOpinionsTermService.deleteByIds(idList); - return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK); - } - - /** - * 通过id查询 - */ - @AutoLog(value = "标准征求意见条款关联表-通过id查询") - @ApiOperation(value = "标准征求意见条款关联表-通过id查询", notes = "标准征求意见条款关联表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id") String id) { - StandardSolicitOpinionsTerm standardSolicitOpinionsTerm = standardSolicitOpinionsTermService.queryById(id); - if (standardSolicitOpinionsTerm == null) { - return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND); - } - return Result.OK(standardSolicitOpinionsTerm); - } - - /** - * 导出excel - */ - @ApiOperation(value = "标准征求意见条款关联表-导出模板") - @GetMapping(value = "/exportTemplate") - public ModelAndView exportTemplate(HttpServletRequest request, StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { - return super.exportListXls(new ArrayList(), StandardSolicitOpinionsTerm.class, "意见详情"); - } /** * 导出excel */ @ApiOperation(value = "标准征求意见条款关联表-导出excel") @GetMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { - return super.exportXls(request, standardSolicitOpinionsTerm, StandardSolicitOpinionsTerm.class, "意见详情"); + public ModelAndView exportXls(HttpServletRequest req, StandardSolicitOpinionsTerm lawsStandardSolicitOpinionsTerm) { + Page page = new Page<>(-1, -1); + IPage pageList = lawsStandardSolicitOpinionsTermService.pageList(page, lawsStandardSolicitOpinionsTerm, req); + // 获取数据 + List records = pageList.getRecords(); + return super.exportListXls(records, StandardSolicitOpinionsTerm.class, "标准征求意见条款关联表"); + } + + /** + * 下载导入模板 + */ + @ApiOperation(value = "标准征求意见条款关联表-下载导入模板") + @GetMapping(value = "/exportTemplate") + public ModelAndView exportTemplate() { + List records = new ArrayList<>(); + return super.exportListXls(records, StandardSolicitOpinionsTerm.class, "标准征求意见条款关联表"); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinions.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinions.java index 1c9e06de..aada7ee7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinions.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinions.java @@ -2,10 +2,8 @@ package com.jero.modules.laws.solicitopinions.entity; import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecgframework.poi.excel.annotation.Excel; @@ -40,40 +38,51 @@ public class StandardSolicitOpinions implements Serializable { @ApiModelProperty(value = "标准id") @Excel(name = "标准id", width = 15) private String standardId; + /** + * 标准编号/名称 + */ + @TableField(exist = false) + @Excel(name = "标准编号/名称", width = 15) + @ApiModelProperty(value = "标准编号/名称") + private java.lang.String standardNumberOrName; /** * 标准编号 */ @ApiModelProperty(value = "标准编号") - @Excel(name = "标准编号", width = 15) private String standardNumber; /** * 标准名称 */ @ApiModelProperty(value = "标准名称") - @Excel(name = "标准名称", width = 15) private String standardName; /** * 适用市场 */ @ApiModelProperty(value = "适用市场") - @Excel(name = "适用市场", width = 15) + @Excel(name = "适用市场", dicCode = "market_state") + @Dict(dicCode = "market_state") private String applicableMarket; /** * 开始日期 */ @ApiModelProperty(value = "开始日期") - @Excel(name = "开始日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startTime; /** - * 结束日期 + * 截止日期 */ - @ApiModelProperty(value = "结束日期") - @Excel(name = "结束日期", width = 15, format = "yyyy-MM-dd") + @ApiModelProperty(value = "截止日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endTime; + /** + * 截止日期字符串 + */ + @TableField(exist = false) + @ApiModelProperty(value = "截止日期字符串") + @Excel(name = "截止日期", width = 15) + private String endTimeStr; /** * 征求意见反馈单编号 */ @@ -86,6 +95,14 @@ public class StandardSolicitOpinions implements Serializable { @ApiModelProperty(value = "意见反馈表") @Excel(name = "意见反馈表", width = 15) private String file; + /** + * 流程完成日期 + */ + @ApiModelProperty(value = "流程完成日期") + @Excel(name = "流程完成日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date processCompleteTime; /** * 创建人id */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinionsTerm.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinionsTerm.java index 29079e04..f3c78de4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinionsTerm.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinionsTerm.java @@ -37,7 +37,6 @@ public class StandardSolicitOpinionsTerm implements Serializable { * 征求意见id */ @ApiModelProperty(value = "征求意见id") - @Excel(name = "征求意见id", width = 15) private String solicitOpinionsId; /** * 法规工程师 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsService.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsService.java index debc7b97..19bc3994 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsService.java @@ -1,12 +1,19 @@ package com.jero.modules.laws.solicitopinions.service; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.laws.solicitopinions.entity.StandardSolicitOpinions; import com.jero.modules.laws.solicitopinions.mapper.StandardSolicitOpinionsMapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; import java.util.List; /** @@ -21,7 +28,37 @@ public class StandardSolicitOpinionsService extends ServiceImpl pageList(Page page, StandardSolicitOpinions standardSolicitOpinions, HttpServletRequest req) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //模糊查询标准编号和标准名称 + String standardNumberOrName = standardSolicitOpinions.getStandardNumberOrName(); + queryWrapper.and(StringUtils.isNotBlank(standardNumberOrName), i -> { + i.like(StandardSolicitOpinions::getStandardNumber, standardNumberOrName); + i.or(); + i.like(StandardSolicitOpinions::getStandardName, standardNumberOrName); + }); + //有交集的数据 + Date startTime = standardSolicitOpinions.getStartTime(); + Date endTime = standardSolicitOpinions.getEndTime(); + queryWrapper.gt(startTime != null, StandardSolicitOpinions::getEndTime, startTime); + queryWrapper.lt(endTime != null, StandardSolicitOpinions::getStartTime, endTime); + + queryWrapper.orderByDesc(StandardSolicitOpinions::getCreateTime); + Page pageList = this.page(page, queryWrapper); + for (StandardSolicitOpinions record : pageList.getRecords()) { + record.setStandardNumberOrName(record.getStandardNumber()+" "+record.getStandardName()); + } + return pageList; + } + public void add(StandardSolicitOpinions standardSolicitOpinions) { + String startTime = DateUtil.formatDate(standardSolicitOpinions.getStartTime()); + String endTime = DateUtil.formatDate(standardSolicitOpinions.getEndTime()); + standardSolicitOpinions.setEndTimeStr(startTime+"-"+endTime); + //征求意见反馈单编号生成规则：ZQYJ-4位年份-4位顺序号 + int count = this.count(); + standardSolicitOpinions.setNumber("ZQYJ-"+DateUtil.thisYear()+"-"+ String.format("%04d",count)); this.save(standardSolicitOpinions); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsTermService.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsTermService.java index 28a56b37..3939ebd1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsTermService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsTermService.java @@ -1,5 +1,9 @@ package com.jero.modules.laws.solicitopinions.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.laws.solicitopinions.entity.StandardSolicitOpinionsTerm; import com.jero.modules.laws.solicitopinions.mapper.StandardSolicitOpinionsTermMapper; import lombok.extern.slf4j.Slf4j; @@ -7,6 +11,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -21,6 +26,11 @@ public class StandardSolicitOpinionsTermService extends ServiceImpl pageList(Page page, StandardSolicitOpinionsTerm lawsStandardSolicitOpinionsTerm, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardSolicitOpinionsTerm, req.getParameterMap()); + return this.page(page, queryWrapper); + } + public void add(StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { this.save(standardSolicitOpinionsTerm); }