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

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<ParamsColl
 		paramsCollectManifestEOService.exportAll(paramsCollectManifestVO, response, request);
 	}
 
+	/**
+	 *  调整责任领域
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-调整责任领域")
+	@ApiOperation(value="参数项收集清单-调整责任领域", notes="参数项收集清单-调整责任领域")
+	@PostMapping(value = "/updateBatchDutyTerritory")
+//	@RequiresPermissions("params:collectManifest:bring")
+	public Result<List<String>> updateBatchDutyTerritory(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<String> msgList = paramsCollectManifestEOService.updateBatchDutyTerritory(paramsCollectManifestVO);
+		return Result.OK(msgList);
+	}
 
 
 

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<ParamsCollectM
 
 	// 全部导出
 	void exportAll(ParamsCollectManifestVO paramsCollectManifestVO, HttpServletResponse response, HttpServletRequest request);
+
+	// 调整责任领域
+	List<String> updateBatchDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO);
 }

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<ParamsCollec
 			 }
 		 }
 
-		return getMsgOfIssueCollection(msgMapList, cut);
+		return getMsgOfIssueCollection(msgMapList, cut, "1");
 	}
 
 	@Override
@@ -1665,10 +1665,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			}
 		}
 
-		return getMsgOfIssueCollection(msgMapList, cut);
+		return getMsgOfIssueCollection(msgMapList, cut, "1");
 	}
 
-	private List<String> getMsgOfIssueCollection(List<Map<String, String>> msgMapList, String cut) {
+	private List<String> getMsgOfIssueCollection(List<Map<String, String>> msgMapList, String cut, String operation) {
 		List<String> msgList = new ArrayList<>();
 		Map<String,String> collectManifestStateEnumMap = CollectManifestStateEnum.toMap(cut);
 
@@ -1698,9 +1698,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		}
 		if (CollectionUtil.isNotEmpty(msgMapList)) {
 			if (CutEnum.EN.getValue().equals(cut)) {
-				msgList.add("<span style='color: red'>Homologation Engineer can operate when data state is 'Wait Collect'、'Sdt Back' or 'Change'</span>");
+				if ("1".equals(operation)) {
+					msgList.add("<span style='color: red'>Homologation Engineer can operate when data state is 'Wait Collect','Sdt Back' or 'Change'.</span>");
+				} else if("2".equals(operation)) {
+					msgList.add("<span style='color: red'>Homologation Engineer can operate when data state is 'Wait Collect','Sdt Back'.</span>");
+				}
 			} else {
-				msgList.add("<span style='color: red'>认证工程师数据状态为 '待发起收集'、'工程接口人退回'或'变更' 时，才有权限操作此按钮。</span>");
+				if ("1".equals(operation)) {
+					msgList.add("<span style='color: red'>认证工程师数据状态为 '待发起收集'、'工程接口人退回'或'变更' 时，才有权限操作此按钮。</span>");
+				} else if("2".equals(operation)) {
+					msgList.add("<span style='color: red'>认证工程师数据状态为 '待发起收集'、'工程接口人退回 时，才有权限操作此按钮。</span>");
+				}
 			}
 		}
 		return msgList;
@@ -2228,6 +2236,69 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		}
 	}
 
+	@Override
+	public List<String> updateBatchDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getDutyTerritory())) {
+			throw new JeroBootException("参数不能为空！");
+		}
+		List<String> paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestVO.getIds().split(","));
+		String dutyTerritory = paramsCollectManifestVO.getDutyTerritory();
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+		String projectId = paramsCollectManifestVO.getProjectId();
+		String cut = paramsCollectManifestVO.getCut();
+
+		LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ParamsCollectManifestEO::getId, paramsCollectManifestIdList);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.selectList(queryWrapper);
+
+		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
+		List<Map<String, String>> 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<String, String> 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();

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<SarFileCompareItemComment, ISarFileCompareItemCommentService> {
+	@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<SarFileCompareItemComment> queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareItemComment, req.getParameterMap());
+		Page<SarFileCompareItemComment> page = new Page<SarFileCompareItemComment>(pageNo, pageSize);
+		IPage<SarFileCompareItemComment> pageList = sarFileCompareItemCommentService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "文档对比信息条款评论表-列表查询")
+    @ApiOperation(value="文档对比信息条款评论表-列表查询", notes="文档对比信息条款评论表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<SarFileCompareItemComment>> queryList() {
+        List<SarFileCompareItemComment> 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);
+    }
+
+}

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<SarFileCompareResComment, ISarFileCompareResCommentService> {
+	@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<SarFileCompareResComment> queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareResComment, req.getParameterMap());
+		Page<SarFileCompareResComment> page = new Page<SarFileCompareResComment>(pageNo, pageSize);
+		IPage<SarFileCompareResComment> pageList = sarFileCompareResCommentService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "文档对比信息结果评论表-列表查询")
+    @ApiOperation(value="文档对比信息结果评论表-列表查询", notes="文档对比信息结果评论表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<SarFileCompareResComment>> queryList() {
+        List<SarFileCompareResComment> 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);
+    }
+
+}

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<SarFileCompareMenuVo> menuLeft;
     private List<SarFileCompareItem> textLeft;
-    private SarFileCompareMenuVo menuRight;
+    private List<SarFileCompareMenuVo> menuRight;
     private List<SarFileCompareItem> 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<SarFileCompareItem> 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<SarFileCompareItem> getTextRight() {
         return textRight;
     }
@@ -118,4 +102,34 @@ public class SarFileCompareDetailVO {
         }
         this.textRight.add(text);
     }
+
+    public List<SarFileCompareMenuVo> getMenuLeft() {
+        return menuLeft;
+    }
+
+    public void setMenuLeft(List<SarFileCompareMenuVo> menuLeft) {
+        this.menuLeft = menuLeft;
+    }
+
+    public void addMenuLeft(SarFileCompareMenuVo menu) {
+        if (this.menuLeft == null) {
+            this.menuLeft = new ArrayList<>();
+        }
+        this.menuLeft.add(menu);
+    }
+
+    public List<SarFileCompareMenuVo> getMenuRight() {
+        return menuRight;
+    }
+
+    public void setMenuRight(List<SarFileCompareMenuVo> menuRight) {
+        this.menuRight = menuRight;
+    }
+
+    public void addMenuRight(SarFileCompareMenuVo menu) {
+        if (this.menuRight == null) {
+            this.menuRight = new ArrayList<>();
+        }
+        this.menuRight.add(menu);
+    }
 }

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;
+
+}

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<SarFileCompareMenuVo> 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;
+    }
 }

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;
+
+}

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<SarFileCompareItemComment> {
+
+}

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<SarFileCompareResComment> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemCommentMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.compare.mapper.SarFileCompareItemCommentMapper">
+    <resultMap id="SarFileCompareItemCommentResultMap" type="com.jero.modules.compare.entity.SarFileCompareItemComment">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="info_id" property="infoId" />
+        <result column="items_id_left" property="itemsIdLeft" />
+        <result column="items_id_right" property="itemsIdRight" />
+        <result column="comment" property="comment" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareResCommentMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.compare.mapper.SarFileCompareResCommentMapper">
+    <resultMap id="SarFileCompareResCommentResultMap" type="com.jero.modules.compare.entity.SarFileCompareResComment">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="info_id" property="infoId" />
+        <result column="parent_id" property="parentId" />
+        <result column="comment" property="comment" />
+    </resultMap>
+</mapper>

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<SarFileCompareItemComment> {
+
+	/**
+	 * 保存
+	 *
+	 * @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<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    SarFileCompareItemComment queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<SarFileCompareItemComment> queryList();
+}

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<SarFileCompareResComment> {
+
+	/**
+	 * 保存
+	 *
+	 * @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<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    SarFileCompareResComment queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<SarFileCompareResComment> queryList();
+}

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<SarFileCompareInf
                 if (menu.getLeftOrRight().equals("LEFT")) {
                     SarFileCompareMenuVo menuLeft = new SarFileCompareMenuVo(menu);
                     menuLeft.setChildren(getMenuChildren(menuList, "LEFT", menuLeft.getMenuId()));
-                    sfVo.setMenuLeft(menuLeft);
+                    sfVo.addMenuLeft(menuLeft);
                 } else if (menu.getLeftOrRight().equals("RIGHT")) {
                     SarFileCompareMenuVo menuRight = new SarFileCompareMenuVo(menu);
                     menuRight.setChildren(getMenuChildren(menuList, "RIGHT", menuRight.getMenuId()));
-                    sfVo.setMenuRight(menuRight);
+                    sfVo.addMenuRight(menuRight);
                 }
             }
-            if (sfVo.getMenuRight() != null && sfVo.getMenuLeft() != null) {
+            if (sfVo.getMenuRight() != null && sfVo.getMenuRight().size() > 0 && sfVo.getMenuLeft() != null && sfVo.getMenuLeft().size() > 0) {
                 break;
             }
         }

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<SarFileCompareItemCommentMapper, SarFileCompareItemComment> 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<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public SarFileCompareItemComment queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<SarFileCompareItemComment> queryList() {
+        return list();
+    }
+}

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<SarFileCompareResCommentMapper, SarFileCompareResComment> 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<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public SarFileCompareResComment queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<SarFileCompareResComment> queryList() {
+        return list();
+    }
+}

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',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1341,4 +1341,5 @@ module.exports = {
   share:'分享',
   simplifiedChinese:'简体中文',
   uploadOnly:'只能上传',
+  Adjustareasofresponsibility:'调整责任领域',
 }

jero-web/src/components/AdjustareaSofrespon/index.vue

@@ -0,0 +1,374 @@
+<template>
+  <div class='diolag-area'>
+    <a-spin :spinning='spinLoading'>
+      <a-form-model
+        class='formAdd'
+        ref='ruleForm'
+        :model='form'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter='24'>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('areaOfResponsibility')">
+                {{$t('areaOfResponsibility')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <j-dict-select-tag class="box-input" v-model="form.dutyTerritory"
+                                   style='width: 200px'
+                                   @input="handleInput('queryzr')"
+                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'duty_territory'"/>
+              </a-form-model-item>
+            </div>
+<!--          <a-col :span='24'>-->
+<!--            <span style='display: flex;justify-content: center;margin-bottom: 20px;'> <span style='margin-top: 6px;margin-right: 7px'>{{$t('cutoffTime')}}</span>-->
+<!--                <a-date-picker :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />-->
+<!--              </span>-->
+<!--          </a-col>-->
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class='drawer-bootom-button'>
+      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
+      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
+    </div>
+    <!--    错误数据提示-->
+    <a-modal
+      :title="$t('operationFailed')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      :footer="null"
+      @cancel='cancleoperationFailed'
+      :body-style="bodystyle"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
+               class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue'>
+            <span v-html='item'></span>
+<!--            <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}-->
+<!--              <span style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。-->
+<!--            </div>-->
+          </div>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
+    <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+  </div>
+</template>
+
+<script>
+import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+import axios from 'axios'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+import moment from 'moment'
+import eventBUs from '../../common/event'
+export default {
+  name: 'diolagArea',
+  components: {},
+  data() {
+    return {
+      token:Vue.ls.get(ACCESS_TOKEN),
+      title: this.$t('add'),
+      total: 0,
+      selectedRowKeysDate: {},
+      loading: false,
+      editId: '',
+      visibleoperationFailed:false,
+      newVisible: false,
+      textLoading:false,
+      NotSelectedRowKeysValue:[],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      rules: {
+        dutyTerritory:[
+          { required: true, message: this.$t('PleaseSelect')+this.$t('areaOfResponsibility'), trigger: 'change' }
+        ]
+      },
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      selectedRowKeys: [],
+      pageNo: 1,
+      pageSize: 10,
+      pickerDate: '',
+      bodystyle:{}
+    }
+  },
+  props: {
+    selectedRowKeysArray: {
+      type: String,
+      default: '',
+      require: true
+    }
+  },
+  mounted() {
+    this.loadData()
+    this.bodystyle = {
+      height: '480px',
+      overflow: 'hidden',
+      overflowY: 'scroll',
+    }
+  },
+  methods: {
+    loadData() {
+      this.loading = true
+      let params = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.form
+      }
+      getAction(`sys/user/page`, params).then(res => {
+        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])
+      })
+    },
+    searchQuery() {
+      this.loadData()
+    },
+    searchReset() {
+      this.form = {}
+      this.loadData()
+    },
+    handleCancel() {
+      this.$emit('areaVisibleTaskCutOffTimeflag', false)
+    },
+    handleTableChange(val) {
+    },
+    //保存
+    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')
+          let cut = ''
+          if (long && long == 'zh-cn') {
+            this.cut = 'cn'
+          } else if (long && long == 'en-us') {
+            this.cut = 'en'
+          }
+          // let _array = []
+          // this.selectedRowKeysValue.forEach((item, index) => {
+          //   _array.push(item.id)
+          // })
+          let _this = this
+          let param = {
+            paramsManifestId: this.$route.query.id,
+            projectId: this.$route.query.projectId,
+            ids: this.selectedRowKeysArray,
+            cut: this.cut,
+            dutyTerritory: this.form.dutyTerritory
+
+          }
+          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]) + '&'
+              }
+              return ret
+            }],
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+              'X-Access-Token': _this.token
+            }
+          })
+            .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('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')
+    },
+  }
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+.box-title-text-index {
+  line-height: 1.4;
+  display: flex;
+}
+.diolag-area {
+  .table-area {
+    margin: 20px 0;
+
+    .action-edit {
+      margin-right: 10px;
+    }
+  }
+
+  .table-del {
+    color: red;
+  }
+}
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
+</style>
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  /*align-items: center;*/
+}
+
+.title-text {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 48px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index:100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+/deep/.add-input{
+  min-height: 135px!important;
+}
+</style>
+<style lang='less'>
+.area-module {
+  .ant-modal-wrap {
+    .ant-modal {
+      .ant-modal-content {
+        .ant-modal-footer {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+.page{
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 20px;
+}
+</style>

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -163,6 +163,10 @@
                   <a-icon type="profile"/>
                   {{$t('bringInTheProjectInterface')}}
                 </div>
+                <div @click="AdjustareasofresponsibilityClick" class="operator-text-title" v-if='currentPersonRole == "homo"'>
+                  <a-icon type="solution"/>
+                  {{$t('Adjustareasofresponsibility')}}
+                </div>
               </template>
               <div class="operator-text" style="position: relative " @click='morepop' v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
                 <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
@@ -295,7 +299,12 @@
                          @GetgetTableList='GetgetTableList'
                          @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
     </a-modal>
-
+<!--    调整责任领域-->
+    <a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='400px' :footer="null">
+      <adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
+                 @GetgetTableList='GetgetTableList'
+                 @areaVisibleTaskCutOffTimeAll='AdjustareasofresponAll'/>
+    </a-modal>
     <!--  引用参数--->
     <a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
       <reference-parameter v-if='areaVisiblereferenceparameter' :paramsManifest='paramsManifest'
@@ -439,6 +448,7 @@
   import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index'
   import TaskCutOffTime from '@/components/TaskCutOffTime/index'
   import TaskTime from '@/components/TaskCutOffTime/indexonekey'
+  import AdjustareaSofrespon from '@/components/AdjustareaSofrespon/index'
   import ReferenceParameter from '@/components/ReferenceParameter/index'
   import AssignedBy from '@/components/AssignedBy/index'
   import axios from 'axios'
@@ -452,6 +462,7 @@
       TableCollection,
       ParameterLibraryAdd,
       AssignedBy,
+      AdjustareaSofrespon,
       TaskCutOffTime,
       ReferenceParameter,
       SynchronousSubmissionLibrary,
@@ -614,6 +625,7 @@
         areaVisibleAssignedby: false, // 分配填写人弹框
         areaVisibleTaskCutOffTime: false, // 截至时间弹框
         OneclickCollection:false,
+        Adjustareasofrespon:false,
         areaVisiblereferenceparameter: false, // 引用参数弹框
         areaVisibsynchronous: false, // 同步上报库弹框
         visibleoperationFailed: false, // 数据失败的弹框
@@ -1160,6 +1172,14 @@
             _this.confirmLoading = false
           })
       },
+      // 调整责任领域
+      AdjustareasofresponsibilityClick(){
+        if(this.selectedRowKeysValue.length == 0){
+          this.$message.warning(this.$t('selectLeastOne'))
+        }else{
+          this.Adjustareasofrespon = true
+        }
+      },
       // 下发收集的权限
       distributionAndCollectionJurisdiction() {
         if(this.selectedRowKeysValue.length == 0){
@@ -1517,6 +1537,11 @@
         this.OneclickCollection = val
         this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
       },
+      AdjustareasofresponAll(val){
+        console.log(val)
+        this.Adjustareasofrespon = val
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
       //引用参数
       referenceparameter() {
         let dreJurisdictionreferenceParameter = this.dreJurisdictionreferenceParameter()