法规月报填写

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java

@@ -0,0 +1,170 @@
+package com.jero.modules.report.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.report.entity.LawsMonthlyReportWriteEO;
+import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 月报填写
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+@Api(tags="月报填写")
+@RestController
+@RequestMapping("/report/lawsMonthlyReportWriteEO")
+@Slf4j
+public class LawsMonthlyReportWriteEOController extends JeroController<LawsMonthlyReportWriteEO, ILawsMonthlyReportWriteEOService> {
+	@Autowired
+	private ILawsMonthlyReportWriteEOService lawsMonthlyReportWriteEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsMonthlyReportWriteEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "月报填写-分页列表查询")
+	@ApiOperation(value="月报填写-分页列表查询", notes="月报填写-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsMonthlyReportWriteEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEO, req.getParameterMap());
+		Page<LawsMonthlyReportWriteEO> page = new Page<LawsMonthlyReportWriteEO>(pageNo, pageSize);
+		IPage<LawsMonthlyReportWriteEO> pageList = lawsMonthlyReportWriteEOService.getPageInfo(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "月报填写-列表查询")
+    @ApiOperation(value="月报填写-列表查询", notes="月报填写-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsMonthlyReportWriteEO>> queryList() {
+        List<LawsMonthlyReportWriteEO> list = lawsMonthlyReportWriteEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsMonthlyReportWriteEO
+	 * @return
+	 */
+	@AutoLog(value = "月报填写-添加")
+	@ApiOperation(value="月报填写-添加", notes="月报填写-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) {
+		lawsMonthlyReportWriteEOService.add(lawsMonthlyReportWriteEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsMonthlyReportWriteEO
+	 * @return
+	 */
+	@AutoLog(value = "月报填写-编辑")
+	@ApiOperation(value="月报填写-编辑", notes="月报填写-编辑")
+	@PostMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) {
+		lawsMonthlyReportWriteEOService.editById(lawsMonthlyReportWriteEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "月报填写-通过id删除")
+	@ApiOperation(value="月报填写-通过id删除", notes="月报填写-通过id删除")
+	@GetMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		lawsMonthlyReportWriteEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "月报填写-批量删除")
+	@ApiOperation(value="月报填写-批量删除", notes="月报填写-批量删除")
+	@GetMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.lawsMonthlyReportWriteEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "月报填写-通过id查询")
+	@ApiOperation(value="月报填写-通过id查询", notes="月报填写-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO = lawsMonthlyReportWriteEOService.queryById(id);
+		if(lawsMonthlyReportWriteEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsMonthlyReportWriteEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsMonthlyReportWriteEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) {
+        return super.exportXls(request, lawsMonthlyReportWriteEO, LawsMonthlyReportWriteEO.class, "月报填写");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, LawsMonthlyReportWriteEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewOpinionTemplateEOController.java

@@ -0,0 +1,170 @@
+package com.jero.modules.report.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.report.entity.NewOpinionTemplateEO;
+import com.jero.modules.report.service.INewOpinionTemplateEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 新征求意见清单模板
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+@Api(tags="新征求意见清单模板")
+@RestController
+@RequestMapping("/report/newOpinionTemplateEO")
+@Slf4j
+public class NewOpinionTemplateEOController extends JeroController<NewOpinionTemplateEO, INewOpinionTemplateEOService> {
+	@Autowired
+	private INewOpinionTemplateEOService newOpinionTemplateEOService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param newOpinionTemplateEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "新征求意见清单模板-分页列表查询")
+	@ApiOperation(value="新征求意见清单模板-分页列表查询", notes="新征求意见清单模板-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(NewOpinionTemplateEO newOpinionTemplateEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<NewOpinionTemplateEO> queryWrapper = QueryGenerator.initQueryWrapper(newOpinionTemplateEO, req.getParameterMap());
+		Page<NewOpinionTemplateEO> page = new Page<NewOpinionTemplateEO>(pageNo, pageSize);
+		IPage<NewOpinionTemplateEO> pageList = newOpinionTemplateEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "新征求意见清单模板-列表查询")
+    @ApiOperation(value="新征求意见清单模板-列表查询", notes="新征求意见清单模板-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<NewOpinionTemplateEO>> queryList() {
+        List<NewOpinionTemplateEO> list = newOpinionTemplateEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param newOpinionTemplateEO
+	 * @return
+	 */
+	@AutoLog(value = "新征求意见清单模板-添加")
+	@ApiOperation(value="新征求意见清单模板-添加", notes="新征求意见清单模板-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody NewOpinionTemplateEO newOpinionTemplateEO) {
+		newOpinionTemplateEOService.add(newOpinionTemplateEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param newOpinionTemplateEO
+	 * @return
+	 */
+	@AutoLog(value = "新征求意见清单模板-编辑")
+	@ApiOperation(value="新征求意见清单模板-编辑", notes="新征求意见清单模板-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody NewOpinionTemplateEO newOpinionTemplateEO) {
+		newOpinionTemplateEOService.editById(newOpinionTemplateEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "新征求意见清单模板-通过id删除")
+	@ApiOperation(value="新征求意见清单模板-通过id删除", notes="新征求意见清单模板-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		newOpinionTemplateEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "新征求意见清单模板-批量删除")
+	@ApiOperation(value="新征求意见清单模板-批量删除", notes="新征求意见清单模板-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.newOpinionTemplateEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "新征求意见清单模板-通过id查询")
+	@ApiOperation(value="新征求意见清单模板-通过id查询", notes="新征求意见清单模板-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		NewOpinionTemplateEO newOpinionTemplateEO = newOpinionTemplateEOService.queryById(id);
+		if(newOpinionTemplateEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(newOpinionTemplateEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param newOpinionTemplateEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, NewOpinionTemplateEO newOpinionTemplateEO) {
+        return super.exportXls(request, newOpinionTemplateEO, NewOpinionTemplateEO.class, "新征求意见清单模板");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, NewOpinionTemplateEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewStandardTemplateEOController.java

@@ -0,0 +1,170 @@
+package com.jero.modules.report.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.report.entity.NewStandardTemplateEO;
+import com.jero.modules.report.service.INewStandardTemplateEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 新发布标准清单模板
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+@Api(tags="新发布标准清单模板")
+@RestController
+@RequestMapping("/report/newStandardTemplateEO")
+@Slf4j
+public class NewStandardTemplateEOController extends JeroController<NewStandardTemplateEO, INewStandardTemplateEOService> {
+	@Autowired
+	private INewStandardTemplateEOService newStandardTemplateEOService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param newStandardTemplateEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "新发布标准清单模板-分页列表查询")
+	@ApiOperation(value="新发布标准清单模板-分页列表查询", notes="新发布标准清单模板-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(NewStandardTemplateEO newStandardTemplateEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<NewStandardTemplateEO> queryWrapper = QueryGenerator.initQueryWrapper(newStandardTemplateEO, req.getParameterMap());
+		Page<NewStandardTemplateEO> page = new Page<NewStandardTemplateEO>(pageNo, pageSize);
+		IPage<NewStandardTemplateEO> pageList = newStandardTemplateEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "新发布标准清单模板-列表查询")
+    @ApiOperation(value="新发布标准清单模板-列表查询", notes="新发布标准清单模板-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<NewStandardTemplateEO>> queryList() {
+        List<NewStandardTemplateEO> list = newStandardTemplateEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param newStandardTemplateEO
+	 * @return
+	 */
+	@AutoLog(value = "新发布标准清单模板-添加")
+	@ApiOperation(value="新发布标准清单模板-添加", notes="新发布标准清单模板-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody NewStandardTemplateEO newStandardTemplateEO) {
+		newStandardTemplateEOService.add(newStandardTemplateEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param newStandardTemplateEO
+	 * @return
+	 */
+	@AutoLog(value = "新发布标准清单模板-编辑")
+	@ApiOperation(value="新发布标准清单模板-编辑", notes="新发布标准清单模板-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody NewStandardTemplateEO newStandardTemplateEO) {
+		newStandardTemplateEOService.editById(newStandardTemplateEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "新发布标准清单模板-通过id删除")
+	@ApiOperation(value="新发布标准清单模板-通过id删除", notes="新发布标准清单模板-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		newStandardTemplateEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "新发布标准清单模板-批量删除")
+	@ApiOperation(value="新发布标准清单模板-批量删除", notes="新发布标准清单模板-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.newStandardTemplateEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "新发布标准清单模板-通过id查询")
+	@ApiOperation(value="新发布标准清单模板-通过id查询", notes="新发布标准清单模板-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		NewStandardTemplateEO newStandardTemplateEO = newStandardTemplateEOService.queryById(id);
+		if(newStandardTemplateEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(newStandardTemplateEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param newStandardTemplateEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, NewStandardTemplateEO newStandardTemplateEO) {
+        return super.exportXls(request, newStandardTemplateEO, NewStandardTemplateEO.class, "新发布标准清单模板");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, NewStandardTemplateEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java

@@ -0,0 +1,193 @@
+package com.jero.modules.report.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 月报填写
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_monthly_report_write")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_monthly_report_write对象", description="月报填写")
+public class LawsMonthlyReportWriteEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**月份*/
+	@Excel(name = "月份", width = 15)
+    @ApiModelProperty(value = "月份")
+    private java.lang.String month;
+
+	/**章节目录*/
+	@Excel(name = "章节目录", width = 15)
+    @ApiModelProperty(value = "章节目录")
+    private java.lang.String memoriesChapter;
+
+	//章节目录名称
+    @TableField(exist = false)
+    private java.lang.String memoriesChapterName;
+
+	/**内容模板*/
+	@Excel(name = "内容模板", width = 15)
+    @ApiModelProperty(value = "内容模板")
+    private java.lang.String contentTemplate;
+
+	/**中文标题*/
+	@Excel(name = "中文标题", width = 15)
+    @ApiModelProperty(value = "中文标题")
+    private java.lang.String titleCn;
+
+	/**英文标题*/
+	@Excel(name = "英文标题", width = 15)
+    @ApiModelProperty(value = "英文标题")
+    private java.lang.String titleEn;
+
+	/**相关领域*/
+	@Excel(name = "相关领域", width = 15)
+    @ApiModelProperty(value = "相关领域")
+    private java.lang.String technologyTerritory;
+
+	/**适用车型*/
+	@Excel(name = "适用车型", width = 15)
+    @ApiModelProperty(value = "适用车型")
+    private java.lang.String applyCar;
+
+	/**适用范围*/
+	@Excel(name = "适用范围", width = 15)
+    @ApiModelProperty(value = "适用范围")
+    private java.lang.String applyScope;
+
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private java.lang.String state;
+
+	/**用法*/
+	@Excel(name = "用法", width = 15)
+    @ApiModelProperty(value = "用法")
+    private java.lang.String useMethod;
+
+	/**实施车型*/
+	@Excel(name = "实施车型", width = 15)
+    @ApiModelProperty(value = "实施车型")
+    private java.lang.String implementCar;
+
+	/**发布日期*/
+	@Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "发布日期")
+    private java.util.Date issueTime;
+
+	/**新车型实施日期*/
+	@Excel(name = "新车型实施日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "新车型实施日期")
+    private java.util.Date newCarImplementTime;
+
+	/**在产车实施日期*/
+	@Excel(name = "在产车实施日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "在产车实施日期")
+    private java.util.Date productionCarImplementTime;
+
+	/**主要内容中文*/
+	@Excel(name = "主要内容中文", width = 15)
+    @ApiModelProperty(value = "主要内容中文")
+    private java.lang.String contentCn;
+
+	/**主要内容英文*/
+	@Excel(name = "主要内容英文", width = 15)
+    @ApiModelProperty(value = "主要内容英文")
+    private java.lang.String contentEn;
+
+	/**NIO工作进展中文*/
+	@Excel(name = "NIO工作进展中文", width = 15)
+    @ApiModelProperty(value = "NIO工作进展中文")
+    private java.lang.String workProgressCn;
+
+	/**NIO工作进展英文*/
+	@Excel(name = "NIO工作进展英文", width = 15)
+    @ApiModelProperty(value = "NIO工作进展英文")
+    private java.lang.String workProgressEn;
+
+	/**法规联系人*/
+	@Excel(name = "法规联系人", width = 15)
+    @ApiModelProperty(value = "法规联系人")
+    private java.lang.String lawsContact;
+
+	/**链接*/
+	@Excel(name = "链接", width = 15)
+    @ApiModelProperty(value = "链接")
+    private java.lang.String link;
+
+	/**导出状态*/
+    @ApiModelProperty(value = "导出状态")
+    private java.lang.String exportState;
+
+    //新征求意见清单模板
+    @TableField(exist = false)
+    private List<NewOpinionTemplateEO> newOpinionTemplateEOList;
+
+    //新发布标准清单模板
+    @TableField(exist = false)
+    private List<NewStandardTemplateEO> newStandardTemplateEOList;
+
+    @TableField(exist = false)
+    private String cut;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java

@@ -0,0 +1,91 @@
+package com.jero.modules.report.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 新征求意见清单模板
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("new_opinion_template")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="new_opinion_template对象", description="新征求意见清单模板")
+public class NewOpinionTemplateEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**月报填写表id*/
+	@Excel(name = "月报填写表id", width = 15)
+    @ApiModelProperty(value = "月报填写表id")
+    private java.lang.String lawsMonthlyReportWriteId;
+
+	/**计划号中文*/
+	@Excel(name = "计划号中文", width = 15)
+    @ApiModelProperty(value = "计划号中文")
+    private java.lang.String planNumberCn;
+
+	/**标准名称中文*/
+	@Excel(name = "标准名称中文", width = 15)
+    @ApiModelProperty(value = "标准名称中文")
+    private java.lang.String standardNameCn;
+
+	/**标准名称英文*/
+	@Excel(name = "标准名称英文", width = 15)
+    @ApiModelProperty(value = "标准名称英文")
+    private java.lang.String standardNameEn;
+
+	/**征求意见截止日期*/
+	@Excel(name = "征求意见截止日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "征求意见截止日期")
+    private java.util.Date expirationDate;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java

@@ -0,0 +1,98 @@
+package com.jero.modules.report.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 新发布标准清单模板
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("new_standard_template")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="new_standard_template对象", description="新发布标准清单模板")
+public class NewStandardTemplateEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**月报填写表id*/
+	@Excel(name = "月报填写表id", width = 15)
+    @ApiModelProperty(value = "月报填写表id")
+    private java.lang.String lawsMonthlyReportWriteId;
+
+	/**标准编号*/
+	@Excel(name = "标准编号", width = 15)
+    @ApiModelProperty(value = "标准编号")
+    private java.lang.String standardNumber;
+
+	/**标准名称中文*/
+	@Excel(name = "标准名称中文", width = 15)
+    @ApiModelProperty(value = "标准名称中文")
+    private java.lang.String standardNameCn;
+
+	/**标准名称英文*/
+	@Excel(name = "标准名称英文", width = 15)
+    @ApiModelProperty(value = "标准名称英文")
+    private java.lang.String standardNameEn;
+
+	/**发布日期*/
+	@Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "发布日期")
+    private java.util.Date issueTime;
+
+	/**实施日期*/
+	@Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实施日期")
+    private java.util.Date implementTime;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java

@@ -0,0 +1,40 @@
+package com.jero.modules.report.enums;
+
+import com.sun.tools.doclets.formats.html.resources.standard;
+
+/**
+ * @description
+ * @date 2022/1/21 15:22
+ * @auth zhn
+ */
+public enum ContentTemplateEnum {
+    DEFAULT_TEMPLATE("Content template","1"),
+    NEW_REQUEST_LIST_TEMPLATE("新征求意见清单模板","2"),
+    NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE("新发布标准清单模板","3");
+
+
+
+    String name;
+    String value;
+
+    private ContentTemplateEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportWriteEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.report.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.report.entity.LawsMonthlyReportWriteEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 月报填写
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+public interface LawsMonthlyReportWriteEOMapper extends BaseMapper<LawsMonthlyReportWriteEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewOpinionTemplateEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.report.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.report.entity.NewOpinionTemplateEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 新征求意见清单模板
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+public interface NewOpinionTemplateEOMapper extends BaseMapper<NewOpinionTemplateEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewStandardTemplateEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.report.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.report.entity.NewStandardTemplateEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 新发布标准清单模板
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+public interface NewStandardTemplateEOMapper extends BaseMapper<NewStandardTemplateEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.report.mapper.LawsMonthlyReportWriteEOMapper">
+    <resultMap id="LawsMonthlyReportWriteEOResultMap" type="com.jero.modules.report.entity.LawsMonthlyReportWriteEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="month" property="month" />
+        <result column="memories_chapter" property="memoriesChapter" />
+        <result column="content_template" property="contentTemplate" />
+        <result column="title_cn" property="titleCn" />
+        <result column="title_en" property="titleEn" />
+        <result column="technology_territory" property="technologyTerritory" />
+        <result column="apply_car" property="applyCar" />
+        <result column="apply_scope" property="applyScope" />
+        <result column="state" property="state" />
+        <result column="use_method" property="useMethod" />
+        <result column="implement_car" property="implementCar" />
+        <result column="issue_time" property="issueTime" />
+        <result column="new_car_implement_time" property="newCarImplementTime" />
+        <result column="production_car_implement_time" property="productionCarImplementTime" />
+        <result column="content_cn" property="contentCn" />
+        <result column="content_en" property="contentEn" />
+        <result column="work_progress_cn" property="workProgressCn" />
+        <result column="work_progress_en" property="workProgressEn" />
+        <result column="laws_contact" property="lawsContact" />
+        <result column="link" property="link" />
+        <result column="export_state" property="exportState" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewOpinionTemplateEOMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.report.mapper.NewOpinionTemplateEOMapper">
+    <resultMap id="NewOpinionTemplateEOResultMap" type="com.jero.modules.report.entity.NewOpinionTemplateEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="laws_monthly_report_write_id" property="lawsMonthlyReportWriteId" />
+        <result column="plan_number_cn" property="planNumberCn" />
+        <result column="standard_name_cn" property="standardNameCn" />
+        <result column="standard_name_en" property="standardNameEn" />
+        <result column="expiration_date" property="expirationDate" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewStandardTemplateEOMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.report.mapper.NewStandardTemplateEOMapper">
+    <resultMap id="NewStandardTemplateEOResultMap" type="com.jero.modules.report.entity.NewStandardTemplateEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="laws_monthly_report_write_id" property="lawsMonthlyReportWriteId" />
+        <result column="standard_number" property="standardNumber" />
+        <result column="standard_name_cn" property="standardNameCn" />
+        <result column="standard_name_en" property="standardNameEn" />
+        <result column="issue_time" property="issueTime" />
+        <result column="implement_time" property="implementTime" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java

@@ -0,0 +1,72 @@
+package com.jero.modules.report.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.modules.report.entity.LawsMonthlyReportWriteEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 月报填写
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+public interface ILawsMonthlyReportWriteEOService extends IService<LawsMonthlyReportWriteEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsMonthlyReportWriteEO
+	 * @return
+	 */
+    void add(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO);
+
+	/**
+	 * 编辑
+	 *
+	 * @param lawsMonthlyReportWriteEO
+	 * @return
+	 */
+    void editById(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsMonthlyReportWriteEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsMonthlyReportWriteEO> queryList();
+
+	/**
+	 * 分页
+	 * @param page
+	 * @param queryWrapper
+	 * @return
+	 */
+	IPage<LawsMonthlyReportWriteEO> getPageInfo(Page<LawsMonthlyReportWriteEO> page, QueryWrapper<LawsMonthlyReportWriteEO> queryWrapper);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewOpinionTemplateEOService.java

@@ -0,0 +1,61 @@
+package com.jero.modules.report.service;
+
+import com.jero.modules.report.entity.NewOpinionTemplateEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 新征求意见清单模板
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+public interface INewOpinionTemplateEOService extends IService<NewOpinionTemplateEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param newOpinionTemplateEO
+	 * @return
+	 */
+    void add(NewOpinionTemplateEO newOpinionTemplateEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param newOpinionTemplateEO
+	 * @return
+	 */
+    void editById(NewOpinionTemplateEO newOpinionTemplateEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    NewOpinionTemplateEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<NewOpinionTemplateEO> queryList();
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewStandardTemplateEOService.java

@@ -0,0 +1,61 @@
+package com.jero.modules.report.service;
+
+import com.jero.modules.report.entity.NewStandardTemplateEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 新发布标准清单模板
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+public interface INewStandardTemplateEOService extends IService<NewStandardTemplateEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param newStandardTemplateEO
+	 * @return
+	 */
+    void add(NewStandardTemplateEO newStandardTemplateEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param newStandardTemplateEO
+	 * @return
+	 */
+    void editById(NewStandardTemplateEO newStandardTemplateEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    NewStandardTemplateEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<NewStandardTemplateEO> queryList();
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java

@@ -0,0 +1,212 @@
+package com.jero.modules.report.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
+import com.jero.modules.report.entity.LawsMonthlyReportWriteEO;
+import com.jero.modules.report.entity.NewOpinionTemplateEO;
+import com.jero.modules.report.entity.NewStandardTemplateEO;
+import com.jero.modules.report.enums.ContentTemplateEnum;
+import com.jero.modules.report.mapper.LawsMonthlyReportWriteEOMapper;
+import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService;
+import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService;
+import com.jero.modules.report.service.INewOpinionTemplateEOService;
+import com.jero.modules.report.service.INewStandardTemplateEOService;
+import com.jero.modules.system.util.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 月报填写
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+@Service
+public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthlyReportWriteEOMapper, LawsMonthlyReportWriteEO> implements ILawsMonthlyReportWriteEOService {
+
+	@Autowired
+	private INewOpinionTemplateEOService iNewOpinionTemplateEOService;
+	@Autowired
+	private INewStandardTemplateEOService iNewStandardTemplateEOService;
+	@Autowired
+	private ILawsMonthlyReportTitleTemplateEOService lawsMonthlyReportTitleTemplateEOService;
+	/**
+	 * 保存
+	 *
+	 * @param lawsMonthlyReportWriteEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) {
+		Date now = new Date();
+		lawsMonthlyReportWriteEO.setCreateTime(now);
+		lawsMonthlyReportWriteEO.setUpdateTime(now);
+		save(lawsMonthlyReportWriteEO);
+
+		if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
+			//新征求意见清单模板
+			List<NewOpinionTemplateEO> newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList();
+			for (NewOpinionTemplateEO newOpinionTemplateEO : newOpinionTemplateEOList) {
+				newOpinionTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId());
+			}
+			iNewOpinionTemplateEOService.saveBatch(newOpinionTemplateEOList);
+
+		}else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
+			//新发布标准清单模板
+			List<NewStandardTemplateEO> newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList();
+			for (NewStandardTemplateEO newStandardTemplateEO : newStandardTemplateEOList) {
+				newStandardTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId());
+			}
+			iNewStandardTemplateEOService.saveBatch(newStandardTemplateEOList);
+		}
+    }
+
+	/**
+	 * 编辑
+	 *
+	 * @param lawsMonthlyReportWriteEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) {
+    	Date now = new Date();
+        lawsMonthlyReportWriteEO.setUpdateTime(now);
+    	saveOrUpdate(lawsMonthlyReportWriteEO);
+
+		if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
+			//新征求意见清单模板
+			List<NewOpinionTemplateEO> newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList();
+			iNewOpinionTemplateEOService.updateBatchById(newOpinionTemplateEOList);
+
+		}else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
+			//新发布标准清单模板
+			List<NewStandardTemplateEO> newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList();
+			iNewStandardTemplateEOService.updateBatchById(newStandardTemplateEOList);
+		}
+
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+        //删除新征求意见清单模板
+		LambdaQueryWrapper<NewOpinionTemplateEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,ids);
+		iNewOpinionTemplateEOService.remove(wrapper);
+
+		//删除新发布标准清单模板
+		LambdaQueryWrapper<NewStandardTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,ids);
+		iNewStandardTemplateEOService.remove(queryWrapper);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public LawsMonthlyReportWriteEO queryById(String id) {
+		LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO = getById(id);
+		if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
+			//新征求意见清单模板
+			LambdaQueryWrapper<NewOpinionTemplateEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,id);
+			List<NewOpinionTemplateEO> newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper);
+			lawsMonthlyReportWriteEO.setNewOpinionTemplateEOList(newOpinionTemplateEOList);
+
+		}else if(ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
+			//新发布标准清单模板
+			LambdaQueryWrapper<NewStandardTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,id);
+			List<NewStandardTemplateEO> newStandardTemplateEOList = iNewStandardTemplateEOService.list(queryWrapper);
+			lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(newStandardTemplateEOList);
+		}
+        return lawsMonthlyReportWriteEO;
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsMonthlyReportWriteEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public IPage<LawsMonthlyReportWriteEO> getPageInfo(Page<LawsMonthlyReportWriteEO> page, QueryWrapper<LawsMonthlyReportWriteEO> queryWrapper) {
+		Page<LawsMonthlyReportWriteEO> pageInfo = this.page(page, queryWrapper);
+		//法规月报id
+		List<String> lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList());
+		//获取章节目录
+		List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list();
+
+		//新征求意见清单模板
+		LambdaQueryWrapper<NewOpinionTemplateEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
+		List<NewOpinionTemplateEO> newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper);
+
+		//新发布标准清单模板
+		LambdaQueryWrapper<NewStandardTemplateEO> qrapperTemp = new LambdaQueryWrapper<>();
+		qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
+		List<NewStandardTemplateEO> newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp);
+
+		for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) {
+			//处理章节目录
+			if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){
+				List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream()
+						.filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList());
+				if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
+					lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn());
+				}else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
+					lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn());
+				}
+			}
+
+			if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
+				//新征求意见清单模板
+				List<NewOpinionTemplateEO> collect = newOpinionTemplateEOList.stream()
+						.filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList());
+				lawsMonthlyReportWriteEO.setNewOpinionTemplateEOList(collect);
+
+			}else if(ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
+				//新发布标准清单模板
+				List<NewStandardTemplateEO> collect = newStandardTemplateEOList.stream()
+						.filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList());
+				lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(collect);
+			}
+		}
+		return pageInfo;
+	}
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewOpinionTemplateEOServiceImpl.java

@@ -0,0 +1,89 @@
+package com.jero.modules.report.service.impl;
+
+import com.jero.modules.report.entity.NewOpinionTemplateEO;
+import com.jero.modules.report.mapper.NewOpinionTemplateEOMapper;
+import com.jero.modules.report.service.INewOpinionTemplateEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 新征求意见清单模板
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+@Service
+public class NewOpinionTemplateEOServiceImpl extends ServiceImpl<NewOpinionTemplateEOMapper, NewOpinionTemplateEO> implements INewOpinionTemplateEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param newOpinionTemplateEO
+	 * @return
+	 */
+	@Override
+    public void add(NewOpinionTemplateEO newOpinionTemplateEO) {
+        Date now = new Date();
+        newOpinionTemplateEO.setCreateTime(now);
+        newOpinionTemplateEO.setUpdateTime(now);
+        save(newOpinionTemplateEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param newOpinionTemplateEO
+	 * @return
+	 */
+	@Override
+    public void editById(NewOpinionTemplateEO newOpinionTemplateEO) {
+    	Date now = new Date();
+        newOpinionTemplateEO.setUpdateTime(now);
+    	saveOrUpdate(newOpinionTemplateEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public NewOpinionTemplateEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<NewOpinionTemplateEO> queryList() {
+        return list();
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewStandardTemplateEOServiceImpl.java

@@ -0,0 +1,89 @@
+package com.jero.modules.report.service.impl;
+
+import com.jero.modules.report.entity.NewStandardTemplateEO;
+import com.jero.modules.report.mapper.NewStandardTemplateEOMapper;
+import com.jero.modules.report.service.INewStandardTemplateEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 新发布标准清单模板
+ * @Author: jero-boot
+ * @Date:   2022-07-02
+ * @Version: V1.0
+ */
+@Service
+public class NewStandardTemplateEOServiceImpl extends ServiceImpl<NewStandardTemplateEOMapper, NewStandardTemplateEO> implements INewStandardTemplateEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param newStandardTemplateEO
+	 * @return
+	 */
+	@Override
+    public void add(NewStandardTemplateEO newStandardTemplateEO) {
+        Date now = new Date();
+        newStandardTemplateEO.setCreateTime(now);
+        newStandardTemplateEO.setUpdateTime(now);
+        save(newStandardTemplateEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param newStandardTemplateEO
+	 * @return
+	 */
+	@Override
+    public void editById(NewStandardTemplateEO newStandardTemplateEO) {
+    	Date now = new Date();
+        newStandardTemplateEO.setUpdateTime(now);
+    	saveOrUpdate(newStandardTemplateEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public NewStandardTemplateEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<NewStandardTemplateEO> queryList() {
+        return list();
+    }
+}