合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!39

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -115,4 +115,6 @@ CREATE TABLE `params_collect_manifest_user_type_log` (
      `user_id` varchar(50) DEFAULT NULL COMMENT '用户id',
      `user_type` varchar(50) DEFAULT NULL COMMENT '用户类型',
      PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 以上部分2022年7月2日已更新至正式环境

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java

@@ -74,8 +74,10 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
     @ApiOperation(value="参数项收集清单-列表查询", notes="参数项收集清单-列表查询")
 	@GetMapping(value = "/list")
 //	@RequiresPermissions("params:collectManifest:list")
-	public Result<List<Map<String, Object>>> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
-													   @RequestParam(name = "cut") String cut) {
+	public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
+							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+							   @RequestParam(name="pageSize", defaultValue="500") Integer pageSize,
+							   @RequestParam(name = "cut") String cut) {
 		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
 			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
 		}
@@ -86,7 +88,8 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 			paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
 		}
 
-		List<Map<String, Object>> list = paramsCollectManifestEOService.queryList(paramsCollectManifestEO, cut);
+		IPage page = new Page(pageNo, pageSize);
+		IPage list = paramsCollectManifestEOService.queryList(page, paramsCollectManifestEO, cut);
         return Result.OK(list);
 	}
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java

@@ -1,5 +1,7 @@
 package com.jero.modules.cert.collect.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
@@ -64,8 +66,10 @@ public class ParamsCollectManifestHistoryEOController extends JeroController<Par
     @ApiOperation(value="历史参数项收集清单-列表查询", notes="历史参数项收集清单-列表查询")
 	@GetMapping(value = "/list")
 //	@RequiresPermissions("params:manifest:history")
-	public Result<List<Map<String, Object>>> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
-													   @RequestParam(name = "cut") String cut) {
+	public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
+							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+							   @RequestParam(name="pageSize", defaultValue="500") Integer pageSize,
+							   @RequestParam(name = "cut") String cut) {
 		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
 			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
 		}
@@ -76,7 +80,8 @@ public class ParamsCollectManifestHistoryEOController extends JeroController<Par
 			paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
 		}
 
-		List<Map<String, Object>> list = paramsCollectManifestHistoryEOService.queryList(paramsCollectManifestEO, cut);
+		IPage page = new Page(pageNo, pageSize);
+		IPage list = paramsCollectManifestHistoryEOService.queryList(page, paramsCollectManifestEO, cut);
         return Result.OK(list);
 	}
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java

@@ -10,6 +10,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.cert.collect.entity.ParamsConfigEO;
 import com.jero.modules.cert.collect.entity.ParamsManifestEO;
 import com.jero.modules.cert.collect.enums.ManifestStateEnum;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.service.IParamsConfigEOService;
 import com.jero.modules.cert.collect.service.IParamsManifestEOService;
 import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
@@ -21,6 +22,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -48,6 +50,9 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@Autowired
 	private IParamsManifestEOService paramsManifestEOService;
 
+	@Autowired
+	private IParamsCollectManifestEOService paramsCollectManifestEOService;
+
 	@Autowired
 	private IParamsConfigEOService paramsConfigEOService;
 
@@ -64,7 +69,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-分页列表查询")
 	@ApiOperation(value="参数清单-分页列表查询", notes="参数清单-分页列表查询")
 	@GetMapping(value = "/page")
-//	@RequiresPermissions("params:manifest:page")
+	@RequiresPermissions("params:manifest:page")
 	public Result<?> queryPageList(ParamsManifestEO paramsManifestEO,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -123,6 +128,21 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 		return Result.OK(true); // 无重复
 	}
 
