From 348f878af0c89a25c213ce4d487e37fb58dd474d Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 3 Nov 2023 15:04:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8):=20=E5=8A=9F=E8=83=BD=E5=88=9D=E6=AD=A5=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/entity/OauthUserInfo.java | 2 +- .../LawsStandardizationController.java | 302 ++++++------ .../LawsStandardizationGroupController.java | 177 +++++++ .../LawsStandardizationLiaisonController.java | 177 +++++++ .../LawsStandardizationMeetingController.java | 177 +++++++ .../LawsStandardizationPaymentController.java | 177 +++++++ .../entity/LawsStandardization.java | 67 +-- .../entity/LawsStandardizationGroup.java | 71 +++ .../entity/LawsStandardizationLiaison.java | 55 +++ .../entity/LawsStandardizationMeeting.java | 56 +++ .../entity/LawsStandardizationPayment.java | 63 +++ .../LawsStandardizationGroupMapper.java | 14 + .../LawsStandardizationLiaisonMapper.java | 14 + .../LawsStandardizationMeetingMapper.java | 14 + .../LawsStandardizationPaymentMapper.java | 14 + .../xml/LawsStandardizationGroupMapper.xml | 5 + .../xml/LawsStandardizationLiaisonMapper.xml | 5 + .../xml/LawsStandardizationMeetingMapper.xml | 4 + .../xml/LawsStandardizationPaymentMapper.xml | 5 + .../ILawsStandardizationGroupService.java | 76 +++ .../ILawsStandardizationLiaisonService.java | 77 +++ .../ILawsStandardizationMeetingService.java | 77 +++ .../ILawsStandardizationPaymentService.java | 77 +++ .../service/ILawsStandardizationService.java | 86 ++-- .../LawsStandardizationGroupServiceImpl.java | 118 +++++ ...LawsStandardizationLiaisonServiceImpl.java | 119 +++++ ...LawsStandardizationMeetingServiceImpl.java | 119 +++++ ...LawsStandardizationPaymentServiceImpl.java | 119 +++++ .../impl/LawsStandardizationServiceImpl.java | 462 +++++++++++++++--- .../standardization/vo/StandardizationVO.java | 33 ++ 30 files changed, 2479 insertions(+), 283 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationGroupController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationLiaisonController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationMeetingController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationPaymentController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationGroupMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationLiaisonMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMeetingMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationPaymentMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationGroupMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationLiaisonMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMeetingMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationPaymentMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationGroupService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationLiaisonService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationMeetingService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationPaymentService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationGroupServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationLiaisonServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationMeetingServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationPaymentServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/vo/StandardizationVO.java diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java index bf7a535f..cab4424c 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java @@ -46,7 +46,7 @@ public class OauthUserInfo { private String title; /** - * 账号名 + * 账号名（旧的不用了） */ @ApiModelProperty(value = "账号信息（旧的不用了）") private List spRoleList; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java index de12597d..4fbc76a8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java @@ -1,25 +1,24 @@ package com.jero.modules.laws.standardization.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; -import com.jero.modules.laws.standardization.entity.LawsStandardization; -import com.jero.modules.laws.standardization.service.ILawsStandardizationService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.aspect.annotation.AutoLog; 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 com.jero.common.util.MessageUtils; +import com.jero.modules.laws.common.constant.ResultCommon; +import com.jero.modules.laws.standardization.entity.*; +import com.jero.modules.laws.standardization.service.ILawsStandardizationService; +import com.jero.modules.laws.standardization.vo.StandardizationVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; /** @@ -33,144 +32,153 @@ import org.apache.poi.ss.formula.functions.T; @RequestMapping("/laws/standardization/lawsStandardization") @Slf4j public class LawsStandardizationController extends JeroController { - @Autowired - private ILawsStandardizationService lawsStandardizationService; + private final ILawsStandardizationService lawsStandardizationService; - /** - * 分页列表查询 - * - * @param lawsStandardization - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "标准化活动-分页列表查询") - @ApiOperation(value="标准化活动-分页列表查询", notes="标准化活动-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(LawsStandardization lawsStandardization, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = lawsStandardizationService.queryPage(lawsStandardization, pageNo, pageSize, req); - return Result.OK(pageList); - } + public LawsStandardizationController(@Lazy ILawsStandardizationService lawsStandardizationService) { + this.lawsStandardizationService = lawsStandardizationService; + } - /** - * 列表查询 - * - * @param lawsStandardization - * @param req - * @return - */ - @AutoLog(value = "标准化活动-列表查询") - @ApiOperation(value="标准化活动-列表查询", notes="标准化活动-列表查询") - @GetMapping(value = "/list") - public Result> queryList(LawsStandardization lawsStandardization, HttpServletRequest req) { - List list = lawsStandardizationService.queryList(lawsStandardization, req); - return Result.OK(list); - } + /** + * 标准化活动-树结构查询 + * @return + */ + @AutoLog(value = "标准化活动-树结构查询") + @ApiOperation(value="标准化活动-树结构查询", notes="标准化活动-树结构查询") + @GetMapping(value = "/queryTreeList") + public Result queryTreeList() { + return Result.OK(lawsStandardizationService.queryTreeList()); + } - /** - * 添加 - * - * @param lawsStandardization - * @return - */ - @AutoLog(value = "标准化活动-添加") - @ApiOperation(value="标准化活动-添加", notes="标准化活动-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody LawsStandardization lawsStandardization) { - lawsStandardizationService.add(lawsStandardization); - return Result.OK("操作成功!"); - } + /** + * 标准化活动-树结构查询 + * @return + */ + @AutoLog(value = "标准化活动-统计列表") + @ApiOperation(value="标准化活动-统计列表", notes="标准化活动-统计列表") + @GetMapping(value = "/queryStatistics") + public Result> queryStatistics() { + return Result.OK(lawsStandardizationService.queryStatistics()); + } - /** - * 编辑 - * - * @param lawsStandardization - * @return - */ - @AutoLog(value = "标准化活动-编辑") - @ApiOperation(value="标准化活动-编辑", notes="标准化活动-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody LawsStandardization lawsStandardization) { - lawsStandardizationService.editById(lawsStandardization); - return Result.OK("操作成功!"); - } + /** + * 新增or编辑 + * + * @param standardizationVO + * @return + */ + @AutoLog(value = "标准化活动-添加") + @ApiOperation(value="标准化活动-添加", notes="标准化活动-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody StandardizationVO standardizationVO) { + lawsStandardizationService.addOrUpdateStandardization(standardizationVO); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化活动-通过id删除") - @ApiOperation(value="标准化活动-通过id删除", notes="标准化活动-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ + /** + * 新增or编辑 + * + * @param standardizationVO + * @return + */ + @AutoLog(value = "标准化活动-编辑") + @ApiOperation(value="标准化活动-编辑", notes="标准化活动-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody StandardizationVO standardizationVO) { + log.info(""); + lawsStandardizationService.addOrUpdateStandardization(standardizationVO); + return Result.OK(MessageUtils.getMessage(ResultCommon.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) { + return Result.OK(lawsStandardizationService.queryById(id)); + } + + /** + * 标准化活动-会议统计-联络人联系方式 + * + * @param standardizationId + * @return + */ + @AutoLog(value = "标准化活动-会议统计-联络人联系方式") + @ApiOperation(value="标准化活动-会议统计-联络人联系方式", notes="标准化活动-会议统计-联络人联系方式") + @GetMapping(value = "/queryLiaisonByStandardizationId") + public Result> queryLiaisonByStandardizationId(@RequestParam(name="id",required=true) String standardizationId) { + return Result.OK(lawsStandardizationService.queryLiaisonByStandardizationId(standardizationId)); + } + + /** + * 标准化活动-会议统计-集团参与情况 + * + * @param standardizationId + * @return + */ + @AutoLog(value = "标准化活动-会议统计-集团参与情况") + @ApiOperation(value="标准化活动-会议统计-集团参与情况", notes="标准化活动-会议统计-集团参与情况") + @GetMapping(value = "/queryGroupByStandardizationId") + public Result> queryGroupByStandardizationId(@RequestParam(name="id",required=true) String standardizationId) { + return Result.OK(lawsStandardizationService.queryGroupByStandardizationId(standardizationId)); + } + + /** + * 标准化活动-会议统计-支付信息 + * + * @param standardizationId + * @return + */ + @AutoLog(value = "标准化活动-会议统计-支付信息") + @ApiOperation(value="标准化活动-会议统计-支付信息", notes="标准化活动-会议统计-支付信息") + @GetMapping(value = "/queryPaymentByStandardizationId") + public Result> queryPaymentByStandardizationId(@RequestParam(name="id",required=true) String standardizationId) { + return Result.OK(lawsStandardizationService.queryPaymentByStandardizationId(standardizationId)); + } + + /** + * 标准化活动-会议统计-参会记录 + * + * @param standardizationId + * @return + */ + @AutoLog(value = "标准化活动-会议统计-参会记录") + @ApiOperation(value="标准化活动-会议统计-参会记录", notes="标准化活动-会议统计-参会记录") + @GetMapping(value = "/queryMeetingByStandardizationId") + public Result> queryMeetingByStandardizationId(@RequestParam(name="id",required=true) String standardizationId) { + return Result.OK(lawsStandardizationService.queryMeetingByStandardizationId(standardizationId)); + } + + /** + * 标准化活动-详情通过id查询 + * @return + */ + @AutoLog(value = "标准化活动-详情通过id查询") + @ApiOperation(value="标准化活动-详情通过id查询", notes="标准化活动-详情通过id查询") + @GetMapping(value = "/queryDetailById") + public Result queryDetailById(String id) { + return Result.OK(lawsStandardizationService.queryDetailById(id)); + } + + /** + * 通过id删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化活动-通过id删除") + @ApiOperation(value="标准化活动-通过id删除", notes="标准化活动-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ return Result.error("请选择数据!"); } - lawsStandardizationService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化活动-批量删除") - @ApiOperation(value="标准化活动-批量删除", notes="标准化活动-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.lawsStandardizationService.deleteByIds(Arrays.asList(map.get("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) { - LawsStandardization lawsStandardization = lawsStandardizationService.queryById(id); - if(lawsStandardization==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(lawsStandardization); - } - - /** - * 导出excel - * - * @param request - * @param lawsStandardization - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, LawsStandardization lawsStandardization) { - return super.exportXls(request, lawsStandardization, LawsStandardization.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, LawsStandardization.class); - } - + lawsStandardizationService.delete(map.get("id")); + return Result.OK("删除成功!"); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationGroupController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationGroupController.java new file mode 100644 index 00000000..8e21bcac --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationGroupController.java @@ -0,0 +1,177 @@ +package com.jero.modules.laws.standardization.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.laws.standardization.entity.LawsStandardizationGroup; +import com.jero.modules.laws.standardization.service.ILawsStandardizationGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; +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 javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + + + /** + * @Description: 标准化-集团参与情况 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Api(tags="标准化-集团参与情况") +@RestController +@RequestMapping("/laws/standardization/lawsStandardizationGroup") +@Slf4j +public class LawsStandardizationGroupController extends JeroController { + @Autowired + private ILawsStandardizationGroupService lawsStandardizationGroupService; + + /** + * 分页列表查询 + * + * @param lawsStandardizationGroup + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "标准化-集团参与情况-分页列表查询") + @ApiOperation(value="标准化-集团参与情况-分页列表查询", notes="标准化-集团参与情况-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(LawsStandardizationGroup lawsStandardizationGroup, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = lawsStandardizationGroupService.queryPage(lawsStandardizationGroup, pageNo, pageSize, req); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @param lawsStandardizationGroup + * @param req + * @return + */ + @AutoLog(value = "标准化-集团参与情况-列表查询") + @ApiOperation(value="标准化-集团参与情况-列表查询", notes="标准化-集团参与情况-列表查询") + @GetMapping(value = "/list") + public Result> queryList(LawsStandardizationGroup lawsStandardizationGroup, HttpServletRequest req) { + List list = lawsStandardizationGroupService.queryList(lawsStandardizationGroup, req); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsStandardizationGroup + * @return + */ + @AutoLog(value = "标准化-集团参与情况-添加") + @ApiOperation(value="标准化-集团参与情况-添加", notes="标准化-集团参与情况-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsStandardizationGroup lawsStandardizationGroup) { + lawsStandardizationGroupService.add(lawsStandardizationGroup); + return Result.OK("操作成功!"); + } + + /** + * 编辑 + * + * @param lawsStandardizationGroup + * @return + */ + @AutoLog(value = "标准化-集团参与情况-编辑") + @ApiOperation(value="标准化-集团参与情况-编辑", notes="标准化-集团参与情况-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsStandardizationGroup lawsStandardizationGroup) { + lawsStandardizationGroupService.editById(lawsStandardizationGroup); + return Result.OK("操作成功!"); + } + + /** + * 通过id删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化-集团参与情况-通过id删除") + @ApiOperation(value="标准化-集团参与情况-通过id删除", notes="标准化-集团参与情况-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ + return Result.error("请选择数据!"); + } + lawsStandardizationGroupService.deleteById(map.get("id")); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化-集团参与情况-批量删除") + @ApiOperation(value="标准化-集团参与情况-批量删除", notes="标准化-集团参与情况-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ + return Result.error("请选择数据!"); + } + this.lawsStandardizationGroupService.deleteByIds(Arrays.asList(map.get("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) { + LawsStandardizationGroup lawsStandardizationGroup = lawsStandardizationGroupService.queryById(id); + if(lawsStandardizationGroup==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsStandardizationGroup); + } + + /** + * 导出excel + * + * @param request + * @param lawsStandardizationGroup + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsStandardizationGroup lawsStandardizationGroup) { + return super.exportXls(request, lawsStandardizationGroup, LawsStandardizationGroup.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, LawsStandardizationGroup.class); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationLiaisonController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationLiaisonController.java new file mode 100644 index 00000000..8a83a7af --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationLiaisonController.java @@ -0,0 +1,177 @@ +package com.jero.modules.laws.standardization.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.laws.standardization.entity.LawsStandardizationLiaison; +import com.jero.modules.laws.standardization.service.ILawsStandardizationLiaisonService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; +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 javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + + + /** + * @Description: 标准化-联络人 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Api(tags="标准化-联络人") +@RestController +@RequestMapping("/laws/standardization/lawsStandardizationLiaison") +@Slf4j +public class LawsStandardizationLiaisonController extends JeroController { + @Autowired + private ILawsStandardizationLiaisonService lawsStandardizationLiaisonService; + + /** + * 分页列表查询 + * + * @param lawsStandardizationLiaison + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "标准化-联络人-分页列表查询") + @ApiOperation(value="标准化-联络人-分页列表查询", notes="标准化-联络人-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(LawsStandardizationLiaison lawsStandardizationLiaison, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = lawsStandardizationLiaisonService.queryPage(lawsStandardizationLiaison, pageNo, pageSize, req); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @param lawsStandardizationLiaison + * @param req + * @return + */ + @AutoLog(value = "标准化-联络人-列表查询") + @ApiOperation(value="标准化-联络人-列表查询", notes="标准化-联络人-列表查询") + @GetMapping(value = "/list") + public Result> queryList(LawsStandardizationLiaison lawsStandardizationLiaison, HttpServletRequest req) { + List list = lawsStandardizationLiaisonService.queryList(lawsStandardizationLiaison, req); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsStandardizationLiaison + * @return + */ + @AutoLog(value = "标准化-联络人-添加") + @ApiOperation(value="标准化-联络人-添加", notes="标准化-联络人-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsStandardizationLiaison lawsStandardizationLiaison) { + lawsStandardizationLiaisonService.add(lawsStandardizationLiaison); + return Result.OK("操作成功!"); + } + + /** + * 编辑 + * + * @param lawsStandardizationLiaison + * @return + */ + @AutoLog(value = "标准化-联络人-编辑") + @ApiOperation(value="标准化-联络人-编辑", notes="标准化-联络人-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsStandardizationLiaison lawsStandardizationLiaison) { + lawsStandardizationLiaisonService.editById(lawsStandardizationLiaison); + return Result.OK("操作成功!"); + } + + /** + * 通过id删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化-联络人-通过id删除") + @ApiOperation(value="标准化-联络人-通过id删除", notes="标准化-联络人-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ + return Result.error("请选择数据!"); + } + lawsStandardizationLiaisonService.deleteById(map.get("id")); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化-联络人-批量删除") + @ApiOperation(value="标准化-联络人-批量删除", notes="标准化-联络人-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ + return Result.error("请选择数据!"); + } + this.lawsStandardizationLiaisonService.deleteByIds(Arrays.asList(map.get("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) { + LawsStandardizationLiaison lawsStandardizationLiaison = lawsStandardizationLiaisonService.queryById(id); + if(lawsStandardizationLiaison==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsStandardizationLiaison); + } + + /** + * 导出excel + * + * @param request + * @param lawsStandardizationLiaison + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsStandardizationLiaison lawsStandardizationLiaison) { + return super.exportXls(request, lawsStandardizationLiaison, LawsStandardizationLiaison.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, LawsStandardizationLiaison.class); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationMeetingController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationMeetingController.java new file mode 100644 index 00000000..00463fa0 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationMeetingController.java @@ -0,0 +1,177 @@ +package com.jero.modules.laws.standardization.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting; +import com.jero.modules.laws.standardization.service.ILawsStandardizationMeetingService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; +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 javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + + + /** + * @Description: 标准化-参会记录 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Api(tags="标准化-参会记录") +@RestController +@RequestMapping("/laws/standardization/lawsStandardizationMeeting") +@Slf4j +public class LawsStandardizationMeetingController extends JeroController { + @Autowired + private ILawsStandardizationMeetingService lawsStandardizationMeetingService; + + /** + * 分页列表查询 + * + * @param lawsStandardizationMeeting + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "标准化-参会记录-分页列表查询") + @ApiOperation(value="标准化-参会记录-分页列表查询", notes="标准化-参会记录-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(LawsStandardizationMeeting lawsStandardizationMeeting, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = lawsStandardizationMeetingService.queryPage(lawsStandardizationMeeting, pageNo, pageSize, req); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @param lawsStandardizationMeeting + * @param req + * @return + */ + @AutoLog(value = "标准化-参会记录-列表查询") + @ApiOperation(value="标准化-参会记录-列表查询", notes="标准化-参会记录-列表查询") + @GetMapping(value = "/list") + public Result> queryList(LawsStandardizationMeeting lawsStandardizationMeeting, HttpServletRequest req) { + List list = lawsStandardizationMeetingService.queryList(lawsStandardizationMeeting, req); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsStandardizationMeeting + * @return + */ + @AutoLog(value = "标准化-参会记录-添加") + @ApiOperation(value="标准化-参会记录-添加", notes="标准化-参会记录-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsStandardizationMeeting lawsStandardizationMeeting) { + lawsStandardizationMeetingService.add(lawsStandardizationMeeting); + return Result.OK("操作成功!"); + } + + /** + * 编辑 + * + * @param lawsStandardizationMeeting + * @return + */ + @AutoLog(value = "标准化-参会记录-编辑") + @ApiOperation(value="标准化-参会记录-编辑", notes="标准化-参会记录-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsStandardizationMeeting lawsStandardizationMeeting) { + lawsStandardizationMeetingService.editById(lawsStandardizationMeeting); + return Result.OK("操作成功!"); + } + + /** + * 通过id删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化-参会记录-通过id删除") + @ApiOperation(value="标准化-参会记录-通过id删除", notes="标准化-参会记录-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ + return Result.error("请选择数据!"); + } + lawsStandardizationMeetingService.deleteById(map.get("id")); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化-参会记录-批量删除") + @ApiOperation(value="标准化-参会记录-批量删除", notes="标准化-参会记录-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ + return Result.error("请选择数据!"); + } + this.lawsStandardizationMeetingService.deleteByIds(Arrays.asList(map.get("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) { + LawsStandardizationMeeting lawsStandardizationMeeting = lawsStandardizationMeetingService.queryById(id); + if(lawsStandardizationMeeting==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsStandardizationMeeting); + } + + /** + * 导出excel + * + * @param request + * @param lawsStandardizationMeeting + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsStandardizationMeeting lawsStandardizationMeeting) { + return super.exportXls(request, lawsStandardizationMeeting, LawsStandardizationMeeting.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, LawsStandardizationMeeting.class); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationPaymentController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationPaymentController.java new file mode 100644 index 00000000..3d4c1b09 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationPaymentController.java @@ -0,0 +1,177 @@ +package com.jero.modules.laws.standardization.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.laws.standardization.entity.LawsStandardizationPayment; +import com.jero.modules.laws.standardization.service.ILawsStandardizationPaymentService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; +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 javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + + + /** + * @Description: 标准化-支付信息 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Api(tags="标准化-支付信息") +@RestController +@RequestMapping("/laws/standardization/lawsStandardizationPayment") +@Slf4j +public class LawsStandardizationPaymentController extends JeroController { + @Autowired + private ILawsStandardizationPaymentService lawsStandardizationPaymentService; + + /** + * 分页列表查询 + * + * @param lawsStandardizationPayment + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "标准化-支付信息-分页列表查询") + @ApiOperation(value="标准化-支付信息-分页列表查询", notes="标准化-支付信息-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(LawsStandardizationPayment lawsStandardizationPayment, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = lawsStandardizationPaymentService.queryPage(lawsStandardizationPayment, pageNo, pageSize, req); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @param lawsStandardizationPayment + * @param req + * @return + */ + @AutoLog(value = "标准化-支付信息-列表查询") + @ApiOperation(value="标准化-支付信息-列表查询", notes="标准化-支付信息-列表查询") + @GetMapping(value = "/list") + public Result> queryList(LawsStandardizationPayment lawsStandardizationPayment, HttpServletRequest req) { + List list = lawsStandardizationPaymentService.queryList(lawsStandardizationPayment, req); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsStandardizationPayment + * @return + */ + @AutoLog(value = "标准化-支付信息-添加") + @ApiOperation(value="标准化-支付信息-添加", notes="标准化-支付信息-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsStandardizationPayment lawsStandardizationPayment) { + lawsStandardizationPaymentService.add(lawsStandardizationPayment); + return Result.OK("操作成功!"); + } + + /** + * 编辑 + * + * @param lawsStandardizationPayment + * @return + */ + @AutoLog(value = "标准化-支付信息-编辑") + @ApiOperation(value="标准化-支付信息-编辑", notes="标准化-支付信息-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsStandardizationPayment lawsStandardizationPayment) { + lawsStandardizationPaymentService.editById(lawsStandardizationPayment); + return Result.OK("操作成功!"); + } + + /** + * 通过id删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化-支付信息-通过id删除") + @ApiOperation(value="标准化-支付信息-通过id删除", notes="标准化-支付信息-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ + return Result.error("请选择数据!"); + } + lawsStandardizationPaymentService.deleteById(map.get("id")); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化-支付信息-批量删除") + @ApiOperation(value="标准化-支付信息-批量删除", notes="标准化-支付信息-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ + return Result.error("请选择数据!"); + } + this.lawsStandardizationPaymentService.deleteByIds(Arrays.asList(map.get("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) { + LawsStandardizationPayment lawsStandardizationPayment = lawsStandardizationPaymentService.queryById(id); + if(lawsStandardizationPayment==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsStandardizationPayment); + } + + /** + * 导出excel + * + * @param request + * @param lawsStandardizationPayment + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsStandardizationPayment lawsStandardizationPayment) { + return super.exportXls(request, lawsStandardizationPayment, LawsStandardizationPayment.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, LawsStandardizationPayment.class); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java index 97541a9a..85c6c318 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java @@ -1,22 +1,16 @@ package com.jero.modules.laws.standardization.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; 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 com.jero.modules.laws.documenttool.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.util.List; /** @@ -30,28 +24,28 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="laws_standardization对象", description="标准化活动") -public class LawsStandardization implements Serializable { +public class LawsStandardization extends BaseEntity { private static final long serialVersionUID = 1L; - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private java.lang.String id; /**上级节点ID*/ @Excel(name = "上级节点ID", width = 15) @ApiModelProperty(value = "上级节点ID") private java.lang.String pid; - /**标准化活动节点类型(1-标委会、2-分标委)*/ - @Excel(name = "标准化活动节点类型(1-标委会、2-分标委)", width = 15) - @ApiModelProperty(value = "标准化活动节点类型(1-标委会、2-分标委)") + /**上级节点名称*/ + @Excel(name = "上级节点名称", width = 15) + @ApiModelProperty(value = "上级节点名称") + private java.lang.String supperName; + /**节点类型（固定：分标委）*/ + @Excel(name = "节点类型", width = 15) + @ApiModelProperty(value = "节点类型（固定：分标委）") private java.lang.String type; /**编号*/ @Excel(name = "编号", width = 15) @ApiModelProperty(value = "编号") private java.lang.String num; - /**会议名称*/ - @Excel(name = "会议名称", width = 15) - @ApiModelProperty(value = "会议名称") + /**名称*/ + @Excel(name = "名称", width = 15) + @ApiModelProperty(value = "名称") private java.lang.String name; /**标准化工作领域*/ @Excel(name = "标准化工作领域", width = 15) @@ -61,28 +55,15 @@ public class LawsStandardization implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String notes; - /**创建人ID*/ - @ApiModelProperty(value = "创建人ID") - private java.lang.String createBy; - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /**修改人ID*/ - @ApiModelProperty(value = "修改人ID") - private java.lang.String updateBy; - /**修改时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "修改时间") - private java.util.Date updateTime; /**部门code*/ @Excel(name = "部门code", width = 15) @ApiModelProperty(value = "部门code") private java.lang.String orgCode; - /**删除状态(0-正常,1-删除)*/ - @Excel(name = "删除状态(0-正常,1-删除)", width = 15) - @ApiModelProperty(value = "删除状态(0-正常,1-删除)") - private java.lang.String delFlag; + + /**层级*/ + @TableField(exist = false) + private Long level; + /**子节点*/ + @TableField(exist = false) + private List children; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java new file mode 100644 index 00000000..c6edcd1b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java @@ -0,0 +1,71 @@ +package com.jero.modules.laws.standardization.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.modules.laws.documenttool.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + + +/** + * @Description: 标准化-集团参与情况 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Data +@TableName("laws_standardization_group") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_standardization_group对象", description="标准化-集团参与情况") +public class LawsStandardizationGroup extends BaseEntity { + private static final long serialVersionUID = 1L; + + /**标准化活动ID*/ + @Excel(name = "标准化活动ID", width = 15) + @ApiModelProperty(value = "标准化活动ID") + private java.lang.String standardizationId; + /**我司在工作组排名顺序*/ + @Excel(name = "我司在工作组排名顺序", width = 15) + @ApiModelProperty(value = "我司在工作组排名顺序") + private java.lang.String sort; + /**参会人员*/ + @Excel(name = "参会人员", width = 15) + @ApiModelProperty(value = "参会人员") + private java.lang.String personnel; + /**工号*/ + @Excel(name = "工号", width = 15) + @ApiModelProperty(value = "工号") + private java.lang.String jobNum; + /**单位*/ + @Excel(name = "单位", width = 15) + @ApiModelProperty(value = "单位") + private java.lang.String unit; + /**提出部门*/ + @Excel(name = "提出部门", width = 15) + @ApiModelProperty(value = "提出部门") + private java.lang.String department; + /**电话*/ + @Excel(name = "电话", width = 15) + @ApiModelProperty(value = "电话") + private java.lang.String phone; + /**邮箱*/ + @Excel(name = "邮箱", width = 15) + @ApiModelProperty(value = "邮箱") + private java.lang.String mailbox; + /**身份*/ + @Excel(name = "身份", width = 15) + @ApiModelProperty(value = "身份") + private java.lang.String identity; + /**资料*/ + @Excel(name = "资料", width = 15) + @ApiModelProperty(value = "资料") + private java.lang.String feeData; + /**部门code*/ + @Excel(name = "部门code", width = 15) + @ApiModelProperty(value = "部门code") + private java.lang.String orgCode; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java new file mode 100644 index 00000000..2763d440 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java @@ -0,0 +1,55 @@ +package com.jero.modules.laws.standardization.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.modules.laws.documenttool.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + + +/** + * @Description: 标准化-联络人 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Data +@TableName("laws_standardization_liaison") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_standardization_liaison对象", description="标准化-联络人") +public class LawsStandardizationLiaison extends BaseEntity { + private static final long serialVersionUID = 1L; + + /**标准化活动ID*/ + @Excel(name = "标准化活动ID", width = 15) + @ApiModelProperty(value = "标准化活动ID") + private String standardizationId; + /**联络人ID*/ + @Excel(name = "联络人ID", width = 15) + @ApiModelProperty(value = "联络人ID") + private String liaisonId; + /**会议名称*/ + @Excel(name = "会议名称", width = 15) + @ApiModelProperty(value = "会议名称") + private String name; + /**单位*/ + @Excel(name = "单位", width = 15) + @ApiModelProperty(value = "单位") + private String unit; + /**电话*/ + @Excel(name = "电话", width = 15) + @ApiModelProperty(value = "电话") + private String phone; + /**邮箱*/ + @Excel(name = "邮箱", width = 15) + @ApiModelProperty(value = "邮箱") + private String mailbox; + /**部门code*/ + @Excel(name = "部门code", width = 15) + @ApiModelProperty(value = "部门code") + private String orgCode; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java new file mode 100644 index 00000000..479ddd52 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java @@ -0,0 +1,56 @@ +package com.jero.modules.laws.standardization.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.modules.laws.documenttool.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + + +/** + * @Description: 标准化-参会记录 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Data +@TableName("laws_standardization_meeting") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_standardization_meeting对象", description="标准化-参会记录") +public class LawsStandardizationMeeting extends BaseEntity { + private static final long serialVersionUID = 1L; + + /**标准化活动ID*/ + @Excel(name = "标准化活动ID", width = 15) + @ApiModelProperty(value = "标准化活动ID") + private String standardizationId; + /**参会日期*/ + @Excel(name = "参会日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "参会日期") + private Date participationTime; + /**会议名称*/ + @Excel(name = "会议名称", width = 15) + @ApiModelProperty(value = "会议名称") + private String name; + /**参会人员*/ + @Excel(name = "参会人员", width = 15) + @ApiModelProperty(value = "参会人员") + private String personnel; + /**会议资料*/ + @Excel(name = "会议资料", width = 15) + @ApiModelProperty(value = "会议资料") + private String meetingData; + @Excel(name = "部门code", width = 15) + @ApiModelProperty(value = "部门code") + private String orgCode; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java new file mode 100644 index 00000000..a0957c14 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java @@ -0,0 +1,63 @@ +package com.jero.modules.laws.standardization.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.modules.laws.documenttool.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + + +/** + * @Description: 标准化-支付信息 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Data +@TableName("laws_standardization_payment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_standardization_payment对象", description="标准化-支付信息") +public class LawsStandardizationPayment extends BaseEntity { + private static final long serialVersionUID = 1L; + + /**标准化活动ID*/ + @Excel(name = "标准化活动ID", width = 15) + @ApiModelProperty(value = "标准化活动ID") + private String standardizationId; + /**费用*/ + @Excel(name = "费用", width = 15) + @ApiModelProperty(value = "费用") + private String fee; + /**年份*/ + @Excel(name = "年份", width = 15) + @ApiModelProperty(value = "年份") + private String year; + /**整改状态(1-待整改、2-整改中、3-审批中、4-已完成)*/ + @Excel(name = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)", width = 15) + @ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)") + private String state; + /**计划内*/ + @Excel(name = "计划内", width = 15) + @ApiModelProperty(value = "计划内") + private String plan; + /**缴费方式*/ + @Excel(name = "缴费方式", width = 15) + @ApiModelProperty(value = "缴费方式") + private String pay; + /**费用列支*/ + @Excel(name = "费用列支", width = 15) + @ApiModelProperty(value = "费用列支") + private String feeListing; + /**资料*/ + @Excel(name = "资料", width = 15) + @ApiModelProperty(value = "资料") + private String feeData; + /**部门code*/ + @Excel(name = "部门code", width = 15) + @ApiModelProperty(value = "部门code") + private String orgCode; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationGroupMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationGroupMapper.java new file mode 100644 index 00000000..96c46fb8 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationGroupMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.laws.standardization.mapper; + +import com.jero.modules.laws.standardization.entity.LawsStandardizationGroup; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 标准化-集团参与情况 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +public interface LawsStandardizationGroupMapper extends BaseMapper { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationLiaisonMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationLiaisonMapper.java new file mode 100644 index 00000000..95adadc7 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationLiaisonMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.laws.standardization.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.laws.standardization.entity.LawsStandardizationLiaison; + +/** + * @Description: 标准化-联络人 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +public interface LawsStandardizationLiaisonMapper extends BaseMapper { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMeetingMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMeetingMapper.java new file mode 100644 index 00000000..9a73811e --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMeetingMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.laws.standardization.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting; + +/** + * @Description: 标准化-参会记录 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +public interface LawsStandardizationMeetingMapper extends BaseMapper { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationPaymentMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationPaymentMapper.java new file mode 100644 index 00000000..f2e7de2a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationPaymentMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.laws.standardization.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.laws.standardization.entity.LawsStandardizationPayment; + +/** + * @Description: 标准化-支付信息 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +public interface LawsStandardizationPaymentMapper extends BaseMapper { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationGroupMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationGroupMapper.xml new file mode 100644 index 00000000..2f9424ff --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationGroupMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationLiaisonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationLiaisonMapper.xml new file mode 100644 index 00000000..64a68819 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationLiaisonMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMeetingMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMeetingMapper.xml new file mode 100644 index 00000000..f1810bc0 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMeetingMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationPaymentMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationPaymentMapper.xml new file mode 100644 index 00000000..26f4ba1c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationPaymentMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationGroupService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationGroupService.java new file mode 100644 index 00000000..c4b0475c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationGroupService.java @@ -0,0 +1,76 @@ +package com.jero.modules.laws.standardization.service; + +import com.jero.modules.laws.standardization.entity.LawsStandardizationGroup; +import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + +/** + * @Description: 标准化-集团参与情况 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +public interface ILawsStandardizationGroupService extends IService { + + /** + * 分页查询 + * + * @param lawsStandardizationGroup + * @param pageNo + * @param pageSize + * @param req + * @return + */ + IPage queryPage(LawsStandardizationGroup lawsStandardizationGroup, Integer pageNo, Integer pageSize, HttpServletRequest req); + + /** + * 列表查询 + * + * @param lawsStandardizationGroup + * @param req + * @return + */ + List queryList(LawsStandardizationGroup lawsStandardizationGroup, HttpServletRequest req); + + /** + * 保存 + * + * @param lawsStandardizationGroup + * @return + */ + void add(LawsStandardizationGroup lawsStandardizationGroup); + + /** + * 更新 + * + * @param lawsStandardizationGroup + * @return + */ + void editById(LawsStandardizationGroup lawsStandardizationGroup); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsStandardizationGroup queryById(String id); +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationLiaisonService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationLiaisonService.java new file mode 100644 index 00000000..f71597f8 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationLiaisonService.java @@ -0,0 +1,77 @@ +package com.jero.modules.laws.standardization.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.standardization.entity.LawsStandardizationLiaison; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: 标准化-联络人 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +public interface ILawsStandardizationLiaisonService extends IService { + + /** + * 分页查询 + * + * @param lawsStandardizationLiaison + * @param pageNo + * @param pageSize + * @param req + * @return + */ + IPage queryPage(LawsStandardizationLiaison lawsStandardizationLiaison, Integer pageNo, Integer pageSize, HttpServletRequest req); + + /** + * 列表查询 + * + * @param lawsStandardizationLiaison + * @param req + * @return + */ + List queryList(LawsStandardizationLiaison lawsStandardizationLiaison, HttpServletRequest req); + + /** + * 保存 + * + * @param lawsStandardizationLiaison + * @return + */ + void add(LawsStandardizationLiaison lawsStandardizationLiaison); + + /** + * 更新 + * + * @param lawsStandardizationLiaison + * @return + */ + void editById(LawsStandardizationLiaison lawsStandardizationLiaison); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsStandardizationLiaison queryById(String id); +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationMeetingService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationMeetingService.java new file mode 100644 index 00000000..e8d5b355 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationMeetingService.java @@ -0,0 +1,77 @@ +package com.jero.modules.laws.standardization.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: 标准化-参会记录 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +public interface ILawsStandardizationMeetingService extends IService { + + /** + * 分页查询 + * + * @param lawsStandardizationMeeting + * @param pageNo + * @param pageSize + * @param req + * @return + */ + IPage queryPage(LawsStandardizationMeeting lawsStandardizationMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req); + + /** + * 列表查询 + * + * @param lawsStandardizationMeeting + * @param req + * @return + */ + List queryList(LawsStandardizationMeeting lawsStandardizationMeeting, HttpServletRequest req); + + /** + * 保存 + * + * @param lawsStandardizationMeeting + * @return + */ + void add(LawsStandardizationMeeting lawsStandardizationMeeting); + + /** + * 更新 + * + * @param lawsStandardizationMeeting + * @return + */ + void editById(LawsStandardizationMeeting lawsStandardizationMeeting); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsStandardizationMeeting queryById(String id); +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationPaymentService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationPaymentService.java new file mode 100644 index 00000000..c98529f0 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationPaymentService.java @@ -0,0 +1,77 @@ +package com.jero.modules.laws.standardization.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.standardization.entity.LawsStandardizationPayment; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: 标准化-支付信息 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +public interface ILawsStandardizationPaymentService extends IService { + + /** + * 分页查询 + * + * @param lawsStandardizationPayment + * @param pageNo + * @param pageSize + * @param req + * @return + */ + IPage queryPage(LawsStandardizationPayment lawsStandardizationPayment, Integer pageNo, Integer pageSize, HttpServletRequest req); + + /** + * 列表查询 + * + * @param lawsStandardizationPayment + * @param req + * @return + */ + List queryList(LawsStandardizationPayment lawsStandardizationPayment, HttpServletRequest req); + + /** + * 保存 + * + * @param lawsStandardizationPayment + * @return + */ + void add(LawsStandardizationPayment lawsStandardizationPayment); + + /** + * 更新 + * + * @param lawsStandardizationPayment + * @return + */ + void editById(LawsStandardizationPayment lawsStandardizationPayment); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsStandardizationPayment queryById(String id); +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java index 47533418..fc15827a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java @@ -1,9 +1,9 @@ package com.jero.modules.laws.standardization.service; -import com.jero.modules.laws.standardization.entity.LawsStandardization; import com.baomidou.mybatisplus.extension.service.IService; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.laws.standardization.entity.*; +import com.jero.modules.laws.standardization.vo.StandardizationVO; + import java.util.List; /** @@ -13,34 +13,21 @@ import java.util.List; * @Version: V1.0 */ public interface ILawsStandardizationService extends IService { - - /** - * 分页查询 + /** + * 新增or编辑 * - * @param lawsStandardization - * @param pageNo - * @param pageSize - * @param req + * @param standardizationVO * @return */ - IPage queryPage(LawsStandardization lawsStandardization, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param lawsStandardization - * @param req - * @return - */ - List queryList(LawsStandardization lawsStandardization, HttpServletRequest req); + void addOrUpdateStandardization(StandardizationVO standardizationVO); /** - * 保存 + * 标准化活动-根据id查询 * - * @param lawsStandardization + * @param id * @return */ - void add(LawsStandardization lawsStandardization); + LawsStandardization queryById(String id); /** * 更新 @@ -59,18 +46,57 @@ public interface ILawsStandardizationService extends IService ids); + LawsStandardization queryTreeList(); /** - * 通过id查询 - * + * 标准化活动-详情通过id查询 * @param id * @return */ - LawsStandardization queryById(String id); + StandardizationVO queryDetailById(String id); + + /** + * 标准化活动-统计列表 + * @return + */ + List queryStatistics(); + + /** + * 标准化活动-会议统计-联络人联系方式 + * @param standardizationId + * @return + * @param standardizationId + * @return + */ + List queryLiaisonByStandardizationId(String standardizationId); + + /** + * 标准化活动-会议统计-集团参与情况 + * @param standardizationId + * @return + */ + List queryGroupByStandardizationId(String standardizationId); + + /** + * 标准化活动-会议统计-支付信息 + * @param standardizationId + * @return + */ + List queryPaymentByStandardizationId(String standardizationId); + + /** + * 标准化活动-会议统计-参会记录 + * @param standardizationId + * @return + */ + List queryMeetingByStandardizationId(String standardizationId); + + /** + * 标准化活动-通过id删除 + * @param id + */ + void delete(String id); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationGroupServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationGroupServiceImpl.java new file mode 100644 index 00000000..6c04244b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationGroupServiceImpl.java @@ -0,0 +1,118 @@ +package com.jero.modules.laws.standardization.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.modules.laws.standardization.entity.LawsStandardizationGroup; +import com.jero.modules.laws.standardization.mapper.LawsStandardizationGroupMapper; +import com.jero.modules.laws.standardization.service.ILawsStandardizationGroupService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.jero.common.exception.JeroBootException; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.query.QueryGenerator; +import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + + +/** + * @Description: 标准化-集团参与情况 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class LawsStandardizationGroupServiceImpl extends ServiceImpl implements ILawsStandardizationGroupService { + + + /** + * 分页查询 + * + * @param lawsStandardizationGroup + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @Override + public IPage queryPage(LawsStandardizationGroup lawsStandardizationGroup, Integer pageNo, Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardizationGroup, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + return page(page, queryWrapper); + } + + /** + * 列表查询 + * + * @param lawsStandardizationGroup + * @param req + * @return + */ + @Override + public List queryList(LawsStandardizationGroup lawsStandardizationGroup, HttpServletRequest req) { + return list(QueryGenerator.initQueryWrapper(lawsStandardizationGroup, req.getParameterMap())); + } + + /** + * 保存 + * + * @param lawsStandardizationGroup + * @return + */ + @Override + public void add(LawsStandardizationGroup lawsStandardizationGroup) { + Date now = new Date(); + lawsStandardizationGroup.setCreateTime(now); + lawsStandardizationGroup.setUpdateTime(now); + save(lawsStandardizationGroup); + } + + /** + * 更新 + * + * @param lawsStandardizationGroup + * @return + */ + @Override + public void editById(LawsStandardizationGroup lawsStandardizationGroup) { + Date now = new Date(); + lawsStandardizationGroup.setUpdateTime(now); + saveOrUpdate(lawsStandardizationGroup); + } + + /** + * 通过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 LawsStandardizationGroup queryById(String id) { + return getById(id); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationLiaisonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationLiaisonServiceImpl.java new file mode 100644 index 00000000..0c928a74 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationLiaisonServiceImpl.java @@ -0,0 +1,119 @@ +package com.jero.modules.laws.standardization.service.impl; + +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.laws.standardization.entity.LawsStandardizationLiaison; +import com.jero.modules.laws.standardization.mapper.LawsStandardizationLiaisonMapper; +import com.jero.modules.laws.standardization.service.ILawsStandardizationLiaisonService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + + +/** + * @Description: 标准化-联络人 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class LawsStandardizationLiaisonServiceImpl extends ServiceImpl implements ILawsStandardizationLiaisonService { + + + /** + * 分页查询 + * + * @param lawsStandardizationLiaison + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @Override + public IPage queryPage(LawsStandardizationLiaison lawsStandardizationLiaison, Integer pageNo, Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardizationLiaison, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + return page(page, queryWrapper); + } + + /** + * 列表查询 + * + * @param lawsStandardizationLiaison + * @param req + * @return + */ + @Override + public List queryList(LawsStandardizationLiaison lawsStandardizationLiaison, HttpServletRequest req) { + return list(QueryGenerator.initQueryWrapper(lawsStandardizationLiaison, req.getParameterMap())); + } + + /** + * 保存 + * + * @param lawsStandardizationLiaison + * @return + */ + @Override + public void add(LawsStandardizationLiaison lawsStandardizationLiaison) { + Date now = new Date(); + lawsStandardizationLiaison.setCreateTime(now); + lawsStandardizationLiaison.setUpdateTime(now); + save(lawsStandardizationLiaison); + } + + /** + * 更新 + * + * @param lawsStandardizationLiaison + * @return + */ + @Override + public void editById(LawsStandardizationLiaison lawsStandardizationLiaison) { + Date now = new Date(); + lawsStandardizationLiaison.setUpdateTime(now); + saveOrUpdate(lawsStandardizationLiaison); + } + + /** + * 通过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 LawsStandardizationLiaison queryById(String id) { + return getById(id); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationMeetingServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationMeetingServiceImpl.java new file mode 100644 index 00000000..4c193279 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationMeetingServiceImpl.java @@ -0,0 +1,119 @@ +package com.jero.modules.laws.standardization.service.impl; + +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting; +import com.jero.modules.laws.standardization.mapper.LawsStandardizationMeetingMapper; +import com.jero.modules.laws.standardization.service.ILawsStandardizationMeetingService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + + +/** + * @Description: 标准化-参会记录 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class LawsStandardizationMeetingServiceImpl extends ServiceImpl implements ILawsStandardizationMeetingService { + + + /** + * 分页查询 + * + * @param lawsStandardizationMeeting + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @Override + public IPage queryPage(LawsStandardizationMeeting lawsStandardizationMeeting, Integer pageNo, Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardizationMeeting, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + return page(page, queryWrapper); + } + + /** + * 列表查询 + * + * @param lawsStandardizationMeeting + * @param req + * @return + */ + @Override + public List queryList(LawsStandardizationMeeting lawsStandardizationMeeting, HttpServletRequest req) { + return list(QueryGenerator.initQueryWrapper(lawsStandardizationMeeting, req.getParameterMap())); + } + + /** + * 保存 + * + * @param lawsStandardizationMeeting + * @return + */ + @Override + public void add(LawsStandardizationMeeting lawsStandardizationMeeting) { + Date now = new Date(); + lawsStandardizationMeeting.setCreateTime(now); + lawsStandardizationMeeting.setUpdateTime(now); + save(lawsStandardizationMeeting); + } + + /** + * 更新 + * + * @param lawsStandardizationMeeting + * @return + */ + @Override + public void editById(LawsStandardizationMeeting lawsStandardizationMeeting) { + Date now = new Date(); + lawsStandardizationMeeting.setUpdateTime(now); + saveOrUpdate(lawsStandardizationMeeting); + } + + /** + * 通过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 LawsStandardizationMeeting queryById(String id) { + return getById(id); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationPaymentServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationPaymentServiceImpl.java new file mode 100644 index 00000000..13d23d75 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationPaymentServiceImpl.java @@ -0,0 +1,119 @@ +package com.jero.modules.laws.standardization.service.impl; + +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.laws.standardization.entity.LawsStandardizationPayment; +import com.jero.modules.laws.standardization.mapper.LawsStandardizationPaymentMapper; +import com.jero.modules.laws.standardization.service.ILawsStandardizationPaymentService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + + +/** + * @Description: 标准化-支付信息 + * @Author: jero-boot + * @Date: 2023-11-02 + * @Version: V1.0 + */ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class LawsStandardizationPaymentServiceImpl extends ServiceImpl implements ILawsStandardizationPaymentService { + + + /** + * 分页查询 + * + * @param lawsStandardizationPayment + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @Override + public IPage queryPage(LawsStandardizationPayment lawsStandardizationPayment, Integer pageNo, Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardizationPayment, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + return page(page, queryWrapper); + } + + /** + * 列表查询 + * + * @param lawsStandardizationPayment + * @param req + * @return + */ + @Override + public List queryList(LawsStandardizationPayment lawsStandardizationPayment, HttpServletRequest req) { + return list(QueryGenerator.initQueryWrapper(lawsStandardizationPayment, req.getParameterMap())); + } + + /** + * 保存 + * + * @param lawsStandardizationPayment + * @return + */ + @Override + public void add(LawsStandardizationPayment lawsStandardizationPayment) { + Date now = new Date(); + lawsStandardizationPayment.setCreateTime(now); + lawsStandardizationPayment.setUpdateTime(now); + save(lawsStandardizationPayment); + } + + /** + * 更新 + * + * @param lawsStandardizationPayment + * @return + */ + @Override + public void editById(LawsStandardizationPayment lawsStandardizationPayment) { + Date now = new Date(); + lawsStandardizationPayment.setUpdateTime(now); + saveOrUpdate(lawsStandardizationPayment); + } + + /** + * 通过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 LawsStandardizationPayment queryById(String id) { + return getById(id); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index e786c89b..244625a4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -1,19 +1,28 @@ package com.jero.modules.laws.standardization.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.modules.laws.standardization.entity.LawsStandardization; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.common.util.SnowflakeUtils; +import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; +import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFileService; +import com.jero.modules.laws.standardization.entity.*; import com.jero.modules.laws.standardization.mapper.LawsStandardizationMapper; -import com.jero.modules.laws.standardization.service.ILawsStandardizationService; +import com.jero.modules.laws.standardization.service.*; +import com.jero.modules.laws.standardization.vo.StandardizationVO; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; -import java.util.List; + +import java.util.Arrays; import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +import java.util.stream.Collectors; /** @@ -22,53 +31,230 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; * @Date: 2023-10-23 * @Version: V1.0 */ +@Slf4j @Service @Transactional(rollbackFor = JeroBootException.class) public class LawsStandardizationServiceImpl extends ServiceImpl implements ILawsStandardizationService { + private final ILawsStandardizationService lawsStandardizationService; + private final ILawsStandardizationGroupService lawsStandardizationGroupService; + private final ILawsStandardizationLiaisonService lawsStandardizationLiaisonService; + private final ILawsStandardizationPaymentService lawsStandardizationPaymentService; + private final ILawsStandardizationMeetingService lawsStandardizationMeetingService; + private final IOSSFileService ossFileService; + private final ILawsDataCenterFileService lawsDataCenterFileService; - - /** - * 分页查询 - * - * @param lawsStandardization - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(LawsStandardization lawsStandardization, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardization, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param lawsStandardization - * @param req - * @return - */ - @Override - public List queryList(LawsStandardization lawsStandardization, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(lawsStandardization, req.getParameterMap())); - } + public LawsStandardizationServiceImpl(@Lazy ILawsStandardizationService lawsStandardizationService, + ILawsStandardizationGroupService lawsStandardizationGroupService, + ILawsStandardizationLiaisonService lawsStandardizationLiaisonService, + ILawsStandardizationPaymentService lawsStandardizationPaymentService, + ILawsStandardizationMeetingService lawsStandardizationMeetingService, + IOSSFileService ossFileService, + ILawsDataCenterFileService lawsDataCenterFileService) { + this.lawsStandardizationService = lawsStandardizationService; + this.lawsStandardizationGroupService = lawsStandardizationGroupService; + this.lawsStandardizationLiaisonService = lawsStandardizationLiaisonService; + this.lawsStandardizationPaymentService = lawsStandardizationPaymentService; + this.lawsStandardizationMeetingService = lawsStandardizationMeetingService; + this.ossFileService = ossFileService; + this.lawsDataCenterFileService = lawsDataCenterFileService; + } /** - * 保存 + * 新增or编辑 * - * @param lawsStandardization + * @param standardizationVO * @return */ @Override - public void add(LawsStandardization lawsStandardization) { - Date now = new Date(); - lawsStandardization.setCreateTime(now); - lawsStandardization.setUpdateTime(now); - save(lawsStandardization); - } + public void addOrUpdateStandardization(StandardizationVO standardizationVO) { + LawsStandardization lawsStandardization = standardizationVO.getLawsStandardization(); + List standardizationLiaisonList = standardizationVO.getStandardizationLiaisonList(); + List standardizationGroupList = standardizationVO.getStandardizationGroupList(); + List standardizationPaymentList = standardizationVO.getStandardizationPayments(); + List standardizationMeetingList = standardizationVO.getStandardizationMeetings(); + + // 基础信息 + lawsStandardizationService.saveOrUpdate(lawsStandardization); + + // 联络人联系方式 + standardizationLiaisonList.stream().map(v -> v.setStandardizationId(lawsStandardization.getId())).forEach(v -> log.info(lawsStandardization.getId())); + lawsStandardizationLiaisonService.saveOrUpdateBatch(standardizationLiaisonList); + + // 集团参与情况 + saveOrUpdateGroup(lawsStandardization, standardizationGroupList); + + // 支付信息 + saveOrUpdatePayment(lawsStandardization, standardizationPaymentList); + + // 参会记录 + saveOrUpdateMeeting(lawsStandardization, standardizationMeetingList); + } + + /** + * 保存或更新会议信息 + * + * @param lawsStandardization 标准化活动 + * @param standardizationMeetingList 标准化-参会记录 + */ + private void saveOrUpdateMeeting(LawsStandardization lawsStandardization, List standardizationMeetingList) { + for (LawsStandardizationMeeting standardizationMeeting : standardizationMeetingList) { + standardizationMeeting.setStandardizationId(lawsStandardization.getId()); + + if (StringUtils.isBlank(standardizationMeeting.getId())){ + standardizationMeeting.setId(String.valueOf(SnowflakeUtils.snowflake())); + } + + if (StringUtils.isNotBlank(standardizationMeeting.getMeetingData())){ + List meetingDataList = Arrays.asList(standardizationMeeting.getMeetingData().split(",")); + + // 更新文件信息 + ossFileService.update(new LambdaUpdateWrapper() + .in(OSSFile::getId, meetingDataList) + .set(OSSFile::getConnectId, standardizationMeeting.getId())); + + // 删除旧文件 + ossFileService.remove(new LambdaQueryWrapper() + .eq(OSSFile::getConnectId, standardizationMeeting.getId()) + .notIn(OSSFile::getId, meetingDataList)); + + // 同步文件到资料中心 + for (String meetingData : meetingDataList) { + LawsDataCenterFile lawsDataCenterFile = new LawsDataCenterFile(); + lawsDataCenterFile.setFileId(meetingData); + // XXX（分标委名称）- XXXX（工作组名称）-会议资料 + lawsDataCenterFile.setFileDescription(getFileDescription(lawsStandardization)); + lawsDataCenterFileService.add(lawsDataCenterFile); + } + } else { + // 删除旧文件 + ossFileService.remove(new LambdaQueryWrapper() + .eq(OSSFile::getConnectId, standardizationMeeting.getId())); + } + } + + // 保存或更新会议列表 + lawsStandardizationMeetingService.saveOrUpdateBatch(standardizationMeetingList); + } + + private String getFileDescription(LawsStandardization lawsStandardization) { + // 树形结构 + LawsStandardization treeList = queryTreeList(); + // 一级 + List children = treeList.getChildren(); + // 查询父级信息 + LawsStandardization fatherDetail = getChildrenDetail(children, lawsStandardization.getPid()); + String name = getName(fatherDetail); + return (StringUtils.isNotBlank(name) ? name + "-" : "") + "会议资料"; + } + + private String getName(LawsStandardization lawsStandardization) { + StringBuilder stringBuilder = new StringBuilder(); + if (lawsStandardization.getLevel() < 2L){ + return stringBuilder.toString(); + } + if (lawsStandardization.getLevel().equals(3L)){ + // 工作组 + stringBuilder.append("-").append(lawsStandardization.getName()); + } + if (lawsStandardization.getLevel().equals(2L)){ + // 委员会 + stringBuilder.insert(0, lawsStandardization.getName()); + } + getName(lawsStandardizationService.getOne( + new LambdaQueryWrapper() + .eq(LawsStandardization::getId, lawsStandardization.getPid()))); + return stringBuilder.toString(); + } + + private LawsStandardization getChildrenDetail(List treeList, String pid) { + for (LawsStandardization tree : treeList) { + if (tree.getId().equals(pid)) { + return tree; + } + if (tree.getChildren() != null && !tree.getChildren().isEmpty()) { + getChildrenDetail(tree.getChildren(), pid); + } + } + return new LawsStandardization(); + } + + /** + * 保存或更新法律法规标准化信息的支付信息 + * + * @param lawsStandardization 法律法规标准化信息对象 + * @param standardizationPaymentList 标准化支付信息列表 + */ + private void saveOrUpdatePayment(LawsStandardization lawsStandardization, List standardizationPaymentList) { + for (LawsStandardizationPayment lawsStandardizationPayment : standardizationPaymentList) { + lawsStandardizationPayment.setStandardizationId(lawsStandardization.getId()); + + // 如果支付信息ID为空，则生成一个SnowflakeID + if (StringUtils.isBlank(lawsStandardizationPayment.getId())){ + lawsStandardizationPayment.setId(String.valueOf(SnowflakeUtils.snowflake())); + } + + // 如果支付信息的费用数据不为空，则进行文件信息的更新和旧文件的删除操作 + if (StringUtils.isNotBlank(lawsStandardizationPayment.getFeeData())){ + List feeDataList = Arrays.asList(lawsStandardizationPayment.getFeeData().split(",")); + + // 更新文件信息 + ossFileService.update(new LambdaUpdateWrapper() + .in(OSSFile::getId, feeDataList) + .set(OSSFile::getConnectId, lawsStandardizationPayment.getId())); + + // 删除旧文件 + ossFileService.remove(new LambdaQueryWrapper() + .eq(OSSFile::getConnectId, lawsStandardizationPayment.getId()) + .notIn(OSSFile::getId, feeDataList)); + } else { + // 删除旧文件 + ossFileService.remove(new LambdaQueryWrapper() + .eq(OSSFile::getConnectId, lawsStandardizationPayment.getId())); + } + } + + // 保存或更新批量支付信息 + lawsStandardizationPaymentService.saveOrUpdateBatch(standardizationPaymentList); + } + + + /** + * 保存或更新法律法规标准化信息 + * + * @param lawsStandardization 法律法规标准化信息对象 + * @param standardizationGroupList 标准化组列表 + */ + private void saveOrUpdateGroup(LawsStandardization lawsStandardization, List standardizationGroupList) { + for (LawsStandardizationGroup lawsStandardizationGroup : standardizationGroupList) { + lawsStandardizationGroup.setStandardizationId(lawsStandardization.getId()); + + if (StringUtils.isBlank(lawsStandardizationGroup.getId())){ + lawsStandardizationGroup.setId(String.valueOf(SnowflakeUtils.snowflake())); + } + + // 处理文件 + if (StringUtils.isNotBlank(lawsStandardizationGroup.getFeeData())){ + // 将文件信息转换为OSSFile对象并更新 + List feeDataList = Arrays.asList(lawsStandardizationGroup.getFeeData().split(",")); + ossFileService.update(new LambdaUpdateWrapper() + .in(OSSFile::getId, feeDataList) + .set(OSSFile::getConnectId, lawsStandardizationGroup.getId())); + + // 删除旧文件 + ossFileService.remove(new LambdaQueryWrapper() + .eq(OSSFile::getConnectId, lawsStandardizationGroup.getId()) + .notIn(OSSFile::getId, feeDataList)); + } else { + // 删除旧文件 + ossFileService.remove(new LambdaQueryWrapper() + .eq(OSSFile::getConnectId, lawsStandardizationGroup.getId())); + } + } + + // 保存或更新标准化组列表 + lawsStandardizationGroupService.saveOrUpdateBatch(standardizationGroupList); + } + /** * 更新 @@ -78,9 +264,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl ids) { - removeByIds(ids); - } - - /** - * 通过id查询 + * 标准化活动-根据id查询 * * @param id * @return */ @Override public LawsStandardization queryById(String id) { - return getById(id); + LawsStandardization lawsStandardization = getById(id); + // 填充上级节点名称 + LawsStandardization standardization = getOne(new LambdaQueryWrapper() + .eq(LawsStandardization::getId, lawsStandardization.getPid())); + if (StringUtils.isNotBlank(standardization.getName())){ + lawsStandardization.setSupperName(standardization.getName()); + } + return lawsStandardization; } + + @Override + public LawsStandardization queryTreeList() { + // 查询所有数据 + List list = list(new LambdaQueryWrapper().orderByAsc(LawsStandardization::getCreateTime)); + Long level = 0L; + return list.stream() + .filter(v -> "0".equals(v.getPid())) + .map(v ->{ + v.setLevel(level); + v.setChildren(createChildren(v, list, level)); + return v; + }).collect(Collectors.toList()).get(0); + } + + @Override + public StandardizationVO queryDetailById(String id) { + StandardizationVO standardizationVO = new StandardizationVO(); + // 基础信息 + standardizationVO.setLawsStandardization(queryById(id)); + // 联络人联系方式 + standardizationVO.setStandardizationLiaisonList(queryLiaisonByStandardizationId(id)); + // 集团参与情况 + standardizationVO.setStandardizationGroupList(queryGroupByStandardizationId(id)); + // 支付信息 + standardizationVO.setStandardizationPayments(queryPaymentByStandardizationId(id)); + // 参会记录 + standardizationVO.setStandardizationMeetings(queryMeetingByStandardizationId(id)); + return standardizationVO; + } + + @Override + public List queryStatistics() { + List list = list( + new LambdaQueryWrapper() + .orderByDesc(LawsStandardization::getCreateTime)); + for (LawsStandardization lawsStandardization : list) { + // 填充上级节点名称 + LawsStandardization standardization = getOne(new LambdaQueryWrapper() + .eq(LawsStandardization::getId, lawsStandardization.getPid())); + if (StringUtils.isNotBlank(standardization.getName())){ + lawsStandardization.setSupperName(standardization.getName()); + } + } + return list; + } + + @Override + public List queryLiaisonByStandardizationId(String standardizationId) { + return lawsStandardizationLiaisonService.list( + new LambdaQueryWrapper() + .eq(LawsStandardizationLiaison::getStandardizationId, standardizationId) + .orderByDesc(LawsStandardizationLiaison::getCreateTime)); + } + + @Override + public List queryGroupByStandardizationId(String standardizationId) { + List lawsStandardizationGroupList = lawsStandardizationGroupService.list( + new LambdaQueryWrapper() + .eq(LawsStandardizationGroup::getStandardizationId, standardizationId) + .orderByDesc(LawsStandardizationGroup::getCreateTime)); + for (LawsStandardizationGroup lawsStandardizationGroup : lawsStandardizationGroupList) { + // 文件信息 + if (StringUtils.isNotBlank(lawsStandardizationGroup.getFeeData())){ + List list = Arrays.asList(lawsStandardizationGroup.getFeeData().split(",")); + List ossFileList = ossFileService.list( + new LambdaQueryWrapper() + .in(OSSFile::getConnectId, list)); + String feeData = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); + lawsStandardizationGroup.setFeeData(feeData); + } + } + return lawsStandardizationGroupList; + } + + @Override + public List queryPaymentByStandardizationId(String standardizationId) { + List lawsStandardizationPaymentList = lawsStandardizationPaymentService.list( + new LambdaQueryWrapper() + .eq(LawsStandardizationPayment::getStandardizationId, standardizationId) + .orderByDesc(LawsStandardizationPayment::getCreateTime)); + for (LawsStandardizationPayment lawsStandardizationPayment : lawsStandardizationPaymentList) { + // 文件信息 + if (StringUtils.isNotBlank(lawsStandardizationPayment.getFeeData())){ + List list = Arrays.asList(lawsStandardizationPayment.getFeeData().split(",")); + List ossFileList = ossFileService.list( + new LambdaQueryWrapper() + .in(OSSFile::getConnectId, list)); + String feeData = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); + lawsStandardizationPayment.setFeeData(feeData); + } + } + return lawsStandardizationPaymentList; + } + + @Override + public List queryMeetingByStandardizationId(String standardizationId) { + List lawsStandardizationMeetingList = lawsStandardizationMeetingService.list( + new LambdaQueryWrapper() + .eq(LawsStandardizationMeeting::getStandardizationId, standardizationId) + .orderByDesc(LawsStandardizationMeeting::getCreateTime)); + for (LawsStandardizationMeeting lawsStandardizationMeeting : lawsStandardizationMeetingList) { + // 文件信息 + if (StringUtils.isNotBlank(lawsStandardizationMeeting.getMeetingData())){ + List list = Arrays.asList(lawsStandardizationMeeting.getMeetingData().split(",")); + List ossFileList = ossFileService.list( + new LambdaQueryWrapper() + .in(OSSFile::getConnectId, list)); + String meetingData = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); + lawsStandardizationMeeting.setMeetingData(meetingData); + } + } + return lawsStandardizationMeetingList; + } + + @Override + public void delete(String id) { + deleteById(id); + lawsStandardizationLiaisonService.remove( + new LambdaQueryWrapper() + .eq(LawsStandardizationLiaison::getStandardizationId, id)); + lawsStandardizationGroupService.remove( + new LambdaQueryWrapper() + .eq(LawsStandardizationGroup::getStandardizationId, id)); + lawsStandardizationPaymentService.remove( + new LambdaQueryWrapper() + .eq(LawsStandardizationPayment::getStandardizationId, id)); + lawsStandardizationMeetingService.remove( + new LambdaQueryWrapper() + .eq(LawsStandardizationMeeting::getStandardizationId, id)); + } + + /** + * 递归创建子节点 + * + * @param tree 当前树节点 + * @param treeList 树节点列表 + * @param level 层级 + * @return 子节点列表 + */ + private List createChildren(LawsStandardization tree, List treeList, Long level){ + List collect = treeList.stream().filter(v -> tree.getId().equals(v.getPid())).collect(Collectors.toList()); + if (collect.isEmpty()){ + level -= 1L; + }else { + level += 1L; + } + Long finalLevel = level; + return collect.stream() + .map(v -> { + v.setLevel(finalLevel); + v.setChildren(createChildren(v, treeList, finalLevel)); + return v; + }) + .collect(Collectors.toList()); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/vo/StandardizationVO.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/vo/StandardizationVO.java new file mode 100644 index 00000000..7c5efacc --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/vo/StandardizationVO.java @@ -0,0 +1,33 @@ +package com.jero.modules.laws.standardization.vo; + +import com.jero.modules.laws.standardization.entity.*; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @ClassName: StandaraizationVO + * @Description: + * @Author: yjz + * @Date: 2023-11-02 14:20 + * @Version: 1.0 + **/ +@Data +public class StandardizationVO { + /**基础信息*/ + @ApiModelProperty(value = "基础信息") + private LawsStandardization lawsStandardization; + /**联络人联系方式*/ + @ApiModelProperty(value = "联络人联系方式") + private ListstandardizationLiaisonList; + /**集团参与情况*/ + @ApiModelProperty(value = "集团参与情况") + private List standardizationGroupList; + /**支付信息*/ + @ApiModelProperty(value = "支付信息") + private List standardizationPayments; + /**参会记录*/ + @ApiModelProperty(value = "参会记录") + private List standardizationMeetings; +}