From 5f74c0968fc4bee1f386c7990a7bd1ef4a83bdc0 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 5 Aug 2022 09:54:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E5=A2=9E=E5=8A=A0=E8=B0=83=E6=95=B4=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E9=A2=86=E5=9F=9F=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/AdjustareaSofrespon/index.vue | 374 ++++++++++++++++++ .../ParameterItemCollectionList.vue | 27 +- 4 files changed, 402 insertions(+), 1 deletion(-) create mode 100644 jero-web/src/components/AdjustareaSofrespon/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b1946fe76..0c905a520 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1238,4 +1238,5 @@ module.exports = { share: 'share', simplifiedChinese:'Simplified Chinese', uploadOnly:'Upload only', + Adjustareasofresponsibility:'Adjust areas of responsibility', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 85ff24ea2..23830184a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1341,4 +1341,5 @@ module.exports = { share:'分享', simplifiedChinese:'简体中文', uploadOnly:'只能上传', + Adjustareasofresponsibility:'调整责任领域', } \ No newline at end of file diff --git a/jero-web/src/components/AdjustareaSofrespon/index.vue b/jero-web/src/components/AdjustareaSofrespon/index.vue new file mode 100644 index 000000000..052fd8850 --- /dev/null +++ b/jero-web/src/components/AdjustareaSofrespon/index.vue @@ -0,0 +1,374 @@ + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index d8debd3ca..b9b69a267 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -163,6 +163,10 @@ {{$t('bringInTheProjectInterface')}} +
+ + {{$t('Adjustareasofresponsibility')}} +
...{{ $t('more') }} @@ -295,7 +299,12 @@ @GetgetTableList='GetgetTableList' @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/> - + + + + Date: Fri, 5 Aug 2022 09:57:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E5=85=A8=E6=96=87=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3-=E6=B7=BB=E5=8A=A0key=E5=92=8Ctitle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarFileCompareDetailVO.java | 50 ++++++++++++------- .../compare/entity/SarFileCompareMenuVo.java | 21 ++++++++ .../impl/SarFileCompareInfoServiceImpl.java | 6 +-- 3 files changed, 56 insertions(+), 21 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java index d93762946..f5508600c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java @@ -12,9 +12,9 @@ public class SarFileCompareDetailVO { private String fileNameRight; private String remark; private String comments; - private SarFileCompareMenuVo menuLeft; + private List menuLeft; private List textLeft; - private SarFileCompareMenuVo menuRight; + private List menuRight; private List textRight; public String getInfoId() { @@ -73,14 +73,6 @@ public class SarFileCompareDetailVO { this.comments = comments; } - public SarFileCompareMenuVo getMenuLeft() { - return menuLeft; - } - - public void setMenuLeft(SarFileCompareMenuVo menuLeft) { - this.menuLeft = menuLeft; - } - public List getTextLeft() { return textLeft; } @@ -96,14 +88,6 @@ public class SarFileCompareDetailVO { this.textLeft.add(text); } - public SarFileCompareMenuVo getMenuRight() { - return menuRight; - } - - public void setMenuRight(SarFileCompareMenuVo menuRight) { - this.menuRight = menuRight; - } - public List getTextRight() { return textRight; } @@ -118,4 +102,34 @@ public class SarFileCompareDetailVO { } this.textRight.add(text); } + + public List getMenuLeft() { + return menuLeft; + } + + public void setMenuLeft(List menuLeft) { + this.menuLeft = menuLeft; + } + + public void addMenuLeft(SarFileCompareMenuVo menu) { + if (this.menuLeft == null) { + this.menuLeft = new ArrayList<>(); + } + this.menuLeft.add(menu); + } + + public List getMenuRight() { + return menuRight; + } + + public void setMenuRight(List menuRight) { + this.menuRight = menuRight; + } + + public void addMenuRight(SarFileCompareMenuVo menu) { + if (this.menuRight == null) { + this.menuRight = new ArrayList<>(); + } + this.menuRight.add(menu); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java index 18cee5103..669f9a217 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java @@ -4,11 +4,15 @@ import java.util.ArrayList; import java.util.List; public class SarFileCompareMenuVo extends SarFileCompareMenu { + private String key; + private String title; + private List children; public SarFileCompareMenuVo(SarFileCompareMenu menu) { super(); this.setId(menu.getId()); + this.setKey(menu.getId()); this.setCreateBy(menu.getCreateBy()); this.setCreateTime(menu.getCreateTime()); this.setUpdateBy(menu.getUpdateBy()); @@ -17,6 +21,7 @@ public class SarFileCompareMenuVo extends SarFileCompareMenu { this.setMenuId(menu.getMenuId()); this.setInfoId(menu.getInfoId()); this.setName(menu.getName()); + this.setTitle(menu.getName()); this.setParentId(menu.getParentId()); this.setDisplaySeq(menu.getDisplaySeq()); this.setLeftOrRight(menu.getLeftOrRight()); @@ -38,4 +43,20 @@ public class SarFileCompareMenuVo extends SarFileCompareMenu { } children.add(child); } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index d6d8b299f..62fba4c09 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -267,14 +267,14 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl 0 && sfVo.getMenuLeft() != null && sfVo.getMenuLeft().size() > 0) { break; } } From 40d2bbda2286a861ac54d7855890fc7d4c09bad2 Mon Sep 17 00:00:00 2001 From: gaosong Date: Fri, 5 Aug 2022 10:03:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E6=B7=BB=E5=8A=A0=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareItemCommentController.java | 170 ++++++++++++++++++ .../SarFileCompareResCommentController.java | 170 ++++++++++++++++++ .../entity/SarFileCompareItemComment.java | 84 +++++++++ .../entity/SarFileCompareResComment.java | 79 ++++++++ .../SarFileCompareItemCommentMapper.java | 17 ++ .../SarFileCompareResCommentMapper.java | 17 ++ .../xml/SarFileCompareItemCommentMapper.xml | 16 ++ .../xml/SarFileCompareResCommentMapper.xml | 15 ++ .../ISarFileCompareItemCommentService.java | 61 +++++++ .../ISarFileCompareResCommentService.java | 61 +++++++ .../SarFileCompareItemCommentServiceImpl.java | 89 +++++++++ .../SarFileCompareResCommentServiceImpl.java | 89 +++++++++ 12 files changed, 868 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItemComment.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComment.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemCommentMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareResCommentMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemCommentMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareResCommentMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java new file mode 100644 index 000000000..263d85d10 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java @@ -0,0 +1,170 @@ +package com.jero.modules.compare.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.compare.entity.SarFileCompareItemComment; +import com.jero.modules.compare.service.ISarFileCompareItemCommentService; +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-08-05 + * @Version: V1.0 + */ +@Api(tags="文档对比信息条款评论表") +@RestController +@RequestMapping("/compare/sarFileCompareItemComment") +@Slf4j +public class SarFileCompareItemCommentController extends JeroController { + @Autowired + private ISarFileCompareItemCommentService sarFileCompareItemCommentService; + + /** + * 分页列表查询 + * + * @param sarFileCompareItemComment + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "文档对比信息条款评论表-分页列表查询") + @ApiOperation(value="文档对比信息条款评论表-分页列表查询", notes="文档对比信息条款评论表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(SarFileCompareItemComment sarFileCompareItemComment, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareItemComment, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = sarFileCompareItemCommentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "文档对比信息条款评论表-列表查询") + @ApiOperation(value="文档对比信息条款评论表-列表查询", notes="文档对比信息条款评论表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = sarFileCompareItemCommentService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param sarFileCompareItemComment + * @return + */ + @AutoLog(value = "文档对比信息条款评论表-添加") + @ApiOperation(value="文档对比信息条款评论表-添加", notes="文档对比信息条款评论表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) { + sarFileCompareItemCommentService.add(sarFileCompareItemComment); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param sarFileCompareItemComment + * @return + */ + @AutoLog(value = "文档对比信息条款评论表-编辑") + @ApiOperation(value="文档对比信息条款评论表-编辑", notes="文档对比信息条款评论表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) { + sarFileCompareItemCommentService.editById(sarFileCompareItemComment); + 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) { + sarFileCompareItemCommentService.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.sarFileCompareItemCommentService.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) { + SarFileCompareItemComment sarFileCompareItemComment = sarFileCompareItemCommentService.queryById(id); + if(sarFileCompareItemComment==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(sarFileCompareItemComment); + } + + /** + * 导出excel + * + * @param request + * @param sarFileCompareItemComment + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SarFileCompareItemComment sarFileCompareItemComment) { + return super.exportXls(request, sarFileCompareItemComment, SarFileCompareItemComment.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, SarFileCompareItemComment.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java new file mode 100644 index 000000000..025f671f7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java @@ -0,0 +1,170 @@ +package com.jero.modules.compare.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.compare.entity.SarFileCompareResComment; +import com.jero.modules.compare.service.ISarFileCompareResCommentService; +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-08-05 + * @Version: V1.0 + */ +@Api(tags="文档对比信息结果评论表") +@RestController +@RequestMapping("/compare/sarFileCompareResComment") +@Slf4j +public class SarFileCompareResCommentController extends JeroController { + @Autowired + private ISarFileCompareResCommentService sarFileCompareResCommentService; + + /** + * 分页列表查询 + * + * @param sarFileCompareResComment + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "文档对比信息结果评论表-分页列表查询") + @ApiOperation(value="文档对比信息结果评论表-分页列表查询", notes="文档对比信息结果评论表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(SarFileCompareResComment sarFileCompareResComment, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareResComment, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = sarFileCompareResCommentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "文档对比信息结果评论表-列表查询") + @ApiOperation(value="文档对比信息结果评论表-列表查询", notes="文档对比信息结果评论表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = sarFileCompareResCommentService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param sarFileCompareResComment + * @return + */ + @AutoLog(value = "文档对比信息结果评论表-添加") + @ApiOperation(value="文档对比信息结果评论表-添加", notes="文档对比信息结果评论表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody SarFileCompareResComment sarFileCompareResComment) { + sarFileCompareResCommentService.add(sarFileCompareResComment); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param sarFileCompareResComment + * @return + */ + @AutoLog(value = "文档对比信息结果评论表-编辑") + @ApiOperation(value="文档对比信息结果评论表-编辑", notes="文档对比信息结果评论表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody SarFileCompareResComment sarFileCompareResComment) { + sarFileCompareResCommentService.editById(sarFileCompareResComment); + 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) { + sarFileCompareResCommentService.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.sarFileCompareResCommentService.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) { + SarFileCompareResComment sarFileCompareResComment = sarFileCompareResCommentService.queryById(id); + if(sarFileCompareResComment==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(sarFileCompareResComment); + } + + /** + * 导出excel + * + * @param request + * @param sarFileCompareResComment + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SarFileCompareResComment sarFileCompareResComment) { + return super.exportXls(request, sarFileCompareResComment, SarFileCompareResComment.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, SarFileCompareResComment.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItemComment.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItemComment.java new file mode 100644 index 000000000..23815ce7c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItemComment.java @@ -0,0 +1,84 @@ +package com.jero.modules.compare.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-08-05 + * @Version: V1.0 + */ +@Data +@TableName("sar_file_compare_item_comment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sar_file_compare_item_comment对象", description="文档对比信息条款评论表") +public class SarFileCompareItemComment 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 infoId; + + /**条款id左*/ + @Excel(name = "条款id左", width = 15) + @ApiModelProperty(value = "条款id左") + private java.lang.String itemsIdLeft; + + /**条款id右*/ + @Excel(name = "条款id右", width = 15) + @ApiModelProperty(value = "条款id右") + private java.lang.String itemsIdRight; + + /**评论*/ + @Excel(name = "评论", width = 15) + @ApiModelProperty(value = "评论") + private java.lang.String comment; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComment.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComment.java new file mode 100644 index 000000000..249ce4d27 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComment.java @@ -0,0 +1,79 @@ +package com.jero.modules.compare.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-08-05 + * @Version: V1.0 + */ +@Data +@TableName("sar_file_compare_res_comment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sar_file_compare_res_comment对象", description="文档对比信息结果评论表") +public class SarFileCompareResComment 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 infoId; + + /**回复评论ID*/ + @Excel(name = "回复评论ID", width = 15) + @ApiModelProperty(value = "回复评论ID") + private java.lang.String parentId; + + /**评论*/ + @Excel(name = "评论", width = 15) + @ApiModelProperty(value = "评论") + private java.lang.String comment; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemCommentMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemCommentMapper.java new file mode 100644 index 000000000..d967ff968 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemCommentMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.compare.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.compare.entity.SarFileCompareItemComment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 文档对比信息条款评论表 + * @Author: jero-boot + * @Date: 2022-08-05 + * @Version: V1.0 + */ +public interface SarFileCompareItemCommentMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareResCommentMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareResCommentMapper.java new file mode 100644 index 000000000..7284b4e27 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareResCommentMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.compare.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.compare.entity.SarFileCompareResComment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 文档对比信息结果评论表 + * @Author: jero-boot + * @Date: 2022-08-05 + * @Version: V1.0 + */ +public interface SarFileCompareResCommentMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemCommentMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemCommentMapper.xml new file mode 100644 index 000000000..0dd23ae97 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemCommentMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareResCommentMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareResCommentMapper.xml new file mode 100644 index 000000000..729c2314d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareResCommentMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java new file mode 100644 index 000000000..5d1e0b594 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java @@ -0,0 +1,61 @@ +package com.jero.modules.compare.service; + +import com.jero.modules.compare.entity.SarFileCompareItemComment; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 文档对比信息条款评论表 + * @Author: jero-boot + * @Date: 2022-08-05 + * @Version: V1.0 + */ +public interface ISarFileCompareItemCommentService extends IService { + + /** + * 保存 + * + * @param sarFileCompareItemComment + * @return + */ + void add(SarFileCompareItemComment sarFileCompareItemComment); + + /** + * 更新 + * + * @param sarFileCompareItemComment + * @return + */ + void editById(SarFileCompareItemComment sarFileCompareItemComment); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + SarFileCompareItemComment queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java new file mode 100644 index 000000000..ad53c87c8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java @@ -0,0 +1,61 @@ +package com.jero.modules.compare.service; + +import com.jero.modules.compare.entity.SarFileCompareResComment; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 文档对比信息结果评论表 + * @Author: jero-boot + * @Date: 2022-08-05 + * @Version: V1.0 + */ +public interface ISarFileCompareResCommentService extends IService { + + /** + * 保存 + * + * @param sarFileCompareResComment + * @return + */ + void add(SarFileCompareResComment sarFileCompareResComment); + + /** + * 更新 + * + * @param sarFileCompareResComment + * @return + */ + void editById(SarFileCompareResComment sarFileCompareResComment); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + SarFileCompareResComment queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java new file mode 100644 index 000000000..a48c18de4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.compare.service.impl; + +import com.jero.modules.compare.entity.SarFileCompareItemComment; +import com.jero.modules.compare.mapper.SarFileCompareItemCommentMapper; +import com.jero.modules.compare.service.ISarFileCompareItemCommentService; +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-08-05 + * @Version: V1.0 + */ +@Service +public class SarFileCompareItemCommentServiceImpl extends ServiceImpl implements ISarFileCompareItemCommentService { + + /** + * 保存 + * + * @param sarFileCompareItemComment + * @return + */ + @Override + public void add(SarFileCompareItemComment sarFileCompareItemComment) { + Date now = new Date(); + sarFileCompareItemComment.setCreateTime(now); + sarFileCompareItemComment.setUpdateTime(now); + save(sarFileCompareItemComment); + } + + /** + * 更新 + * + * @param sarFileCompareItemComment + * @return + */ + @Override + public void editById(SarFileCompareItemComment sarFileCompareItemComment) { + Date now = new Date(); + sarFileCompareItemComment.setUpdateTime(now); + saveOrUpdate(sarFileCompareItemComment); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public SarFileCompareItemComment queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java new file mode 100644 index 000000000..c77ce0609 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.compare.service.impl; + +import com.jero.modules.compare.entity.SarFileCompareResComment; +import com.jero.modules.compare.mapper.SarFileCompareResCommentMapper; +import com.jero.modules.compare.service.ISarFileCompareResCommentService; +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-08-05 + * @Version: V1.0 + */ +@Service +public class SarFileCompareResCommentServiceImpl extends ServiceImpl implements ISarFileCompareResCommentService { + + /** + * 保存 + * + * @param sarFileCompareResComment + * @return + */ + @Override + public void add(SarFileCompareResComment sarFileCompareResComment) { + Date now = new Date(); + sarFileCompareResComment.setCreateTime(now); + sarFileCompareResComment.setUpdateTime(now); + save(sarFileCompareResComment); + } + + /** + * 更新 + * + * @param sarFileCompareResComment + * @return + */ + @Override + public void editById(SarFileCompareResComment sarFileCompareResComment) { + Date now = new Date(); + sarFileCompareResComment.setUpdateTime(now); + saveOrUpdate(sarFileCompareResComment); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public SarFileCompareResComment queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} From 331ecbd17b7d3c908e0bd77ceae4ca4f5e4a09dc Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 5 Aug 2022 10:21:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E6=B7=BB=E5=8A=A0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9A=E8=B0=83=E6=95=B4=E8=B4=A3=E4=BB=BB=E9=A2=86?= =?UTF-8?q?=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 14 ++++ .../IParamsCollectManifestEOService.java | 3 + .../ParamsCollectManifestEOServiceImpl.java | 81 +++++++++++++++++-- 3 files changed, 93 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index c797b78a3..349d8ced7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -530,6 +530,20 @@ public class ParamsCollectManifestEOController extends JeroController> updateBatchDutyTerritory(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) { + List msgList = paramsCollectManifestEOService.updateBatchDutyTerritory(paramsCollectManifestVO); + return Result.OK(msgList); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index fac103ab5..8904cd11c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -161,4 +161,7 @@ public interface IParamsCollectManifestEOService extends IService updateBatchDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 9efca35d4..f6870131d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1532,7 +1532,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl getMsgOfIssueCollection(List> msgMapList, String cut) { + private List getMsgOfIssueCollection(List> msgMapList, String cut, String operation) { List msgList = new ArrayList<>(); Map collectManifestStateEnumMap = CollectManifestStateEnum.toMap(cut); @@ -1698,9 +1698,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImplHomologation Engineer can operate when data state is 'Wait Collect'、'Sdt Back' or 'Change'"); + if ("1".equals(operation)) { + msgList.add("Homologation Engineer can operate when data state is 'Wait Collect','Sdt Back' or 'Change'."); + } else if("2".equals(operation)) { + msgList.add("Homologation Engineer can operate when data state is 'Wait Collect','Sdt Back'."); + } } else { - msgList.add("认证工程师数据状态为 '待发起收集'、'工程接口人退回'或'变更' 时，才有权限操作此按钮。"); + if ("1".equals(operation)) { + msgList.add("认证工程师数据状态为 '待发起收集'、'工程接口人退回'或'变更' 时，才有权限操作此按钮。"); + } else if("2".equals(operation)) { + msgList.add("认证工程师数据状态为 '待发起收集'、'工程接口人退回 时，才有权限操作此按钮。"); + } } } return msgList; @@ -2228,6 +2236,69 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateBatchDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) { + if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) + || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId()) + || StringUtils.isEmpty(paramsCollectManifestVO.getDutyTerritory())) { + throw new JeroBootException("参数不能为空！"); + } + List paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestVO.getIds().split(",")); + String dutyTerritory = paramsCollectManifestVO.getDutyTerritory(); + String paramsManifestId = paramsCollectManifestVO.getParamsManifestId(); + String projectId = paramsCollectManifestVO.getProjectId(); + String cut = paramsCollectManifestVO.getCut(); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsCollectManifestEO::getId, paramsCollectManifestIdList); + List paramsCollectManifestEOList = paramsCollectManifestEOMapper.selectList(queryWrapper); + + List updateEOList = new ArrayList<>(); + List> msgMapList = new ArrayList<>(); + paramsCollectManifestEOList.forEach(paramsCollectManifestEO -> { + if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState()) + || CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState())) { + + ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO(); + updateEO.setId(paramsCollectManifestEO.getId()); + updateEO.setDutyTerritory(dutyTerritory); + + // 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段 + ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectId, dutyTerritory); + if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) { + String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson(); + if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段 + SysUser sysUser = sysUserService.getById(sdtId); + if (ObjectUtil.isNotEmpty(sysUser)) { + updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人 + } else { + updateEO.setSdt(""); // 设置工程接口人 + } + } else { + updateEO.setSdt(""); // 设置工程接口人 + } + } else { + updateEO.setSdt(""); // 设置工程接口人 + } + + updateEOList.add(updateEO); + + } else { + Map msgMap = new HashMap<>(); + msgMap.put("nioNumber", paramsCollectManifestEO.getNioNumber()); + msgMap.put("state", paramsCollectManifestEO.getState()); + msgMap.put("type", "2"); + msgMapList.add(msgMap); + } + }); + + // 修改责任领域及工程接口人 + updateBatchById(updateEOList); + + // 返回不符合参数项的提示信息 + return getMsgOfIssueCollection(msgMapList, cut, "2"); + } + private String[] getWorkbookTitleForExport(ParamsCollectManifestVO paramsCollectManifestVO) { String cut = paramsCollectManifestVO.getCut(); String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();