From f1a396f3fdbd204f71fab78b6f339ce20b8e5cc1 Mon Sep 17 00:00:00 2001 From: gaosong Date: Fri, 5 Aug 2022 01:40:14 +0800 Subject: [PATCH 01/97] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareInfoController.java | 74 ++-- .../SarFileCompareMenuController.java | 170 ++++++++++ .../entity/SarFileCompareDetailVO.java | 121 +++++++ .../compare/entity/SarFileCompareInfo.java | 12 +- .../compare/entity/SarFileCompareItem.java | 16 +- .../compare/entity/SarFileCompareMenu.java | 126 +++++++ .../compare/entity/SarFileCompareMenuVo.java | 41 +++ .../compare/enums/ComparesInfoStateEnum.java | 24 ++ .../mapper/SarFileCompareInfoMapper.java | 2 +- .../mapper/SarFileCompareItemMapper.java | 2 +- .../mapper/SarFileCompareMenuMapper.java | 17 + .../mapper/xml/SarFileCompareInfoMapper.xml | 2 + .../mapper/xml/SarFileCompareItemMapper.xml | 2 +- .../mapper/xml/SarFileCompareMenuMapper.xml | 20 ++ .../service/ISarFileCompareInfoService.java | 11 +- .../service/ISarFileCompareItemService.java | 75 +++-- .../service/ISarFileCompareMenuService.java | 64 ++++ .../impl/SarFileCompareInfoServiceImpl.java | 316 ++++++++---------- .../impl/SarFileCompareItemServiceImpl.java | 11 + .../impl/SarFileCompareMenuServiceImpl.java | 101 ++++++ .../split/mapper/FileSplitItemsEOMapper.java | 3 +- .../mapper/xml/FileSplitItemsEOMapper.xml | 22 +- .../service/IFileSplitItemsEOService.java | 2 +- .../service/ISarFileSplitMenuEOService.java | 3 + .../impl/FileSplitItemsEOServiceImpl.java | 6 +- .../impl/SarFileSplitMenuEOServiceImpl.java | 8 + 26 files changed, 977 insertions(+), 274 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenu.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareMenuMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareMenuMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareMenuService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareMenuServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index e25f54deb..de5908b73 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -1,28 +1,29 @@ package com.jero.modules.compare.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.alibaba.fastjson.JSONObject; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.compare.entity.SarFileCompareInfo; -import com.jero.modules.compare.service.ISarFileCompareInfoService; 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.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.compare.entity.SarFileCompareDetailVO; +import com.jero.modules.compare.entity.SarFileCompareInfo; +import com.jero.modules.compare.service.ISarFileCompareInfoService; +import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -174,13 +175,11 @@ public class SarFileCompareInfoController extends JeroController fullTextComparison(@RequestBody JSONObject json) { try { @@ -190,12 +189,43 @@ public class SarFileCompareInfoController extends JeroController resMap = sarFileCompareInfoService.fullTextComparison(leftStandard, rightStandard, remark); - return Result.OK(resMap); + String InfoId = sarFileCompareInfoService.fullTextComparison(leftStandard, rightStandard, remark); + return Result.OK(InfoId); } catch (Exception ex) { log.error("发起文档对比失败：" + ex.getMessage()); return Result.OK("发起文档对比失败!"); } } + /** + * 更改发布状态 + * + * @param sarFileCompareInfo + * @return + */ + @AutoLog(value = "文档对比信息表-更改发布状态") + @ApiOperation(value = "文档对比信息表-更改发布状态", notes = "文档对比信息表-更改发布状态") + @RequestMapping(value = "/changeState", method = RequestMethod.POST) + public Result changeState(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { + if (sarFileCompareInfo.getReleaseState().equals(ReleaseConditionEnum.DRAFT.getValue())) { + sarFileCompareInfo.setReleaseState(ReleaseConditionEnum.PUBLISHED.getValue()); + } else { + sarFileCompareInfo.setReleaseState(ReleaseConditionEnum.DRAFT.getValue()); + } + sarFileCompareInfoService.editById(sarFileCompareInfo); + return Result.OK("更改成功!"); + } + + /** + * 求对比详情 + * + * @return + */ + @AutoLog(value = "文档对比信息表-请求对比详情") + @ApiOperation(value = "文档对比信息表-请求对比详情", notes = "文档对比信息表-请求对比详情") + @RequestMapping(value = "/getComparisonDetail", method = RequestMethod.POST) + public Result getComparisonDetail(@RequestBody JSONObject json) { + SarFileCompareDetailVO sarFileCompareDetailVO = sarFileCompareInfoService.getComparisonDetail(json.get("id").toString()); + return Result.OK(sarFileCompareDetailVO); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java new file mode 100644 index 000000000..e398c5727 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.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.SarFileCompareMenu; +import com.jero.modules.compare.service.ISarFileCompareMenuService; +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-03 + * @Version: V1.0 + */ +@Api(tags="文档对比信息目录表") +@RestController +@RequestMapping("/compare/sarFileCompareMenu") +@Slf4j +public class SarFileCompareMenuController extends JeroController { + @Autowired + private ISarFileCompareMenuService sarFileCompareMenuService; + + /** + * 分页列表查询 + * + * @param sarFileCompareMenu + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "文档对比信息目录表-分页列表查询") + @ApiOperation(value="文档对比信息目录表-分页列表查询", notes="文档对比信息目录表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(SarFileCompareMenu sarFileCompareMenu, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareMenu, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = sarFileCompareMenuService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "文档对比信息目录表-列表查询") + @ApiOperation(value="文档对比信息目录表-列表查询", notes="文档对比信息目录表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = sarFileCompareMenuService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param sarFileCompareMenu + * @return + */ + @AutoLog(value = "文档对比信息目录表-添加") + @ApiOperation(value="文档对比信息目录表-添加", notes="文档对比信息目录表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody SarFileCompareMenu sarFileCompareMenu) { + sarFileCompareMenuService.add(sarFileCompareMenu); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param sarFileCompareMenu + * @return + */ + @AutoLog(value = "文档对比信息目录表-编辑") + @ApiOperation(value="文档对比信息目录表-编辑", notes="文档对比信息目录表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody SarFileCompareMenu sarFileCompareMenu) { + sarFileCompareMenuService.editById(sarFileCompareMenu); + 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) { + sarFileCompareMenuService.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.sarFileCompareMenuService.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) { + SarFileCompareMenu sarFileCompareMenu = sarFileCompareMenuService.queryById(id); + if(sarFileCompareMenu==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(sarFileCompareMenu); + } + + /** + * 导出excel + * + * @param request + * @param sarFileCompareMenu + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SarFileCompareMenu sarFileCompareMenu) { + return super.exportXls(request, sarFileCompareMenu, SarFileCompareMenu.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, SarFileCompareMenu.class); + } + +} 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 new file mode 100644 index 000000000..d93762946 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java @@ -0,0 +1,121 @@ +package com.jero.modules.compare.entity; + +import java.util.ArrayList; +import java.util.List; + +public class SarFileCompareDetailVO { + + private String InfoId; + private String serialNumberLeft; + private String fileNameLeft; + private String serialNumberRight; + private String fileNameRight; + private String remark; + private String comments; + private SarFileCompareMenuVo menuLeft; + private List textLeft; + private SarFileCompareMenuVo menuRight; + private List textRight; + + public String getInfoId() { + return InfoId; + } + + public void setInfoId(String infoId) { + InfoId = infoId; + } + + public String getSerialNumberLeft() { + return serialNumberLeft; + } + + public void setSerialNumberLeft(String serialNumberLeft) { + this.serialNumberLeft = serialNumberLeft; + } + + public String getFileNameLeft() { + return fileNameLeft; + } + + public void setFileNameLeft(String fileNameLeft) { + this.fileNameLeft = fileNameLeft; + } + + public String getSerialNumberRight() { + return serialNumberRight; + } + + public void setSerialNumberRight(String serialNumberRight) { + this.serialNumberRight = serialNumberRight; + } + + public String getFileNameRight() { + return fileNameRight; + } + + public void setFileNameRight(String fileNameRight) { + this.fileNameRight = fileNameRight; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getComments() { + return comments; + } + + public void setComments(String comments) { + this.comments = comments; + } + + public SarFileCompareMenuVo getMenuLeft() { + return menuLeft; + } + + public void setMenuLeft(SarFileCompareMenuVo menuLeft) { + this.menuLeft = menuLeft; + } + + public List getTextLeft() { + return textLeft; + } + + public void setTextLeft(List textLeft) { + this.textLeft = textLeft; + } + + public void addTextLeft(SarFileCompareItem text) { + if (this.textLeft == null) { + this.textLeft = new ArrayList<>(); + } + this.textLeft.add(text); + } + + public SarFileCompareMenuVo getMenuRight() { + return menuRight; + } + + public void setMenuRight(SarFileCompareMenuVo menuRight) { + this.menuRight = menuRight; + } + + public List getTextRight() { + return textRight; + } + + public void setTextRight(List textRight) { + this.textRight = textRight; + } + + public void addTextRight(SarFileCompareItem text) { + if (this.textRight == null) { + this.textRight = new ArrayList<>(); + } + this.textRight.add(text); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java index fec7f0f57..7760d639c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @Description: 文档对比信息表 * @Author: jero-boot - * @Date: 2022-08-02 + * @Date: 2022-08-04 * @Version: V1.0 */ @Data @@ -66,6 +66,11 @@ public class SarFileCompareInfo implements Serializable { @ApiModelProperty(value = "文档1") private String fileIdLeft; + /**文档key1*/ + @Excel(name = "文档key1", width = 15) + @ApiModelProperty(value = "文档key1") + private String fileKeyLeft; + /**编号1*/ @Excel(name = "编号1", width = 15) @ApiModelProperty(value = "编号1") @@ -91,6 +96,11 @@ public class SarFileCompareInfo implements Serializable { @ApiModelProperty(value = "文档2") private String fileIdRight; + /**文档key2*/ + @Excel(name = "文档key2", width = 15) + @ApiModelProperty(value = "文档key2") + private String fileKeyRight; + /**编号2*/ @Excel(name = "编号2", width = 15) @ApiModelProperty(value = "编号2") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItem.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItem.java index 10717e093..b92921961 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItem.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItem.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @Description: 文档对比信息条款表 * @Author: jero-boot - * @Date: 2022-08-02 + * @Date: 2022-08-04 * @Version: V1.0 */ @Data @@ -66,10 +66,10 @@ public class SarFileCompareItem implements Serializable { @ApiModelProperty(value = "文档对比信息id") private String infoId; - /**条款id*/ - @Excel(name = "条款id", width = 15) - @ApiModelProperty(value = "条款id") - private String itemsId; + /**目录id*/ + @Excel(name = "目录id", width = 15) + @ApiModelProperty(value = "目录id") + private String menuId; /**条款名称*/ @Excel(name = "条款名称", width = 15) @@ -91,9 +91,9 @@ public class SarFileCompareItem implements Serializable { @ApiModelProperty(value = "条款展示编号") private Integer itemsDisplayNum; - /**目标位置*/ - @Excel(name = "目标位置", width = 15) - @ApiModelProperty(value = "目标位置") + /**对应相似条目*/ + @Excel(name = "对应相似条目", width = 15) + @ApiModelProperty(value = "对应相似条目") private Integer targetStand; /**条款位置*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenu.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenu.java new file mode 100644 index 000000000..754f85899 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenu.java @@ -0,0 +1,126 @@ +package com.jero.modules.compare.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.util.Date; + +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-04 + * @Version: V1.0 + */ +@Data +@TableName("sar_file_compare_menu") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sar_file_compare_menu对象", description="文档对比信息目录表") +public class SarFileCompareMenu implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private 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 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 String sysOrgCode; + + /**目录ID*/ + @Excel(name = "目录ID", width = 15) + @ApiModelProperty(value = "目录ID") + private String menuId; + + /**信息ID*/ + @Excel(name = "信息ID", width = 15) + @ApiModelProperty(value = "信息ID") + private String infoId; + + /**目录名称*/ + @Excel(name = "目录名称", width = 15) + @ApiModelProperty(value = "目录名称") + private String name; + + /**父级目录ID*/ + @Excel(name = "父级目录ID", width = 15) + @ApiModelProperty(value = "父级目录ID") + private String parentId; + + /**排序序号*/ + @Excel(name = "排序序号", width = 15) + @ApiModelProperty(value = "排序序号") + private Integer displaySeq; + + /**目录位置*/ + @Excel(name = "目录位置", width = 15) + @ApiModelProperty(value = "目录位置") + private String leftOrRight; + + /**条款名称*/ + @Excel(name = "条款名称", width = 15) + @ApiModelProperty(value = "条款名称") + private String itemName; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remarks; + + public SarFileCompareMenu(String id, String createBy, Date createTime, String updateBy, Date updateTime, String sysOrgCode, String menuId, String infoId, String name, String parentId, Integer displaySeq, String leftOrRight, String itemName, String remarks) { + this.id = id; + this.createBy = createBy; + this.createTime = createTime; + this.updateBy = updateBy; + this.updateTime = updateTime; + this.sysOrgCode = sysOrgCode; + this.menuId = menuId; + this.infoId = infoId; + this.name = name; + this.parentId = parentId; + this.displaySeq = displaySeq; + this.leftOrRight = leftOrRight; + this.itemName = itemName; + this.remarks = remarks; + } + + public SarFileCompareMenu() { + + } +} 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 new file mode 100644 index 000000000..18cee5103 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java @@ -0,0 +1,41 @@ +package com.jero.modules.compare.entity; + +import java.util.ArrayList; +import java.util.List; + +public class SarFileCompareMenuVo extends SarFileCompareMenu { + private List children; + + public SarFileCompareMenuVo(SarFileCompareMenu menu) { + super(); + this.setId(menu.getId()); + this.setCreateBy(menu.getCreateBy()); + this.setCreateTime(menu.getCreateTime()); + this.setUpdateBy(menu.getUpdateBy()); + this.setUpdateTime(menu.getUpdateTime()); + this.setSysOrgCode(menu.getSysOrgCode()); + this.setMenuId(menu.getMenuId()); + this.setInfoId(menu.getInfoId()); + this.setName(menu.getName()); + this.setParentId(menu.getParentId()); + this.setDisplaySeq(menu.getDisplaySeq()); + this.setLeftOrRight(menu.getLeftOrRight()); + this.setItemName(menu.getItemName()); + this.setRemarks(menu.getRemarks()); + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public void addChild(SarFileCompareMenuVo child) { + if (null == this.children) { + this.children = new ArrayList<>(); + } + children.add(child); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java new file mode 100644 index 000000000..fa94f0621 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java @@ -0,0 +1,24 @@ +package com.jero.modules.compare.enums; + +/** + * 对比信息发布状态 + */ +public enum ComparesInfoStateEnum { + DRAFT(0, "草稿"), RELEASE(1, "发布"); + + private int value; + private String lable; + + private ComparesInfoStateEnum(int value, String lable) { + this.value = value; + this.lable = lable; + } + + public int getValue() { + return value; + } + + public String getLable() { + return lable; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareInfoMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareInfoMapper.java index fa41936d1..113090c39 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareInfoMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareInfoMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 文档对比信息表 * @Author: jero-boot - * @Date: 2022-08-02 + * @Date: 2022-08-04 * @Version: V1.0 */ public interface SarFileCompareInfoMapper extends BaseMapper { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemMapper.java index 2fabfcce3..4bbf387b1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 文档对比信息条款表 * @Author: jero-boot - * @Date: 2022-08-02 + * @Date: 2022-08-04 * @Version: V1.0 */ public interface SarFileCompareItemMapper extends BaseMapper { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareMenuMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareMenuMapper.java new file mode 100644 index 000000000..fe457fd5f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareMenuMapper.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.SarFileCompareMenu; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 文档对比信息目录表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface SarFileCompareMenuMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareInfoMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareInfoMapper.xml index 829a862dd..4b2c440cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareInfoMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareInfoMapper.xml @@ -9,11 +9,13 @@ + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemMapper.xml index fc42d5309..c04f04e9f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemMapper.xml @@ -9,7 +9,7 @@ - + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareMenuMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareMenuMapper.xml new file mode 100644 index 000000000..6d0130b4a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareMenuMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java index ba26736d9..5dc0688fe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java @@ -1,5 +1,6 @@ package com.jero.modules.compare.service; +import com.jero.modules.compare.entity.SarFileCompareDetailVO; import com.jero.modules.compare.entity.SarFileCompareInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -69,5 +70,13 @@ public interface ISarFileCompareInfoService extends IService * @param remark * @return */ - Map fullTextComparison(String leftStandard, String rightStandard, String remark) throws Exception; + String fullTextComparison(String leftStandard, String rightStandard, String remark) throws Exception; + + /** + * 求对比详情 + * + * @param id + * @return + */ + SarFileCompareDetailVO getComparisonDetail(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java index a925f9f33..c4bcc295f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java @@ -1,61 +1,64 @@ package com.jero.modules.compare.service; -import com.jero.modules.compare.entity.SarFileCompareItem; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.compare.entity.SarFileCompareItem; + import java.util.List; /** * @Description: 文档对比信息条款表 * @Author: jero-boot - * @Date: 2022-08-02 + * @Date: 2022-08-02 * @Version: V1.0 */ public interface ISarFileCompareItemService extends IService { - /** - * 保存 - * - * @param sarFileCompareItem - * @return - */ + /** + * 保存 + * + * @param sarFileCompareItem + * @return + */ void add(SarFileCompareItem sarFileCompareItem); - /** - * 更新 - * - * @param sarFileCompareItem - * @return - */ + /** + * 更新 + * + * @param sarFileCompareItem + * @return + */ void editById(SarFileCompareItem sarFileCompareItem); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ SarFileCompareItem queryById(String id); /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @return + */ List queryList(); + + List queryListByInfoId(String infoId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareMenuService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareMenuService.java new file mode 100644 index 000000000..d8d4fc63f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareMenuService.java @@ -0,0 +1,64 @@ +package com.jero.modules.compare.service; + +import com.jero.modules.compare.entity.SarFileCompareMenu; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 文档对比信息目录表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ISarFileCompareMenuService extends IService { + + /** + * 保存 + * + * @param sarFileCompareMenu + * @return + */ + void add(SarFileCompareMenu sarFileCompareMenu); + + /** + * 更新 + * + * @param sarFileCompareMenu + * @return + */ + void editById(SarFileCompareMenu sarFileCompareMenu); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + SarFileCompareMenu queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + + List queryListByInfoId(String infoId); +} 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 2ce5214e4..d6d8b299f 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 @@ -1,35 +1,25 @@ package com.jero.modules.compare.service.impl; -import com.jero.modules.compare.entity.SarFileCompareInfo; -import com.jero.modules.compare.entity.SarFileCompareItem; -import com.jero.modules.compare.enums.ValidFlagEnum; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.compare.entity.*; import com.jero.modules.compare.mapper.SarFileCompareInfoMapper; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.compare.service.ISarFileCompareItemService; +import com.jero.modules.compare.service.ISarFileCompareMenuService; import com.jero.modules.compare.utils.CompHanLPUtils; -import com.jero.modules.compare.utils.treeTool.Tree; -import com.jero.modules.compare.utils.treeTool.TreeNode; import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; -import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsEO; -import com.jero.modules.split.entity.SarFileSplitItemsValEO; import com.jero.modules.split.entity.SarFileSplitMenuEO; -import com.jero.modules.split.page.SarFileSplitItemsEOPage; -import com.jero.modules.split.page.SarFileSplitItemsValEOPage; -import com.jero.modules.split.page.SarFileSplitMenuEOPage; import com.jero.modules.split.service.IFileSplitItemsEOService; import com.jero.modules.split.service.ISarFileSplitInfoService; -import com.jero.modules.split.service.ISarFileSplitItemsValEOService; import com.jero.modules.split.service.ISarFileSplitMenuEOService; -import com.jero.modules.system.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 文档对比信息表 * @Author: jero-boot @@ -45,16 +35,15 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl fullTextComparison(String leftStandard, String rightStandard, String remark) throws Exception { - Map resultMap = new HashMap(); - List> leftMapList = fullTextComparePackageData(leftStandard); - List> rightMapList = fullTextComparePackageData(rightStandard); - List> resLeftMapList = null; - List> resRightMapList = null; - if (leftMapList != null && !leftMapList.isEmpty() && rightMapList != null && !rightMapList.isEmpty()) { + public String fullTextComparison(String leftStandard, String rightStandard, String remark) throws Exception { + SarFileCompareInfo sfcInfo = addStandCompareHis(leftStandard, rightStandard, remark); + + List leftMenuEOList = sarFileSplitMenuEOService.queryByInfoId(leftStandard); + Map leftMenuMap = wrapperMenuMap(leftMenuEOList, sfcInfo.getId(), "LEFT"); + sarFileCompareMenuService.saveBatch(leftMenuMap.values()); + List rightMenuEOList = sarFileSplitMenuEOService.queryByInfoId(rightStandard); + Map rightMenuMap = wrapperMenuMap(rightMenuEOList, sfcInfo.getId(), "RIGHT"); + sarFileCompareMenuService.saveBatch(rightMenuMap.values()); + + List leftItemEOList = sarFileSplitItemsEOService.selectByInfoId(leftStandard); + List leftItemList = wrapperItemList(leftItemEOList, sfcInfo.getId(), leftMenuMap, "LEFT"); + List rightItemEOList = sarFileSplitItemsEOService.selectByInfoId(rightStandard); + List rightItemList = wrapperItemList(rightItemEOList, sfcInfo.getId(), rightMenuMap, "RIGHT"); + + if (!leftItemList.isEmpty() && !rightItemList.isEmpty()) { //双重循环找到相似度最高的条款做关联 - for (int i = 0; i < leftMapList.size(); i++) { - String leftTxt = leftMapList.get(i).get("itemsText").toString(); + for (SarFileCompareItem leftItem : leftItemList) { + String leftTxt = leftItem.getItemsText(); //定义初始化的相似度 double compareSimilarity = 0.0; - if (!leftTxt.isEmpty()) { - for (int j = 0; j < rightMapList.size(); j++) { - String rightTxt = rightMapList.get(j).get("itemsText").toString(); - double similarity = CompHanLPUtils.findSimilarity(leftTxt.trim(), rightTxt.trim()); - //如果相似度超过0.6 并且该相似度比之前的相似度还高，那么该条款目前相似度最高 - if (similarity >= 0.6 && compareSimilarity < similarity) { - compareSimilarity = similarity; - leftMapList.get(i).put("targetStand", j); - if (rightMapList.get(j).get("targetStand") == null) { - rightMapList.get(j).put("targetStand", i); + if (null != leftTxt && !leftTxt.isEmpty()) { + for (SarFileCompareItem rightItem : rightItemList) { + String rightTxt = rightItem.getItemsText(); + if (null != rightTxt && !rightTxt.isEmpty()) { + double similarity = CompHanLPUtils.findSimilarity(leftTxt.trim(), rightTxt.trim()); + //如果相似度超过0.6 并且该相似度比之前的相似度还高，那么该条款目前相似度最高 + if (similarity >= 0.6 && compareSimilarity < similarity) { + compareSimilarity = similarity; + leftItem.setTargetStand(rightItem.getItemsDisplayNum()); + rightItem.setTargetStand(leftItem.getItemsDisplayNum()); } } } } } - //循环对比结束，开始填充html代码 - resLeftMapList = writeResultHtml(leftMapList); - resultMap.put("resLeftMapList", resLeftMapList); - resRightMapList = writeResultHtml(rightMapList); - resultMap.put("resRightMapList", resRightMapList); } - //往全文比对历史表中添加数据 - addStandCompareHis(leftStandard, rightStandard, remark, resLeftMapList, resRightMapList); - return resultMap; + sarFileCompareItemService.saveBatch(leftItemList); + sarFileCompareItemService.saveBatch(rightItemList); + return sfcInfo.getId(); } - /** - * 组装条款数据 - * - * @param standardId - * @return - * @throws Exception - */ - public List> fullTextComparePackageData(String standardId) throws Exception { - List> mapList = new ArrayList>(); - //调用查询条款接口 - SarFileSplitItemsEOPage sarFileSplitItemsEOPage = new SarFileSplitItemsEOPage(); - sarFileSplitItemsEOPage.setInfoId(standardId); - sarFileSplitItemsEOPage.setValidFlag(String.valueOf(ValidFlagEnum.VALID_TRUE.getValue())); - sarFileSplitItemsEOPage.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); - if (StringUtils.isNotEmpty(sarFileSplitItemsEOPage.getMenuId())) { - List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); - Tree tree = new Tree<>(sarFileSplitMenuEOList); - TreeNode treeNode = tree.getTreeNode(sarFileSplitItemsEOPage.getMenuId()); - - List menuIds = new ArrayList<>(); - menuIds.add(treeNode.getNodeId()); - for (TreeNode node : treeNode.getAllChildren()) { - menuIds.add(node.getNodeId()); - } - sarFileSplitItemsEOPage.setMenuIdList(menuIds); + private Map wrapperMenuMap(List list, String infoId, String leftOrRight) { + Map resMap = new HashMap<>(); + for (SarFileSplitMenuEO meo : list) { + SarFileCompareMenu sfcMenu = new SarFileCompareMenu(); + sfcMenu.setInfoId(infoId); + sfcMenu.setMenuId(meo.getId()); + sfcMenu.setName(meo.getName()); + sfcMenu.setItemName(meo.getItemName()); + sfcMenu.setParentId(meo.getPId()); + sfcMenu.setDisplaySeq(meo.getDisplaySeq().intValue()); + sfcMenu.setRemarks(meo.getRemarks()); + sfcMenu.setLeftOrRight(leftOrRight); + resMap.put(sfcMenu.getMenuId(), sfcMenu); } - - - List itemList = sarFileSplitItemsEOService.queryByList(sarFileSplitItemsEOPage); - if (itemList != null && !itemList.isEmpty()) { - for (SarFileSplitItemsEO sarFileSplitItemsEO : itemList) { - Map map = new HashMap(); - map.put("itemsNum", sarFileSplitItemsEO.getItemsNum()); - map.put("itemsName", sarFileSplitItemsEO.getItemsName()); - map.put("itemsId", sarFileSplitItemsEO.getId()); - //（内容1\n内容2\n格式） - String txt = ""; - //调用条款内容详情表查询条款内容 - SarFileSplitItemsValEOPage sarFileSplitItemsValEOPage = new SarFileSplitItemsValEOPage(); - sarFileSplitItemsValEOPage.setItemId(sarFileSplitItemsEO.getId()); - sarFileSplitItemsValEOPage.setValidFlag(String.valueOf(ValidFlagEnum.VALID_TRUE.getValue())); - sarFileSplitItemsValEOPage.setType("TEXT"); - List leftValList = sarFileSplitItemsValEOService.queryByList(sarFileSplitItemsValEOPage); - if (leftValList != null && !leftValList.isEmpty()) { - for (SarFileSplitItemsValEO sarFileSplitItemsValEO : leftValList) { - txt += "

" + sarFileSplitItemsValEO.getItemContent() + "

"; - } - } - map.put("itemsText", txt); - map.put("targetStand", null); - map.put("menuId", sarFileSplitItemsEO.getMenuId()); - mapList.add(map); - } - } - return mapList; + return resMap; } - /** - * 填充html代码，返回结果 - * - * @param resMapList - * @return - */ - public List> writeResultHtml(List> resMapList) throws Exception { - List> resultMapList = new ArrayList<>(); - for (Map resMap : resMapList) { - Map map = new HashMap<>(); - StringBuilder stringBuilder = new StringBuilder(); - Object itemsNum = resMap.get("itemsNum"); - if (null != itemsNum) { - stringBuilder.append(itemsNum.toString()); - } else { - stringBuilder.append("undefined"); + private List wrapperItemList(List list, String infoId, Map menuMap, String leftOrRight) { + List resList = new ArrayList<>(); + for (SarFileSplitItemsEO itemsEO : list) { + SarFileCompareItem item = new SarFileCompareItem(); + item.setInfoId(infoId); + item.setItemsName(itemsEO.getItemsName()); + item.setMenuId(itemsEO.getMenuId()); + item.setItemsNum(itemsEO.getItemsNum()); + item.setItemsText(itemsEO.getItermsConditions()); + SarFileCompareMenu menu = menuMap.get(itemsEO.getMenuId()); + if (menu != null) { + item.setItemsDisplayNum(menu.getDisplaySeq()); } - stringBuilder.append(" "); - Object itemsName = resMap.get("itemsName"); - if (null != itemsName) { - stringBuilder.append(itemsName.toString()); - } else { - stringBuilder.append("undefined"); - } - stringBuilder.append("
"); + item.setLeftOrRight(leftOrRight); + resList.add(item); + } - Object itemsTxt = resMap.get("itemsTxt"); - if (null != itemsTxt) { - stringBuilder.append(itemsTxt.toString()); - } - stringBuilder.append("
"); - map.put("resultHtml", stringBuilder.toString()); - Object targetStand = resMap.get("targetStand"); - int targetStandInt = 0; - if (null != targetStand) { - targetStand = (Integer) targetStand; - } - map.put("targetStand", targetStand); - Object itemsId = resMap.get("itemsId"); - String itemsIdStr = "undefined"; - if (null != itemsId) { - itemsIdStr = itemsId.toString(); - } - map.put("itemsId", itemsIdStr); - resultMapList.add(map); + return resList; + } + + private void copySarFileSplitMenu(String infoId, String cInfoId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SarFileSplitMenuEO::getInfoId, infoId); + List menuEOList = sarFileSplitMenuEOService.list(queryWrapper); + List sfcMenuList = new ArrayList<>(); + for (SarFileSplitMenuEO menuEO : menuEOList) { + SarFileCompareMenu sfcMenu = new SarFileCompareMenu(); + sfcMenu.setInfoId(cInfoId); } - return resMapList; } /** @@ -286,66 +221,85 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl> resLeftMapList, List> resRightMapList) throws Exception { + public SarFileCompareInfo addStandCompareHis(String leftStandId, String rightStandId, String remark) throws Exception { SarFileSplitInfoEO leftInfo = sarFileSplitInfoEOService.queryById(leftStandId); SarFileSplitInfoEO rightInfo = sarFileSplitInfoEOService.queryById(rightStandId); //保存标准比对历史表数据 SarFileCompareInfo sarFileCompareInfo = new SarFileCompareInfo(); - sarFileCompareInfo.setId(UUID.randomUUID().toString()); - sarFileCompareInfo.setFileIdLeft(leftInfo.getFileId()); + String id = UUID.randomUUID().toString(); + sarFileCompareInfo.setId(id); + sarFileCompareInfo.setFileIdLeft(leftInfo.getId()); + sarFileCompareInfo.setFileKeyLeft(leftInfo.getFileId()); sarFileCompareInfo.setFileNameLeft(leftInfo.getFileName()); + sarFileCompareInfo.setTitleLeft(leftInfo.getTitle()); sarFileCompareInfo.setFileTypeLeft(leftInfo.getFileType()); sarFileCompareInfo.setSerialNumberLeft(leftInfo.getSerialNumber()); - sarFileCompareInfo.setFileIdRight(rightInfo.getFileId()); + sarFileCompareInfo.setFileIdRight(rightInfo.getId()); + sarFileCompareInfo.setFileKeyRight(rightInfo.getFileId()); sarFileCompareInfo.setFileNameRight(rightInfo.getFileName()); sarFileCompareInfo.setFileTypeRight(rightInfo.getFileType()); + sarFileCompareInfo.setTitleRight(rightInfo.getTitle()); sarFileCompareInfo.setSerialNumberRight(rightInfo.getSerialNumber()); sarFileCompareInfo.setReleaseState(ReleaseConditionEnum.DRAFT.getValue()); sarFileCompareInfo.setRemark(remark); this.add(sarFileCompareInfo); - //保存标准的所有条款比对的历史数据 - if (resLeftMapList != null && !resLeftMapList.isEmpty()) { - setStandCompareHisEO(resLeftMapList, sarFileCompareInfo.getId(), "LEFT"); - } - if (resRightMapList != null && !resRightMapList.isEmpty()) { - setStandCompareHisEO(resRightMapList, sarFileCompareInfo.getId(), "RIGHT"); - } + return sarFileCompareInfo; } - public void setStandCompareHisEO(List> mapList, String id, String leftOrRight) throws Exception { - for (int i = 0; i < mapList.size(); i++) { - SarFileCompareItem sarFileCompareItem = new SarFileCompareItem(); - sarFileCompareItem.setItemsId(id); - sarFileCompareItem.setItemsDisplayNum(i); - sarFileCompareItem.setLeftOrRight(leftOrRight); - Object itemsId = mapList.get(i).get("itemsId"); - if (null != itemsId) { - sarFileCompareItem.setItemsId(itemsId.toString()); + + public SarFileCompareDetailVO getComparisonDetail(String id) { + SarFileCompareDetailVO sfVo = new SarFileCompareDetailVO(); + SarFileCompareInfo sfcInfo = this.queryById(id); + sfVo.setInfoId(id); + sfVo.setFileNameLeft(sfcInfo.getFileNameLeft()); + sfVo.setFileNameRight(sfcInfo.getFileNameRight()); + sfVo.setSerialNumberLeft(sfcInfo.getSerialNumberLeft()); + sfVo.setSerialNumberRight(sfcInfo.getSerialNumberRight()); + sfVo.setRemark(sfcInfo.getRemark()); + sfVo.setComments(sfcInfo.getComments()); + List menuList = sarFileCompareMenuService.queryListByInfoId(id); + for (SarFileCompareMenu menu : menuList) { + if ("General catalogue".equals(menu.getName())) { + if (menu.getLeftOrRight().equals("LEFT")) { + SarFileCompareMenuVo menuLeft = new SarFileCompareMenuVo(menu); + menuLeft.setChildren(getMenuChildren(menuList, "LEFT", menuLeft.getMenuId())); + sfVo.setMenuLeft(menuLeft); + } else if (menu.getLeftOrRight().equals("RIGHT")) { + SarFileCompareMenuVo menuRight = new SarFileCompareMenuVo(menu); + menuRight.setChildren(getMenuChildren(menuList, "RIGHT", menuRight.getMenuId())); + sfVo.setMenuRight(menuRight); + } } - Object itemsName = mapList.get(i).get("itemsName"); - if (null != itemsName) { - sarFileCompareItem.setItemsName(itemsName.toString()); + if (sfVo.getMenuRight() != null && sfVo.getMenuLeft() != null) { + break; } - Object itemsNum = mapList.get(i).get("itemsNum"); - if (null != itemsNum) { - sarFileCompareItem.setItemsNum(itemsNum.toString()); - } - Object itemsText = mapList.get(i).get("itemsText"); - if (null != itemsText) { - sarFileCompareItem.setItemsText(itemsText.toString()); - } - Object targetStand = mapList.get(i).get("targetStand"); - if (targetStand != null) { - sarFileCompareItem.setTargetStand((int) targetStand); - } - sarFileCompareItemService.add(sarFileCompareItem); } + List itemList = sarFileCompareItemService.queryListByInfoId(id); + for (SarFileCompareItem item : itemList) { + if (item.getLeftOrRight().equals("LEFT")) { + sfVo.addTextLeft(item); + } else if (item.getLeftOrRight().equals("RIGHT")) { + sfVo.addTextRight(item); + } + } + return sfVo; } + private List getMenuChildren(List menuList, String leftOrRight, String pid) { + List list = new ArrayList<>(); + for (SarFileCompareMenu menu : menuList) { + if (menu.getLeftOrRight().equals(leftOrRight) && menu.getParentId() != null && menu.getParentId().equals(pid)) { + SarFileCompareMenuVo menuVO = new SarFileCompareMenuVo(menu); + menuVO.setChildren(getMenuChildren(menuList, leftOrRight, menuVO.getMenuId())); + list.add(menuVO); + } + } + return list; + } + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemServiceImpl.java index 3373dfce7..97c9c3f41 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemServiceImpl.java @@ -1,6 +1,8 @@ package com.jero.modules.compare.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.compare.entity.SarFileCompareItem; +import com.jero.modules.compare.entity.SarFileCompareMenu; import com.jero.modules.compare.mapper.SarFileCompareItemMapper; import com.jero.modules.compare.service.ISarFileCompareItemService; import org.springframework.stereotype.Service; @@ -86,4 +88,13 @@ public class SarFileCompareItemServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public List queryListByInfoId(String infoId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SarFileCompareItem::getInfoId, infoId); + queryWrapper.orderBy(true,true,SarFileCompareItem::getItemsDisplayNum); + List list = this.list(queryWrapper); + return list; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareMenuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareMenuServiceImpl.java new file mode 100644 index 000000000..7a9a80f06 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareMenuServiceImpl.java @@ -0,0 +1,101 @@ +package com.jero.modules.compare.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.compare.entity.SarFileCompareMenu; +import com.jero.modules.compare.mapper.SarFileCompareMenuMapper; +import com.jero.modules.compare.service.ISarFileCompareMenuService; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @Description: 文档对比信息目录表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +public class SarFileCompareMenuServiceImpl extends ServiceImpl implements ISarFileCompareMenuService { + + /** + * 保存 + * + * @param sarFileCompareMenu + * @return + */ + @Override + public void add(SarFileCompareMenu sarFileCompareMenu) { + Date now = new Date(); + sarFileCompareMenu.setCreateTime(now); + sarFileCompareMenu.setUpdateTime(now); + save(sarFileCompareMenu); + } + + /** + * 更新 + * + * @param sarFileCompareMenu + * @return + */ + @Override + public void editById(SarFileCompareMenu sarFileCompareMenu) { + Date now = new Date(); + sarFileCompareMenu.setUpdateTime(now); + saveOrUpdate(sarFileCompareMenu); + } + + /** + * 通过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 SarFileCompareMenu queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + + @Override + public List queryListByInfoId(String infoId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SarFileCompareMenu::getInfoId, infoId); + queryWrapper.orderBy(true,true,SarFileCompareMenu::getDisplaySeq); + List list = this.list(queryWrapper); + return list; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java index a82b7511b..a7051d77c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java @@ -1,5 +1,6 @@ package com.jero.modules.split.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.split.entity.SarFileSplitItemsEO; @@ -67,5 +68,5 @@ public interface FileSplitItemsEOMapper extends BaseMapper int insertForeach(List list); - List queryByList(SarFileSplitItemsEOPage page); + List selectByInfoId(String value); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml index 29a65a59f..6512e6f1e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml @@ -117,22 +117,10 @@ ) - - + select * + from sar_file_split_items + where info_id = #{value} - diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java index b16caa11d..5dc2bacf4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java @@ -84,5 +84,5 @@ public interface IFileSplitItemsEOService extends IService List> getHeader(String flag, String cut); - List queryByList(SarFileSplitItemsEOPage page); + List selectByInfoId(String infoId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java index fac750ad5..361e46e32 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java @@ -41,4 +41,7 @@ public interface ISarFileSplitMenuEOService extends IService int queryByCount(SarFileSplitMenuEOPage page); List queryByPage(SarFileSplitMenuEOPage page); + + + List queryByInfoId(String infoId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 132bc2a02..757e76a96 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -72,6 +72,7 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.mock.web.MockMultipartFile; @@ -3734,12 +3735,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl queryByList(SarFileSplitItemsEOPage page){ - return dao.queryByList(page); + public List selectByInfoId(String infoId){ + return dao.selectByInfoId(infoId); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java index b252a40fb..660eb7c95 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.split.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.split.entity.SarFileSplitMenuEO; import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper; @@ -141,4 +142,11 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl queryByInfoId(String infoId) { + SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage(); + page.setInfoId(infoId); + return dao.queryByList(page); + } + } From 5f74c0968fc4bee1f386c7990a7bd1ef4a83bdc0 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 5 Aug 2022 09:54:42 +0800 Subject: [PATCH 02/97] =?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 03/97] =?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 04/97] =?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 05/97] =?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(); From eabce4d783c201468cbbb8e7b3965442bc3631b2 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 5 Aug 2022 10:32:45 +0800 Subject: [PATCH 06/97] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ryCardManageReleaseDetailEOController.java | 27 +++++++++- .../CountryCardManageReleaseEOController.java | 5 +- .../entity/CountryCardManageReleaseEO.java | 11 ++++ .../enums/LableTypeEnum.java | 8 +-- .../enums/ReleaseStatusEnum.java | 47 +++++++++++++++++ .../ICountryCardManageReleaseEOService.java | 7 +++ .../service/ICountryCardTempEOService.java | 6 +++ ...CountryCardManageReleaseEOServiceImpl.java | 50 +++++++++++++++++++ .../impl/CountryCardTempEOServiceImpl.java | 44 +++++++++++++++- 9 files changed, 198 insertions(+), 7 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java index 685e49453..c6c423cab 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java @@ -1,9 +1,13 @@ package com.jero.modules.problemKnowledgeBase.controller; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; @@ -35,7 +39,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class CountryCardManageReleaseDetailEOController extends JeroController { @Autowired private ICountryCardManageReleaseDetailEOService countryCardManageReleaseDetailEOService; - + /** * 分页列表查询 * @@ -167,4 +171,25 @@ public class CountryCardManageReleaseDetailEOController extends JeroController editBatch(@RequestBody JSONObject json) { + JSONArray countryCardManageReleaseDetailEOList = json.getJSONArray("countryCardManageReleaseDetailEOList"); + List releaseDetailEOList = new ArrayList<>(); + CountryCardManageReleaseDetailEO releaseDetailEO = null; + for (Object releaseDetail : countryCardManageReleaseDetailEOList) { + releaseDetailEO = JSONObject.parseObject(JSONObject.toJSONString(releaseDetail),CountryCardManageReleaseDetailEO.class); + releaseDetailEOList.add(releaseDetailEO); + } + + this.countryCardManageReleaseDetailEOService.updateBatchById(releaseDetailEOList); + return Result.OK("编辑成功!"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index 7504e7c33..8887cd8ed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class CountryCardManageReleaseEOController extends JeroController { @Autowired private ICountryCardManageReleaseEOService countryCardManageReleaseEOService; - + /** * 分页列表查询 * @@ -51,10 +51,13 @@ public class CountryCardManageReleaseEOController extends JeroController queryPageList(CountryCardManageReleaseEO countryCardManageReleaseEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="cut", defaultValue="cn") String cut, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = countryCardManageReleaseEOService.page(page, queryWrapper); + this.countryCardManageReleaseEOService.disposeData(pageList.getRecords(),cut); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java index 03b247fc6..9c556df95 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java @@ -3,7 +3,10 @@ package com.jero.modules.problemKnowledgeBase.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -71,4 +74,12 @@ public class CountryCardManageReleaseEO implements Serializable { @ApiModelProperty(value = "发布状态") private java.lang.String releaseStatus; + /**发布状态展示字段**/ + @TableField(exist = false) + private String releaseStatus_dictText; + + /**问题知识库-country_card-管理发布明细数组**/ + @TableField(exist = false) + private List countryCardManageReleaseDetailEOList; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/LableTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/LableTypeEnum.java index ff422ef83..4643efeb8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/LableTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/LableTypeEnum.java @@ -35,12 +35,12 @@ public enum LableTypeEnum { public static String getTextByValue(String value,String cut) { LableTypeEnum[] values = values(); - for (LableTypeEnum taskStatusEnum : values) { - if (taskStatusEnum.value.equals(value)) { + for (LableTypeEnum lableTypeEnum : values) { + if (lableTypeEnum.value.equals(value)) { if(StringUtils.equals(cut, CutEnum.CN.getValue())){ - return taskStatusEnum.cnName; + return lableTypeEnum.cnName; }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - return taskStatusEnum.enName; + return lableTypeEnum.enName; } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java new file mode 100644 index 000000000..5684cf326 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java @@ -0,0 +1,47 @@ +package com.jero.modules.problemKnowledgeBase.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 发布状态枚举类 + */ +public enum ReleaseStatusEnum { + + HAVE_RELEASED("已发布","Have released","have released"), + DRAFT("草稿","Draft","draft"), + ; + + + String cnName; + String enName; + String value; + + private ReleaseStatusEnum(String cnName, String enName, String value) { + this.cnName = cnName; + this.enName = enName; + this.value = value; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + ReleaseStatusEnum[] values = values(); + for (ReleaseStatusEnum releaseStatusEnum : values) { + if (releaseStatusEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return releaseStatusEnum.cnName; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return releaseStatusEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index e5958d1e2..e0de0375f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -58,4 +58,11 @@ public interface ICountryCardManageReleaseEOService extends IService queryList(); + + /** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java index 4e10be53d..6881d81b4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java @@ -67,4 +67,10 @@ public interface ICountryCardTempEOService extends IService { * @param cut */ void disposeData(List datas, String cut); + + /** + * 设置排序号 + * @param countryCardTempEO + */ + void setOrderNum(CountryCardTempEO countryCardTempEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index cec8bb911..52d5a6810 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -1,11 +1,21 @@ package com.jero.modules.problemKnowledgeBase.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; +import com.jero.modules.problemKnowledgeBase.enums.ReleaseStatusEnum; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseEOMapper; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,6 +30,9 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl implements ICountryCardManageReleaseEOService { + @Autowired + private ICountryCardManageReleaseDetailEOService countryCardManageReleaseDetailEOService; + /** * 保存 * @@ -31,7 +44,15 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl releaseDetailEOList = countryCardManageReleaseEO.getCountryCardManageReleaseDetailEOList(); + if(CollectionUtils.isNotEmpty(releaseDetailEOList)){ + releaseDetailEOList.forEach(releaseDetailEO -> { + releaseDetailEO.setCountryCardManageReleaseId(countryCardManageReleaseEO.getId()); + }); + this.countryCardManageReleaseDetailEOService.saveBatch(releaseDetailEOList); + } } /** @@ -89,4 +110,33 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public void disposeData(List datas, String cut) { + if (CollectionUtils.isNotEmpty(datas)) { + List CountryCardManageReleaseEOId = datas.stream().map(CountryCardManageReleaseEO::getId).collect(Collectors.toList()); + + //查询出来管理发布列表中数据的明细信息 + QueryWrapper releaseDetailEOQueryWrapper = new QueryWrapper<>(); + releaseDetailEOQueryWrapper.lambda().in(CountryCardManageReleaseDetailEO::getCountryCardManageReleaseId,CountryCardManageReleaseEOId); + List releaseDetailEOList = this.countryCardManageReleaseDetailEOService.list(releaseDetailEOQueryWrapper); + + datas.forEach(data -> { + if (StringUtils.isNotEmpty(data.getReleaseStatus())) { + data.setReleaseStatus_dictText(ReleaseStatusEnum.getTextByValue(data.getReleaseStatus(),cut)); + } + + if(CollectionUtils.isNotEmpty(releaseDetailEOList)){ + List collect = releaseDetailEOList.stream().filter(releaseDetailEO -> { + boolean flag = false; + if(StringUtils.equals(data.getId(),releaseDetailEO.getCountryCardManageReleaseId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + data.setCountryCardManageReleaseDetailEOList(collect); + } + }); + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java index 143ab8369..73511969a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java @@ -13,7 +13,6 @@ import org.apache.commons.lang3.StringUtils; 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; @@ -45,6 +44,7 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByAsc("order_num"); + List countryCardTempEOList = this.list(queryWrapper); + + Integer orderNumData = countryCardTempEOList.stream().filter(e -> e.getId().equals(countryCardTempEO.getId())) + .map(e -> e.getOrderNum()).collect(Collectors.toList()).get(0); + + queryWrapper.eq("order_num", inputOrderNum); + Integer orderNumCount = this.baseMapper.selectCount(queryWrapper); + //有重复展示顺序的,后面的号全+1 + if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) { + + //设置排序 + QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); + orderNumQueryWrapper.ge("order_num", inputOrderNum) + .orderByAsc("order_num"); + List geOrderNumList = this.list(orderNumQueryWrapper); + + //判断相邻的序号,去掉不邻的 + for (int i = 0; i < geOrderNumList.size(); i++) { + if (geOrderNumList.size() == 1) { + break; + } else if(i+1 >= geOrderNumList.size()){ + break; + }else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) { + int deleteStart = geOrderNumList.get(i + 1).getOrderNum(); + geOrderNumList = geOrderNumList.stream().filter(e -> e.getOrderNum() < deleteStart).collect(Collectors.toList()); + break; + } + } + + geOrderNumList.stream().forEach(e -> e.setOrderNum(e.getOrderNum() + 1)); + saveOrUpdateBatch(geOrderNumList); + } + } + } } From 33df55a7917603fc0dc5930f1d968c8090f67ccf Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 5 Aug 2022 10:40:42 +0800 Subject: [PATCH 07/97] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E9=A2=86=E5=9F=9F=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/AdjustareaSofrespon/index.vue | 152 +++++------------- .../ParameterItemCollectionList.vue | 4 +- 2 files changed, 41 insertions(+), 115 deletions(-) diff --git a/jero-web/src/components/AdjustareaSofrespon/index.vue b/jero-web/src/components/AdjustareaSofrespon/index.vue index 052fd8850..05beafa9c 100644 --- a/jero-web/src/components/AdjustareaSofrespon/index.vue +++ b/jero-web/src/components/AdjustareaSofrespon/index.vue @@ -2,7 +2,7 @@
- -
-
- * - - {{$t('areaOfResponsibility')}} -
- - - -
- - - - - + + + + +
+
+ + {{$t('submit')}} + + {{$t('cancel')}} +
+
-
- {{ $t('cancel') }} - {{ $t('submit') }} -
+ + + + { - if (res.success) { - this.areaTable = [...res.result.records] - this.total = res.result.total - } - }).finally(() => { - this.loading = false - }) - }, handleInput(value) { this.$nextTick(() => { this.form = { ...this.form } - this.$refs.ruleFormOne.validateField([value]) + this.$refs.ruleForm.validateField([value]) }) }, - searchQuery() { - this.loadData() - }, - searchReset() { - this.form = {} - this.loadData() - }, handleCancel() { - this.$emit('areaVisibleTaskCutOffTimeflag', false) - }, - handleTableChange(val) { + this.$emit('AdjustareasofresponAll', false) }, //保存 handleSubmit() { - // let _this = this - // let param = {ids: this.selectedRowKeysArray, deadline: `${this.pickerDate}`, } - // this.confirmLoading = true - // postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => { - // if (res.success) { - // this.$emit('areaVisibleTaskCutOffTimeflag', false) - // this.$message.success(_this.$t('OperationSuccessful')) - // this.confirmLoading = false - // } else { - // this.$message.warning(_this.$t('operationFailed')) - // this.confirmLoading = false - // } - // }) this.$refs.ruleForm.validate(valid => { if(valid){ let long = localStorage.getItem('language') @@ -205,62 +161,32 @@ export default { } this.textLoading = true - axios({ - url: '/jero-boot/params/collectManifest/issueCollection', - method: 'post', - data: param, - transformRequest: [function(data) { - let ret = '' - for (let it in data) { - ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' + postAction('/params/collectManifest/updateBatchDutyTerritory', param).then((res) => { + if (res.success) { + if(res.result.length == 0){ + this.visibleoperationFailed = false + this.textLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.$emit('AdjustareasofresponAll', false) + this.$emit('GetgetTableList') + + }else{ + this.NotSelectedRowKeysValue = res.result + this.visibleoperationFailed = true + this.textLoading = false } - return ret - }], - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token': _this.token + } else { + this.$message.warning(this.$t('operationFailed')) } }) - .then((res) => { - if (res.data.success) { - // _this.$message.success(this.$t('OperationSuccessful')) - if(res.data.result.length == 0){ - this.visibleoperationFailed = false - this.textLoading = false - _this.$message.success(this.$t('OperationSuccessful')) - this.$emit('areaVisibleTaskCutOffTimeflag', false) - this.$emit('GetgetTableList') - - }else{ - this.NotSelectedRowKeysValue = res.data.result - this.visibleoperationFailed = true - this.textLoading = false - } - - // this.$emit('areaVisibleTaskCutOffTimeflag', false) - // this.$emit('GetgetTableList') - } else { - _this.$message.warning(this.$t('operationFailed')) - } - }) - .catch((error) => { - this.textLoading = false - }) } }) }, // 错误数据的弹框 cancleoperationFailed() { this.visibleoperationFailed = false - this.$emit('areaVisibleTaskCutOffTimeflag', false) + this.$emit('AdjustareasofresponAll', false) this.$emit('GetgetTableList') - // this.GetgetTableList() - }, - onChange(val) { - this.pickerDate = moment(val).format('YYYY-MM-DD HH:mm:ss') - }, - onOk(val) { - this.pickerDate = moment(val).format('YYYY-MM-DD HH:mm:ss') }, } } diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index b9b69a267..b767cba40 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -300,10 +300,10 @@ @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/> - + + @AdjustareasofresponAll='AdjustareasofresponAll'/> From ad34f231a4b2523bbf72912666437699ed815cdc Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 5 Aug 2022 10:52:08 +0800 Subject: [PATCH 08/97] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E7=9B=B8=E5=85=B3=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=90=8D=E5=8D=95-bug:=E5=8B=BE=E9=80=89=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=BC=BA=E5=A4=B1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ProjectRelatedPersonnelMapper.xml | 9 ++++----- .../impl/ProjectRelatedPersonnelServiceImpl.java | 16 +++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml index 8c097fef3..107fe1a72 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml @@ -60,13 +60,12 @@ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 8f2136160..12b491960 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -34,14 +34,7 @@ import org.apache.poi.hssf.usermodel.HSSFRichTextString; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -475,8 +468,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl idList = Arrays.asList(id.split(",")); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id",idList); + queryWrapper.lambda().in(ProjectRelatedPersonnel::getId, idList); records = list(queryWrapper); + disposeData(records); } else {//1个id records = queryById(id); @@ -486,8 +480,12 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records,String cut) { //查标签内容里的责任领域数据 List sysDictItemValueList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()); From 559f9496455244f57d68bb35b0176ea6831c36c1 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 5 Aug 2022 11:09:00 +0800 Subject: [PATCH 09/97] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/AdjustareaSofrespon/index.vue | 6 ++--- .../src/components/tableCollection/index.vue | 2 +- .../ParameterItemCollectionList.vue | 24 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jero-web/src/components/AdjustareaSofrespon/index.vue b/jero-web/src/components/AdjustareaSofrespon/index.vue index 05beafa9c..f88517b41 100644 --- a/jero-web/src/components/AdjustareaSofrespon/index.vue +++ b/jero-web/src/components/AdjustareaSofrespon/index.vue @@ -11,10 +11,10 @@ > - + @@ -98,7 +98,7 @@ export default { form: {}, rules: { dutyTerritory:[ - { required: true, message: this.$t('PleaseSelect')+this.$t('areaOfResponsibility'), trigger: 'change' } + { required: true, message: this.$t('PleaseSelect')+this.$t('NareaOfResponsibility'), trigger: 'change' } ] }, areaTable: [], diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index f29c53e4e..df0a4ef53 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -46,7 +46,7 @@ + v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "Wait Collect" || record.state == "Sdt Back"'> {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }} diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index b767cba40..ca4ca84d0 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -17,19 +17,19 @@
-
- {{$t('newNiONumber')}} +
+ {{$t('NNiONumber')}}
-
-
- {{$t('ParameterName')}} +
+ {{$t('NParameterName')}}
-
@@ -46,21 +46,21 @@
-
- {{$t('areaOfResponsibility')}} +
+ {{$t('NareaOfResponsibility')}}
-
- {{$t('completedBy')}} +
+ {{$t('dre')}}
-
From 981ab74e67867507eff1bc1f6542f60d230b6f9e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 5 Aug 2022 11:16:50 +0800 Subject: [PATCH 10/97] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E9=A6=96=E5=AD=97?= =?UTF-8?q?=E6=AF=8D=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0c905a520..50c3f02c7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1218,8 +1218,8 @@ module.exports = { documentTitle: 'Document Title', bringInDocumentInformation: 'Bring in document information', thereWhichCannotDeleted: 'There are sub headings under this title, which cannot be deleted', - sdt: 'sdt', - dre: 'dre', + sdt: 'Sdt', + dre: 'Dre', applicableInstructionsMarketList: 'Applicable instructions of market list', pleaseSelectTheDataCompared: 'Please select the data to be compared', problemLabel: 'Problem label', From 33680a5c32187ab602e89b727bb791043f514352 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 5 Aug 2022 13:39:08 +0800 Subject: [PATCH 11/97] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= 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/comparisonResults.vue | 112 ++------ .../components/documentDataComparison.vue | 251 +++++++++++------- .../components/initiateComparison.vue | 9 +- .../documentComparison/index.vue | 94 +++++-- 6 files changed, 260 insertions(+), 208 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 50c3f02c7..d08e9e438 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1238,5 +1238,6 @@ module.exports = { share: 'share', simplifiedChinese:'Simplified Chinese', uploadOnly:'Upload only', + turnOnAutoMatch:'Turn on auto match', 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 23830184a..bd9a45ef5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1341,5 +1341,6 @@ module.exports = { share:'分享', simplifiedChinese:'简体中文', uploadOnly:'只能上传', + turnOnAutoMatch:'打开自动匹配', Adjustareasofresponsibility:'调整责任领域', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue index 81de1c7e2..52e4c4497 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue @@ -27,24 +27,27 @@
-
+
所选标准：GB 23456-2020 机动车标准 FMVSS 114 中文.word
-
+
所选标准：GB 23456-2020 机动车标准 FMVSS 114 中文.word
-
+
操作
-
+
-
+
第10条 @@ -74,7 +77,7 @@
-
+
{{$t('edit')}} {{$t('delete')}} @@ -82,96 +85,13 @@
-
- - -
-
-
-
- 第10条 - 光反射器 -
-
- 12. 附加光反射器，可以是贴纸，具有以下规格： a) 正面左右两侧呈白色或淡黄色； b) 背面左右两侧呈红色； c) 防护板 - sdf kdsf kljsfkldsfdsfdsf -
-
-
-
- 第10条 - 光反射器 -
-
- 12. 附加光反射器，可以是贴纸，具有以下规格： a) 正面左右两侧呈白色或淡黄色； b) 背面左右两侧呈红色； c) 防护板收到反是馈就但是罚款决定书发的科技示范 -
-
-
-
- - {{$t('comparisonDifferenceComment')}}: -
-
- 差异是各单位在结构上的差别程度成员在时间横轴上的位置的差别程经理与其他的差别程度 横轴上的位置的差别程经理与其他的差别程度差异 -
-
-
-
- - {{$t('edit')}} - {{$t('delete')}} - -
-
-
-
- - -
-
-
-
- 第10条 - 光反射器 -
-
- 12. 附加光反射器，可以是贴纸，具有以下规格： a) 正面左右两侧呈白色或淡黄色； b) 背面左右两侧呈红色； c) 防护板 - sdf kdsf kljsfkldsfdsfdsf -
-
-
-
- 第10条 - 光反射器 -
-
- 12. 附加光反射器，可以是贴纸，具有以下规格： a) 正面左右两侧呈白色或淡黄色； b) 背面左右两侧呈红色； c) 防护板收到反是馈就但是罚款决定书发的科技示范 -
-
-
-
- - {{$t('comparisonDifferenceComment')}}: -
-
- 差异是各单位在结构上的差别程度成员在时间横轴上的位置的差别程经理与其他的差别程度 横轴上的位置的差别程经理与其他的差别程度差异 -
-
-
-
- - {{$t('edit')}} - {{$t('delete')}} - -
-
-
-
+
{{$t('fullTextComments')}}: 文字占位符评论文字内容文字占位符评论文 字内容文字占位符评论文字内容文字 @@ -190,7 +110,7 @@ 占位符评论文字内容文字占位符评论文字内容文字占
-
+
{{$t('edit')}} @@ -593,4 +513,12 @@ overflow: hidden; text-overflow: ellipsis; } + + .detail-content-content-text-dis { + width: 100% !important; + } + + .detail-content-header-content-left-active { + width: 50% !important; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index c229dafa3..28e5f759b 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -20,9 +20,9 @@ {{$t('addFullTextComment')}}
- - {{$t('turnOffAutomaticMatching')}} + :title="isMatching ? $t('turnOffAutomaticMatching'):$t('turnOnAutoMatch')"> + + {{isMatching ? $t('turnOffAutomaticMatching'):$t('turnOnAutoMatch')}}
@@ -31,33 +31,25 @@
- GB 23145-2020 机动车标准 FMVSS 114 中文.word + {{this.resultData.serialNumberLeft}}  + {{this.resultData.fileNameLeft}}
-
-
-
- 1、范围 -
-
- 本标准规定了汽车用LED光源/模块或含有LED光源/模块的前照灯配光性能、光色温度循环等试验方法和检验规则等， - 本标准适用于M、N类汽车使用的LED前照灯、或主要由LED光源或LED模块形成远光或近光的LED前照灯。 -
-
-
-
- 1、范围 -
-
- 本标准规定了汽车用LED光源/模块或含有LED光源/模块的前照灯配光性能、光色温度循环等试验方法和检验规则等， - 本标准适用于M、N类汽车使用的LED前照灯、或主要由LED光源或LED模块形成远光或近光的LED前照灯。 +
+
+
+
+ {{item.itemsNum + ' ' + item.itemsName}} +
+
@@ -65,55 +57,31 @@
- GB 23145-2020 机动车标准 FMVSS 114 中文.word + {{this.resultData.serialNumberRight}}  + {{this.resultData.fileNameRight}} - 相似度: - 98% + +
-
-
-
- 1、范围 -
-
- 本标准规定了汽车用LED光源/模块或含有LED光源/模块的前照灯配光性能、光色温度循环等试验方法和检验规则等， - 本标准适用于M、N类汽车使用的LED前照灯、或主要由LED光源或LED模块形成远光或近光的LED前照灯。 -
-
-
-
- 1、范围 -
-
- 本标准规定了汽车用LED光源/模块或含有LED光源/模块的前照灯配光性能、光色温度循环等试验方法和检验规则等， - 本标准适用于M、N类汽车使用的LED前照灯、或主要由LED光源或LED模块形成远光或近光的LED前照灯。 -
-
-
-
- 1、范围 -
-
- 本标准规定了汽车用LED光源/模块或含有LED光源/模块的前照灯配光性能、光色温度循环等试验方法和检验规则等， - 本标准适用于M、N类汽车使用的LED前照灯、或主要由LED光源或LED模块形成远光或近光的LED前照灯。 -
-
-
-
- 1、范围 -
-
- 本标准规定了汽车用LED光源/模块或含有LED光源/模块的前照灯配光性能、光色温度循环等试验方法和检验规则等， - 本标准适用于M、N类汽车使用的LED前照灯、或主要由LED光源或LED模块形成远光或近光的LED前照灯。 +
+
+
+
+ {{item.itemsNum + ' ' + item.itemsName}} +
+
+
@@ -160,7 +128,7 @@
{{$t('fullTextComments')}}
- + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index bb5cacdb6..f2bc6ff04 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -3,7 +3,7 @@
- + {{$t('newlyAdded')}} @@ -19,28 +19,28 @@ * {{$t('displayPermission')}}
- + + @change="showPermissionsChange" + v-model="formInline.showPermissions"> - - {{ item.projectName}} + :value="item.value"> + + {{ item.name}}
- +
* {{$t('authorizedUser')}}
- + * {{$t('title')}}
- + {{$t('problemClassification')}}
- - + + + + + {{item.problemLabel}} + + +
@@ -88,13 +92,13 @@ * {{$t('market')}}
- - + + :triggerChange="false" :dictCode="'region'"/>
@@ -105,10 +109,10 @@
{{$t('standardNo')}}
- +
@@ -150,10 +154,10 @@
- {{ (formInline.enclosure === 'null' || formInline.enclosure === '' + @click="clickButtonToUpload('accessoryFile')"> + {{ (formInline.accessoryFile === 'null' || formInline.accessoryFile === '' || - formInline.enclosure == null) ? $t('clickUpload') : $t('viewUploadedFiles') + formInline.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -161,9 +165,14 @@ +
+ {{$t('submit')}} +
+ {{$t('pleaseWaitWhileRunning')}} +
@@ -175,6 +184,7 @@ import 'quill/dist/quill.core.css' import 'quill/dist/quill.snow.css' import 'quill/dist/quill.bubble.css' + import listAddModel from './listAddModel' import { quillEditor } from 'vue-quill-editor' export default { @@ -182,14 +192,72 @@ components: { PersonnelSelection, uploadFile, - quillEditor + quillEditor, + listAddModel }, data() { return { formInline: {}, - rules: {}, + loading: false, + problemTypeList: [], + rules: { + showPermissions: [ + { + required: true, + message: this.$t('displayPermission') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + studioEngineerName: [ + { + required: true, + message: this.$t('authorizedUser') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + title: [ + { + required: true, + message: this.$t('title') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('title') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ], + problemType: [ + { + required: true, + message: this.$t('problemClassification') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + targetMarket: [ + { + required: true, + message: this.$t('market') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + }, + url: { + add: '/problemKnowledgeBase/problemKnowledgeBaseEO/add', + edit: '/problemKnowledgeBase/problemKnowledgeBaseEO/edit' + }, + isDisplay: false, disabled: false, - projectNameList: [], + projectNameList: [ + { + value: 'Open', + name: this.$t('OpenOne') + }, + { + value: 'Privacy', + name: this.$t('Privacy') + } + ], content: '

I am Example

', editorOption: { // Some Quill options... @@ -203,34 +271,92 @@ }, mounted() { document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded') + this.getBase() + if (this.$route.query.id) { + this.queryById() + } }, methods: { + getBase() { + getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { + if (res.success) { + this.problemTypeList = res.result || [] + } else { + this.problemTypeList = [] + } + }) + }, + queryById() { + let query = { + id: this.$route.query.id + } + getAction('/problemKnowledgeBase/problemKnowledgeBaseEO/queryById', query).then((res) => { + if (res.success) { + this.formInline = res.result || {} + this.formInline = { ...this.formInline } + if (this.formInline.showPermissions == 'Privacy'){ + this.isDisplay = true + }else{ + this.isDisplay = false + } + } else { + this.formInline = {} + } + }) + }, + backClick() { + this.$router.push({ + path: '/problemknowledgeBase' + }) + } + , + showPermissionsChange(event) { + if (event == 'Open') { + this.isDisplay = false + } else { + this.isDisplay = true + } + } + , onEditorBlur(quill) { console.log('editor blur!', quill) - }, + } + , onEditorFocus(quill) { console.log('editor focus!', quill) - }, + } + , onEditorReady(quill) { console.log('editor ready!', quill) - }, + } + , onEditorChange({ quill, html, text }) { console.log('editor change!', quill, html, text) this.content = html - }, + } + , PersonnelSelectionChange(value, id) { this.formInline[value] = id this.formInline = { ...this.formInline } - }, + } + , handleInput(value) { this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.validateField([value]) }) - }, + } + , bringInDocumentInformationClick() { - - }, + this.$refs.listAddModelRef.addModel(this.formInline) + } + , + listAddModelForm(id, number) { + this.formInline.standNumber = number + this.formInline.bussDocumentLibraryId = id + this.formInline = { ...this.formInline } + } + , clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true @@ -242,7 +368,8 @@ this.$refs.uploadFile.perentHandleFunc() } }) - }, + } + , /** 上传文件的回调 */ uploadSuccess(data) { let attIdList = [] @@ -255,6 +382,47 @@ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } } + , + submit() { + this.$refs.ruleForm.validate(valid => { + if (valid) { + let formInline = JSON.parse(JSON.stringify(this.formInline)) + this.loading = true + this.confirmLoading = true + let url = '' + if (this.formInline.id) { + url = this.url.edit + } else { + url = this.url.add + } + formInline.permissionUserList = [] + if (formInline.showPermissions == 'Privacy') { + let studioEngineer = formInline.studioEngineer.split(',') + studioEngineer.forEach(res => { + formInline.permissionUserList.push({ + userId: res + }) + }) + } + postAction(url, formInline).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.loading = false + if (this.$route.query.id) { + + } else { + this.$router.push({ + path: '/problemknowledgeBase' + }) + } + } else { + this.loading = false + this.$message.warning(this.$t('operationFailed')) + } + }) + } + }) + } } } @@ -381,4 +549,13 @@ .box-button { height: 38px; } + + .submit-button { + width: 100%; + margin-top: 20px; + text-align: right; + padding: 0 32px; + box-sizing: border-box; + } + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 6036c6576..a5cae60f5 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -99,7 +99,7 @@ downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, url: { - getInfoList: 'search/document/getFullTextInfoList' + getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page' } } }, @@ -108,10 +108,13 @@ }, methods: { onSearch() { - + this.pageNo = 1 + this.getList() }, ResetSearch() { - + this.searchContent = '' + this.pageNo = 1 + this.getList() }, classificationClick() { this.$refs.classificationMaintenanceModelRef.getData() @@ -124,11 +127,14 @@ window.open(newUrl.href, '_blank') }, newlyAddedClick() { - let newUrl = this.$router.resolve({ - path: '/problemKnowledgeBaseAdd', - query: {} + this.$router.push({ + path: '/problemKnowledgeBaseAdd' }) - window.open(newUrl.href, '_blank') + // let newUrl = this.$router.resolve({ + // path: '/problemKnowledgeBaseAdd', + // query: {} + // }) + // window.open(newUrl.href, '_blank') }, pageOnChange(page, pageSize) { this.pageNo = page @@ -144,7 +150,7 @@ pageNo: this.pageNo, pageSize: this.pageSize } - postAction(this.url.getInfoList, query).then((res) => { + getAction(this.url.getInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records this.total = res.result.total From eedb9de0224fd1b930b2ad75a2baf2a067bf884c Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 17:10:21 +0800 Subject: [PATCH 50/97] =?UTF-8?q?country=5Fcard-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83-=E8=8E=B7=E5=8F=96=E9=80=82=E7=94=A8?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=8B=E6=8B=89=E9=80=89=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82=20=E5=88=86=E7=B1=BB-=E5=A4=84=E7=90=86=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=90=8D=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/enums/DicCodeEnum.java | 52 +++++++++++++++++++ .../CountryCardManageReleaseEOController.java | 13 +++++ .../ICountryCardManageReleaseEOService.java | 8 +++ ...CountryCardManageReleaseEOServiceImpl.java | 37 +++++++++++++ ...lemKnowledgeBaseClassifyEOServiceImpl.java | 35 +++++++++---- 5 files changed, 135 insertions(+), 10 deletions(-) create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java new file mode 100644 index 000000000..d109cf276 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java @@ -0,0 +1,52 @@ +package com.jero.modules.system.enums; + +/** + * 数据字典code枚举类 + */ +public enum DicCodeEnum { + REGION("适用地区","0","region"), + ; + + String name; + String value; + String code; + + private DicCodeEnum(String name, String value, String code) { + this.name = name; + this.value = value; + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public static String getTextByValue(String value) { + DicCodeEnum[] values = values(); + for (DicCodeEnum dicCodeEnum : values) { + if (dicCodeEnum.value.equals(value)) { + return dicCodeEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index ae2e63e86..2830d355d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -185,4 +186,16 @@ public class CountryCardManageReleaseEOController extends JeroController> getApplyMarketList() { + Result> result = this.countryCardManageReleaseEOService.getApplyMarketList(); + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index 68de81566..90fd6f872 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -1,6 +1,8 @@ package com.jero.modules.problemKnowledgeBase.service; import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -72,4 +74,10 @@ public interface ICountryCardManageReleaseEOService extends IService> getApplyMarketList(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index a0a0f6c04..e39493645 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -2,17 +2,22 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.jero.modules.problemKnowledgeBase.enums.ReleaseStatusEnum; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseEOMapper; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Date; @@ -34,6 +39,8 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl> getApplyMarketList() { + List result = new ArrayList<>(); + + //获取所有的适用地区 + List dictModelList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + + //获取已经创建了country Card的适用地区，该接口只返回，在country Card里面没有的适用地区。 + List countryCardManageReleaseEOList = this.list(); + if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){ + result = dictModelList; + }else { + for (DictModel dictModel : dictModelList) { + boolean flag = true; + for (CountryCardManageReleaseEO countryCardManageReleaseEO : countryCardManageReleaseEOList) { + if(StringUtils.equals(dictModel.getValue(),countryCardManageReleaseEO.getApplyMarket())){ + flag = false; + break; + } + } + + if(flag){ + result.add(dictModel); + } + } + } + + return Result.OK(result); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java index 4949d9f5f..c8359bbdc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java @@ -9,6 +9,9 @@ import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Date; import java.util.stream.Collectors; @@ -102,21 +105,33 @@ public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl datas) { if (CollectionUtils.isNotEmpty(datas)) { - List userIdList = datas.stream().map(ProblemKnowledgeBaseClassifyEO::getChargePersonId).distinct().collect(Collectors.toList()); + + StringBuffer userIdSb = new StringBuffer(); + for (ProblemKnowledgeBaseClassifyEO data : datas) { + userIdSb.append(data.getChargePersonId() + ","); + } + List userIdList = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIdSb.toString())){ + userIdList = Arrays.asList(userIdSb.toString().substring(0,userIdSb.length()-1).split(",")); + } List userList = this.sysUserService.querySysUserListByIdList(userIdList); datas.forEach(data -> { if(CollectionUtils.isNotEmpty(userList)){ - List sysUsers = userList.stream().filter(user -> { - boolean flag = false; - if (StringUtils.equals(data.getId(), user.getId())) { - flag = true; - } - return flag; - }).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(sysUsers)){ - data.setChargePersonIdName(sysUsers.get(0).getUsername()); + String chargePersonId = data.getChargePersonId(); + if(StringUtils.isNotEmpty(chargePersonId)){ + String[] chargePersonIdArr = chargePersonId.split(","); + String chargePersonIdName = userList.stream().filter(user -> { + boolean flag = false; + for (String chargePerson : chargePersonIdArr) { + if(StringUtils.equals(user.getId(),chargePerson)){ + flag = true; + } + } + return flag; + }).map(SysUser::getUsername).collect(Collectors.joining(",")); + data.setChargePersonIdName(chargePersonIdName); } } }); From 30f5341748c8eb85654121c0109455ab6172ea34 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 17:14:24 +0800 Subject: [PATCH 51/97] update --- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index b4155d784..680113bf6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -200,7 +200,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl problemKnowledgeBaseClassifyEOList = new ArrayList<>(); if(StringUtils.isNotEmpty(problemTypeSb.toString())){ - Stream problemTypeList = Arrays.asList(problemTypeSb.toString().substring(0, problemTypeSb.toString().length() - 1).split(",")).stream().distinct(); + List problemTypeList = Arrays.asList(problemTypeSb.toString().substring(0, problemTypeSb.toString().length() - 1).split(",")).stream().distinct().collect(Collectors.toList()); QueryWrapper classifyEOQueryWrapper = new QueryWrapper<>(); classifyEOQueryWrapper.lambda().in(ProblemKnowledgeBaseClassifyEO::getId,problemTypeList); problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(classifyEOQueryWrapper); From 6f47ffebaa69b276a491cc0a868db49c391a8093 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 8 Aug 2022 17:24:28 +0800 Subject: [PATCH 52/97] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseList.vue | 4 +- .../components/problemKnowledgeBaseView.vue | 130 ++++++++++++++---- 2 files changed, 109 insertions(+), 25 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index a5cae60f5..6e291a5a3 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -162,7 +162,9 @@ titleClick(item) { let newUrl = this.$router.resolve({ path: '/problemKnowledgeBaseView', - query: {} + query: { + id: item.id + } }) window.open(newUrl.href, '_blank') } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 2d85b178d..c90f35272 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -21,30 +21,23 @@ - {{queryForm[item.value]}}fdgdgdfg + {{queryForm[item.value]}}
-
- sfdsfdsf的防控流感的飞机过来看的结果东法兰克感觉地方给了地方国家的分开两个就地方孤苦伶仃附件给领导反馈 - 独守空房了就收到付款了的角色发看来都是风景但是考虑附件第三方库老师积分迪斯科浪费绝对是分类的课时费 - 是反抗拉萨的飞机罗斯福就点十六分就但是发 - 迪斯科浪费电视机分厘卡的设计分类的水库附近的说服力但是积分的历史房价多少发了多少给京东方管理看豆腐干豆腐干看 - a fjsd fklsdjfk s是否考虑技术的反抗类毒素就发的撒开了房间但是发离开打扫房间是开了房间都是老师JFK了的身份圣诞快乐就是的反抗类毒素解放迪斯科浪费是 - 考虑到房价打开拉萨附近分离技术的领导是否打开拉萨范德萨发了开始就发的考虑是否就但是考虑发及代理商开发就十分大师傅看 -
+
- 123456 + {{this.queryForm.browsingHistoryCount}} - - - 123456 + + + {{this.queryForm.praiseCount}} - - - 123456 + + + {{this.queryForm.collectCount}}
@@ -107,7 +100,8 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index cd7fc3755..e3e4044bf 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -8,8 +8,17 @@
{{$t('applicableMarket')}}
- + + + + {{ item.title}} + + +
@@ -89,15 +98,25 @@ return { queryParam: {}, conList: [], + applyMarketList: [], pageSize: 10, total: 0, pageNo: 1 } }, mounted() { - + this.getApplyMarketList() }, methods: { + getApplyMarketList() { + getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: 'countryCard' }).then((res) => { + if (res.success) { + this.applyMarketList = res.result || [] + } else { + this.applyMarketList = [] + } + }) + }, searchQuery() { }, diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index ec96f19d0..9e34a7f28 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -19,8 +19,10 @@
{{$t('applicableMarket')}}
- +
@@ -28,8 +30,18 @@
{{$t('releaseStatus')}}
- + + + + {{ item.name}} + + +
@@ -74,8 +86,10 @@ {{!record.releaseStatus || record.releaseStatus == 'Draft' ? $t('release') :$t('withdraw')}} {{$t('edit')}} {{$t('delete')}} @@ -104,6 +118,7 @@ import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import countryCardReleaseModel from './countryCardReleaseModel' import countryCardReleaseAdd from './countryCardReleaseAdd' + import { mapGetters } from 'vuex' export default { name: 'countryCardRelease', @@ -114,8 +129,19 @@ data() { return { queryParam: {}, + releaseStatusList: [ + { + value: 'Draft', + name: this.$t('draft') + }, + { + value: 'Have released', + name: this.$t('HaveReleased') + } + ], loading: false, - dataSource: [{}], + dataSource: [], + selectedRowKeysRecord: [], total: 0, pageSize: 10, pageNo: 1, @@ -123,12 +149,13 @@ list: '/problemKnowledgeBase/countryCardManageReleaseEO/page', deleteBatch: '/problemKnowledgeBase/countryCardManageReleaseEO/deleteBatch' }, + userInfoQuery: {}, selectedRowKeys: [], columns: [ { title: this.$t('applicableMarket'), align: 'center', - dataIndex: 'applyMarket', + dataIndex: 'applyMarket_dictText', ellipsis: true }, { @@ -150,8 +177,10 @@ mounted() { document.title = 'Country Card-' + this.$t('managePublishing') this.getList() + this.userInfoQuery = this.userInfo() }, methods: { + ...mapGetters(['userInfo']), searchQuery() { this.pageNo = 1 this.getList() @@ -197,8 +226,9 @@ } }) }, - onSelectChange(value) { + onSelectChange(value, record) { this.selectedRowKeys = value + this.selectedRowKeysRecord = record }, newlyAddedClick() { this.$refs.countryCardReleaseAddRef.add() @@ -212,16 +242,27 @@ this.$confirm({ content: _this.$t('ConfirmBatchDeletion'), onOk() { - let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - getAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - } else { - _this.$message.warning(res.message) + let idList = [] + let selectedRowKeysRecord = JSON.parse(JSON.stringify(_this.selectedRowKeysRecord)) + for (let i = 0; i < selectedRowKeysRecord.length; i++) { + if (selectedRowKeysRecord[i].createBy == _this.userInfo().username && + selectedRowKeysRecord[i].releaseStatus == 'Draft') { + idList.push(selectedRowKeysRecord[i].id) } - }) + } + if (idList.length > 0) { + deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } else { + _this.$message.warning(_this.$t('doNotHavePermissionDeleteData')) + } } }) } else { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index db4a9d6a0..a2ed72151 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -10,7 +10,7 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> - +
@@ -20,6 +20,7 @@
+ + +
+
+ {{$t('applicableMarket')}} +
+ + + +
+ +
{ + this.formInline = {} + this.$refs.ruleForm.clearValidate() + }) this.title = this.$t('newlyAdded') this.replacePage() this.getApplyMarketList() }, edit(row) { this.visible = true + this.$nextTick(() => { + this.formInline = row + this.formInline = { ...this.formInline } + this.$refs.ruleForm.clearValidate() + }) this.title = this.$t('edit') this.editReplacePage(row) - this.getApplyMarketList() }, getApplyMarketList() { getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', {}).then((res) => { @@ -194,20 +220,29 @@ this.$refs.ruleForm.validate(valid => { if (valid) { let url = '' + let content = [] if (this.title == this.$t('newlyAdded')) { url = this.url.add + this.dataList.forEach(res => { + content.push({ + countryCardTempId: res.id, + description: res.description, + content: res.content + }) + }) } else { url = this.url.edit + this.dataList.forEach(res => { + content.push({ + countryCardTempId: res.id, + description: res.description, + content: res.content, + id: res.id + }) + }) } this.confirmLoading = true - let content = [] - this.dataList.forEach(res => { - content.push({ - countryCardTempId: res.id, - description: res.description, - content: res.content - }) - }) + let query = { countryCardManageReleaseDetailEOList: content, applyMarket: this.formInline.applyMarket @@ -240,7 +275,7 @@ }, editReplacePage(row) { this.loading = true - getAction('/problemKnowledgeBase/countryCardManageReleaseDetailEO/list', { editReplacePage: row.id }).then((res) => { + getAction('/problemKnowledgeBase/countryCardManageReleaseDetailEO/list', { countryCardManageReleaseId: row.id }).then((res) => { if (res.success) { this.dataList = res.result || [] this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 6e291a5a3..d7a0ab0e4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -215,8 +215,7 @@ } .box-content-left { - width: 60%; - float: left; + width: 100%; font-size: 14px; font-weight: 400; color: #040B29; @@ -224,8 +223,7 @@ } .box-content-right { - width: 40%; - float: left; + width: 100%; display: inline-block; text-align: right; margin-top: 20px; diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 1419c58cc..232ad441e 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -8,6 +8,12 @@ {{$t('applicableInstructionsMarketList')}}
+
+
+ + {{$t('forward')}} +
+
@@ -77,18 +83,21 @@
+