From e3b222a6e3e3ba296a84728e52c87cacf0299139 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 20 Sep 2024 15:24:18 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=20=E5=9F=BA=E7=A1=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/第二阶段.sql | 1 + .../StandardSolicitOpinionsController.java | 157 +++++++++++++++++ ...StandardSolicitOpinionsTermController.java | 166 ++++++++++++++++++ .../entity/StandardSolicitOpinions.java | 127 ++++++++++++++ .../entity/StandardSolicitOpinionsTerm.java | 146 +++++++++++++++ .../mapper/StandardSolicitOpinionsMapper.java | 15 ++ .../StandardSolicitOpinionsTermMapper.java | 15 ++ .../xml/StandardSolicitOpinionsMapper.xml | 41 +++++ .../xml/StandardSolicitOpinionsTermMapper.xml | 47 +++++ .../StandardSolicitOpinionsService.java | 47 +++++ .../StandardSolicitOpinionsTermService.java | 47 +++++ 11 files changed, 809 insertions(+) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsTermController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinions.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinionsTerm.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/StandardSolicitOpinionsMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/StandardSolicitOpinionsTermMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/xml/StandardSolicitOpinionsMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/xml/StandardSolicitOpinionsTermMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsTermService.java diff --git a/db/第二阶段.sql b/db/第二阶段.sql index 51945845..e636ccf1 100644 --- a/db/第二阶段.sql +++ b/db/第二阶段.sql @@ -62,6 +62,7 @@ create table laws_standard_solicit_opinions_term term_id varchar(36) comment '条款id', term_num varchar(200) comment '标准编号/条款号', term_name varchar(200) comment '标准名称/条款内容', + translation varchar(200) comment '译文', before_modify varchar(500) comment '修改前', after_modify varchar(500) comment '修改后', reason varchar(500) comment '修改理由', diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsController.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsController.java new file mode 100644 index 00000000..ed6c3b33 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsController.java @@ -0,0 +1,157 @@ +package com.jero.modules.laws.solicitopinions.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.laws.solicitopinions.entity.StandardSolicitOpinions; +import com.jero.modules.laws.solicitopinions.service.StandardSolicitOpinionsService; +import com.jero.modules.system.vo.IdMapBody; +import com.jero.modules.system.vo.IdsMapBody; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang3.StringUtils; +import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + +/** + * 标准征求意见(StandardSolicitOpinions)表控制层 + * + * @author lijiarao + * @since 2024-09-20 14:13:56 + */ +@Slf4j +@RestController +@RequestMapping("standardSolicitOpinions") +public class StandardSolicitOpinionsController extends JeroController { + /** + * 服务对象 + */ + @Resource + private StandardSolicitOpinionsService standardSolicitOpinionsService; + + /** + * 分页列表查询 + */ + @ApiOperation(value = "标准征求意见-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(StandardSolicitOpinions standardSolicitOpinions, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(standardSolicitOpinions, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = standardSolicitOpinionsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + */ + @ApiOperation(value = "标准征求意见-列表查询", notes = "标准征求意见-列表查询") + @GetMapping(value = "/list") + public Result> queryList(StandardSolicitOpinions standardSolicitOpinions, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(standardSolicitOpinions, req.getParameterMap()); + List list = standardSolicitOpinionsService.list(queryWrapper); + return Result.OK(list); + } + + /** + * 添加 + */ + @AutoLog(value = "标准征求意见-添加") + @ApiOperation(value = "标准征求意见-添加", notes = "标准征求意见-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody StandardSolicitOpinions standardSolicitOpinions) { + standardSolicitOpinionsService.add(standardSolicitOpinions); + return Result.OK(ResultCommon.OK); + } + + /** + * 编辑 + */ + @AutoLog(value = "标准征求意见-编辑") + @ApiOperation(value = "标准征求意见-编辑", notes = "标准征求意见-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody StandardSolicitOpinions standardSolicitOpinions) { + standardSolicitOpinionsService.editById(standardSolicitOpinions); + return Result.OK(ResultCommon.EDIT_OK); + } + + /** + * 通过id删除 + */ + @AutoLog(value = "标准征求意见-通过id删除") + @ApiOperation(value = "标准征求意见-通过id删除", notes = "标准征求意见-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody IdMapBody map) { + String id = map.getId(); + if (StringUtils.isBlank(id)) { + return Result.error("请选择数据"); + } + standardSolicitOpinionsService.deleteById(id); + return Result.OK(ResultCommon.SUCCESSFULLY_DELETED); + } + + /** + * 批量删除 + */ + @AutoLog(value = "标准征求意见-批量删除") + @ApiOperation(value = "标准征求意见-批量删除", notes = "标准征求意见-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody IdsMapBody map) { + String ids = map.getIds(); + if (StringUtils.isBlank(ids)) { + return Result.error(ResultCommon.PLEASE_SELECT_DATA); + } + List idList = Arrays.asList(map.getIds().split(",")); + this.standardSolicitOpinionsService.deleteByIds(idList); + return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK); + } + + /** + * 通过id查询 + */ + @AutoLog(value = "标准征求意见-通过id查询") + @ApiOperation(value = "标准征求意见-通过id查询", notes = "标准征求意见-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id") String id) { + StandardSolicitOpinions standardSolicitOpinions = standardSolicitOpinionsService.queryById(id); + if (standardSolicitOpinions == null) { + return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + } + return Result.OK(standardSolicitOpinions); + } + + /** + * 导出excel + */ + @ApiOperation(value = "标准征求意见-导出excel") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, StandardSolicitOpinions standardSolicitOpinions) { + return super.exportXls(request, standardSolicitOpinions, StandardSolicitOpinions.class, "标准征求意见"); + } + + /** + * 通过excel导入数据 + */ + @ApiOperation(value = "标准征求意见-通过excel导入数据") + @PostMapping(value = "/importExcel") + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, StandardSolicitOpinions.class); + } + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsTermController.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsTermController.java new file mode 100644 index 00000000..5e49744c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsTermController.java @@ -0,0 +1,166 @@ +package com.jero.modules.laws.solicitopinions.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.laws.solicitopinions.entity.StandardSolicitOpinionsTerm; +import com.jero.modules.laws.solicitopinions.service.StandardSolicitOpinionsTermService; +import com.jero.modules.system.vo.IdMapBody; +import com.jero.modules.system.vo.IdsMapBody; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang3.StringUtils; +import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * 标准征求意见条款关联表(StandardSolicitOpinionsTerm)表控制层 + * + * @author lijiarao + * @since 2024-09-20 14:13:55 + */ +@Slf4j +@RestController +@RequestMapping("standardSolicitOpinionsTerm") +public class StandardSolicitOpinionsTermController extends JeroController { + /** + * 服务对象 + */ + @Resource + private StandardSolicitOpinionsTermService standardSolicitOpinionsTermService; + + /** + * 分页列表查询 + */ + @ApiOperation(value = "标准征求意见条款关联表-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(StandardSolicitOpinionsTerm standardSolicitOpinionsTerm, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(standardSolicitOpinionsTerm, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = standardSolicitOpinionsTermService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + */ + @ApiOperation(value = "标准征求意见条款关联表-列表查询", notes = "标准征求意见条款关联表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(StandardSolicitOpinionsTerm standardSolicitOpinionsTerm, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(standardSolicitOpinionsTerm, req.getParameterMap()); + List list = standardSolicitOpinionsTermService.list(queryWrapper); + return Result.OK(list); + } + + /** + * 添加 + */ + @AutoLog(value = "标准征求意见条款关联表-添加") + @ApiOperation(value = "标准征求意见条款关联表-添加", notes = "标准征求意见条款关联表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { + standardSolicitOpinionsTermService.add(standardSolicitOpinionsTerm); + return Result.OK(ResultCommon.OK); + } + + /** + * 编辑 + */ + @AutoLog(value = "标准征求意见条款关联表-编辑") + @ApiOperation(value = "标准征求意见条款关联表-编辑", notes = "标准征求意见条款关联表-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { + standardSolicitOpinionsTermService.editById(standardSolicitOpinionsTerm); + return Result.OK(ResultCommon.EDIT_OK); + } + + /** + * 通过id删除 + */ + @AutoLog(value = "标准征求意见条款关联表-通过id删除") + @ApiOperation(value = "标准征求意见条款关联表-通过id删除", notes = "标准征求意见条款关联表-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody IdMapBody map) { + String id = map.getId(); + if (StringUtils.isBlank(id)) { + return Result.error("请选择数据"); + } + standardSolicitOpinionsTermService.deleteById(id); + return Result.OK(ResultCommon.SUCCESSFULLY_DELETED); + } + + /** + * 批量删除 + */ + @AutoLog(value = "标准征求意见条款关联表-批量删除") + @ApiOperation(value = "标准征求意见条款关联表-批量删除", notes = "标准征求意见条款关联表-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody IdsMapBody map) { + String ids = map.getIds(); + if (StringUtils.isBlank(ids)) { + return Result.error(ResultCommon.PLEASE_SELECT_DATA); + } + List idList = Arrays.asList(map.getIds().split(",")); + this.standardSolicitOpinionsTermService.deleteByIds(idList); + return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK); + } + + /** + * 通过id查询 + */ + @AutoLog(value = "标准征求意见条款关联表-通过id查询") + @ApiOperation(value = "标准征求意见条款关联表-通过id查询", notes = "标准征求意见条款关联表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id") String id) { + StandardSolicitOpinionsTerm standardSolicitOpinionsTerm = standardSolicitOpinionsTermService.queryById(id); + if (standardSolicitOpinionsTerm == null) { + return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + } + return Result.OK(standardSolicitOpinionsTerm); + } + + /** + * 导出excel + */ + @ApiOperation(value = "标准征求意见条款关联表-导出模板") + @GetMapping(value = "/exportTemplate") + public ModelAndView exportTemplate(HttpServletRequest request, StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { + return super.exportListXls(new ArrayList(), StandardSolicitOpinionsTerm.class, "意见详情"); + } + /** + * 导出excel + */ + @ApiOperation(value = "标准征求意见条款关联表-导出excel") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { + return super.exportXls(request, standardSolicitOpinionsTerm, StandardSolicitOpinionsTerm.class, "意见详情"); + } + + /** + * 通过excel导入数据 + */ + @ApiOperation(value = "标准征求意见条款关联表-通过excel导入数据") + @PostMapping(value = "/importExcel") + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, StandardSolicitOpinionsTerm.class); + } + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinions.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinions.java new file mode 100644 index 00000000..1c9e06de --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinions.java @@ -0,0 +1,127 @@ +package com.jero.modules.laws.solicitopinions.entity; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +import lombok.Data; +import io.swagger.annotations.ApiModel; + + +/** + * 标准征求意见(StandardSolicitOpinions)实体类 + * + * @author lijiarao + * @since 2024-09-20 14:13:56 + */ +@Data +@TableName("laws_standard_solicit_opinions") +@ApiModel(value = "StandardSolicitOpinions", description = "标准征求意见") +public class StandardSolicitOpinions implements Serializable { + private static final long serialVersionUID = 867973520650578075L; + /** + * 主键id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键id") + private String id; + /** + * 标准id + */ + @ApiModelProperty(value = "标准id") + @Excel(name = "标准id", width = 15) + private String standardId; + /** + * 标准编号 + */ + @ApiModelProperty(value = "标准编号") + @Excel(name = "标准编号", width = 15) + private String standardNumber; + /** + * 标准名称 + */ + @ApiModelProperty(value = "标准名称") + @Excel(name = "标准名称", width = 15) + private String standardName; + /** + * 适用市场 + */ + @ApiModelProperty(value = "适用市场") + @Excel(name = "适用市场", width = 15) + private String applicableMarket; + /** + * 开始日期 + */ + @ApiModelProperty(value = "开始日期") + @Excel(name = "开始日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date startTime; + /** + * 结束日期 + */ + @ApiModelProperty(value = "结束日期") + @Excel(name = "结束日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date endTime; + /** + * 征求意见反馈单编号 + */ + @ApiModelProperty(value = "征求意见反馈单编号") + @Excel(name = "征求意见反馈单编号", width = 15) + private String number; + /** + * 意见反馈表 + */ + @ApiModelProperty(value = "意见反馈表") + @Excel(name = "意见反馈表", width = 15) + private String file; + /** + * 创建人id + */ + @ApiModelProperty(value = "创建人id") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date createTime; + /** + * 修改人id + */ + @ApiModelProperty(value = "修改人id") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date updateTime; + /** + * 部门code + */ + @ApiModelProperty(value = "部门code") + private String orgCode; + /** + * 删除状态(0-正常,1-删除) + */ + @ApiModelProperty(value = "删除状态(0-正常,1-删除)") + @TableLogic + private String delFlag; + + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinionsTerm.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinionsTerm.java new file mode 100644 index 00000000..29079e04 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinionsTerm.java @@ -0,0 +1,146 @@ +package com.jero.modules.laws.solicitopinions.entity; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.*; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import io.swagger.annotations.ApiModel; + + +/** + * 标准征求意见条款关联表(StandardSolicitOpinionsTerm)实体类 + * + * @author lijiarao + * @since 2024-09-20 14:13:55 + */ +@Data +@TableName("laws_standard_solicit_opinions_term") +@ApiModel(value = "StandardSolicitOpinionsTerm", description = "标准征求意见条款关联表") +public class StandardSolicitOpinionsTerm implements Serializable { + private static final long serialVersionUID = -90451310233446586L; + /** + * 主键id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键id") + private String id; + /** + * 征求意见id + */ + @ApiModelProperty(value = "征求意见id") + @Excel(name = "征求意见id", width = 15) + private String solicitOpinionsId; + /** + * 法规工程师 + */ + @ApiModelProperty(value = "法规工程师") + @Excel(name = "法规工程师", width = 15, dictTable = "sys_user", dicCode = "id", dicText = "realname") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") + private String proposerId; + /** + * 专业模块 + */ + @ApiModelProperty(value = "专业模块") + @Excel(name = "专业模块", width = 15, dicCode = "professional_module") + @Dict(dicCode = "professional_module") + private String professionalModule; + /** + * 条款id + */ + @ApiModelProperty(value = "条款id") + private String termId; + /** + * 标准编号/条款号 + */ + @ApiModelProperty(value = "标准编号/条款号") + @Excel(name = "标准编号/条款号", width = 15) + private String termNum; + /** + * 标准名称/条款内容 + */ + @ApiModelProperty(value = "标准名称/条款内容") + @Excel(name = "标准名称/条款内容", width = 15) + private String termName; + /** + * 译文 + */ + @ApiModelProperty(value = "译文") + @Excel(name = "译文", width = 30) + private String translation; + /** + * 修改前 + */ + @ApiModelProperty(value = "修改前") + @Excel(name = "修改前", width = 15) + private String beforeModify; + /** + * 修改后 + */ + @ApiModelProperty(value = "修改后") + @Excel(name = "修改后", width = 15) + private String afterModify; + /** + * 修改理由 + */ + @ApiModelProperty(value = "修改理由") + @Excel(name = "修改理由", width = 15) + private String reason; + /** + * 反馈人id + */ + @ApiModelProperty(value = "反馈人id") + private String feedbackPersonId; + /** + * 反馈人 + */ + @ApiModelProperty(value = "反馈人") + @Excel(name = "反馈人", width = 15) + private String feedbackPerson; + /** + * 反馈意见 + */ + @ApiModelProperty(value = "反馈意见") + @Excel(name = "反馈意见", width = 15) + private String feedbackOpinion; + /** + * 创建人id + */ + @ApiModelProperty(value = "创建人id") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date createTime; + /** + * 修改人id + */ + @ApiModelProperty(value = "修改人id") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date updateTime; + /** + * 部门code + */ + @ApiModelProperty(value = "部门code") + private String orgCode; + + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/StandardSolicitOpinionsMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/StandardSolicitOpinionsMapper.java new file mode 100644 index 00000000..6bb1fb1a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/StandardSolicitOpinionsMapper.java @@ -0,0 +1,15 @@ +package com.jero.modules.laws.solicitopinions.mapper; + +import com.jero.modules.laws.solicitopinions.entity.StandardSolicitOpinions; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 标准征求意见(StandardSolicitOpinions)表数据库访问层 + * + * @author lijiarao + * @since 2024-09-20 14:13:56 + */ +public interface StandardSolicitOpinionsMapper extends BaseMapper { + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/StandardSolicitOpinionsTermMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/StandardSolicitOpinionsTermMapper.java new file mode 100644 index 00000000..b737153c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/StandardSolicitOpinionsTermMapper.java @@ -0,0 +1,15 @@ +package com.jero.modules.laws.solicitopinions.mapper; + +import com.jero.modules.laws.solicitopinions.entity.StandardSolicitOpinionsTerm; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 标准征求意见条款关联表(StandardSolicitOpinionsTerm)表数据库访问层 + * + * @author lijiarao + * @since 2024-09-20 14:13:55 + */ +public interface StandardSolicitOpinionsTermMapper extends BaseMapper { + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/xml/StandardSolicitOpinionsMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/xml/StandardSolicitOpinionsMapper.xml new file mode 100644 index 00000000..6a7b2b8c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/xml/StandardSolicitOpinionsMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, + standard_id, + standard_number, + standard_name, + applicable_market, + start_time, + end_time, + number, + file, + create_by, + create_time, + update_by, + update_time, + org_code, + del_flag + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/xml/StandardSolicitOpinionsTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/xml/StandardSolicitOpinionsTermMapper.xml new file mode 100644 index 00000000..cbee097c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/mapper/xml/StandardSolicitOpinionsTermMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, + solicit_opinions_id, + proposer_id, + professional_module, + term_id, + term_num, + term_name, + before_modify, + after_modify, + reason, + feedback_person_id, + feedback_person, + feedback_opinion, + create_by, + create_time, + update_by, + update_time, + org_code + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsService.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsService.java new file mode 100644 index 00000000..debc7b97 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsService.java @@ -0,0 +1,47 @@ +package com.jero.modules.laws.solicitopinions.service; + +import com.jero.modules.laws.solicitopinions.entity.StandardSolicitOpinions; +import com.jero.modules.laws.solicitopinions.mapper.StandardSolicitOpinionsMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 标准征求意见(StandardSolicitOpinions)表服务实现类 + * + * @author lijiarao + * @since 2024-09-20 14:13:56 + */ +@Slf4j +@Service() +public class StandardSolicitOpinionsService extends ServiceImpl { + @Resource + private StandardSolicitOpinionsMapper standardSolicitOpinionsMapper; + + public void add(StandardSolicitOpinions standardSolicitOpinions) { + this.save(standardSolicitOpinions); + } + + public void editById(StandardSolicitOpinions standardSolicitOpinions) { + this.updateById(standardSolicitOpinions); + } + + public void deleteById(String id) { + this.removeById(id); + } + + public void deleteByIds(List idList) { + for (String id : idList) { + deleteById(id); + } + } + + public StandardSolicitOpinions queryById(String id) { + StandardSolicitOpinions standardSolicitOpinions = this.getById(id); + return standardSolicitOpinions; + } +} + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsTermService.java b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsTermService.java new file mode 100644 index 00000000..28a56b37 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsTermService.java @@ -0,0 +1,47 @@ +package com.jero.modules.laws.solicitopinions.service; + +import com.jero.modules.laws.solicitopinions.entity.StandardSolicitOpinionsTerm; +import com.jero.modules.laws.solicitopinions.mapper.StandardSolicitOpinionsTermMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 标准征求意见条款关联表(StandardSolicitOpinionsTerm)表服务实现类 + * + * @author lijiarao + * @since 2024-09-20 14:13:56 + */ +@Slf4j +@Service() +public class StandardSolicitOpinionsTermService extends ServiceImpl { + @Resource + private StandardSolicitOpinionsTermMapper standardSolicitOpinionsTermMapper; + + public void add(StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { + this.save(standardSolicitOpinionsTerm); + } + + public void editById(StandardSolicitOpinionsTerm standardSolicitOpinionsTerm) { + this.updateById(standardSolicitOpinionsTerm); + } + + public void deleteById(String id) { + this.removeById(id); + } + + public void deleteByIds(List idList) { + for (String id : idList) { + deleteById(id); + } + } + + public StandardSolicitOpinionsTerm queryById(String id) { + StandardSolicitOpinionsTerm standardSolicitOpinionsTerm = this.getById(id); + return standardSolicitOpinionsTerm; + } +} +