认证-参数项收集清单-sdt查询,当前登录用户类型查询

2022-05-12 10:50:11 +08:00
parent 09b6dff601
commit ad561ad29d
8 changed files with 235 additions and 36 deletions
@@ -7,6 +7,7 @@ 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -79,14 +80,14 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	/**
 	 *   提交
 	 *
-	 * @param configDataList
+	 * @param paramsCollectManifestVO
 	 * @return
 	 */
 	@AutoLog(value = "参数项收集清单-提交")
 	@ApiOperation(value="参数项收集清单-提交", notes="参数项收集清单-提交")
 	@PostMapping(value = "/submit")
-	public Result<?> submit(@RequestBody List<Map<String, Object>> configDataList) {
-		boolean isSuccess = paramsCollectManifestEOService.submit(configDataList);
+	public Result<?> submit(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.submit(paramsCollectManifestVO.getConfigDataList());
 		if (isSuccess) {
 			return Result.OK("提交成功！");
 		} else {
@@ -152,6 +153,33 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		}
 	}

+	/**
+	 * 查询工程接口人列表
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-查询工程接口人列表")
+	@ApiOperation(value="参数项收集清单-查询工程接口人列表", notes="参数项收集清单-查询工程接口人列表")
+	@GetMapping(value = "/querySdtList")
+	public Result<List<SysUser>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<SysUser> sdtList = paramsCollectManifestEOService.querySdtList(paramsCollectManifestVO);
+		return Result.OK(sdtList);
+	}
+
+	/**
+	 * 判断当前登录用户在当前项目下的角色：homo,sdt,dre
+	 * 一个用户可以有多个用户类型
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-判断当前登录用户类型")
+	@ApiOperation(value="参数项收集清单-判断当前登录用户类型", notes="参数项收集清单-判断当前登录用户类型")
+	@GetMapping(value = "/getLoginUserType")
+	public Result<?> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String loginUserType = paramsCollectManifestEOService.getLoginUserTypes(paramsCollectManifestVO);
+		return Result.OK(loginUserType);
+	}

 	/**
 	 * 通过id查询
@@ -60,4 +60,17 @@ public class ParamsConfigEOController extends JeroController<ParamsConfigEO, IPa
 		paramsConfigEOService.addBatch(paramsConfigVO);
 		return Result.OK("添加成功！");
 	}
+
+	 /**
+	  * 列表查询
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "参数配置-查看单个详情")
+	 @ApiOperation(value="参数配置-查看单个详情", notes="参数配置-查看单个详情")
+	 @GetMapping(value = "/getById")
+	 public Result<ParamsConfigEO> getById(@RequestParam(name = "id") String id) {
+		 ParamsConfigEO paramsConfigEO = paramsConfigEOService.getById(id);
+		 return Result.OK(paramsConfigEO);
+	 }
 }
@@ -1,6 +1,7 @@
 package com.jero.modules.cert.collect.entity;

 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -154,4 +155,7 @@ public class ParamsCollectManifestEO implements Serializable {
 	@Excel(name = "是否冻结", width = 15)
    @ApiModelProperty(value = "是否冻结")
    private String isLock;
+
+	@TableField(exist = false)
+    private String userTypes;
 }
@@ -0,0 +1,37 @@
+package com.jero.modules.cert.collect.enums;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 16:47 2022/5/11
+ */
+public enum CollectManifestUserTypeEnum {
+    HOMO("认证工程师","homo"),
+    SDT("工程接口人","sdt"),
+    DRE("填写人","dre"),
+    GUEST("游客","guest");
+
+    String name;
+    String value;
+
+    CollectManifestUserTypeEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}
@@ -49,6 +49,19 @@
                <if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
                    AND params_manifest_id LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsManifestId}),'%')
                </if>
+                <if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
+                    <choose>
+                        <when test="paramsCollectManifestEO.userTypes == 'sdt'">
+                            AND sdt = #{paramsCollectManifestEO.sdt}
+                        </when>
+                        <when test="paramsCollectManifestEO.userTypes == 'dre'">
+                            AND dre = #{paramsCollectManifestEO.dre}
+                        </when>
+                        <when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
+                            AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre})
+                        </when>
+                    </choose>
+                </if>

            </if>
        </where>
@@ -4,6 +4,7 @@ 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 com.jero.modules.system.entity.SysUser;

 import java.util.List;
 import java.util.Map;
@@ -86,4 +87,8 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	 * @return
 	 */
 	List<ParamsInfoPublishEO> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	List<SysUser> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	String getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO);
 }
@@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
+import com.jero.common.system.vo.LoginUser;
 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.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
 import com.jero.modules.cert.collect.entity.ParamsConfigEO;
 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.mapper.ParamsCollectManifestEOMapper;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
@@ -32,6 +34,7 @@ import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -173,7 +176,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
    public List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
 		String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();

-		List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
+//		String userTypes = paramsCollectManifestEO.getUserTypes();
+//		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
+//		if ("sdt".equals(userTypes)) {
+//			paramsCollectManifestEO.setSdt(loginUser.getUsername());
+//		} else if ("dre".equals(userTypes)) {
+//			paramsCollectManifestEO.setDre(loginUser.getUsername());
+//		} else if ("sdt,dre".equals(userTypes)) {
+//			paramsCollectManifestEO.setSdt(loginUser.getUsername());
+//			paramsCollectManifestEO.setDre(loginUser.getUsername());
+//		}
+		List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列

 		// 普通数据字典
@@ -266,7 +279,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
 			paramsConfigDataVOList.add(configDataVO);
@@ -277,7 +290,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			configDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
 			paramsConfigDataVOList.add(configDataVO);
@@ -288,7 +301,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
 			paramsConfigDataVOList.add(configDataVO);
@@ -298,7 +311,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
 			}
 			paramsConfigDataVOList.add(configDataVO);
@@ -309,7 +322,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
 			paramsConfigDataVOList.add(textConfigDataVO);
@@ -318,7 +331,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
 			paramsConfigDataVOList.add(pullConfigDataVO);
@@ -329,7 +342,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
 			paramsConfigDataVOList.add(textConfigDataVO);
@@ -338,7 +351,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
 			paramsConfigDataVOList.add(pullMoreConfigDataVO);
@@ -349,7 +362,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
 			paramsConfigDataVOList.add(textConfigDataVO);
@@ -357,7 +370,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
 			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
 			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
 			}
 			paramsConfigDataVOList.add(fileConfigDataVO);
@@ -368,7 +381,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
 			paramsConfigDataVOList.add(pullConfigDataVO);
@@ -376,7 +389,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
 			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
 			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
 			}
 			paramsConfigDataVOList.add(fileConfigDataVO);
@@ -387,7 +400,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
 			paramsConfigDataVOList.add(pullMoreConfigDataVO);
@@ -395,7 +408,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
 			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
 			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
 			}
 			paramsConfigDataVOList.add(fileConfigDataVO);
@@ -406,7 +419,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
 			paramsConfigDataVOList.add(textConfigDataVO);
@@ -415,7 +428,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
 			paramsConfigDataVOList.add(pullConfigDataVO);
@@ -423,7 +436,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
 			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
 			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) {
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
 			}
 			paramsConfigDataVOList.add(fileConfigDataVO);
@@ -500,18 +513,19 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec

 		// 处理数据
 		for (Map<String, Object> map : configDataList) {
-			String paramsCollectManifestId = (String) map.get("paramsCollectManifestId");
-			ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
+			String paramsCollectManifestId = (String) map.get("id");

 			for (Map.Entry<String, Object> entry : map.entrySet()) {
-				if ("paramsCollectManifestId".equals(entry.getKey())) {
+				ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
+				if ("id".equals(entry.getKey())) {
 					continue;
 				}

 				// 取值
 				String paramsConfigEOId = entry.getKey();
 				Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue();
-				List<ParamsConfigDataVO> paramsConfigDataVOList = (List<ParamsConfigDataVO>) paramsConfigDataMap.get("list");
+				// 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO）
+				List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list");

 				// 判断是新增还是修改
 				ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
@@ -521,16 +535,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				}
 				paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
 				paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
-				paramsConfigDataVOList.forEach(paramsConfigDataVO -> {
-					if (paramsConfigDataVO.getType().equals(ConfigDataTypeEnum.TEXT.getValue())) {
-						paramsConfigDataEO.setTextData(paramsConfigDataVO.getDataValue());
+				for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
+					String type = (String) paramsConfigDataVO.get("type");
+					String dataValue = (String) paramsConfigDataVO.get("dataValue");

-					} else if (paramsConfigDataVO.getType().equals(ConfigDataTypeEnum.PULL.getValue())
-								|| paramsConfigDataVO.getType().equals(ConfigDataTypeEnum.PULL_MORE.getValue())) {
-						paramsConfigDataEO.setPullData(paramsConfigDataVO.getDataValue());
+					if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) {
+						paramsConfigDataEO.setTextData(dataValue);

-					} else if (paramsConfigDataVO.getType().equals(ConfigDataTypeEnum.TEXT.getValue())) {
-						String dataValue = paramsConfigDataVO.getDataValue();
+					} else if (type.equals(ConfigDataTypeEnum.PULL.getValue())
+								|| type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) {
+						paramsConfigDataEO.setPullData(dataValue);
+
+					} else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) {
 						if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) {
 							// 处理文件connectId
 							String[] fileIdList = dataValue.split(",");
@@ -548,9 +564,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						paramsConfigDataEO.setFileConnectId(dataValue);

 					}
-				});
+				}
+				newConfigDataEOList.add(paramsConfigDataEO);
 			}