+	/**
+	 * 获取配置标识
+	 * 判断是否可新增配置，清单参数项状态为 待发起、变更时，可添加配置
+	 * true-可添加配置；false-不可添加配置
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-获取配置标识")
+	@ApiOperation(value="参数清单-获取配置标识", notes="参数清单-获取配置标识")
+	@GetMapping(value = "/getConfigFlag")
+	@RequiresPermissions("params:manifest:page")
+	public Result<?> getManifestConfigFlag(@RequestParam(name="paramsManifestId", required = true) String paramsManifestId) {
+		boolean configFlag = paramsCollectManifestEOService.getManifestConfigFlag(paramsManifestId);
+		return Result.OK(configFlag);
+	}
+
 	/**
 	 *   添加
 	 *
@@ -132,7 +152,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-添加")
 	@ApiOperation(value="参数清单-添加", notes="参数清单-添加")
 	@PostMapping(value = "/add")
-//	@RequiresPermissions("params:manifest:add")
+	@RequiresPermissions("params:manifest:add")
 	public Result<?> add(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
 		boolean isSuccess = paramsManifestEOService.add(paramsManifestEO);
 		if (isSuccess) {
@@ -151,7 +171,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-编辑")
 	@ApiOperation(value="参数清单-编辑", notes="参数清单-编辑")
 	@PostMapping(value = "/edit")
-//	@RequiresPermissions("params:manifest:edit")
+	@RequiresPermissions("params:manifest:edit")
 	public Result<?> edit(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
 		boolean isSuccess = paramsManifestEOService.editById(paramsManifestEO);
 		if (isSuccess) {
@@ -170,7 +190,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-通过id删除")
 	@ApiOperation(value="参数清单-通过id删除", notes="参数清单-通过id删除")
 	@GetMapping(value = "/delete")
-//	@RequiresPermissions("params:manifest:delete")
+	@RequiresPermissions("params:manifest:delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) {
 		boolean isSuccess = paramsManifestEOService.deleteById(id, cut);
 		if (isSuccess) {
@@ -189,7 +209,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-批量删除")
 	@ApiOperation(value="参数清单-批量删除", notes="参数清单-批量删除")
 	@PostMapping(value = "/deleteBatch")
-//	@RequiresPermissions("params:manifest:deleteBatch")
+	@RequiresPermissions("params:manifest:deleteBatch")
 	public Result<?> deleteBatch(@RequestBody ParamsManifestVO paramsManifestVO) {
 		if (StringUtils.isEmpty(paramsManifestVO.getIds()) || StringUtils.isEmpty(paramsManifestVO.getCut())) {
 			return Result.error("参数不能为空！");
@@ -211,7 +231,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @AutoLog(value = "参数清单-变更扩展")
 	 @ApiOperation(value="参数清单-变更扩展", notes="参数清单-变更扩展")
 	 @GetMapping(value = "/changeExtension")
-//	 @RequiresPermissions("params:manifest:change")
+	 @RequiresPermissions("params:manifest:change")
 	 public Result<?> changeExtension(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) {
 		 boolean isSuccess = paramsManifestEOService.changeExtension(id, cut);
 		 if(isSuccess) {
@@ -230,7 +250,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @AutoLog(value = "参数清单-历史版本")
 	 @ApiOperation(value="参数清单-历史版本", notes="参数清单-历史版本")
 	 @GetMapping(value = "/history")
-//	 @RequiresPermissions("params:manifest:history")
+	 @RequiresPermissions("params:manifest:history")
 	 public Result<?> history(@RequestParam(name="title",required=true) String title) {
 		 List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(title);
 		 return Result.OK(historyVersionList);
@@ -245,7 +265,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @AutoLog(value = "参数清单-查询所有项目的所有参数清单")
 	 @ApiOperation(value="参数清单-查询所有项目的所有参数清单", notes="参数清单-查询所有项目的所有参数清单")
 	 @PostMapping(value = "/getAllManifest")
-//	 @RequiresPermissions("params:manifest:copy")
+	 @RequiresPermissions("params:manifest:copy")
 	 public Result<?> getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									 @RequestParam(name="projectName",required=false) String projectName) {
@@ -262,7 +282,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @AutoLog(value = "参数清单-复制-参数模板列表查询")
 	 @ApiOperation(value="参数清单-复制-参数模板列表查询", notes="参数清单-复制-参数模板列表查询")
 	 @GetMapping(value = "/getParamsTemplatePageOfCopy")
-//	@RequiresPermissions("params:manifest:copy")
+	@RequiresPermissions("params:manifest:copy")
 	 public Result<?> getParamsTemplatePageOfCopy(ParamsTemplateEO paramsTemplateEO,
 												  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -281,7 +301,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @AutoLog(value = "参数清单-复制清单")
 	 @ApiOperation(value="参数清单-复制清单", notes="参数清单-复制清单")
 	 @PostMapping(value = "/copy")
-//	 @RequiresPermissions("params:manifest:copy")
+	 @RequiresPermissions("params:manifest:copy")
 	 public Result<?> copy(@RequestBody ParamsManifestVO paramsManifestVO) {
 		 ParamsManifestEO paramsManifestEO = new ParamsManifestEO();
 		 BeanUtils.copyProperties(paramsManifestVO, paramsManifestEO);
@@ -297,7 +317,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-判断配置列表是否为空")
 	@ApiOperation(value="参数清单-判断配置列表是否为空", notes="参数清单-判断配置列表是否为空")
 	@GetMapping(value = "/verifyConfig")
-//	@RequiresPermissions("params:config:list")
+	@RequiresPermissions("params:manifest:page")
 	public Result<?> queryList(@RequestParam(name = "paramsManifestId") String paramsManifestId) {
 		List<ParamsConfigEO> list = paramsConfigEOService.queryList(paramsManifestId);
 		if (CollectionUtil.isNotEmpty(list)) {

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java

@@ -97,9 +97,6 @@ public class ParamsManifestEO implements Serializable {
     @TableField(exist = false)
     private String paramsTemplateName;
 
-    @TableField(exist = false)
-    private Boolean configFlag; // true-可添加配置；false-不可添加配置
-
     @TableField(exist = false)
     private String cut;
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java

@@ -2,6 +2,7 @@ package com.jero.modules.cert.collect.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -15,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectManifestEO> {
 
     List<ParamsCollectManifestEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
+
+    IPage pageInfo(@Param("page") IPage page, @Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
  }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java

@@ -1,6 +1,7 @@
 package com.jero.modules.cert.collect.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
 import org.apache.ibatis.annotations.Param;
@@ -16,4 +17,6 @@ import java.util.List;
 public interface ParamsCollectManifestHistoryEOMapper extends BaseMapper<ParamsCollectManifestHistoryEO> {
 
     List<ParamsCollectManifestHistoryEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
+
+    IPage pageInfo(@Param("page") IPage page, @Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml

@@ -62,9 +62,6 @@
                         <when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
                             AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state in ('2','4','5','6','7','8')
                         </when>
-                        <when test="paramsCollectManifestEO.userTypes == 'guest'">
-                            AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth})
-                        </when>
                     </choose>
                 </if>
 
@@ -79,4 +76,11 @@
         order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
     </select>
 
+    <select id="pageInfo" resultMap="ParamsCollectManifestEOResultMap">
+        select *
+        from params_collect_manifest
+        <include refid="BaseQuerySql"/>
+        order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
+    </select>
+
 </mapper>

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml

@@ -59,4 +59,11 @@
         <include refid="BaseQuerySql"/>
         order by nio_number asc
     </select>
+
+    <select id="pageInfo" resultMap="ParamsCollectManifestHistoryEOResultMap">
+        select *
+        from params_collect_manifest_history
+        <include refid="BaseQuerySql"/>
+        order by nio_number asc
+    </select>
 </mapper>

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java

@@ -1,5 +1,6 @@
 package com.jero.modules.cert.collect.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
@@ -58,11 +59,12 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 
     /**
 	 * 列表查询
+	 * @param page
 	 * @param paramsCollectManifestEO
 	 * @param cut
 	 * @return
 	 */
