From bf68ee69c00b3d19561dc8fece1fbfea2bc21f37 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sat, 2 Jul 2022 11:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5=E5=A1=AB?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOController.java | 170 ++++++++++++++ .../NewOpinionTemplateEOController.java | 170 ++++++++++++++ .../NewStandardTemplateEOController.java | 170 ++++++++++++++ .../entity/LawsMonthlyReportWriteEO.java | 193 ++++++++++++++++ .../report/entity/NewOpinionTemplateEO.java | 91 ++++++++ .../report/entity/NewStandardTemplateEO.java | 98 ++++++++ .../report/enums/ContentTemplateEnum.java | 40 ++++ .../LawsMonthlyReportWriteEOMapper.java | 17 ++ .../mapper/NewOpinionTemplateEOMapper.java | 17 ++ .../mapper/NewStandardTemplateEOMapper.java | 17 ++ .../xml/LawsMonthlyReportWriteEOMapper.xml | 33 +++ .../mapper/xml/NewOpinionTemplateEOMapper.xml | 17 ++ .../xml/NewStandardTemplateEOMapper.xml | 18 ++ .../ILawsMonthlyReportWriteEOService.java | 72 ++++++ .../service/INewOpinionTemplateEOService.java | 61 +++++ .../INewStandardTemplateEOService.java | 61 +++++ .../LawsMonthlyReportWriteEOServiceImpl.java | 212 ++++++++++++++++++ .../impl/NewOpinionTemplateEOServiceImpl.java | 89 ++++++++ .../NewStandardTemplateEOServiceImpl.java | 89 ++++++++ 19 files changed, 1635 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewOpinionTemplateEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewStandardTemplateEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportWriteEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewOpinionTemplateEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewStandardTemplateEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewOpinionTemplateEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewStandardTemplateEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewOpinionTemplateEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewStandardTemplateEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewOpinionTemplateEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewStandardTemplateEOServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java new file mode 100644 index 000000000..ea0dc4d54 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.report.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; +import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 月报填写 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Api(tags="月报填写") +@RestController +@RequestMapping("/report/lawsMonthlyReportWriteEO") +@Slf4j +public class LawsMonthlyReportWriteEOController extends JeroController { + @Autowired + private ILawsMonthlyReportWriteEOService lawsMonthlyReportWriteEOService; + + /** + * 分页列表查询 + * + * @param lawsMonthlyReportWriteEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "月报填写-分页列表查询") + @ApiOperation(value="月报填写-分页列表查询", notes="月报填写-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsMonthlyReportWriteEOService.getPageInfo(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "月报填写-列表查询") + @ApiOperation(value="月报填写-列表查询", notes="月报填写-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsMonthlyReportWriteEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + @AutoLog(value = "月报填写-添加") + @ApiOperation(value="月报填写-添加", notes="月报填写-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + lawsMonthlyReportWriteEOService.add(lawsMonthlyReportWriteEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + @AutoLog(value = "月报填写-编辑") + @ApiOperation(value="月报填写-编辑", notes="月报填写-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + lawsMonthlyReportWriteEOService.editById(lawsMonthlyReportWriteEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "月报填写-通过id删除") + @ApiOperation(value="月报填写-通过id删除", notes="月报填写-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsMonthlyReportWriteEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "月报填写-批量删除") + @ApiOperation(value="月报填写-批量删除", notes="月报填写-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsMonthlyReportWriteEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "月报填写-通过id查询") + @ApiOperation(value="月报填写-通过id查询", notes="月报填写-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO = lawsMonthlyReportWriteEOService.queryById(id); + if(lawsMonthlyReportWriteEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsMonthlyReportWriteEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsMonthlyReportWriteEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + return super.exportXls(request, lawsMonthlyReportWriteEO, LawsMonthlyReportWriteEO.class, "月报填写"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LawsMonthlyReportWriteEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewOpinionTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewOpinionTemplateEOController.java new file mode 100644 index 000000000..af8e55437 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewOpinionTemplateEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.report.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.report.entity.NewOpinionTemplateEO; +import com.jero.modules.report.service.INewOpinionTemplateEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 新征求意见清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Api(tags="新征求意见清单模板") +@RestController +@RequestMapping("/report/newOpinionTemplateEO") +@Slf4j +public class NewOpinionTemplateEOController extends JeroController { + @Autowired + private INewOpinionTemplateEOService newOpinionTemplateEOService; + + /** + * 分页列表查询 + * + * @param newOpinionTemplateEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "新征求意见清单模板-分页列表查询") + @ApiOperation(value="新征求意见清单模板-分页列表查询", notes="新征求意见清单模板-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(NewOpinionTemplateEO newOpinionTemplateEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(newOpinionTemplateEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = newOpinionTemplateEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "新征求意见清单模板-列表查询") + @ApiOperation(value="新征求意见清单模板-列表查询", notes="新征求意见清单模板-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = newOpinionTemplateEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param newOpinionTemplateEO + * @return + */ + @AutoLog(value = "新征求意见清单模板-添加") + @ApiOperation(value="新征求意见清单模板-添加", notes="新征求意见清单模板-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody NewOpinionTemplateEO newOpinionTemplateEO) { + newOpinionTemplateEOService.add(newOpinionTemplateEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param newOpinionTemplateEO + * @return + */ + @AutoLog(value = "新征求意见清单模板-编辑") + @ApiOperation(value="新征求意见清单模板-编辑", notes="新征求意见清单模板-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody NewOpinionTemplateEO newOpinionTemplateEO) { + newOpinionTemplateEOService.editById(newOpinionTemplateEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "新征求意见清单模板-通过id删除") + @ApiOperation(value="新征求意见清单模板-通过id删除", notes="新征求意见清单模板-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + newOpinionTemplateEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "新征求意见清单模板-批量删除") + @ApiOperation(value="新征求意见清单模板-批量删除", notes="新征求意见清单模板-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.newOpinionTemplateEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "新征求意见清单模板-通过id查询") + @ApiOperation(value="新征求意见清单模板-通过id查询", notes="新征求意见清单模板-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NewOpinionTemplateEO newOpinionTemplateEO = newOpinionTemplateEOService.queryById(id); + if(newOpinionTemplateEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(newOpinionTemplateEO); + } + + /** + * 导出excel + * + * @param request + * @param newOpinionTemplateEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NewOpinionTemplateEO newOpinionTemplateEO) { + return super.exportXls(request, newOpinionTemplateEO, NewOpinionTemplateEO.class, "新征求意见清单模板"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NewOpinionTemplateEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewStandardTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewStandardTemplateEOController.java new file mode 100644 index 000000000..9dfdc1ded --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewStandardTemplateEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.report.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.report.entity.NewStandardTemplateEO; +import com.jero.modules.report.service.INewStandardTemplateEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 新发布标准清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Api(tags="新发布标准清单模板") +@RestController +@RequestMapping("/report/newStandardTemplateEO") +@Slf4j +public class NewStandardTemplateEOController extends JeroController { + @Autowired + private INewStandardTemplateEOService newStandardTemplateEOService; + + /** + * 分页列表查询 + * + * @param newStandardTemplateEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "新发布标准清单模板-分页列表查询") + @ApiOperation(value="新发布标准清单模板-分页列表查询", notes="新发布标准清单模板-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(NewStandardTemplateEO newStandardTemplateEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(newStandardTemplateEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = newStandardTemplateEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "新发布标准清单模板-列表查询") + @ApiOperation(value="新发布标准清单模板-列表查询", notes="新发布标准清单模板-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = newStandardTemplateEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param newStandardTemplateEO + * @return + */ + @AutoLog(value = "新发布标准清单模板-添加") + @ApiOperation(value="新发布标准清单模板-添加", notes="新发布标准清单模板-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody NewStandardTemplateEO newStandardTemplateEO) { + newStandardTemplateEOService.add(newStandardTemplateEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param newStandardTemplateEO + * @return + */ + @AutoLog(value = "新发布标准清单模板-编辑") + @ApiOperation(value="新发布标准清单模板-编辑", notes="新发布标准清单模板-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody NewStandardTemplateEO newStandardTemplateEO) { + newStandardTemplateEOService.editById(newStandardTemplateEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "新发布标准清单模板-通过id删除") + @ApiOperation(value="新发布标准清单模板-通过id删除", notes="新发布标准清单模板-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + newStandardTemplateEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "新发布标准清单模板-批量删除") + @ApiOperation(value="新发布标准清单模板-批量删除", notes="新发布标准清单模板-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.newStandardTemplateEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "新发布标准清单模板-通过id查询") + @ApiOperation(value="新发布标准清单模板-通过id查询", notes="新发布标准清单模板-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NewStandardTemplateEO newStandardTemplateEO = newStandardTemplateEOService.queryById(id); + if(newStandardTemplateEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(newStandardTemplateEO); + } + + /** + * 导出excel + * + * @param request + * @param newStandardTemplateEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NewStandardTemplateEO newStandardTemplateEO) { + return super.exportXls(request, newStandardTemplateEO, NewStandardTemplateEO.class, "新发布标准清单模板"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NewStandardTemplateEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java new file mode 100644 index 000000000..c7b84b430 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -0,0 +1,193 @@ +package com.jero.modules.report.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 月报填写 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Data +@TableName("laws_monthly_report_write") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_monthly_report_write对象", description="月报填写") +public class LawsMonthlyReportWriteEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**月份*/ + @Excel(name = "月份", width = 15) + @ApiModelProperty(value = "月份") + private java.lang.String month; + + /**章节目录*/ + @Excel(name = "章节目录", width = 15) + @ApiModelProperty(value = "章节目录") + private java.lang.String memoriesChapter; + + //章节目录名称 + @TableField(exist = false) + private java.lang.String memoriesChapterName; + + /**内容模板*/ + @Excel(name = "内容模板", width = 15) + @ApiModelProperty(value = "内容模板") + private java.lang.String contentTemplate; + + /**中文标题*/ + @Excel(name = "中文标题", width = 15) + @ApiModelProperty(value = "中文标题") + private java.lang.String titleCn; + + /**英文标题*/ + @Excel(name = "英文标题", width = 15) + @ApiModelProperty(value = "英文标题") + private java.lang.String titleEn; + + /**相关领域*/ + @Excel(name = "相关领域", width = 15) + @ApiModelProperty(value = "相关领域") + private java.lang.String technologyTerritory; + + /**适用车型*/ + @Excel(name = "适用车型", width = 15) + @ApiModelProperty(value = "适用车型") + private java.lang.String applyCar; + + /**适用范围*/ + @Excel(name = "适用范围", width = 15) + @ApiModelProperty(value = "适用范围") + private java.lang.String applyScope; + + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private java.lang.String state; + + /**用法*/ + @Excel(name = "用法", width = 15) + @ApiModelProperty(value = "用法") + private java.lang.String useMethod; + + /**实施车型*/ + @Excel(name = "实施车型", width = 15) + @ApiModelProperty(value = "实施车型") + private java.lang.String implementCar; + + /**发布日期*/ + @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "发布日期") + private java.util.Date issueTime; + + /**新车型实施日期*/ + @Excel(name = "新车型实施日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "新车型实施日期") + private java.util.Date newCarImplementTime; + + /**在产车实施日期*/ + @Excel(name = "在产车实施日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "在产车实施日期") + private java.util.Date productionCarImplementTime; + + /**主要内容中文*/ + @Excel(name = "主要内容中文", width = 15) + @ApiModelProperty(value = "主要内容中文") + private java.lang.String contentCn; + + /**主要内容英文*/ + @Excel(name = "主要内容英文", width = 15) + @ApiModelProperty(value = "主要内容英文") + private java.lang.String contentEn; + + /**NIO工作进展中文*/ + @Excel(name = "NIO工作进展中文", width = 15) + @ApiModelProperty(value = "NIO工作进展中文") + private java.lang.String workProgressCn; + + /**NIO工作进展英文*/ + @Excel(name = "NIO工作进展英文", width = 15) + @ApiModelProperty(value = "NIO工作进展英文") + private java.lang.String workProgressEn; + + /**法规联系人*/ + @Excel(name = "法规联系人", width = 15) + @ApiModelProperty(value = "法规联系人") + private java.lang.String lawsContact; + + /**链接*/ + @Excel(name = "链接", width = 15) + @ApiModelProperty(value = "链接") + private java.lang.String link; + + /**导出状态*/ + @ApiModelProperty(value = "导出状态") + private java.lang.String exportState; + + //新征求意见清单模板 + @TableField(exist = false) + private List newOpinionTemplateEOList; + + //新发布标准清单模板 + @TableField(exist = false) + private List newStandardTemplateEOList; + + @TableField(exist = false) + private String cut; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java new file mode 100644 index 000000000..fcd2ec8d8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java @@ -0,0 +1,91 @@ +package com.jero.modules.report.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 新征求意见清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Data +@TableName("new_opinion_template") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="new_opinion_template对象", description="新征求意见清单模板") +public class NewOpinionTemplateEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**月报填写表id*/ + @Excel(name = "月报填写表id", width = 15) + @ApiModelProperty(value = "月报填写表id") + private java.lang.String lawsMonthlyReportWriteId; + + /**计划号中文*/ + @Excel(name = "计划号中文", width = 15) + @ApiModelProperty(value = "计划号中文") + private java.lang.String planNumberCn; + + /**标准名称中文*/ + @Excel(name = "标准名称中文", width = 15) + @ApiModelProperty(value = "标准名称中文") + private java.lang.String standardNameCn; + + /**标准名称英文*/ + @Excel(name = "标准名称英文", width = 15) + @ApiModelProperty(value = "标准名称英文") + private java.lang.String standardNameEn; + + /**征求意见截止日期*/ + @Excel(name = "征求意见截止日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "征求意见截止日期") + private java.util.Date expirationDate; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java new file mode 100644 index 000000000..ca7363247 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java @@ -0,0 +1,98 @@ +package com.jero.modules.report.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 新发布标准清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Data +@TableName("new_standard_template") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="new_standard_template对象", description="新发布标准清单模板") +public class NewStandardTemplateEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**月报填写表id*/ + @Excel(name = "月报填写表id", width = 15) + @ApiModelProperty(value = "月报填写表id") + private java.lang.String lawsMonthlyReportWriteId; + + /**标准编号*/ + @Excel(name = "标准编号", width = 15) + @ApiModelProperty(value = "标准编号") + private java.lang.String standardNumber; + + /**标准名称中文*/ + @Excel(name = "标准名称中文", width = 15) + @ApiModelProperty(value = "标准名称中文") + private java.lang.String standardNameCn; + + /**标准名称英文*/ + @Excel(name = "标准名称英文", width = 15) + @ApiModelProperty(value = "标准名称英文") + private java.lang.String standardNameEn; + + /**发布日期*/ + @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "发布日期") + private java.util.Date issueTime; + + /**实施日期*/ + @Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "实施日期") + private java.util.Date implementTime; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java new file mode 100644 index 000000000..08679a039 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java @@ -0,0 +1,40 @@ +package com.jero.modules.report.enums; + +import com.sun.tools.doclets.formats.html.resources.standard; + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum ContentTemplateEnum { + DEFAULT_TEMPLATE("Content template","1"), + NEW_REQUEST_LIST_TEMPLATE("新征求意见清单模板","2"), + NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE("新发布标准清单模板","3"); + + + + String name; + String value; + + private ContentTemplateEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportWriteEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportWriteEOMapper.java new file mode 100644 index 000000000..71197a5af --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportWriteEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.report.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 月报填写 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface LawsMonthlyReportWriteEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewOpinionTemplateEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewOpinionTemplateEOMapper.java new file mode 100644 index 000000000..441b6351d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewOpinionTemplateEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.report.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.report.entity.NewOpinionTemplateEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 新征求意见清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface NewOpinionTemplateEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewStandardTemplateEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewStandardTemplateEOMapper.java new file mode 100644 index 000000000..33b248d73 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewStandardTemplateEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.report.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.report.entity.NewStandardTemplateEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 新发布标准清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface NewStandardTemplateEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml new file mode 100644 index 000000000..17fc90742 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewOpinionTemplateEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewOpinionTemplateEOMapper.xml new file mode 100644 index 000000000..ddd0bdae5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewOpinionTemplateEOMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewStandardTemplateEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewStandardTemplateEOMapper.xml new file mode 100644 index 000000000..c41c66e29 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewStandardTemplateEOMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java new file mode 100644 index 000000000..733f6d18f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java @@ -0,0 +1,72 @@ +package com.jero.modules.report.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.modules.report.entity.LawsMonthlyReportWriteEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 月报填写 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface ILawsMonthlyReportWriteEOService extends IService { + + /** + * 保存 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + void add(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO); + + /** + * 编辑 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + void editById(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsMonthlyReportWriteEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 分页 + * @param page + * @param queryWrapper + * @return + */ + IPage getPageInfo(Page page, QueryWrapper queryWrapper); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewOpinionTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewOpinionTemplateEOService.java new file mode 100644 index 000000000..401a0c9f6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewOpinionTemplateEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.report.service; + +import com.jero.modules.report.entity.NewOpinionTemplateEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 新征求意见清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface INewOpinionTemplateEOService extends IService { + + /** + * 保存 + * + * @param newOpinionTemplateEO + * @return + */ + void add(NewOpinionTemplateEO newOpinionTemplateEO); + + /** + * 更新 + * + * @param newOpinionTemplateEO + * @return + */ + void editById(NewOpinionTemplateEO newOpinionTemplateEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + NewOpinionTemplateEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewStandardTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewStandardTemplateEOService.java new file mode 100644 index 000000000..357b739f4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewStandardTemplateEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.report.service; + +import com.jero.modules.report.entity.NewStandardTemplateEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 新发布标准清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface INewStandardTemplateEOService extends IService { + + /** + * 保存 + * + * @param newStandardTemplateEO + * @return + */ + void add(NewStandardTemplateEO newStandardTemplateEO); + + /** + * 更新 + * + * @param newStandardTemplateEO + * @return + */ + void editById(NewStandardTemplateEO newStandardTemplateEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + NewStandardTemplateEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java new file mode 100644 index 000000000..5cd7e09cd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -0,0 +1,212 @@ +package com.jero.modules.report.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.constant.enums.CutEnum; +import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; +import com.jero.modules.report.entity.NewOpinionTemplateEO; +import com.jero.modules.report.entity.NewStandardTemplateEO; +import com.jero.modules.report.enums.ContentTemplateEnum; +import com.jero.modules.report.mapper.LawsMonthlyReportWriteEOMapper; +import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; +import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService; +import com.jero.modules.report.service.INewOpinionTemplateEOService; +import com.jero.modules.report.service.INewStandardTemplateEOService; +import com.jero.modules.system.util.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import java.util.UUID; +import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 月报填写 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Service +public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportWriteEOService { + + @Autowired + private INewOpinionTemplateEOService iNewOpinionTemplateEOService; + @Autowired + private INewStandardTemplateEOService iNewStandardTemplateEOService; + @Autowired + private ILawsMonthlyReportTitleTemplateEOService lawsMonthlyReportTitleTemplateEOService; + /** + * 保存 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + @Override + public void add(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + Date now = new Date(); + lawsMonthlyReportWriteEO.setCreateTime(now); + lawsMonthlyReportWriteEO.setUpdateTime(now); + save(lawsMonthlyReportWriteEO); + + if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新征求意见清单模板 + List newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList(); + for (NewOpinionTemplateEO newOpinionTemplateEO : newOpinionTemplateEOList) { + newOpinionTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId()); + } + iNewOpinionTemplateEOService.saveBatch(newOpinionTemplateEOList); + + }else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新发布标准清单模板 + List newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList(); + for (NewStandardTemplateEO newStandardTemplateEO : newStandardTemplateEOList) { + newStandardTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId()); + } + iNewStandardTemplateEOService.saveBatch(newStandardTemplateEOList); + } + } + + /** + * 编辑 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + @Override + public void editById(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + Date now = new Date(); + lawsMonthlyReportWriteEO.setUpdateTime(now); + saveOrUpdate(lawsMonthlyReportWriteEO); + + if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新征求意见清单模板 + List newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList(); + iNewOpinionTemplateEOService.updateBatchById(newOpinionTemplateEOList); + + }else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新发布标准清单模板 + List newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList(); + iNewStandardTemplateEOService.updateBatchById(newStandardTemplateEOList); + } + + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + //删除新征求意见清单模板 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,ids); + iNewOpinionTemplateEOService.remove(wrapper); + + //删除新发布标准清单模板 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,ids); + iNewStandardTemplateEOService.remove(queryWrapper); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsMonthlyReportWriteEO queryById(String id) { + LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO = getById(id); + if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新征求意见清单模板 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,id); + List newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); + lawsMonthlyReportWriteEO.setNewOpinionTemplateEOList(newOpinionTemplateEOList); + + }else if(ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新发布标准清单模板 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,id); + List newStandardTemplateEOList = iNewStandardTemplateEOService.list(queryWrapper); + lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(newStandardTemplateEOList); + } + return lawsMonthlyReportWriteEO; + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public IPage getPageInfo(Page page, QueryWrapper queryWrapper) { + Page pageInfo = this.page(page, queryWrapper); + //法规月报id + List lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); + //获取章节目录 + List lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); + + //新征求意见清单模板 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); + List newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); + + //新发布标准清单模板 + LambdaQueryWrapper qrapperTemp = new LambdaQueryWrapper<>(); + qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); + List newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp); + + for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) { + //处理章节目录 + if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){ + List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() + .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); + }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); + } + } + + if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新征求意见清单模板 + List collect = newOpinionTemplateEOList.stream() + .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); + lawsMonthlyReportWriteEO.setNewOpinionTemplateEOList(collect); + + }else if(ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新发布标准清单模板 + List collect = newStandardTemplateEOList.stream() + .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); + lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(collect); + } + } + return pageInfo; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewOpinionTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewOpinionTemplateEOServiceImpl.java new file mode 100644 index 000000000..4774386de --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewOpinionTemplateEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.report.service.impl; + +import com.jero.modules.report.entity.NewOpinionTemplateEO; +import com.jero.modules.report.mapper.NewOpinionTemplateEOMapper; +import com.jero.modules.report.service.INewOpinionTemplateEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 新征求意见清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Service +public class NewOpinionTemplateEOServiceImpl extends ServiceImpl implements INewOpinionTemplateEOService { + + /** + * 保存 + * + * @param newOpinionTemplateEO + * @return + */ + @Override + public void add(NewOpinionTemplateEO newOpinionTemplateEO) { + Date now = new Date(); + newOpinionTemplateEO.setCreateTime(now); + newOpinionTemplateEO.setUpdateTime(now); + save(newOpinionTemplateEO); + } + + /** + * 更新 + * + * @param newOpinionTemplateEO + * @return + */ + @Override + public void editById(NewOpinionTemplateEO newOpinionTemplateEO) { + Date now = new Date(); + newOpinionTemplateEO.setUpdateTime(now); + saveOrUpdate(newOpinionTemplateEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public NewOpinionTemplateEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewStandardTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewStandardTemplateEOServiceImpl.java new file mode 100644 index 000000000..ed1bcb4b8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewStandardTemplateEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.report.service.impl; + +import com.jero.modules.report.entity.NewStandardTemplateEO; +import com.jero.modules.report.mapper.NewStandardTemplateEOMapper; +import com.jero.modules.report.service.INewStandardTemplateEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 新发布标准清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Service +public class NewStandardTemplateEOServiceImpl extends ServiceImpl implements INewStandardTemplateEOService { + + /** + * 保存 + * + * @param newStandardTemplateEO + * @return + */ + @Override + public void add(NewStandardTemplateEO newStandardTemplateEO) { + Date now = new Date(); + newStandardTemplateEO.setCreateTime(now); + newStandardTemplateEO.setUpdateTime(now); + save(newStandardTemplateEO); + } + + /** + * 更新 + * + * @param newStandardTemplateEO + * @return + */ + @Override + public void editById(NewStandardTemplateEO newStandardTemplateEO) { + Date now = new Date(); + newStandardTemplateEO.setUpdateTime(now); + saveOrUpdate(newStandardTemplateEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public NewStandardTemplateEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +}