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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java

@@ -706,4 +706,27 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	public Result<?> queryDutyTerritory(@RequestParam(name="id",required=true) String id) {
 		return this.paramsCollectManifestEOService.queryDutyTerritory(id);
 	}
+	/**
+	 *  查询本清单所有责任领域
+	 */
+	@AutoLog(value = "参数项历史收集清单-查询本清单所有责任领域")
+	@ApiOperation(value="参数项历史收集清单-查询本清单所有责任领域", notes="参数项历史收集清单-查询本清单所有责任领域")
+	@GetMapping(value = "/queryDutyTerritoryHistory")
+	public Result<?> queryDutyTerritoryHistory(@RequestParam(name="id",required=true) String id) {
+		return this.paramsCollectManifestEOService.queryDutyTerritoryHistory(id);
+	}
+
+	/**
+	 * 某个项目责任领域下-工程接口人
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "某个项目责任领域下-工程接口人")
+	@ApiOperation(value="某个项目责任领域下-工程接口人", notes="某个项目责任领域下-工程接口人")
+	@GetMapping(value = "/getSdtList")
+	public Result<List<Map<String,String>>> getSdtList(String projectId,String projectVersion,String dutyTerritory) {
+		List<Map<String,String>> sdtList = paramsCollectManifestEOService.getSdtList(projectId,projectVersion,dutyTerritory);
+		return Result.OK(sdtList);
+	}
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java

@@ -1,5 +1,6 @@
 package com.jero.modules.cert.collect.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -37,4 +38,7 @@ public class ParamsCollectManifestHistoryEO extends ParamsCollectManifestBaseEO
 
     @ApiModelProperty(value = "参考列")
     private String referencesCol;
+
+    @TableField(exist = false)
+    private String userTypes;//用户类型
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java

@@ -1,11 +1,9 @@
 package com.jero.modules.cert.collect.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.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.entity.ParamsManifestEO;
-import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -41,5 +39,7 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
 
     List<String> queryDutyTerritory(@Param("paramsManifestId") String paramsManifestId);
 
+    List<String> queryDutyTerritoryHistory(@Param("paramsManifestId") String paramsManifestId);
+
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml

@@ -159,5 +159,8 @@
     <select id="queryDutyTerritory" resultType="java.lang.String">
         SELECT duty_territory FROM params_collect_manifest WHERE params_manifest_id = #{paramsManifestId} GROUP BY duty_territory
     </select>
+    <select id="queryDutyTerritoryHistory" resultType="java.lang.String">
+        SELECT duty_territory FROM params_collect_manifest_history WHERE params_manifest_id = #{paramsManifestId} GROUP BY duty_territory
+    </select>
 
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java

@@ -113,6 +113,8 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 
 	List<Map<String,String>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO);
 
+	List<Map<String,String>> getSdtList(String projectId,String projectVersion,String dutyTerritory);
+
 	List<Map<String, String>> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO, String cut);
 
 	Map<String, Object> isCollectFinished(String paramsManifestId);
@@ -204,4 +206,5 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
     List<ParamsCollectManifestEO> getList(Map<String,Object> params);
 
 	Result<?> queryDutyTerritory(String id);
+	Result<?> queryDutyTerritoryHistory(String id);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -13,7 +13,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jero.common.api.vo.Result;
-import com.jero.common.constant.enums.*;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.MessageType2Enum;
+import com.jero.common.constant.enums.MessageTypeEnum;
+import com.jero.common.constant.enums.ModuleEnum;
+import com.jero.common.constant.enums.MsgColorEnum;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.query.QueryRuleEnum;
@@ -21,15 +26,42 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.oss.CosBootUtil;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
-import com.jero.modules.cert.collect.entity.*;
+import com.jero.modules.cert.collect.entity.ParamsCollectExport;
-import com.jero.modules.cert.collect.enums.*;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestBaseEO;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+import com.jero.modules.cert.collect.entity.ParamsManifestEO;
+import com.jero.modules.cert.collect.enums.CollectManifestChangeFlagEnum;
+import com.jero.modules.cert.collect.enums.CollectManifestRoleIdEnum;
+import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
+import com.jero.modules.cert.collect.enums.CollectManifestUserTypeEnum;
+import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
+import com.jero.modules.cert.collect.enums.ConfigLockEnum;
+import com.jero.modules.cert.collect.enums.ExportStateEnum;
+import com.jero.modules.cert.collect.enums.ManifestStateEnum;
 import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
-import com.jero.modules.cert.collect.service.*;
+import com.jero.modules.cert.collect.service.IParamsCollectExportService;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestLogEOService;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigEOService;
+import com.jero.modules.cert.collect.service.IParamsManifestEOService;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
 import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
 import com.jero.modules.cert.collect.vo.ParamsManifestVO;
-import com.jero.modules.cert.report.entity.*;
+import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
-import com.jero.modules.cert.report.service.*;
+import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
+import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
+import com.jero.modules.cert.report.entity.ParamsReportEO;
+import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
+import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService;
+import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
+import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
+import com.jero.modules.cert.report.service.IParamsReportEOService;
+import com.jero.modules.cert.report.service.IReportCertCategoryParamsInfoEOService;
 import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
 import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import com.jero.modules.cert.template.enums.ControlTypeEnum;
@@ -61,22 +93,34 @@ import com.jero.modules.split.common.ReadExcel;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.entity.SysUserRole;
+import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
 import com.jero.modules.system.service.ISysAnnouncementService;
 import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysUserRoleService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
-import com.jero.modules.system.service.*;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFDataFormat;
 import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+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.util.CellRangeAddress;
 import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.apache.poi.xssf.usermodel.XSSFRichTextString;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.util.FileUtil;
 import org.springframework.beans.BeanUtils;
@@ -92,15 +136,33 @@ import org.yaml.snakeyaml.util.UriEncoder;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
-import java.text.Collator;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static com.jero.modules.split.util.ExcelUtil.checkObjAllFieldsIsNull;
@@ -1525,7 +1587,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
                         String[] references = projectName.split("-");
                         // map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
-                        map.put("db_field_txt", paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
+//                        map.put("db_field_txt", paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
+                        map.put("db_field_txt", onlCgformField.getDbFieldTxt()+projectName+" "+paramsManifestEO.getReferencesColName());//字段中文名
                         map.put("db_field_id", paramsManifestEO.getReferencesColId());
                         map.put("references_col", true);
                     } else {
@@ -1543,7 +1606,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
                         String[] references = projectName.split("-");
                         // map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
-                        map.put("db_field_txt", projectName + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
+//                        map.put("db_field_txt", projectName + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
+                        map.put("db_field_txt", onlCgformField.getDbFieldEnName()+" "+projectName + " " + paramsManifestEO.getReferencesColName());//字段英文名
                         map.put("db_field_id", paramsManifestEO.getReferencesColId());
                         map.put("references_col", true);
 
@@ -1968,6 +2032,30 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         }
         return sdtList;
     }
+    @Override
+    public List<Map<String, String>> getSdtList(String projectId,String projectVersion,String dutyTerritory) {
+        // 根据主项目ID 查询 相关项目版本的项目ID
+        String projectVersionId = projectLibraryBaseService.getIdByVersionAndParentId(projectVersion, projectId);
+
+        List<Map<String, String>> sdtList = new ArrayList<>();
+        ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectVersionId, dutyTerritory);
+        if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+            String sdtIds = projectRelatedPersonnel.getEngineeringInterfacePerson();
+            if (StringUtils.isNotBlank(sdtIds)) {
+                String[] sdtIdStr = sdtIds.split(",");
+                for (int i = 0; i < sdtIdStr.length; i++) {
+                    SysUser sysUser = sysUserService.getById(sdtIdStr[i]);
+                    if (ObjectUtil.isNotEmpty(sysUser)) {
+                        Map<String, String> userMap = new HashMap<>();
+                        userMap.put("userName", sysUser.getUsername());
+                        userMap.put("id", sysUser.getId());
+                        sdtList.add(userMap);
+                    }
+                }
+            }
+        }
+        return sdtList;
+    }
 
     @Override
     public List<Map<String, String>> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO, String cut) {
@@ -3569,6 +3657,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
     @Override
     public boolean bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
+        if(StringUtils.isBlank(paramsCollectManifestVO.getIds())){
+            return false;
+        }
         String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
         String projectId = paramsCollectManifestVO.getProjectId();
 
@@ -3579,18 +3670,29 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
         paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
         List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
-        // 过滤出 状态为：待发起收集，且工程接口人处为空的参数项
+        //带入逻辑修改为只带入勾选的条目
-        list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
+        if(StringUtils.isNotBlank(paramsCollectManifestVO.getIds())){
+            list = list.stream().filter(e->paramsCollectManifestVO.getIds().contains(e.getId())).collect(Collectors.toList());
+        }
 
+        // 过滤出 状态为：待发起收集或变更，且工程接口人处为空的参数项
+        list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
+                || CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).collect(Collectors.toList());
+//        list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
+
+        //以下为新需求 2023-10-25----------------
+        //变更状态下允许带入接口人
+        //带入逻辑修改为只带入勾选的条目，
+        //原有B或空，相关人A=A，相关人BC=B，相关人AC=空
         List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(list)) {
             list.forEach(collectManifestEO -> {
-
+                String sdt = collectManifestEO.getSdt();
                 // 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
                 ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectVersionId(), collectManifestEO.getDutyTerritory());
                 if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
                     String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
-                    if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+                    if (StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
                         SysUser sysUser = sysUserService.getById(sdtId);
                         if (ObjectUtil.isNotEmpty(sysUser)) {
                             ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
@@ -3600,6 +3702,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                             updateCollectManifestEOList.add(updateCollectManifestEO);
                         }
                     }
+                    List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(sdtId.split(",")));
+                    List<String> userNameList = sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
+
+                    if (StringUtils.isNotBlank(sdt)
+                            && ObjectUtils.isNotEmpty(userNameList)
+                            && sdtId.contains(",")
+                            && !userNameList.contains(sdt)) {
+
+                        ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
+                        updateCollectManifestEO.setId(collectManifestEO.getId());
+                        updateCollectManifestEO.setSdt("");
+
+                        updateCollectManifestEOList.add(updateCollectManifestEO);
+                    }
                 }
             });
 
@@ -3607,6 +3723,46 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
         return updateBatchById(updateCollectManifestEOList);
     }
+//    @Override
+//    public boolean bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
+//        String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+//        String projectId = paramsCollectManifestVO.getProjectId();
+//
+//        // 查询参数清单
+//        ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
+//
+//        // 查询所有收集参数项
+//        ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+//        paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
+//        List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+//        // 过滤出 状态为：待发起收集，且工程接口人处为空的参数项
+//        list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
+//
+//        List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
+//        if (CollectionUtil.isNotEmpty(list)) {
+//            list.forEach(collectManifestEO -> {
+//
+//                // 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+//                ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectVersionId(), collectManifestEO.getDutyTerritory());
+//                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)) {
+//                            ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
+//                            updateCollectManifestEO.setId(collectManifestEO.getId());
+//                            updateCollectManifestEO.setSdt(sysUser.getUsername());
+//
+//                            updateCollectManifestEOList.add(updateCollectManifestEO);
+//                        }
+//                    }
+//                }
+//            });
+//
+//        }
+//
+//        return updateBatchById(updateCollectManifestEOList);
+//    }
 
     @Override
     public void exportAll(ParamsCollectManifestVO paramsCollectManifestVO, HttpServletResponse response, HttpServletRequest request) {
@@ -7499,4 +7655,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         }
         return Result.OK(resList);
     }
+    @Override
+    public Result<?> queryDutyTerritoryHistory(String paramsManifestId) {
+        List<String> dtList = paramsCollectManifestEOMapper.queryDutyTerritoryHistory(paramsManifestId);
+        List<SysDictItem> dtSdiList = sysDictItemService.selectItemsByDictCode("duty_territory");
+        Map<String,String> dictItemsMap = dtSdiList.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName));
+        JSONArray resList = new JSONArray();
+        if(ObjectUtils.isNotEmpty(dtList)){
+            for (String dtId : dtList) {
+                if(StringUtils.isNotBlank(dtId)){
+                    JSONObject dt = new JSONObject();
+                    dt.put("key",dtId);
+                    dt.put("value",dictItemsMap.get(dtId));
+                    resList.add(dt);
+                }
+            }
+        }
+        return Result.OK(resList);
+    }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java

@@ -16,7 +16,12 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.oss.CosBootUtil;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
-import com.jero.modules.cert.collect.entity.*;
+import com.jero.modules.cert.collect.entity.ParamsCollectExport;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
 import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
 import com.jero.modules.cert.collect.enums.CollectManifestUserTypeEnum;
 import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
@@ -36,13 +41,20 @@ import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.split.common.ReadExcel;
 import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
 import com.jero.modules.system.service.ISysDictItemService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.apache.poi.xssf.usermodel.XSSFRichTextString;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.util.FileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,13 +65,31 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -92,6 +122,8 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 	private IParamsCollectExportService paramsCollectExportService;
 	@Autowired
 	private ICertCategoryParamsInfoPublishEOService certCategoryParamsInfoPublishEOService;
+	@Autowired
+	private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
 	@Value(value = "${jero.path.upload}")
 	private String uploadpath;
 
@@ -120,6 +152,25 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 				.orderByAsc(ParamsCollectManifestHistoryEO::getNioNumber);
 
 		String paramsManifestId = paramsCollectManifestHistoryEO.getParamsManifestId();
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
+		String userTypes = paramsCollectManifestHistoryEO.getUserTypes();
+		if (CollectManifestUserTypeEnum.SDT.getValue().equals(userTypes)) {
+			queryWrapper.lambda().eq(ParamsCollectManifestHistoryEO::getSdt,loginUser.getUsername());
+			queryWrapper.lambda().in(ParamsCollectManifestHistoryEO::getState,new ArrayList<String>(Arrays.asList("2","4","5","6","7","8")));
+		} else if (CollectManifestUserTypeEnum.DRE.getValue().equals(userTypes)) {
+			queryWrapper.lambda().eq(ParamsCollectManifestHistoryEO::getDre,loginUser.getUsername());
+			queryWrapper.lambda().in(ParamsCollectManifestHistoryEO::getState,new ArrayList<String>(Arrays.asList("4","6","7","8")));
+		} else if (CollectManifestUserTypeEnum.GUEST.getValue().equals(userTypes)) {
+			return page;
+		} else if (CollectManifestUserTypeEnum.VIEWER.getValue().equals(userTypes)) {
+			List<String> dutyTerritoryList = projectUserDutyTerritoryService.queryDutyTerritoryByUserId(loginUser.getId());
+			queryWrapper.lambda().and(q->{
+				q.eq(ParamsCollectManifestHistoryEO::getSdt,loginUser.getUsername());
+				q.or().eq(ParamsCollectManifestHistoryEO::getDre,loginUser.getUsername());
+				q.or().in(ParamsCollectManifestHistoryEO::getDutyTerritory,dutyTerritoryList);
+			});
+		}
+
 
 		IPage pageInfo = page(page, queryWrapper); // 查询固定列
 //		IPage pageInfo = paramsCollectManifestHistoryEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -14,9 +14,7 @@ import com.jero.common.system.vo.DictModel;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
 import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
-import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
 import com.jero.modules.cert.collect.entity.ParamsConfigEO;
-import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
 import com.jero.modules.cert.collect.entity.ParamsManifestEO;
 import com.jero.modules.cert.collect.entity.ParamsManifestHistoryEO;
 import com.jero.modules.cert.collect.enums.CollectManifestChangeFlagEnum;
@@ -187,7 +185,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                 return p2.getCreateTime().compareTo(p1.getCreateTime());
             }
         });
-
+        //处理中英文切换--状态字段
+        for (ParamsManifestEO manifestEO : resList) {
+            String state = manifestEO.getState();
+            if(CutEnum.EN.getValue().equals(paramsManifestEO.getCut())){
+                if(ManifestStateEnum.UNCOLLECTED.getName().equals(state)){
+                    manifestEO.setState(ManifestStateEnum.UNCOLLECTED.getEnName());
+                }
+                if(ManifestStateEnum.COLLECTING.getName().equals(state)){
+                    manifestEO.setState(ManifestStateEnum.COLLECTING.getEnName());
+                }
+                if(ManifestStateEnum.FINISHED.getName().equals(state)){
+                    manifestEO.setState(ManifestStateEnum.FINISHED.getEnName());
+                }
+            }
+        }
         return resList;
     }
 

jero-web/src/common/lang/en-us.js

@@ -2029,4 +2029,5 @@ module.exports = {
   high:'High',
   centre:'Centre',
   low:'Low',
+  interfacePerson:'Interface person',
 }

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

@@ -3985,4 +3985,5 @@ module.exports = {
   high:'高',
   centre:'中',
   low:'低',
+  interfacePerson:'接口人',
 }

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

@@ -14,11 +14,29 @@
             <a-form-model-item ref='region' :label="$t('NareaOfResponsibility')" prop='dutyTerritory'>
               <j-dict-select-tag class="box-input" v-model="form.dutyTerritory"
                                  @input="handleInput('dutyTerritory')"
+                                 @changeQuery="handleChange"
                                  :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item :label="$t('interfacePerson')" prop='sdt'>
+              <a-select
+                class="box-input"
+                v-model="form.sdt"
+                :placeholder="$t('PleaseSelect')+$t('interfacePerson')">
+                <a-select-option
+                  v-for="(item,index) in sdtList"
+                  :key="item.id"
+                  :value="item.id">
+                    <span class="itemOption" :title="item.userName">
+                     {{ item.userName}}
+                    </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
       <div class="imports-footer">
@@ -30,10 +48,10 @@
         </div>
       </div>
     </a-spin>
-<!--    <div class='drawer-bootom-button'>-->
+    <!--    <div class='drawer-bootom-button'>-->
-<!--      <a-button style='margin-right: 8px' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
+    <!--      <a-button style='margin-right: 8px' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
-<!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
+    <!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
-<!--    </div>-->
+    <!--    </div>-->
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -49,9 +67,9 @@
           <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')}}-->
+            <!--            <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}-->
-<!--              <span style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。-->
+            <!--              <span style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。-->
-<!--            </div>-->
+            <!--            </div>-->
           </div>
         </a-col>
       </a-row>
@@ -66,235 +84,260 @@
 </template>
 
 <script>
-import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+  import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
-import axios from 'axios'
+  import axios from 'axios'
-import Vue from 'vue'
+  import Vue from 'vue'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
-import moment from 'moment'
+  import moment from 'moment'
-import eventBUs from '../../common/event'
+  import eventBUs from '../../common/event'
-export default {
+
-  name: 'diolagArea',
+  export default {
-  components: {},
+    name: 'diolagArea',
-  data() {
+    components: {},
-    return {
+    data() {
-      token:Vue.ls.get(ACCESS_TOKEN),
+      return {
-      title: this.$t('add'),
+        token: Vue.ls.get(ACCESS_TOKEN),
-      total: 0,
+        title: this.$t('add'),
-      selectedRowKeysDate: {},
+        total: 0,
-      loading: false,
+        selectedRowKeysDate: {},
-      editId: '',
+        sdtList: [],
-      visibleoperationFailed:false,
+        loading: false,
-      newVisible: false,
+        editId: '',
-      textLoading:false,
+        visibleoperationFailed: false,
-      NotSelectedRowKeysValue:[],
+        newVisible: false,
-      labelCol: {
+        textLoading: false,
-        xs: { span: 24 },
+        NotSelectedRowKeysValue: [],
-        sm: { span: 7 }
+        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('NareaOfResponsibility'), 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.bodystyle = {
+        height: '480px',
+        overflow: 'hidden',
+        overflowY: 'scroll'
+      }
+    },
+    methods: {
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.form = { ...this.form }
+          this.$refs.ruleForm.validateField([value])
+        })
       },
-      wrapperCol: {
+      handleChange(value) {
-        xs: { span: 24 },
+        this.form.sdt = undefined
-        sm: { span: 14 }
-      },
-      form: {},
-      rules: {
-        dutyTerritory:[
-          { required: true, message: this.$t('PleaseSelect')+this.$t('NareaOfResponsibility'), 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.bodystyle = {
-      height: '480px',
-      overflow: 'hidden',
-      overflowY: 'scroll',
-    }
-  },
-  methods: {
-    handleInput(value) {
-      this.$nextTick(() => {
         this.form = { ...this.form }
-        this.$refs.ruleForm.validateField([value])
+        this.getSdtList(this.form.dutyTerritory)
-      })
+      },
-    },
+      getSdtList(value) {
-    handleCancel() {
+        let query = {
-      this.$emit('AdjustareasofresponAll', false)
+          dutyTerritory: value,
-    },
+          projectId: this.$route.query.projectId,
-    //保存
+          projectVersion: this.$route.query.projectVersion
-    handleSubmit() {
-      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
-          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
-              }
-            } else {
-              this.$message.warning(this.$t('operationFailed'))
-            }
-          })
         }
-      })
+        getAction('/params/collectManifest/getSdtList', query).then((res) => {
-    },
+          if (res.success) {
-    // 错误数据的弹框
+            this.sdtList = res.result || []
-    cancleoperationFailed() {
+          } else {
-      this.visibleoperationFailed = false
+            this.sdtList = []
-      this.$emit('AdjustareasofresponAll', false)
+          }
-      this.$emit('GetgetTableList')
+        })
-    },
+      },
+      handleCancel() {
+        this.$emit('AdjustareasofresponAll', false)
+      },
+      //保存
+      handleSubmit() {
+        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,
+              sdt: this.form.sdt
+            }
+            this.textLoading = true
+            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
+                }
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      },
+      // 错误数据的弹框
+      cancleoperationFailed() {
+        this.visibleoperationFailed = false
+        this.$emit('AdjustareasofresponAll', false)
+        this.$emit('GetgetTableList')
+      }
+    }
   }
-}
 </script>
 
 <style lang='less' scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
-.box-title-text-index {
-  line-height: 1.4;
-  display: flex;
-}
-.diolag-area {
-  .table-area {
-    margin: 20px 0;
 
-    .action-edit {
+  .box-title-text-index {
-      margin-right: 10px;
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .diolag-area {
+    .table-area {
+      margin: 20px 0;
+
+      .action-edit {
+        margin-right: 10px;
+      }
+    }
+
+    .table-del {
+      color: red;
     }
   }
 
-  .table-del {
+  .drawer-bootom-button {
-    color: red;
+    display: flex;
+    justify-content: center;
   }
-}
-.drawer-bootom-button{
-  display: flex;
-  justify-content: center;
-}
 </style>
 <style scoped>
-.box-title-text {
+  .box-title-text {
-  line-height: 1.4;
+    line-height: 1.4;
-  display: flex;
+    display: flex;
-  /*align-items: center;*/
+    /*align-items: center;*/
-}
+  }
 
