From 51977b5214611da309980d54ab53ca4edff582b2 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 10:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOController.java    | 22 ++++++++++++--
 .../IParamsCollectManifestEOService.java      |  4 ++-
 .../ParamsCollectManifestEOServiceImpl.java   | 30 +++++++++++++++++++
 3 files changed, 52 insertions(+), 4 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 aed81c064..3020e8abf 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
@@ -5,20 +5,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
-import com.jero.common.aspect.annotation.PermissionData;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
-import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -279,6 +276,25 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		}
 	}
 
+	/**
+	 *  修改责任领域
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-修改责任领域")
+	@ApiOperation(value="参数项收集清单-修改责任领域", notes="参数项收集清单-修改责任领域")
+	@PostMapping(value = "/updateDutyTerritory")
+//	@RequiresPermissions("params:collectManifest:sdt")
+	public Result<?> updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.updateDutyTerritory(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("修改责任领域成功！");
+		} else {
+			return Result.error("修改责任领域失败！");
+		}
+	}
+
 	/**
 	 *  分配工程接口人
 	 *
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 fce085305..d41c37cf2 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
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
-import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 
 import java.util.List;
 import java.util.Map;
@@ -116,6 +115,9 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	// 批量设置截止时间
 	boolean updateDeadlineBatch(ParamsCollectManifestVO paramsCollectManifestVO);
 
+	// 修改责任领域
+	boolean updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO);
+
 	// 修改工程接口人
 	boolean updateSdt(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 10ea4fc41..f44f6b9f1 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
@@ -1178,6 +1178,36 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return updateBatchById(updateEOList);
 	}
 
+	@Override
+	public boolean updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getDutyTerritory())) {
+			throw new JeroBootException("参数不能为空！");
+		}
+		String paramsCollectManifestId = paramsCollectManifestVO.getIds();
+		String projectId = paramsCollectManifestVO.getProjectId();
+		String dutyTerritory = paramsCollectManifestVO.getDutyTerritory();
+
+		ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+		updateEO.setId(paramsCollectManifestId);
+		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()); // 设置工程接口人
+				}
+			}
+		}
+
+		return updateById(updateEO);
+	}
+
 	@Override
 	public boolean updateSdt(ParamsCollectManifestVO paramsCollectManifestVO) {
 		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || StringUtils.isEmpty(paramsCollectManifestVO.getSdt())) {