Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

2022-09-07 15:01:12 +08:00
parent bea743190e 22ccdae002
commit 9e8e62bbe3
13 changed files with 591 additions and 15 deletions
@@ -1089,3 +1089,15 @@ INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_ti
 -- 增加 中国台湾 数据字典数据 2022-09-06
 INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1567085557701386242', '1493782108399820801', '中国台湾', '96d49ba5797d4791906ce2baee87d4bc', '中国台湾', 1, 1, 'admin', '2022-09-06 17:41:27', 'admin', '2022-09-06 17:41:35', 1, NULL, NULL, '0', 'Tai Wan China');

+-- 问题知识库-评论回复表。 2022-09-07
+CREATE TABLE `laws_weilai`.`problem_knowledge_base_reply`  (
+   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+   `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+   `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+   `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+   `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+   `comment_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库-评论表id',
+   `reply_content` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '回复内容',
+   PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-评论回复表' ROW_FORMAT = Dynamic;
@@ -11,6 +11,7 @@ import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCommen
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.modules.problemKnowledgeBase.vo.ProblemKnowledgeBaseCommentVO;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,8 +68,8 @@ public class ProblemKnowledgeBaseCommentEOController extends JeroController<Prob
 	@AutoLog(value = "问题知识库评论表-列表查询")
    @ApiOperation(value="问题知识库评论表-列表查询", notes="问题知识库评论表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<ProblemKnowledgeBaseCommentEO>> queryList(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO,HttpServletRequest req) {
-        List<ProblemKnowledgeBaseCommentEO> list = problemKnowledgeBaseCommentEOService.queryList(problemKnowledgeBaseCommentEO,req);
+	public Result<List<ProblemKnowledgeBaseCommentVO>> queryList(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO, HttpServletRequest req) {
+        List<ProblemKnowledgeBaseCommentVO> list = this.problemKnowledgeBaseCommentEOService.getInfoList(problemKnowledgeBaseCommentEO,req);
        return Result.OK(list);
 	}

@@ -2,6 +2,7 @@ package com.jero.modules.problemKnowledgeBase.service;

 import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.problemKnowledgeBase.vo.ProblemKnowledgeBaseCommentVO;

 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -60,4 +61,6 @@ public interface IProblemKnowledgeBaseCommentEOService extends IService<ProblemK
 	 * @return
 	 */
    List<ProblemKnowledgeBaseCommentEO> queryList(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO, HttpServletRequest req);
+
+    List<ProblemKnowledgeBaseCommentVO> getInfoList(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO, HttpServletRequest req);
 }
@@ -5,9 +5,20 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO;
 import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseCommentEOMapper;
 import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCommentEOService;
+import com.jero.modules.problemKnowledgeBase.vo.ProblemKnowledgeBaseCommentVO;
+import com.jero.modules.project.entity.ProblemKnowledgeBaseReplyEO;
+import com.jero.modules.project.service.IProblemKnowledgeBaseReplyEOService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +35,8 @@ import javax.servlet.http.HttpServletRequest;
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl<ProblemKnowledgeBaseCommentEOMapper, ProblemKnowledgeBaseCommentEO> implements IProblemKnowledgeBaseCommentEOService {

+	@Autowired
+	private IProblemKnowledgeBaseReplyEOService problemKnowledgeBaseReplyEOService;
 	/**
 	 * 保存
 	 *
@@ -96,4 +109,36 @@ public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl<Proble
 		List<ProblemKnowledgeBaseCommentEO> result = this.list(queryWrapper);
 		return result;
    }
+
+	@Override
+	public List<ProblemKnowledgeBaseCommentVO> getInfoList(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO, HttpServletRequest req) {
+		List<ProblemKnowledgeBaseCommentVO> result = new ArrayList<>();
+		List<ProblemKnowledgeBaseCommentEO> problemKnowledgeBaseCommentEOList = this.queryList(problemKnowledgeBaseCommentEO, req);
+
+		if(CollectionUtils.isNotEmpty(problemKnowledgeBaseCommentEOList)){
+			List<String> commentIdList = problemKnowledgeBaseCommentEOList.stream().map(ProblemKnowledgeBaseCommentEO::getId).distinct().collect(Collectors.toList());
+			QueryWrapper<ProblemKnowledgeBaseReplyEO> replyQueryWrapper = new QueryWrapper<>();
+			replyQueryWrapper.lambda().in(ProblemKnowledgeBaseReplyEO::getCommentId,commentIdList);
+			List<ProblemKnowledgeBaseReplyEO> problemKnowledgeBaseReplyEOList = this.problemKnowledgeBaseReplyEOService.list(replyQueryWrapper);
+
+			problemKnowledgeBaseCommentEOList.forEach(commentEO -> {
+				List<ProblemKnowledgeBaseCommentVO> commentVOList = new ArrayList<>();
+
+				problemKnowledgeBaseReplyEOList.forEach(replyEO -> {
+					if(StringUtils.equals(commentEO.getId(),replyEO.getCommentId())){
+						ProblemKnowledgeBaseCommentVO commentVO = new ProblemKnowledgeBaseCommentVO();
+						BeanUtils.copyProperties(replyEO, commentVO);
+						commentVO.setCommentContent(replyEO.getReplyContent());
+						commentVOList.add(commentVO);
+					}
+				});
+
+				ProblemKnowledgeBaseCommentVO commentVO = new ProblemKnowledgeBaseCommentVO();
+				BeanUtils.copyProperties(commentEO, commentVO);
+				commentVO.setProblemKnowledgeBaseCommentVOList(commentVOList);
+				result.add(commentVO);
+			});
+		}
+		return result;
+	}
 }
@@ -0,0 +1,62 @@
+package com.jero.modules.problemKnowledgeBase.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="problem_knowledge_base_comment对象", description="问题知识库评论表")
+public class ProblemKnowledgeBaseCommentVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @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*/
+    @ApiModelProperty(value = "问题知识库id")
+    private java.lang.String problemKnowledgeBaseId;
+
+    /**评论内容*/
+    @ApiModelProperty(value = "评论内容")
+    private java.lang.String commentContent;
+
+    /**评论用户id*/
+    @ApiModelProperty(value = "评论用户id")
+    private java.lang.String commentUserId;
+
+    private List<ProblemKnowledgeBaseCommentVO> problemKnowledgeBaseCommentVOList;
+}
@@ -0,0 +1,170 @@
+package com.jero.modules.project.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.project.entity.ProblemKnowledgeBaseReplyEO;
+import com.jero.modules.project.service.IProblemKnowledgeBaseReplyEOService;
+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-09-07
+ * @Version: V1.0
+ */
+@Api(tags="问题知识库-评论回复表")
+@RestController
+@RequestMapping("/project/problemKnowledgeBaseReplyEO")
+@Slf4j
+public class ProblemKnowledgeBaseReplyEOController extends JeroController<ProblemKnowledgeBaseReplyEO, IProblemKnowledgeBaseReplyEOService> {
+	@Autowired
+	private IProblemKnowledgeBaseReplyEOService problemKnowledgeBaseReplyEOService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param problemKnowledgeBaseReplyEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "问题知识库-评论回复表-分页列表查询")
+	@ApiOperation(value="问题知识库-评论回复表-分页列表查询", notes="问题知识库-评论回复表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProblemKnowledgeBaseReplyEO problemKnowledgeBaseReplyEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProblemKnowledgeBaseReplyEO> queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseReplyEO, req.getParameterMap());
+		Page<ProblemKnowledgeBaseReplyEO> page = new Page<ProblemKnowledgeBaseReplyEO>(pageNo, pageSize);
+		IPage<ProblemKnowledgeBaseReplyEO> pageList = problemKnowledgeBaseReplyEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "问题知识库-评论回复表-列表查询")
+    @ApiOperation(value="问题知识库-评论回复表-列表查询", notes="问题知识库-评论回复表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProblemKnowledgeBaseReplyEO>> queryList() {
+        List<ProblemKnowledgeBaseReplyEO> list = problemKnowledgeBaseReplyEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param problemKnowledgeBaseReplyEO
+	 * @return
+	 */
+	@AutoLog(value = "问题知识库-评论回复表-添加")
+	@ApiOperation(value="问题知识库-评论回复表-添加", notes="问题知识库-评论回复表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProblemKnowledgeBaseReplyEO problemKnowledgeBaseReplyEO) {
+		problemKnowledgeBaseReplyEOService.add(problemKnowledgeBaseReplyEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param problemKnowledgeBaseReplyEO
+	 * @return
+	 */
+	@AutoLog(value = "问题知识库-评论回复表-编辑")
+	@ApiOperation(value="问题知识库-评论回复表-编辑", notes="问题知识库-评论回复表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProblemKnowledgeBaseReplyEO problemKnowledgeBaseReplyEO) {
+		problemKnowledgeBaseReplyEOService.editById(problemKnowledgeBaseReplyEO);
+		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) {
+		problemKnowledgeBaseReplyEOService.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.problemKnowledgeBaseReplyEOService.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) {
+		ProblemKnowledgeBaseReplyEO problemKnowledgeBaseReplyEO = problemKnowledgeBaseReplyEOService.queryById(id);
+		if(problemKnowledgeBaseReplyEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(problemKnowledgeBaseReplyEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param problemKnowledgeBaseReplyEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseReplyEO problemKnowledgeBaseReplyEO) {
+        return super.exportXls(request, problemKnowledgeBaseReplyEO, ProblemKnowledgeBaseReplyEO.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, ProblemKnowledgeBaseReplyEO.class);
+    }
+
+}
@@ -0,0 +1,74 @@
+package com.jero.modules.project.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-09-07
+ * @Version: V1.0
+ */
+@Data
+@TableName("problem_knowledge_base_reply")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="problem_knowledge_base_reply对象", description="问题知识库-评论回复表")
+public class ProblemKnowledgeBaseReplyEO 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 commentId;
+
+	/**回复内容*/
+	@Excel(name = "回复内容", width = 15)
+    @ApiModelProperty(value = "回复内容")
+    private java.lang.String replyContent;
+
+}
@@ -0,0 +1,17 @@
+package com.jero.modules.project.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.project.entity.ProblemKnowledgeBaseReplyEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 问题知识库-评论回复表
+ * @Author: jero-boot
+ * @Date:   2022-09-07
+ * @Version: V1.0
+ */
+public interface ProblemKnowledgeBaseReplyEOMapper extends BaseMapper<ProblemKnowledgeBaseReplyEO> {
+
+}
@@ -0,0 +1,14 @@
+<?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.project.mapper.ProblemKnowledgeBaseReplyEOMapper">
+    <resultMap id="ProblemKnowledgeBaseReplyEOResultMap" type="com.jero.modules.project.entity.ProblemKnowledgeBaseReplyEO">
+        <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="comment_id" property="commentId" />
+        <result column="reply_content" property="replyContent" />
+    </resultMap>
+</mapper>
@@ -0,0 +1,61 @@
+package com.jero.modules.project.service;
+
+import com.jero.modules.project.entity.ProblemKnowledgeBaseReplyEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 问题知识库-评论回复表
+ * @Author: jero-boot
+ * @Date:   2022-09-07
+ * @Version: V1.0
+ */
+public interface IProblemKnowledgeBaseReplyEOService extends IService<ProblemKnowledgeBaseReplyEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param problemKnowledgeBaseReplyEO
+	 * @return
+	 */
+    void add(ProblemKnowledgeBaseReplyEO problemKnowledgeBaseReplyEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param problemKnowledgeBaseReplyEO
+	 * @return
+	 */
+    void editById(ProblemKnowledgeBaseReplyEO problemKnowledgeBaseReplyEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProblemKnowledgeBaseReplyEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProblemKnowledgeBaseReplyEO> queryList();
+}
@@ -0,0 +1,89 @@
+package com.jero.modules.project.service.impl;
+
+import com.jero.modules.project.entity.ProblemKnowledgeBaseReplyEO;
+import com.jero.modules.project.mapper.ProblemKnowledgeBaseReplyEOMapper;
+import com.jero.modules.project.service.IProblemKnowledgeBaseReplyEOService;
+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-09-07
+ * @Version: V1.0
+ */
+@Service
+public class ProblemKnowledgeBaseReplyEOServiceImpl extends ServiceImpl<ProblemKnowledgeBaseReplyEOMapper, ProblemKnowledgeBaseReplyEO> implements IProblemKnowledgeBaseReplyEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param problemKnowledgeBaseReplyEO
+	 * @return
+	 */
+	@Override
+    public void add(ProblemKnowledgeBaseReplyEO problemKnowledgeBaseReplyEO) {
+        Date now = new Date();
+        problemKnowledgeBaseReplyEO.setCreateTime(now);
+        problemKnowledgeBaseReplyEO.setUpdateTime(now);
+        save(problemKnowledgeBaseReplyEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param problemKnowledgeBaseReplyEO
+	 * @return
+	 */
+	@Override
+    public void editById(ProblemKnowledgeBaseReplyEO problemKnowledgeBaseReplyEO) {
+    	Date now = new Date();
+        problemKnowledgeBaseReplyEO.setUpdateTime(now);
+    	saveOrUpdate(problemKnowledgeBaseReplyEO);
+    }
+
+	/**
+	 * 通过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 ProblemKnowledgeBaseReplyEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ProblemKnowledgeBaseReplyEO> queryList() {
+        return list();
+    }
+}
@@ -216,6 +216,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	@Autowired
 	ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService;

+	@Autowired
+	private IProjectLawsInventoryRejectCauseEOService projectLawsInventoryRejectCauseEOService;
 	/**
 	 * 保存
 	 *
@@ -597,9 +599,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		removeById(id);
 		this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(Arrays.asList(id.split(",")));

-		QueryWrapper<ConditionAssessmentEO> removeWrapper = new QueryWrapper<>();
-		removeWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,id);
-		this.conditionAssessmentEOService.remove(removeWrapper);
+		//删除该条法规清单数据的 项目当前状态数据
+		QueryWrapper<ConditionAssessmentEO> conditionAssessmentRemoveWrapper = new QueryWrapper<>();
+		conditionAssessmentRemoveWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,id);
+		this.conditionAssessmentEOService.remove(conditionAssessmentRemoveWrapper);
+		//删除该条法规清单数据的拒绝原因。
+		QueryWrapper<ProjectLawsInventoryRejectCauseEO> rejectCauseRemoveWrapper = new QueryWrapper<>();
+		rejectCauseRemoveWrapper.lambda().eq(ProjectLawsInventoryRejectCauseEO::getProjectLawsInventoryId,id);
+		this.projectLawsInventoryRejectCauseEOService.remove(rejectCauseRemoveWrapper);
 	}

 	/**
@@ -635,9 +642,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		removeByIds(ids);
 		this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids);

-		QueryWrapper<ConditionAssessmentEO> removeWrapper = new QueryWrapper<>();
-		removeWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,ids);
-		this.conditionAssessmentEOService.remove(removeWrapper);
+		//删除该条法规清单数据的 项目当前状态数据
+		QueryWrapper<ConditionAssessmentEO> conditionAssessmentRemoveWrapper = new QueryWrapper<>();
+		conditionAssessmentRemoveWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,ids);
+		this.conditionAssessmentEOService.remove(conditionAssessmentRemoveWrapper);
+
+		//删除该条法规清单数据的拒绝原因。
+		QueryWrapper<ProjectLawsInventoryRejectCauseEO> rejectCauseRemoveWrapper = new QueryWrapper<>();
+		rejectCauseRemoveWrapper.lambda().in(ProjectLawsInventoryRejectCauseEO::getProjectLawsInventoryId,ids);
+		this.projectLawsInventoryRejectCauseEOService.remove(rejectCauseRemoveWrapper);
 	}

 	/**
@@ -1385,14 +1398,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						projectLawsInventoryEO.setInventoryAffirmStatus(InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
 						projectLawsInventoryEO.setInventoryAffirmDueDate(sdf.parse(inventoryAffirmDueDate));
 						LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
-						updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus,null);
-						updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null);
 						updateWrapper.eq(ProjectLawsInventoryEO::getId,projectLawsInventoryEO.getId());
-						super.update(projectLawsInventoryEO, updateWrapper);
-
-						userIdList.add(projectLawsInventoryEO.getHomologationEngineerId());
-						userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
+						//认证工程师标识 如果认证工程师提交状态为空， 或认证工程师拒绝过，给认证工程师任务，让他处理
+						boolean homologationEngineerFlag = (
+								StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())
+										|| StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(),"1")
+						);
+						//法规工程师标识 如果法规工程师提交状态为空， 或法规工程师拒绝过，给法规工程师任务，让他处理
+						boolean regulationOwnerFlag = (
+								StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())
+										|| StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(),"1")
+						);
+						if(homologationEngineerFlag){
+							updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null);
+							userIdList.add(projectLawsInventoryEO.getHomologationEngineerId());
+						}
+						if(regulationOwnerFlag){
+							updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus,null);
+							userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
+						}

+						if(homologationEngineerFlag || regulationOwnerFlag){
+							super.update(projectLawsInventoryEO, updateWrapper);
+						}
 					}
 				}

@@ -222,7 +222,7 @@
        dataSource: [],
        pageNo: 1,
        pageSize: 10,
-        pageSizeOptions: ['10', '20','30', '50'],
+        pageSizeOptions: ['100', '200'],
        total: 0,
        searchParmes: {},
        loading: false,