Merge remote-tracking branch 'origin/master'

2022-04-29 18:27:49 +08:00
parent 9576a62f01 5430b056bf
commit 40993e0495
65 changed files with 3075 additions and 226 deletions
@@ -4267,6 +4267,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi


                        } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldShowType)) {
+                            value = value.replaceAll("/","-");
                            //单选日期
                            //判断是否必填
                            if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
@@ -484,10 +484,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				}
 			}

-			//对应标准 iBussDocumentLibraryEOService
-			LambdaQueryWrapper<BussDocumentLibraryEO> wrapperTemp = new LambdaQueryWrapper<>();
-			wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet);
-			List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp);
+			List<BussDocumentLibraryEO> bussDocumentLibraryEOList = new ArrayList<>();
+			if(correspondingStandardSet.size() != 0){
+				//对应标准 iBussDocumentLibraryEOService
+				LambdaQueryWrapper<BussDocumentLibraryEO> wrapperTemp = new LambdaQueryWrapper<>();
+				wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet);
+				bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp);
+			}
+



@@ -801,7 +805,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		List<SysCategory> categoryList = sysCategoryService.list();
 		//普通数据字典
 		List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
-		importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,dummyInventoryInfoEO.getCut());
+		importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,dummyInventoryInfoEO);
 		//删除原上传文件
 		FileUnZip.deleteDir(saveDirectory);

@@ -813,17 +817,17 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 							 List<SysDictItem> dictItemList,
 							 String zipEntryName,
 							 File saveDirectory,
-							 String cut) {
+							 DummyInventoryInfoEO dummyInventoryInfoEOTemp) {
 		int i = 3;
 		List<String> msgList = new ArrayList<>();
 		String value = "";
 		boolean flag = true;
 		//编号验证
-		List<BussDocumentLibraryEO> bussDocumentLibraryEOList = verifySerialNumber(dataList);
+		List<BussDocumentLibraryEO> bussDocumentLibraryEOList = verifySerialNumber(dataList,dummyInventoryInfoEOTemp);
 		for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) {
 			i++;
 			String errorMsg = "";
-			if(CutEnum.CN.getValue().equals(cut)){
+			if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){
 				errorMsg = "第" + i + "行：";
 			}else{
 				errorMsg = i + " line：";
@@ -998,7 +1002,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		}
 	}

-	private List<BussDocumentLibraryEO> verifySerialNumber(List<DummyInventoryInfoEO> dataList) {
+	private List<BussDocumentLibraryEO> verifySerialNumber(List<DummyInventoryInfoEO> dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) {
 		//文档库数据
 		List<String> serialNumberList = dataList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
 		LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
@@ -1009,8 +1013,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI

 		//虚拟清单数据
 		LambdaQueryWrapper<DummyInventoryInfoEO> wrapperTemp = new LambdaQueryWrapper<>();
-		wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList);
+		wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId());
 		List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(wrapperTemp);
+		List<String> serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
 		if(serialNumberList.size() != serialNumberListTemp.size()){
 			//存在文档库没有的数据
 			List<String> collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
@@ -1023,9 +1028,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		}
 		if(dummyInventoryInfoEOList.size() > 0){
 			if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){
-				throw new JeroBootException(StringUtils.join(serialNumberList,",")+"已存在,不能重复添加");
+				throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加");
 			}else{
-				throw new JeroBootException(StringUtils.join(serialNumberList,",")+" already exists and cannot be added again");
+				throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again");
 			}
 		}
 		//通过编号将导入的数据与文档库进行关联
@@ -0,0 +1,171 @@
+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.ProjectCommentEO;
+import com.jero.modules.project.service.IProjectCommentEOService;
+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.project.vo.ProjectCommentVO;
+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-04-29
+ * @Version: V1.0
+ */
+@Api(tags="法规清单评论表")
+@RestController
+@RequestMapping("/project/projectCommentEO")
+@Slf4j
+public class ProjectCommentEOController extends JeroController<ProjectCommentEO, IProjectCommentEOService> {
+	@Autowired
+	private IProjectCommentEOService projectCommentEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectCommentEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规清单评论表-分页列表查询")
+	@ApiOperation(value="法规清单评论表-分页列表查询", notes="法规清单评论表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectCommentEO projectCommentEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectCommentEO> queryWrapper = QueryGenerator.initQueryWrapper(projectCommentEO, req.getParameterMap());
+		Page<ProjectCommentEO> page = new Page<ProjectCommentEO>(pageNo, pageSize);
+		IPage<ProjectCommentEO> pageList = projectCommentEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规清单评论表-列表查询")
+    @ApiOperation(value="法规清单评论表-列表查询", notes="法规清单评论表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectCommentVO>> queryList(ProjectCommentEO projectCommentEO) {
+        List<ProjectCommentVO> list = projectCommentEOService.getInfoList(projectCommentEO);
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectCommentEO
+	 * @return
+	 */
+	@AutoLog(value = "法规清单评论表-添加")
+	@ApiOperation(value="法规清单评论表-添加", notes="法规清单评论表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectCommentEO projectCommentEO) {
+		projectCommentEOService.add(projectCommentEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectCommentEO
+	 * @return
+	 */
+	@AutoLog(value = "法规清单评论表-编辑")
+	@ApiOperation(value="法规清单评论表-编辑", notes="法规清单评论表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectCommentEO projectCommentEO) {
+		projectCommentEOService.editById(projectCommentEO);
+		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) {
+		projectCommentEOService.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.projectCommentEOService.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) {
+		ProjectCommentEO projectCommentEO = projectCommentEOService.queryById(id);
+		if(projectCommentEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectCommentEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectCommentEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectCommentEO projectCommentEO) {
+        return super.exportXls(request, projectCommentEO, ProjectCommentEO.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, ProjectCommentEO.class);
+    }
+
+}
@@ -0,0 +1,175 @@
+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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectHistoryVersionsEO;
+import com.jero.modules.project.service.IProjectHistoryVersionsEOService;
+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-04-29
+ * @Version: V1.0
+ */
+@Api(tags="法规清单历史版本表")
+@RestController
+@RequestMapping("/project/projectHistoryVersionsEO")
+@Slf4j
+public class ProjectHistoryVersionsEOController extends JeroController<ProjectHistoryVersionsEO, IProjectHistoryVersionsEOService> {
+	@Autowired
+	private IProjectHistoryVersionsEOService projectHistoryVersionsEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectHistoryVersionsEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规清单历史版本表-分页列表查询")
+	@ApiOperation(value="法规清单历史版本表-分页列表查询", notes="法规清单历史版本表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectHistoryVersionsEO projectHistoryVersionsEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectHistoryVersionsEO> queryWrapper = QueryGenerator.initQueryWrapper(projectHistoryVersionsEO, req.getParameterMap());
+		Page<ProjectHistoryVersionsEO> page = new Page<ProjectHistoryVersionsEO>(pageNo, pageSize);
+		IPage<ProjectHistoryVersionsEO> pageList = projectHistoryVersionsEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规清单历史版本表-列表查询")
+    @ApiOperation(value="法规清单历史版本表-列表查询", notes="法规清单历史版本表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectHistoryVersionsEO>> queryList(ProjectHistoryVersionsEO projectHistoryVersionsEO) {
+		LambdaQueryWrapper<ProjectHistoryVersionsEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(ProjectHistoryVersionsEO::getProjectLibraryId,projectHistoryVersionsEO.getProjectLibraryId());
+		wrapper.orderByDesc(ProjectHistoryVersionsEO::getCreateTime);
+        List<ProjectHistoryVersionsEO> list = projectHistoryVersionsEOService.list(wrapper);
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectHistoryVersionsEO
+	 * @return
+	 */
+	@AutoLog(value = "法规清单历史版本表-添加")
+	@ApiOperation(value="法规清单历史版本表-添加", notes="法规清单历史版本表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectHistoryVersionsEO projectHistoryVersionsEO) {
+		projectHistoryVersionsEOService.add(projectHistoryVersionsEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectHistoryVersionsEO
+	 * @return
+	 */
+	@AutoLog(value = "法规清单历史版本表-编辑")
+	@ApiOperation(value="法规清单历史版本表-编辑", notes="法规清单历史版本表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectHistoryVersionsEO projectHistoryVersionsEO) {
+		projectHistoryVersionsEOService.editById(projectHistoryVersionsEO);
+		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) {
+		projectHistoryVersionsEOService.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.projectHistoryVersionsEOService.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) {
+		ProjectHistoryVersionsEO projectHistoryVersionsEO = projectHistoryVersionsEOService.queryById(id);
+		if(projectHistoryVersionsEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectHistoryVersionsEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectHistoryVersionsEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectHistoryVersionsEO projectHistoryVersionsEO) {
+        return super.exportXls(request, projectHistoryVersionsEO, ProjectHistoryVersionsEO.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, ProjectHistoryVersionsEO.class);
+    }
+
+}
@@ -326,7 +326,7 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 		 QueryWrapper<DummyInventoryBaseEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryBaseEO, req.getParameterMap());
 		 queryWrapper.orderByDesc("create_time");
 		 Page<DummyInventoryBaseEO> page = new Page<DummyInventoryBaseEO>(pageNo, pageSize);
-		 IPage<DummyInventoryBaseEO> pageList = dummyInventoryBaseEOService.getPageInfo(page,queryWrapper);
+		 IPage<DummyInventoryBaseEO> pageList = dummyInventoryBaseEOService.getPageInfoDummy(page,queryWrapper);
 		 return Result.OK(dummyInventoryBaseEO.getCut(),pageList);
 	 }

@@ -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.ProjectReplyEO;
+import com.jero.modules.project.service.IProjectReplyEOService;
+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-04-29
+ * @Version: V1.0
+ */
+@Api(tags="法规清单回复表")
+@RestController
+@RequestMapping("/project/projectReplyEO")
+@Slf4j
+public class ProjectReplyEOController extends JeroController<ProjectReplyEO, IProjectReplyEOService> {
+	@Autowired
+	private IProjectReplyEOService projectReplyEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectReplyEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规清单回复表-分页列表查询")
+	@ApiOperation(value="法规清单回复表-分页列表查询", notes="法规清单回复表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectReplyEO projectReplyEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectReplyEO> queryWrapper = QueryGenerator.initQueryWrapper(projectReplyEO, req.getParameterMap());
+		Page<ProjectReplyEO> page = new Page<ProjectReplyEO>(pageNo, pageSize);
+		IPage<ProjectReplyEO> pageList = projectReplyEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规清单回复表-列表查询")
+    @ApiOperation(value="法规清单回复表-列表查询", notes="法规清单回复表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectReplyEO>> queryList() {
+        List<ProjectReplyEO> list = projectReplyEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectReplyEO
+	 * @return
+	 */
+	@AutoLog(value = "法规清单回复表-添加")
+	@ApiOperation(value="法规清单回复表-添加", notes="法规清单回复表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody ProjectReplyEO projectReplyEO) {
+		projectReplyEOService.add(projectReplyEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectReplyEO
+	 * @return
+	 */
+	@AutoLog(value = "法规清单回复表-编辑")
+	@ApiOperation(value="法规清单回复表-编辑", notes="法规清单回复表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectReplyEO projectReplyEO) {
+		projectReplyEOService.editById(projectReplyEO);
+		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) {
+		projectReplyEOService.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.projectReplyEOService.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) {
+		ProjectReplyEO projectReplyEO = projectReplyEOService.queryById(id);
+		if(projectReplyEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectReplyEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectReplyEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectReplyEO projectReplyEO) {
+        return super.exportXls(request, projectReplyEO, ProjectReplyEO.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, ProjectReplyEO.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-04-29
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_comment")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_comment对象", description="法规清单评论表")
+public class ProjectCommentEO 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 projectLibraryId;
+
+	/**评论内容*/
+	@Excel(name = "评论内容", width = 15)
+    @ApiModelProperty(value = "评论内容")
+    private java.lang.String commentContent;
+
+}
@@ -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-04-29
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_history_versions")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_history_versions对象", description="法规清单历史版本表")
+public class ProjectHistoryVersionsEO 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 versionsName;
+
+	/**项目库id*/
+	@Excel(name = "项目库id", width = 15)
+    @ApiModelProperty(value = "项目库id")
+    private java.lang.String projectLibraryId;
+
+}
@@ -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-04-29
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_reply")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_reply对象", description="法规清单回复表")
+public class ProjectReplyEO 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 projectCommentId;
+
+	/**回复内容*/
+	@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.ProjectCommentEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规清单评论表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+public interface ProjectCommentEOMapper extends BaseMapper<ProjectCommentEO> {
+
+}
@@ -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.ProjectHistoryVersionsEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规清单历史版本表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+public interface ProjectHistoryVersionsEOMapper extends BaseMapper<ProjectHistoryVersionsEO> {
+
+}
@@ -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.ProjectReplyEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规清单回复表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+public interface ProjectReplyEOMapper extends BaseMapper<ProjectReplyEO> {
+
+}
@@ -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.ProjectCommentEOMapper">
+    <resultMap id="ProjectCommentEOResultMap" type="com.jero.modules.project.entity.ProjectCommentEO">
+        <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="project_library_id" property="projectLibraryId" />
+        <result column="comment_content" property="commentContent" />
+    </resultMap>
+</mapper>
@@ -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.ProjectHistoryVersionsEOMapper">
+    <resultMap id="ProjectHistoryVersionsEOResultMap" type="com.jero.modules.project.entity.ProjectHistoryVersionsEO">
+        <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="versions_name" property="versionsName" />
+        <result column="project_library_id" property="projectLibraryId" />
+    </resultMap>
+</mapper>
@@ -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.ProjectReplyEOMapper">
+    <resultMap id="ProjectReplyEOResultMap" type="com.jero.modules.project.entity.ProjectReplyEO">
+        <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="project_comment_id" property="projectCommentId" />
+        <result column="reply_content" property="replyContent" />
+    </resultMap>
+</mapper>
@@ -0,0 +1,66 @@
+package com.jero.modules.project.service;
+
+import com.jero.modules.project.entity.ProjectCommentEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.project.vo.ProjectCommentVO;
+
+import java.util.List;
+
+/**
+ * @Description: 法规清单评论表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+public interface IProjectCommentEOService extends IService<ProjectCommentEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectCommentEO
+	 * @return
+	 */
+    void add(ProjectCommentEO projectCommentEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectCommentEO
+	 * @return
+	 */
+    void editById(ProjectCommentEO projectCommentEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectCommentEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectCommentEO> queryList();
+
+
+	List<ProjectCommentVO> getInfoList(ProjectCommentEO projectCommentEO);
+}
@@ -0,0 +1,61 @@
+package com.jero.modules.project.service;
+
+import com.jero.modules.project.entity.ProjectHistoryVersionsEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 法规清单历史版本表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+public interface IProjectHistoryVersionsEOService extends IService<ProjectHistoryVersionsEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectHistoryVersionsEO
+	 * @return
+	 */
+    void add(ProjectHistoryVersionsEO projectHistoryVersionsEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectHistoryVersionsEO
+	 * @return
+	 */
+    void editById(ProjectHistoryVersionsEO projectHistoryVersionsEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectHistoryVersionsEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectHistoryVersionsEO> queryList();
+}
@@ -0,0 +1,61 @@
+package com.jero.modules.project.service;
+
+import com.jero.modules.project.entity.ProjectReplyEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 法规清单回复表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+public interface IProjectReplyEOService extends IService<ProjectReplyEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectReplyEO
+	 * @return
+	 */
+    void add(ProjectReplyEO projectReplyEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectReplyEO
+	 * @return
+	 */
+    void editById(ProjectReplyEO projectReplyEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectReplyEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectReplyEO> queryList();
+}
@@ -0,0 +1,145 @@
+package com.jero.modules.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.project.entity.ProjectCommentEO;
+import com.jero.modules.project.entity.ProjectReplyEO;
+import com.jero.modules.project.mapper.ProjectCommentEOMapper;
+import com.jero.modules.project.service.IProjectCommentEOService;
+import com.jero.modules.project.service.IProjectReplyEOService;
+import com.jero.modules.project.vo.ProjectCommentVO;
+import org.apache.shiro.SecurityUtils;
+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;
+
+/**
+ * @Description: 法规清单评论表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+@Service
+public class ProjectCommentEOServiceImpl extends ServiceImpl<ProjectCommentEOMapper, ProjectCommentEO> implements IProjectCommentEOService {
+
+	@Autowired
+	private IProjectReplyEOService iProjectReplyEOService;
+	/**
+	 * 保存
+	 *
+	 * @param projectCommentEO
+	 * @return
+	 */
+	@Override
+    public void add(ProjectCommentEO projectCommentEO) {
+        Date now = new Date();
+        projectCommentEO.setCreateTime(now);
+        projectCommentEO.setUpdateTime(now);
+        save(projectCommentEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param projectCommentEO
+	 * @return
+	 */
+	@Override
+    public void editById(ProjectCommentEO projectCommentEO) {
+    	Date now = new Date();
+        projectCommentEO.setUpdateTime(now);
+    	saveOrUpdate(projectCommentEO);
+    }
+
+	/**
+	 * 通过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 ProjectCommentEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ProjectCommentEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public List<ProjectCommentVO> getInfoList(ProjectCommentEO projectCommentEOTemp) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		//评论的内容
+		LambdaQueryWrapper<ProjectCommentEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(ProjectCommentEO::getCreateBy,sysUser.getUsername()).in(ProjectCommentEO::getProjectLibraryId,projectCommentEOTemp.getProjectLibraryId());
+		wrapper.orderByDesc(ProjectCommentEO::getCreateTime);
+		List<ProjectCommentEO> projectCommentEOS = this.list(wrapper);
+		List<String> projectCommentIdList = projectCommentEOS.stream().map(ProjectCommentEO::getId).collect(Collectors.toList());
+
+		List<ProjectCommentVO> projectCommentVOList = new ArrayList<>();
+		if(projectCommentIdList.size() != 0){
+			//回复的内容
+			LambdaQueryWrapper<ProjectReplyEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.in(ProjectReplyEO::getProjectCommentId,projectCommentIdList);
+			List<ProjectReplyEO> projectReplyEOList = iProjectReplyEOService.list(lambdaQueryWrapper);
+			//封装数据
+			for (ProjectCommentEO projectCommentEO : projectCommentEOS) {
+				//每条评论对应的回复
+				List<ProjectReplyEO> projectReplyEOS = projectReplyEOList.stream()
+						.filter(e -> projectCommentEO.getId().equals(e.getProjectCommentId())).collect(Collectors.toList());
+				ProjectCommentVO projectCommentVO = new ProjectCommentVO();
+				projectCommentVO.setId(projectCommentEO.getId());
+				projectCommentVO.setName(projectCommentEO.getCreateBy());
+				projectCommentVO.setCreateTime(projectCommentEO.getCreateTime());
+				projectCommentVO.setContent(projectCommentEO.getCommentContent());
+				List<ProjectCommentVO> projectCommentVOS = new ArrayList<>();
+				if(projectReplyEOS.size() != 0){
+					for (ProjectReplyEO projectReplyEO : projectReplyEOS) {
+						ProjectCommentVO projectCommentVOTemp = new ProjectCommentVO();
+						projectCommentVOTemp.setName(projectReplyEO.getCreateBy());
+						projectCommentVOTemp.setCreateTime(projectReplyEO.getCreateTime());
+						projectCommentVOTemp.setContent(projectReplyEO.getReplyContent());
+						projectCommentVOS.add(projectCommentVOTemp);
+					}
+					projectCommentVO.setProjectCommentVOList(projectCommentVOS);
+				}
+				projectCommentVOList.add(projectCommentVO);
+			}
+		}
+		return projectCommentVOList;
+	}
+}
@@ -0,0 +1,89 @@
+package com.jero.modules.project.service.impl;
+
+import com.jero.modules.project.entity.ProjectHistoryVersionsEO;
+import com.jero.modules.project.mapper.ProjectHistoryVersionsEOMapper;
+import com.jero.modules.project.service.IProjectHistoryVersionsEOService;
+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-04-29
+ * @Version: V1.0
+ */
+@Service
+public class ProjectHistoryVersionsEOServiceImpl extends ServiceImpl<ProjectHistoryVersionsEOMapper, ProjectHistoryVersionsEO> implements IProjectHistoryVersionsEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectHistoryVersionsEO
+	 * @return
+	 */
+	@Override
+    public void add(ProjectHistoryVersionsEO projectHistoryVersionsEO) {
+        Date now = new Date();
+        projectHistoryVersionsEO.setCreateTime(now);
+        projectHistoryVersionsEO.setUpdateTime(now);
+        save(projectHistoryVersionsEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param projectHistoryVersionsEO
+	 * @return
+	 */
+	@Override
+    public void editById(ProjectHistoryVersionsEO projectHistoryVersionsEO) {
+    	Date now = new Date();
+        projectHistoryVersionsEO.setUpdateTime(now);
+    	saveOrUpdate(projectHistoryVersionsEO);
+    }
+
+	/**
+	 * 通过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 ProjectHistoryVersionsEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ProjectHistoryVersionsEO> queryList() {
+        return list();
+    }
+}
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.WebsocketConst;
@@ -24,7 +25,13 @@ import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectNameInfoEO;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
-import com.jero.modules.project.enums.*;
+import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
+import com.jero.modules.project.enums.MsgTypeEnum;
+import com.jero.modules.project.enums.OperatorResultEnum;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.ProjectRoleEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import com.jero.modules.project.enums.TaskAffirmStatusEnum;
 import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
@@ -44,15 +51,18 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;

-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import javax.servlet.http.HttpServletRequest;
-
 /**
 * @Description: 项目库-法规清单表
 * @Author: jero-boot
@@ -121,6 +131,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
 						projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
 						BeanUtils.copyProperties(dummyInventoryInfoEO,projectLawsInventoryEOTemp);
+						projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
+						projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+						projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
 						projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
 					}
 				}else{
@@ -139,6 +152,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
 							projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
 							BeanUtils.copyProperties(dummyInventoryInfoEO,projectLawsInventoryEOTemp);
+							projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
+							projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+							projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
 							projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
 						}
 					}
@@ -13,7 +13,6 @@ import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.project.util.ExcelLangUtils;
 import com.jero.modules.system.entity.SysUser;
-import com.jero.modules.system.mapper.SysDictItemMapper;
 import com.jero.modules.system.mapper.SysDictMapper;
 import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.ISysDictService;
@@ -60,8 +59,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat

 	@Autowired
 	private SysDictMapper sysDictMapper;
-	@Autowired
-	private SysDictItemMapper sysDictItemMapper;

 	/**
 	 * 保存
@@ -382,11 +379,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		try {
 			//中英切换
 			if(CutEnum.CN.getValue().equals(cut)) {
-				exportParams=new ExportParams(title , "导出人:" + sysUser.getUsername(), title);
+				exportParams=new ExportParams(title , null, title);
 				mv.addObject(NormalExcelConstants.CLASS, ExcelLangUtils.chooseLang(clazz, CutEnum.CN.getValue()));
 			}
 			else {
-				exportParams=new ExportParams(title , "Exporter:" + sysUser.getUsername(), title);
+				exportParams=new ExportParams(title , null, title);
 				mv.addObject(NormalExcelConstants.CLASS, ExcelLangUtils.chooseLang(clazz, CutEnum.EN.getValue()));
 			}

@@ -408,30 +405,23 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 	 */
 	@Override
 	public ModelAndView setExporTemplate(HttpServletRequest request, Class<ProjectRelatedPersonnel> clazz, String title,String cut){
-		List<ProjectRelatedPersonnel> records = new ArrayList<>();;
-
+		List<ProjectRelatedPersonnel> records=new ArrayList<>();
+//		ProjectRelatedPersonnel projectRelatedPersonnel=new ProjectRelatedPersonnel();
 		// Step.1 组装查询条件
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		ExportParams exportParams=null;
 		// Step.2 AutoPoi 导出Excel
 		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
 		try {
-			String fillingExplanationCN="填写说明\n" +
-					"1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n" +
-					"2.所有带*号的字段必须填写\n" +
-					"3.填写人员时，必须使用人员账号进行填写。\n" +
-					"4.填写的人员账号必须与系统中账号保持一致";
 			//中英切换模板
-		/*	if(CutEnum.CN.getValue().equals(cut)) {
-
-				exportParams=new ExportParams(title , fillingExplanationCN, title);
+			if(CutEnum.CN.getValue().equals(cut)) {
+				//projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getName());
+				exportParams=new ExportParams(title , null, title);
 			}else{
-
-				exportParams=new ExportParams(title , ExportTemplateEnum.FILLING_EXPLANATION_EN.getName(), title);
-			}*/
-			exportParams=new ExportParams();
-			exportParams.setSheetName(title);
-			//查标签内容里的责任领域数据
+				//projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getValue());
+				exportParams=new ExportParams(title , null, title);
+			}
+//查标签内容里的责任领域数据
 			List<String> dictItemNameList = sysDictMapper.queryDictNameByCode(DictCodeEnum.DUTY_TERRITORY.getValue());
 			//新建相关人员表里的责任领域数据
 			if (CollectionUtils.isNotEmpty(dictItemNameList)) {
@@ -441,7 +431,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					records.add(projectRelatedPersonnel);
 				}
 			}
-
 			mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
 			mv.addObject(NormalExcelConstants.CLASS, clazz);//!!!!这里设置中英切换
 			mv.addObject(NormalExcelConstants.PARAMS,exportParams);
@@ -466,7 +455,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
 			MultipartFile file = entity.getValue();// 获取上传文件对象
 			ImportParams params = new ImportParams();
-			params.setTitleRows(2);
+			params.setTitleRows(1);
 			params.setHeadRows(1);
 			params.setNeedSave(true);
 			try {
@@ -0,0 +1,89 @@
+package com.jero.modules.project.service.impl;
+
+import com.jero.modules.project.entity.ProjectReplyEO;
+import com.jero.modules.project.mapper.ProjectReplyEOMapper;
+import com.jero.modules.project.service.IProjectReplyEOService;
+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-04-29
+ * @Version: V1.0
+ */
+@Service
+public class ProjectReplyEOServiceImpl extends ServiceImpl<ProjectReplyEOMapper, ProjectReplyEO> implements IProjectReplyEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectReplyEO
+	 * @return
+	 */
+	@Override
+    public void add(ProjectReplyEO projectReplyEO) {
+        Date now = new Date();
+        projectReplyEO.setCreateTime(now);
+        projectReplyEO.setUpdateTime(now);
+        save(projectReplyEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param projectReplyEO
+	 * @return
+	 */
+	@Override
+    public void editById(ProjectReplyEO projectReplyEO) {
+    	Date now = new Date();
+        projectReplyEO.setUpdateTime(now);
+    	saveOrUpdate(projectReplyEO);
+    }
+
+	/**
+	 * 通过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 ProjectReplyEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ProjectReplyEO> queryList() {
+        return list();
+    }
+}
@@ -198,6 +198,14 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 		}
 		// 排序
 		Collections.sort(timeNodeVOS, listConfirmationVO);
+		//设置在已过时,和未发生之间的数据的状态为进行中
+		for(int i=0;i<timeNodeVOS.size();i++){
+			if(timeNodeVOS.get(i).getStatus().equals(PlanStatusEnum.OUT_OF_DATE.getValue())
+					&& timeNodeVOS.get(i+1).getStatus().equals(PlanStatusEnum.LESS_THAN_TIME.getValue())){
+				timeNodeVOS.get(i+1).setStatus(PlanStatusEnum.ON_GOING.getValue());
+			}
+
+		}
 		return timeNodeVOS;
 	}

@@ -0,0 +1,52 @@
+package com.jero.modules.project.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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.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-04-29
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_comment对象", description="法规清单评论表")
+public class ProjectCommentVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "评论人或回复人")
+    private String name;
+
+
+	@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 String content;
+
+    private List<ProjectCommentVO> ProjectCommentVOList;
+
+
+
+}
@@ -83,6 +83,7 @@ import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -917,6 +918,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                        itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
                        itemsMap.put(dbFieldName, StringUtils.join(names,","));

+                    } else { // TODO 可能是只有机构id, 也可能是错误数据
+                        itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
+                        itemsMap.put(dbFieldName, null);
                    }
                }
            }
@@ -1731,12 +1735,18 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                    }
                    String cellValue = null;

-                    if (cell.getCellTypeEnum().equals("NUMERIC") && HSSFDateUtil.isCellDateFormatted(cell)) {
+                    if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) {
                        // 获取日期类型的单元格的值
                        Date d = cell.getDateCellValue();
                        // 进行格式转换
-                        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-                        cellValue = formatter.format(d);
+                        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+                        cellValue = df.format(d);
+                        map.put(dbfieldList.get(y), cellValue);
+                        if (map.get(dbfieldList.get(y)) == null || "".equals(map.get(dbfieldList.get(y)))) {
+                            a++;
+                        }
+                        continue;
+
                    } else {
                        //设置单元格类型
                        cell.setCellType(CellType.STRING);