-	List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut);
+	IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut);
 
 	/**
 	 * 列表表头中英文切换

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java

@@ -1,5 +1,6 @@
 package com.jero.modules.cert.collect.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
@@ -17,11 +18,12 @@ public interface IParamsCollectManifestHistoryEOService extends IService<ParamsC
 
 	/**
 	 * 列表查询
+	 * @param page
 	 * @param paramsCollectManifestEO
 	 * @param cut
 	 * @return
 	 */
-	List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut);
+	IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut);
 
 	/**
 	 * 列表表头中英文切换

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 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.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jero.common.constant.CommonConstant;
@@ -34,6 +35,8 @@ import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOService;
 import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
 import com.jero.modules.feishu.service.IFeishuService;
+import com.jero.modules.feishu.vo.FeishuMsgVo;
+import com.jero.modules.ocr.service.WebSocketServer;
 import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
@@ -113,7 +116,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	private ISysUserRoleService sysUserRoleService;
 	@Autowired
 	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
-
+	@Autowired
+	private WebSocketServer webSocketServer;
 
 
 
@@ -243,7 +247,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	 * @return
 	 */
 	@Override
-    public List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
+    public IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
 		String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
 
 		String userTypes = paramsCollectManifestEO.getUserTypes();
@@ -270,10 +274,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			paramsCollectManifestEO.setSdt(loginUser.getUsername());
 			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
 		} else if ("guest".equals(userTypes)) {
-			paramsCollectManifestEO.setSdt(loginUser.getUsername());
-			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
+			return page;
 		}