-			newConfigDataEOList.add(paramsConfigDataEO);
 		}

 		// 批量更新
@@ -584,6 +600,87 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return paramsInfoPublishEOList;
 	}

+	@Override
+	public List<SysUser> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<SysUser> sdtList = new ArrayList<>();
+		ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsCollectManifestVO.getProjectId(), paramsCollectManifestVO.getDutyTerritory());
+		if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+			String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+			if (StringUtils.isNotBlank(sdtId)) {
+				SysUser sysUser = sysUserService.getById(sdtId);
+				if (ObjectUtil.isNotEmpty(sysUser)) {
+					sdtList.add(sysUser);
+				}
+			}
+		}
+		return sdtList;
+	}
+
+	@Override
+	public String getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String projectId = paramsCollectManifestVO.getProjectId();
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+
+		StringBuilder userTypesBuilder=new StringBuilder(); // 一个用户可以有多个用户类型
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
+
+		// 查询项目下所有责任领域下的 homo,sdt人员
+		LambdaQueryWrapper<ProjectRelatedPersonnel> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ProjectRelatedPersonnel::getProjectId, projectId);
+		List<ProjectRelatedPersonnel> prpList = projectRelatedPersonnelService.list(queryWrapper);
+
+		String homoIdStr = prpList.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.joining(","));
+		String sdtIdStr = prpList.stream().map(e -> e.getEngineeringInterfacePerson()).collect(Collectors.joining(","));
+		List<String> homoList = new ArrayList<>();
+		if (StringUtils.isNotEmpty(homoIdStr)) {
+			List<String> homoIdList = Arrays.asList(homoIdStr.split(",")).stream().distinct().collect(Collectors.toList());
+			homoList = sysUserService.listByIds(homoIdList).stream().map(SysUser::getUsername).collect(Collectors.toList());
+		} else {
+			return CollectManifestUserTypeEnum.GUEST.getValue();
+		}
+		// 项目下有homo-->必定有sdt
+		List<String> sdtIdList = Arrays.asList(sdtIdStr.split(",")).stream().distinct().collect(Collectors.toList());
+		List<String> sdtList = sysUserService.listByIds(sdtIdList).stream().map(SysUser::getUsername).collect(Collectors.toList());
+
+		// 查询项目下参数清单下收集参数项中的 sdt,dre人员
+		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+		paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
+		List<ParamsCollectManifestEO> pcmList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+		List<String> sdtListOfPCM = pcmList.stream()
+				.filter(e->StringUtils.isNotEmpty(e.getSdt()))
+				.map(ParamsCollectManifestEO::getSdt)
+				.distinct()
+				.collect(Collectors.toList());
+		sdtList.addAll(sdtListOfPCM);
+
+		List<String> dreListOfPCM = pcmList.stream()
+				.filter(e->StringUtils.isNotEmpty(e.getDre()))
+				.map(ParamsCollectManifestEO::getDre)
+				.distinct()
+				.collect(Collectors.toList());
+
+		if (!homoList.contains(loginUser.getUsername())
+				&& !sdtList.contains(loginUser.getUsername())
+				&& !dreListOfPCM.contains(loginUser.getUsername())) {
+
+			return CollectManifestUserTypeEnum.GUEST.getValue();
+		}
+
+		if (homoList.contains(loginUser.getUsername())) {
+			userTypesBuilder.append(CollectManifestUserTypeEnum.HOMO.getValue()).append(",");
+		}
+
+		if (sdtList.contains(loginUser.getUsername())) {
+			userTypesBuilder.append(CollectManifestUserTypeEnum.SDT.getValue()).append(",");
+		}
+
+		if (dreListOfPCM.contains(loginUser.getUsername())) {
+			userTypesBuilder.append(CollectManifestUserTypeEnum.DRE.getValue()).append(",");
+		}
+
+		return userTypesBuilder.substring(0, userTypesBuilder.toString().length() - 1);
+	}
+
 	/**
 	 * 实体对象转成Map
 	 * @param obj 实体对象
@@ -4,6 +4,7 @@ import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import lombok.Data;

 import java.util.List;
+import java.util.Map;

 /**
 * @Author: liyawei
@@ -20,5 +21,6 @@ public class ParamsCollectManifestVO {
    private String paramsManifestId;

    private String projectId;
-    private List<ParamsInfoPublishEO> paramsInfoPublishEOList;
+    private List<ParamsInfoPublishEO> paramsInfoPublishEOList; // 添加专用
+    private List<Map<String, Object>> configDataList; // 提交专用
 }