-.title-text {
+  .title-text {
-  width: 114px;
+    width: 114px;
-  text-align: right;
+    text-align: right;
-  display: inline-block;
+    display: inline-block;
-  font-weight: 500;
+    font-weight: 500;
-  font-size: 14px;
+    font-size: 14px;
-  margin-right: 16px;
+    margin-right: 16px;
-  overflow: hidden;
+    overflow: hidden;
-  text-overflow: ellipsis;
+    text-overflow: ellipsis;
-  white-space: nowrap;
+    white-space: nowrap;
-  height: 42px;
+    height: 42px;
-  line-height: 48px;
+    line-height: 48px;
-}
+  }
 
-.box-input {
+  .box-input {
-  display: inline-block;
+    display: inline-block;
-  height: 38px;
+    height: 38px;
-  width: 100%;
+    width: 100%;
-}
+  }
 
-.itemModel {
+  .itemModel {
-  width: calc(100% - 130px);
+    width: calc(100% - 130px);
-  display: inline-block;
+    display: inline-block;
-  margin-top: 2px;
+    margin-top: 2px;
-}
+  }
 
-.Required {
+  .Required {
-  color: red;
+    color: red;
-  margin-right: 4px;
+    margin-right: 4px;
-}
+  }
 
-.title-text-text {
+  .title-text-text {
-  margin-top: 9px;
+    margin-top: 9px;
-}
+  }
 
 
-.formAdd {
+  .formAdd {
-  margin-bottom: 40px;
+    margin-bottom: 40px;
-}
+  }
 
 
-.drawer-bootom-button {
+  .drawer-bootom-button {
-  position: absolute;
+    position: absolute;
-  bottom: 0;
+    bottom: 0;
-  width: 100%;
+    width: 100%;
-  z-index:100;
+    z-index: 100;
-  border-top: 1px solid #e8e8e8;
+    border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
+    padding: 10px 16px;
-  text-align: right;
+    text-align: right;
-  left: 0;
+    left: 0;
-  background: #fff;
+    background: #fff;
-  border-radius: 0 0 2px 2px;
+    border-radius: 0 0 2px 2px;
-}
+  }
-/deep/.add-input{
+
-  min-height: 135px!important;
+  /deep/ .add-input {
-}
+    min-height: 135px !important;
-  ::v-deep .page{
+  }
+
+  ::v-deep .page {
     display: flex;
     justify-content: flex-end;
     margin-bottom: 20px;
   }
 </style>
 <style lang='less'>
-.area-module {
+  .area-module {
-  .ant-modal-wrap {
+    .ant-modal-wrap {
-    .ant-modal {
+      .ant-modal {
-      .ant-modal-content {
+        .ant-modal-content {
-        .ant-modal-footer {
+          .ant-modal-footer {
-          text-align: center;
+            text-align: center;
+          }
         }
       }
     }
   }
-}
 </style>

jero-web/src/views/projectManagement/ProjectDetails/index.vue

@@ -293,7 +293,7 @@ export default {
       },
       roleSwitchListEn: {
         '0': 'R&H Studio',
-        '1': 'studio',
+        '1': 'Regulation',
         '2': 'homo',
         '4': 'Regulatory Engineer/Certification Engineer',
         '11': 'R&H Manager',

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

@@ -234,7 +234,7 @@
                 <div @click="AdjustareasofresponsibilityClick" class="operator-text-title"
                      v-if='currentPersonRole == "homo"'>
                   <a-icon type="setting"/>
-                  {{$t('Adjustareasofresponsibility')}}
+                  {{$t('BatchSetting')}}
                 </div>
                 <!--      认证工程师分配填写人-->
                 <div @click="assignedByHomo" class="operator-text-title" v-if='currentPersonRole == "homo" '>
@@ -272,17 +272,20 @@
               {{$t('dataExport')}}
             </div>
             <!--      导出列表-->
-            <div @click="Derivedlist" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
+            <div @click="Derivedlist" class="operator-text"
+                 v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
               <a-icon type="export"/>
               {{$t('Derivedlist')}}
             </div>
             <!--      引用参数-->
-            <div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
+            <div @click="referenceparameter" class="operator-text"
+                 v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
               <a-icon type="plus"/>
               {{$t('referenceparameter')}}
             </div>
             <!--            保存-->
-            <div @click="handlePreservation(1)" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
+            <div @click="handlePreservation(1)" class="operator-text"
+                 v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
               <a-icon type="check-circle"/>
               {{$t('tempSave')}}
             </div>
@@ -359,12 +362,14 @@
 
           <div class="table-operator" v-if="this.$route.query.it">
             <!--      导出-->
-            <div @click="handleExport('1')" class="operator-text" v-if='currentPersonRole == "homo" || currentPersonRole == "admin"　|| currentPersonRole == "viewer"'>
+            <div @click="handleExport('1')" class="operator-text"
+                 v-if='currentPersonRole == "homo" || currentPersonRole == "admin"　|| currentPersonRole == "viewer"'>
               <a-icon type="export" :rotate="-90"/>
               {{$t('dataExport')}}
             </div>
             <!--      导出列表-->
-            <div @click="Derivedlist" class="operator-text" v-if='currentPersonRole == "homo" || currentPersonRole == "admin"　|| currentPersonRole == "viewer"'>
+            <div @click="Derivedlist" class="operator-text"
+                 v-if='currentPersonRole == "homo" || currentPersonRole == "admin"　|| currentPersonRole == "viewer"'>
               <a-icon type="export" :rotate="-90"/>
               {{$t('Derivedlist')}}
             </div>
@@ -455,7 +460,7 @@
                @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
     <!--    </a-modal>-->
     <!--    调整责任领域-->
-    <a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null">
+    <a-modal v-model="Adjustareasofrespon" :title="$t('BatchSetting')" width='620px' :footer="null">
       <adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
                             @GetgetTableList='GetgetTableList'
                             @AdjustareasofresponAll='AdjustareasofresponAll'/>
@@ -631,27 +636,27 @@
       @ok="exportok"
       @cancel="exportvisiblecancel"
     >
-<!--      <historyTable :columnshistory='columnshistory' :dataSourcehistory='dataSourcehistory'></historyTable>-->
+      <!--      <historyTable :columnshistory='columnshistory' :dataSourcehistory='dataSourcehistory'></historyTable>-->
-            <a-table
+      <a-table
-              class="table"
+        class="table"
-              :components="drag(columnsexport,'columnsexport')"
+        :components="drag(columnsexport,'columnsexport')"
-              :columns="columnsexport"
+        :columns="columnsexport"
-              :pagination="false"
+        :pagination="false"
-              rowKey="id"
+        rowKey="id"
-              :scroll="{x: '100%',y: 400}"
+        :scroll="{x: '100%',y: 400}"
-              :data-source="dataSourceexport"
+        :data-source="dataSourceexport"
-              :loading="loading"
+        :loading="loading"
-            >
+      >
              <span slot="operation" slot-scope="text,record">
                 <a @click="exportdata(record)" v-if="record.state == '1'">{{$t('download')}}</a>
                 <a style="margin-left: 5px;" @click="exportdelete(record)">{{$t('delete')}}</a>
              </span>
-<!--              <span slot="detailText" slot-scope="text,record">-->
+        <!--              <span slot="detailText" slot-scope="text,record">-->
-<!--                    <span class="text" :title="text">-->
+        <!--                    <span class="text" :title="text">-->
-<!--                     {{text && text.length > 40?text.slice(0,39)+'...':text}}-->
+        <!--                     {{text && text.length > 40?text.slice(0,39)+'...':text}}-->
-<!--                    </span>-->
+        <!--                    </span>-->
-<!--              </span>-->
+        <!--              </span>-->
-            </a-table>
+      </a-table>
       <div class="page" v-if="dataSourceexport.length > 0">
         <a-pagination
           :show-total="total => $t('total')+` ${total} `+$t('strip')"
@@ -706,7 +711,7 @@
         </a-row>
       </a-form-model>
     </a-modal>
-<!--    数据导出异步弹窗-->
+    <!--    数据导出异步弹窗-->
     <a-modal
       :title="$t('dataExport')"
       :width="500"
@@ -736,7 +741,7 @@
 <script>
   import TableCollection from '@/components/tableCollection/index'
   import parameterColumn from '../dialog/parametercolumn'
-  import { getAction, postAction, downloadFile ,deleteAction } from '../../../api/manage'
+  import { getAction, postAction, downloadFile, deleteAction } from '../../../api/manage'
   import eventBUs from '../../../common/event'
   import customizeList from './customizeList'
   import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
@@ -774,7 +779,7 @@
       globalAdvancedQuery,
       batchUpdateDeadline
     },
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    mixins: [ResizeHeader, ResizeColumnProvide],
     data() {
       this.statusList = [
         {
@@ -894,7 +899,7 @@
             title: this.$t('status'),
             align: 'left',
             dataIndex: 'stateText',
-            width: 120,
+            width: 120
           },
           {
             title: this.$t('Exporttime'),
@@ -1162,9 +1167,9 @@
       }
       if (this.$route.query.statusFlag == '1') {
         this.formInline.state = '1'
-      } else if(this.$route.query.statusFlag == '2'){
+      } else if (this.$route.query.statusFlag == '2') {
         this.formInline.state = '2'
-      }else if(this.$route.query.statusFlag == '4'){
+      } else if (this.$route.query.statusFlag == '4') {
         this.formInline.state = '4'
       }
       // clearTimeout(this.timeBatch)
@@ -1206,7 +1211,13 @@
     methods: {
       ...mapGetters(['userInfo']),
       getQueryDutyTerritory() {
-        getAction('/params/collectManifest/queryDutyTerritory', { id: this.$route.query.id }).then((res) => {
+        let url = ''
+        if(this.$route.query.it){
+          url = '/params/collectManifest/queryDutyTerritoryHistory'
+        }else{
+          url = '/params/collectManifest/queryDutyTerritory'
+        }
+        getAction(url, { id: this.$route.query.id }).then((res) => {
           if (res.success) {
             // res.result.push(
             //   {
@@ -1272,20 +1283,29 @@
         this.visibleRoleSwitching = false
       },
       bringInTheProjectInterfaceClick() {
-        let query = {
+        if (this.selectedRowKeysValue && this.selectedRowKeysValue.length > 0) {
-          paramsManifestId: this.paramsManifest.id,
+          let ids = []
-          projectId: this.$route.query.projectId
+          this.selectedRowKeysValue.forEach(res => {
-        }
+            ids.push(res.id)
-        this.textLoading = true
+          })
-        getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
+          let query = {
-          if (res.success) {
+            paramsManifestId: this.paramsManifest.id,
-            this.$message.success(this.$t('OperationSuccessful'))
+            ids: ids.join(','),
-            this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+            projectId: this.$route.query.projectId
-          } else {
-            this.$message.warning(this.$t('operationFailed'))
           }
-          this.textLoading = false
+          this.textLoading = true
-        })
+          getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+            }
+            this.textLoading = false
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
       },
       handleOkRoleSwitching() {
         if (this.$route.query.type == '1') {
@@ -1574,7 +1594,7 @@
         // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
       },
       // 导出列表
-      Derivedlist(){
+      Derivedlist() {
         this.exportvisible = true
         this.expoteList()
       },
@@ -1587,22 +1607,22 @@
         this.pageSizehistory = pageSize
         this.expoteList()
       },
-      exportok(){
+      exportok() {
         this.exportvisible = false
       },
-      exportvisiblecancel(){
+      exportvisiblecancel() {
         this.exportvisible = false
       },
-      exportsubmit(){
+      exportsubmit() {
         this.ExportFailed = false
       },
-      exportcancel(){
+      exportcancel() {
         this.ExportFailed = false
       },
-      exportdata(item){
+      exportdata(item) {
         downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.fileId })
       },
-      exportdelete(item){
+      exportdelete(item) {
         this.$confirm({
           title: this.$t('confirmDeletion'),
           content: '',
@@ -1661,8 +1681,8 @@
               paramsTemplatePublishVersion: 1,
               cut: this.cut,
               userTypes: this.currentPersonRole,
-              exportName: this.$route.query.projectName.slice(0,-3)+ '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')'+'-' + this.$route.query.version,
+              exportName: this.$route.query.projectName.slice(0, -3) + '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')' + '-' + this.$route.query.version,
-              isHistory:this.isHistroy
+              isHistory: this.isHistroy
             }
             let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
             getAction('/params/collectManifest/exportAll', query).then((res) => {
@@ -2325,7 +2345,7 @@
         let selectedRowKeysValue = []
         data.forEach(res => {
           if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' ||
-            res.state == 'Rejected by homo engineer' ||res.state == 'Modify' || res.state == '变更') {
+            res.state == 'Rejected by homo engineer' || res.state == 'Modify' || res.state == '变更') {
             selectedRowKeysValue.push(res)
           }
         })
@@ -2509,7 +2529,7 @@
                     if (keyNameOne[l].type == 'pull_more') {
                       keyNameOne[l].dataValue = keyNameOne[l].dataValue.join(',')
                     }
-                    if ((keyNameOne[l].dataValue== undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') {
+                    if ((keyNameOne[l].dataValue == undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') {
                       this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
                       return
                     }