-		List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
+		IPage pageInfo = paramsCollectManifestEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
+		List<ParamsCollectManifestEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
 		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
 		List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
@@ -365,7 +369,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			listMap.add(manifestMap);
 		});
 
-        return listMap;
+		pageInfo.setRecords(listMap);
+        return pageInfo;
     }
 
 	/**
@@ -882,31 +887,29 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		List<Map<String, String>> userTypeList = new ArrayList<>(); // 一个用户可以有多个用户类型
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
 
-		// 查询项目下所有责任领域下的 homo,sdt人员
+		// 查询项目下所有责任领域下的 homo人员
+		List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseMapper.queryById(projectId);
+		List<String> homoList = new ArrayList<>();
+		if (CollectionUtil.isNotEmpty(projectLibraryBaseList)) {
+			String homoIdStr = projectLibraryBaseList.get(0).getCertificationEngineer();
+			if (StringUtils.isNotEmpty(homoIdStr)) {
+				List<String> homoIdList = Arrays.asList(homoIdStr.split(",")).stream().distinct().collect(Collectors.toList());
+				homoList = sysUserService.listByIds(homoIdList).stream().map(SysUser::getUsername).collect(Collectors.toList());
+			}
+		}
+
+		// 查询项目下所有责任领域下的 sdt人员
+		List<String> sdtList = new ArrayList<>();
 		LambdaQueryWrapper<ProjectRelatedPersonnel> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(ProjectRelatedPersonnel::getProjectId, projectId);
 		List<ProjectRelatedPersonnel> prpList = projectRelatedPersonnelService.list(queryWrapper);
-
-		String homoIdStr = prpList.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.joining(","));
+//		String homoIdStr = prpList.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.joining(","));
 		String sdtIdStr = prpList.stream().map(e -> e.getEngineeringInterfacePerson()).collect(Collectors.joining(","));
-		List<String> homoList = new ArrayList<>();
-		if (StringUtils.isNotEmpty(homoIdStr)) {
-			List<String> homoIdList = Arrays.asList(homoIdStr.split(",")).stream().distinct().collect(Collectors.toList());
-			homoList = sysUserService.listByIds(homoIdList).stream().map(SysUser::getUsername).collect(Collectors.toList());
-		} else {
-			Map<String, String> map = new HashMap<>();
-			if (CutEnum.CN.getValue().equals(cut)) {
-				map.put("label", CollectManifestUserTypeEnum.GUEST.getName());
-			} else {
-				map.put("label", CollectManifestUserTypeEnum.GUEST.getEnName());
-			}
-			map.put("value", CollectManifestUserTypeEnum.GUEST.getValue());
-			userTypeList.add(map);
-			return userTypeList;
+		// 项目下有homo-->不一定有sdt
+		if(StringUtils.isNotBlank(sdtIdStr)) {
+			List<String> sdtIdList = Arrays.asList(sdtIdStr.split(",")).stream().distinct().collect(Collectors.toList());
+			sdtList = sysUserService.listByIds(sdtIdList).stream().map(SysUser::getUsername).collect(Collectors.toList());
 		}
-		// 项目下有homo-->必定有sdt
-		List<String> sdtIdList = Arrays.asList(sdtIdStr.split(",")).stream().distinct().collect(Collectors.toList());
-		List<String> sdtList = sysUserService.listByIds(sdtIdList).stream().map(SysUser::getUsername).collect(Collectors.toList());
 
 		// 查询项目下参数清单下收集参数项中的 sdt,dre人员
 		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
@@ -917,7 +920,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				.map(ParamsCollectManifestEO::getSdt)
 				.distinct()
 				.collect(Collectors.toList());
-		sdtList.addAll(sdtListOfPCM);
+		sdtList.addAll(sdtListOfPCM); // 需要取并集，因为存在参数项开始收集但 人员相关名单中sdt被修改的情况
 
 		List<String> dreListOfPCM = pcmList.stream()
 				.filter(e->StringUtils.isNotEmpty(e.getDre()))
@@ -933,11 +936,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			List<String> userRoleIdList = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
 			userRoleIds = roleIdList.stream().filter(e->userRoleIdList.contains(e)).collect(Collectors.toList());
 		}
-		// TODO 查询当前登录用户角色 是否是当前项目的studio
+		// 查询当前登录用户角色 是否是当前项目的studio
 		List<String> studioList = new ArrayList<>();
-		List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseMapper.queryById(projectId);
 		if (CollectionUtil.isNotEmpty(projectLibraryBaseList)) {
-			studioList = projectLibraryBaseList.stream().map(ProjectLibraryBase::getStudioEngineerName).collect(Collectors.toList());
+			studioList = projectLibraryBaseList.stream().map(ProjectLibraryBase::getStudioEngineerName).collect(Collectors.toList()); // studio 一个项目只有一个
 		}
 
 		if (CollectionUtil.isEmpty(userRoleIds) && !studioList.contains(loginUser.getUsername())
@@ -1207,7 +1209,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		// 发送飞书消息
 		try {
-			feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.HOMO_TASK.getName(), hrefFeishu);
+			FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+			feishuMsgVo.setTitle(MessageTypeEnum.HOMO_TASK.getName());
+			feishuMsgVo.setContent(content);
+			feishuMsgVo.setUrl(hrefFeishu);
+			feishuService.sendCardMsg(thirdIds, feishuMsgVo);
 		} catch (IOException e) {
 			log.error("飞书消息推送失败");
 		}
@@ -1275,7 +1281,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 			// 发送飞书消息
 			try {
-				feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.HOMO_TASK.getName(), hrefFeishu);
+				FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+				feishuMsgVo.setTitle(MessageTypeEnum.HOMO_TASK.getName());
+				feishuMsgVo.setContent(content);
+				feishuMsgVo.setUrl(hrefFeishu);
+				feishuService.sendCardMsg(thirdIds, feishuMsgVo);
 			} catch (IOException e) {
 				log.error("飞书消息推送失败");
 			}
@@ -1540,8 +1550,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				updateParamsManifestEO.setId(paramsManifestId);
 				updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
 				updateParamsManifestEO.setFinishTime(time);
-				paramsManifestEOService.updateById(updateParamsManifestEO);
-
+				boolean isSuccess2 = paramsManifestEOService.updateById(updateParamsManifestEO);
+				if (isSuccess2) {
+					webSocketServer.sendMessage();
+				}
 			}
 
 		return isSuccess;

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java

@@ -2,6 +2,7 @@ package com.jero.modules.cert.collect.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jero.common.constant.enums.CutEnum;
@@ -72,10 +73,11 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
+	public IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
 		String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
 
-		List<ParamsCollectManifestHistoryEO> list = paramsCollectManifestHistoryEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
+		IPage pageInfo = paramsCollectManifestHistoryEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
+		List<ParamsCollectManifestHistoryEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsConfigHistoryEO> paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列
 		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
 		List<ParamsConfigDataHistoryEO> paramsConfigDataEOList = paramsConfigDataHistoryEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
@@ -168,7 +170,8 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 			listMap.add(manifestMap);
 		});
 
-		return listMap;
+		pageInfo.setRecords(listMap);
+		return pageInfo;
 	}
 
 	/**

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jero.modules.cert.collect.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
 import com.jero.modules.cert.collect.mapper.ParamsCollectManifestUserTypeLogEOMapper;
@@ -41,6 +42,14 @@ public class ParamsCollectManifestUserTypeLogEOServiceImpl extends ServiceImpl<P
 	 */
 	@Override
     public void editById(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO) {
+		String projectId = paramsCollectManifestUserTypeLogEO.getProjectId();
+		String paramsManifestId = paramsCollectManifestUserTypeLogEO.getParamsManifestId();
+		String userId = paramsCollectManifestUserTypeLogEO.getUserId();
+
+		ParamsCollectManifestUserTypeLogEO oldEO = queryCurrentType(projectId, paramsManifestId, userId);
+		if (ObjectUtil.isNotEmpty(oldEO)) {
+			paramsCollectManifestUserTypeLogEO.setId(oldEO.getId());
+		}
     	Date now = new Date();
         paramsCollectManifestUserTypeLogEO.setUpdateTime(now);
     	saveOrUpdate(paramsCollectManifestUserTypeLogEO);

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -290,60 +290,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	@Override
 	public IPage pageInfo(IPage page, ParamsManifestEO paramsManifestEO) {
 		IPage rows = paramsManifestEOMapper.pageInfo(page, paramsManifestEO);
-		// 根据参数项状态更新清单状态
-		List<ParamsManifestEO> paramsManifestEOList = rows.getRecords();
-		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
-			List<String> manifestIdList = paramsManifestEOList.stream().map(ParamsManifestEO::getId).collect(Collectors.toList());
-			Map<String, List<ParamsCollectManifestEO>> manifestMap = paramsCollectManifestEOService.queryByManifestIdList(manifestIdList);
-
-			paramsManifestEOList.forEach(manifestEO -> {
-			/*Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(manifestEO.getId());
-			Boolean finish = (Boolean) map.get("finish");
-			Date time = (Date) map.get("time");
-			if (finish) {
-				manifestEO.setState(ManifestStateEnum.FINISHED.getValue());
-				manifestEO.setFinishTime(time);
-
-				// 更新清单状态和完成时间
-				ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
-				updateParamsManifestEO.setId(manifestEO.getId());
-				updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
-				updateParamsManifestEO.setFinishTime(time);
-				updateById(updateParamsManifestEO);
-
-			} else {
-				if (ManifestStateEnum.FINISHED.getValue().equals(manifestEO.getState())) {
-					// 更新清单状态和完成时间
-					ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
-					updateParamsManifestEO.setId(manifestEO.getId());
-					updateParamsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
-					updateParamsManifestEO.setFinishTime(null);
-					updateById(updateParamsManifestEO);
-				}
-				manifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
-				manifestEO.setFinishTime(null);
-
-			}*/
-
-				// 添加配置标识，清单参数项状态为 待发起、变更时，可添加配置
-				boolean configFlag = getManifestConfigFlag(manifestMap.get(manifestEO.getId()));
-				manifestEO.setConfigFlag(configFlag);
-
-			});
-		}
 		return rows;
 	}
 
-	private boolean getManifestConfigFlag(List<ParamsCollectManifestEO> list) {
-		int number = (int) list.stream().filter(e->CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
-				|| CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count();
-		if (number == list.size() && list.size() > 0) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
 	/**
 	 * 变更扩展
 	 * 仅能选择一条进行变更扩展

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

@@ -181,4 +181,17 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController<L
 		 return Result.OK(list);
 	 }
 
+	 /**
+	  * 上移下移
+	  * @param lawsMonthlyReportTitleTemplateEOS
+	  * @return
+	  */
+	 @AutoLog(value = "上移下移")
+	 @ApiOperation(value="上移下移", notes="上移下移")
+	 @PostMapping(value = "/move")
+	 public Result<?> move(@RequestBody List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS) {
+		 lawsMonthlyReportTitleTemplateEOService.move(lawsMonthlyReportTitleTemplateEOS);
+		 return Result.OK("操作成功！");
+	 }
+
 }

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

@@ -0,0 +1,175 @@
+package com.jero.modules.report.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.report.entity.LawsMonthlyReportWriteEO;
+import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+ /**
+ * @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) {
+		IPage<LawsMonthlyReportWriteEO> pageList = lawsMonthlyReportWriteEOService.getPageInfo(lawsMonthlyReportWriteEO, pageNo,pageSize,req);
+		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,String cut) {
+		LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO = lawsMonthlyReportWriteEOService.queryById(id,cut);
+		if(lawsMonthlyReportWriteEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOList = new ArrayList<>();
+		lawsMonthlyReportWriteEOList.add(lawsMonthlyReportWriteEO);
+		return Result.OK(lawsMonthlyReportWriteEOList);
+	}
+
+    /**
+    * 导出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/LawsMonthlyReportTitleTemplateEO.java

@@ -79,10 +79,6 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable {
 	@TableField(exist = false)
 	private List<LawsMonthlyReportTitleTemplateEO> children = new ArrayList<>();
 
-	//标识(上移-->0,下移-->1)
-    @TableField(exist = false)
-	private String flag;
-
     //排序
     private int sort;
 

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

@@ -0,0 +1,199 @@
+package com.jero.modules.report.entity;
+
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+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.io.Serializable;
+import java.util.List;
+
+
+/**
+ * @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;
+
+	@TableField(exist = false)
+    private java.lang.String technologyTerritoryName;
+
+	/**适用车型*/
+	@Excel(name = "适用车型", width = 15)
+    @ApiModelProperty(value = "适用车型")
+    @Dict(dicCode ="car_type")
+    private java.lang.String applyCar;
+
+	/**适用范围*/
+	@Excel(name = "适用范围", width = 15)
+    @ApiModelProperty(value = "适用范围")
+    @Dict(dicCode ="apply_scope")
+    private java.lang.String applyScope;
+
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    @Dict(dicCode = "state")
+    private java.lang.String state;
+
+	/**用法*/
+	@Excel(name = "用法", width = 15)
+    @ApiModelProperty(value = "用法")
+    @Dict(dicCode ="yong4_fa3")
+    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 java.lang.String exportStateName;
+
+    //新征求意见清单模板
+    @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,39 @@
+package com.jero.modules.report.enums;
+
+
+/**
+ * @description
+ * @date 2022/1/21 15:22
+ * @auth zhn
+ */
+public enum ContentTemplateEnum {
+    DEFAULT_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/enums/ExportStateEnum.java

@@ -0,0 +1,48 @@
+package com.jero.modules.report.enums;
+
+
+/**
+ * @description
+ * @date 2022/1/21 15:22
+ * @auth zhn
+ */
+public enum ExportStateEnum {
+    NOT_EXPORT("未导出","Not export","1"),
+    HAS_BEEN_EXPORT("已导出","Has been export","2");
+
+
+    String name;
+    String nameEn;
+    String value;
+
+
+
+    private ExportStateEnum(String name, String nameEn, String value) {
+        this.name = name;
+        this.nameEn = nameEn;
+        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;
+    }
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+}

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/ILawsMonthlyReportTitleTemplateEOService.java

@@ -72,7 +72,13 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService<LawsM
 	IPage<LawsMonthlyReportTitleTemplateEO> getPageInfo(Integer pageNo,Integer pageSize, QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper);
 
 	/**
-	 * 以及菜单
+	 * 一级菜单
 	 */
 	List<LawsMonthlyReportTitleTemplateEO> OneMenuList();
+
+	/**
+	 * 上移下移
+	 * @param lawsMonthlyReportTitleTemplateEOS
+	 */
+	void move(List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS);
 }

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

@@ -0,0 +1,77 @@
+package com.jero.modules.report.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.report.entity.LawsMonthlyReportWriteEO;
+
+import javax.servlet.http.HttpServletRequest;
+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,String cut);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsMonthlyReportWriteEO> queryList();
+
+	/**
+	 * 分页
+	 * @param lawsMonthlyReportWriteEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	IPage<LawsMonthlyReportWriteEO> getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,
+												Integer pageNo,
+												Integer pageSize,
+												HttpServletRequest req);
+}

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/LawsMonthlyReportTitleTemplateEOServiceImpl.java

@@ -159,6 +159,22 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<Law
 		return this.list(wrapper);
 	}
 
+	/**
+	 * 上移,下移
+	 * @param lawsMonthlyReportTitleTemplateEOS
+	 */
+	@Override
+	public void move(List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS) {
+		//上移,下移(交换sort)
+		if(lawsMonthlyReportTitleTemplateEOS.size() == 2){
+			int one = lawsMonthlyReportTitleTemplateEOS.get(0).getSort();
+			int two = lawsMonthlyReportTitleTemplateEOS.get(1).getSort();
+			lawsMonthlyReportTitleTemplateEOS.get(0).setSort(two);
+			lawsMonthlyReportTitleTemplateEOS.get(1).setSort(one);
+		}
+		this.updateBatchById(lawsMonthlyReportTitleTemplateEOS);
+	}
+
 	public Page getPages(Integer currentPage, Integer pageSize, List<LawsMonthlyReportTitleTemplateEO> list){
 		Page page =new Page();
 		if(list==null){

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

@@ -0,0 +1,292 @@
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.query.QueryGenerator;
+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.enums.ExportStateEnum;
+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.entity.SysCategory;
+import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
+import com.jero.modules.system.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @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;
+	@Autowired
+	private SysCategoryServiceImpl sysCategoryService;
+	/**
+	 * 保存
+	 *
+	 * @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,String cut) {
+		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);
+		}
+		//数据转换(章节目录,相关领域,导出状态)
+		dataTransition(cut, lawsMonthlyReportWriteEO);
+		return lawsMonthlyReportWriteEO;
+    }
+
+	private void dataTransition(String cut, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) {
+		//处理章节目录
+		List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list();
+		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(cut) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
+				lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn());
+			}else if(CutEnum.EN.getValue().equals(cut) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
+				lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn());
+			}
+		}
+		//处理相关领域
+		//树形结构数据字典(技术领域)
+		List<SysCategory> categoryList = sysCategoryService.queryByTreeDicCode("technology_territory");
+		String technologyTerritory = lawsMonthlyReportWriteEO.getTechnologyTerritory();
+		if (StringUtils.isNotBlank(technologyTerritory)) {
+			List<String> technologyTerritoryList = Arrays.asList(technologyTerritory.split(","));
+			StringBuilder sb = new StringBuilder();
+			for (String technologyTerritoryTemp : technologyTerritoryList) {
+				List<SysCategory> collect = categoryList.stream().filter(e -> technologyTerritoryTemp.equals(e.getId())).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					sb.append(collect.get(0).getEnName() + ",");
+				}
+			}
+			if (StringUtils.isNotBlank(sb)) {
+				String technologyTerritoryName = sb.substring(0, sb.length() - 1);
+				lawsMonthlyReportWriteEO.setTechnologyTerritoryName(technologyTerritoryName);
+			}
+		}
+		//处理导出状态
+		String exportState = lawsMonthlyReportWriteEO.getExportState();
+		if(StringUtils.isNotBlank(exportState)){
+			if(ExportStateEnum.NOT_EXPORT.getValue().equals(exportState)){
+				if(CutEnum.CN.getValue().equals(cut)){
+					lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getName());
+				}else{
+					lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getNameEn());
+				}
+			}else if(ExportStateEnum.HAS_BEEN_EXPORT.getValue().equals(exportState)){
+				if(CutEnum.CN.getValue().equals(cut)){
+					lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getName());
+				}else{
+					lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getNameEn());
+				}
+			}
+		}
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsMonthlyReportWriteEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public IPage<LawsMonthlyReportWriteEO> getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEOTemp,
+													   Integer pageNo,
+													   Integer pageSize,
+													   HttpServletRequest req) {
+		QueryWrapper<LawsMonthlyReportWriteEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap());
+		Page<LawsMonthlyReportWriteEO> page = new Page<LawsMonthlyReportWriteEO>(pageNo, pageSize);
+		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);
+			}
+
+			//处理导出状态
+			String exportState = lawsMonthlyReportWriteEO.getExportState();
+			if(StringUtils.isNotBlank(exportState)){
+				if(ExportStateEnum.NOT_EXPORT.getValue().equals(exportState)){
+					if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){
+						lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getName());
+					}else{
+						lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getNameEn());
+					}
+				}else if(ExportStateEnum.HAS_BEEN_EXPORT.getValue().equals(exportState)){
+					if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){
+						lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getName());
+					}else{
+						lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getNameEn());
+					}
+				}
+			}
+		}
+		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();
+    }
+}