Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java

@@ -8,7 +8,8 @@ package com.jero.common.constant.enums;
 public enum MessageTypeEnum {
     READ("订阅通知","1"),
     WARN("预警信息","2"),
-    PUSH("转发推送","3");
+    PUSH("转发推送","3"),
+    COLLECT("认证消息","4");
 
     String name;
     String value;

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

@@ -181,6 +181,149 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		return Result.OK(loginUserType);
 	}
 
+	/**
+	 *  退回
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-退回")
+	@ApiOperation(value="参数项收集清单-退回", notes="参数项收集清单-退回")
+	@PostMapping(value = "/back")
+	public Result<?> back(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.goBack(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("退回成功！");
+		} else {
+			return Result.error("退回失败！");
+		}
+	}
+
+	/**
+	 *  撤回
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-撤回")
+	@ApiOperation(value="参数项收集清单-撤回", notes="参数项收集清单-撤回")
+	@PostMapping(value = "/withdraw")
+	public Result<?> withdraw(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.withdraw(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("撤回成功！");
+		} else {
+			return Result.error("撤回失败！");
+		}
+	}
+
+	/**
+	 *  设置截止时间
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-设置截止时间")
+	@ApiOperation(value="参数项收集清单-设置截止时间", notes="参数项收集清单-设置截止时间")
+	@PostMapping(value = "/updateDeadlineBatch")
+	public Result<?> updateDeadlineBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.updateDeadlineBatch(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("设置截止时间成功！");
+		} else {
+			return Result.error("设置截止时间失败！");
+		}
+	}
+
+	/**
+	 *  分配工程接口人
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-分配工程接口人")
+	@ApiOperation(value="参数项收集清单-分配工程接口人", notes="参数项收集清单-分配工程接口人")
+	@PostMapping(value = "/updateSdt")
+	public Result<?> updateSdt(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.updateSdt(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("分配工程接口人成功！");
+		} else {
+			return Result.error("分配工程接口人失败！");
+		}
+	}
+
+	/**
+	 *  分配工程接口人
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-分配填写人")
+	@ApiOperation(value="参数项收集清单-分配工程接口人", notes="参数项收集清单-分配工程接口人")
+	@PostMapping(value = "/updateDreBatch")
+	public Result<?> updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.updateDreBatch(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("分配填写人成功！");
+		} else {
+			return Result.error("分配填写人失败！");
+		}
+	}
+
+	/**
+	 *  下发收集
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-下发收集")
+	@ApiOperation(value="参数项收集清单-下发收集", notes="参数项收集清单-下发收集")
+	@PostMapping(value = "/issueCollection")
+	public Result<?> issueCollection(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.issueCollection(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("下发收集成功！");
+		} else {
+			return Result.error("下发收集失败！");
+		}
+	}
+
+	/**
+	 *  冻结配置-下拉选项
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-冻结配置-下拉选项")
+	@ApiOperation(value="参数项收集清单-冻结配置-下拉选项", notes="参数项收集清单-冻结配置-下拉选项")
+	@PostMapping(value = "/getConfigLableList")
+	public Result<?> getConfigLableList(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<Map<String, String>> configLableList = paramsCollectManifestEOService.getConfigLabelList(paramsCollectManifestVO);
+		return Result.OK(configLableList);
+	}
+
+	/**
+	 *  冻结配置
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-冻结配置")
+	@ApiOperation(value="参数项收集清单-冻结配置", notes="参数项收集清单-冻结配置")
+	@PostMapping(value = "/lockConfigColumn")
+	public Result<?> lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.lockConfigColumn(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("冻结配置成功！");
+		} else {
+			return Result.error("冻结配置失败！");
+		}
+	}
+
+
+
+
 	/**
 	 * 通过id查询
 	 *

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java

@@ -151,11 +151,6 @@ public class ParamsCollectManifestEO implements Serializable {
     @ApiModelProperty(value = "参数清单id")
     private String paramsManifestId;
 
-	/**是否冻结*/
-	@Excel(name = "是否冻结", width = 15)
-    @ApiModelProperty(value = "是否冻结")
-    private String isLock;
-
 	@TableField(exist = false)
     private String userTypes;
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java

@@ -93,4 +93,9 @@ public class ParamsConfigEO implements Serializable {
     @ApiModelProperty(value = "展示顺序")
     private Integer displaySeq;
 
+    /**是否冻结*/
+    @Excel(name = "是否冻结", width = 15)
+    @ApiModelProperty(value = "是否冻结")
+    private String isLock;
+
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigLockEnum.java

@@ -0,0 +1,35 @@
+package com.jero.modules.cert.collect.enums;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 16:54 2022/5/13
+ */
+public enum ConfigLockEnum {
+    YES("冻结","1"),
+    NO("未冻结","0");
+
+    String name;
+    String value;
+
+    ConfigLockEnum(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;
+    }
+}

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

@@ -52,13 +52,13 @@
                 <if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
                     <choose>
                         <when test="paramsCollectManifestEO.userTypes == 'sdt'">
-                            AND sdt = #{paramsCollectManifestEO.sdt}
+                            AND sdt = #{paramsCollectManifestEO.sdt} AND state != '1'
                         </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})
+                            AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre}) AND state != '1'
                         </when>
                     </choose>
                 </if>

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

@@ -93,4 +93,28 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	String getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO);
 
 	Map<String, Object> isCollectFinished(String paramsManifestId);
+
+	// 退回
+	boolean goBack(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 撤回
+	boolean withdraw(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 批量设置截止时间
+	boolean updateDeadlineBatch(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 修改工程接口人
+	boolean updateSdt(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 分配填写人
+	boolean updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 下发收集
+	boolean issueCollection(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 冻结配置-下拉选项
+	List<Map<String, String>> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 冻结配置
+	boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO);
 }

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

@@ -4,7 +4,9 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.MessageTypeEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
@@ -15,6 +17,7 @@ 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.enums.ConfigLockEnum;
 import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
@@ -24,23 +27,28 @@ import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
 import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
+import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
+import com.jero.modules.system.entity.SysAnnouncement;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysAnnouncementService;
 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.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -82,6 +90,16 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	@Autowired
 	private ISysUserService sysUserService;
 
+	@Autowired
+	private IFeishuService feishuService;
+
+	@Autowired
+	private ISysAnnouncementService sysAnnouncementService;
+
+
+	@Value(value = "${jero.backUrl}")
+	private String backUrl;
+
 	/**
 	 * 保存
 	 *
@@ -259,7 +277,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					Map<String, Object> configMap = new HashMap<>();
 					String paramsConfigId = paramsConfigEO.getId();
 					ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
-					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
+					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
 					configMap.put("controlType", controlType);
 					configMap.put("list", paramsConfigDataVOList);
 					manifestMap.put(paramsConfigEO.getId(), configMap);
@@ -279,7 +297,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	 * @param paramsCollectManifestEO
 	 * @return
 	 */
-    private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) {
+    private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) {
 		List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
 
 		if (ControlTypeEnum.TEXT.getValue().equals(controlType)) {
@@ -287,6 +305,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			configDataVO.setIsLock(paramsConfigEO.getIsLock());
 			configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -298,6 +317,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			configDataVO.setIsLock(paramsConfigEO.getIsLock());
 			configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -309,6 +329,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			configDataVO.setIsLock(paramsConfigEO.getIsLock());
 			configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -320,6 +341,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			configDataVO.setIsLock(paramsConfigEO.getIsLock());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
 			}
@@ -330,6 +352,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -339,6 +362,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			pullConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -350,6 +374,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -359,6 +384,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
 			pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			pullMoreConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -370,6 +396,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -379,6 +406,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
 			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
 			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
 			}
@@ -389,6 +417,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			pullConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -398,6 +427,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
 			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
 			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
 			}
@@ -408,6 +438,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
 			pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			pullMoreConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -417,6 +448,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
 			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
 			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
 			}
@@ -427,6 +459,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -436,6 +469,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			pullConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -445,6 +479,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
 			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
 			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
 			}
@@ -461,7 +496,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			String[] controlValueStr = controlValue.split(",");
 			for (int i = 0; i < controlValueStr.length; i++) {
 				Map<String, String> controlValueMap = new HashMap<>();
-				controlValueMap.put("lable", controlValueStr[i]);
+				controlValueMap.put("label", controlValueStr[i]);
 				controlValueMap.put("value", controlValueStr[i]);
 				controlValueMapList.add(controlValueMap);
 			}
@@ -709,6 +744,227 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return map;
 	}
 
+	@Override
+	public boolean goBack(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
+		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
+
+		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
+		for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
+			ParamsCollectManifestEO paramsCollectManifestEO = getById(paramsCollectManifestIdStr[i]);
+			ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+			updateEO.setId(paramsCollectManifestIdStr[i]);
+			updateEO.setState(paramsCollectManifestEO.getState() + 1); // 设置对应状态
+			updateEOList.add(updateEO);
+		}
+		return updateBatchById(updateEOList);
+	}
+
+	@Override
+	public boolean withdraw(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
+		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
+
+		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
+		for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
+			ParamsCollectManifestEO paramsCollectManifestEO = getById(paramsCollectManifestIdStr[i]);
+			Integer state =  Integer.parseInt(paramsCollectManifestEO.getState());
+
+			ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+			if (CollectManifestStateEnum.WAIT_SDT.getValue().equals(state)
+					|| CollectManifestStateEnum.DRE_BACK.getValue().equals(state)) {
+				updateEO.setState(String.valueOf(state-1)); // 设置对应状态
+
+			} else if (CollectManifestStateEnum.WAIT_SDT.getValue().equals(state)
+					|| CollectManifestStateEnum.WAIT_SDT.getValue().equals(state)) {
+				updateEO.setState(String.valueOf(state-2)); // 设置对应状态
+
+			}
+
+			updateEO.setId(paramsCollectManifestIdStr[i]);
+			updateEOList.add(updateEO);
+		}
+		return updateBatchById(updateEOList);
+	}
+
+	@Override
+	public boolean updateDeadlineBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
+		Date deadline = paramsCollectManifestVO.getDeadline();
+
+		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
+		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
+		for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
+			ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+			updateEO.setId(paramsCollectManifestIdStr[i]);
+			updateEO.setDeadline(deadline); // 设置截至时间
+			updateEOList.add(updateEO);
+		}
+		return updateBatchById(updateEOList);
+	}
+
+	@Override
+	public boolean updateSdt(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsCollectManifestId = paramsCollectManifestVO.getIds();
+		String sdt = paramsCollectManifestVO.getSdt();
+
+		ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+		updateEO.setId(paramsCollectManifestId);
+		updateEO.setSdt(sdt); // 设置工程接口人
+		return updateById(updateEO);
+	}
+
+	@Override
+	public boolean updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
+		String dre = paramsCollectManifestVO.getDre();
+		String projectId = paramsCollectManifestVO.getProjectId();
+
+		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
+		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
+		StringBuilder connectBuilder = new StringBuilder();
+		connectBuilder.append("You are required to fll in ");
+		for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
+			ParamsCollectManifestEO paramsCollectManifestEO = getById(paramsCollectManifestIdStr[i]);
+			connectBuilder.append(paramsCollectManifestEO.getNioNumber()).append("-").append(paramsCollectManifestEO.getParamsName()).append(",");
+
+			ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+			updateEO.setId(paramsCollectManifestIdStr[i]);
+			updateEO.setDre(dre); // 设置填写人
+			updateEO.setState(CollectManifestStateEnum.WAIT_FILL.getValue()); // 设置状态为：待填写
+			updateEOList.add(updateEO);
+		}
+		 boolean isSuccess = updateBatchById(updateEOList);
+
+		// 消息内容
+		SysUser sysUser = sysUserService.getUserByName(dre);
+		String[] thirdIds = new String[1];
+		thirdIds[0] = sysUser.getThirdId();
+		String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + projectId; // TODO 后续可能有变动
+		String href = "<a href='/ParameterItemCollection?id=" + projectId + "'" + " target='_blank'>the link</a>,";
+		String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it.";
+		String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " please enter " + href + " to handle it.";
+		// 发送系统消息
+		SysAnnouncement sysAnnouncement  = new SysAnnouncement();
+		sysAnnouncement.setDelFlag("0");
+		sysAnnouncement.setSendStatus("0");
+		sysAnnouncement.setSendTime(new Date());
+		sysAnnouncement.setMsgCategory(MessageTypeEnum.COLLECT.getValue());//消息类型
+		sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
+		sysAnnouncement.setMsgContent(content);
+		sysAnnouncement.setMsgContentInfo(contentInfo);
+		sysAnnouncement.setUserIds(sysUser.getId());
+		sysAnnouncementService.saveAnnouncement(sysAnnouncement);
+
+		// 发送飞书消息
+		try {
+			feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.PUSH.getName(), hrefFeishu);
+		} catch (IOException e) {
+			log.error("飞书消息推送失败");
+		}
+
+		return isSuccess;
+	}
+
+	@Override
+	public boolean issueCollection(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
+		String projectId = paramsCollectManifestVO.getProjectId();
+
+		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
+		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
+
+		for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
+			ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+			updateEO.setId(paramsCollectManifestIdStr[i]);
+			updateEO.setState(CollectManifestStateEnum.WAIT_SDT.getValue()); // 设置状态为：待工程接口人处理
+			updateEOList.add(updateEO);
+		}
+		boolean isSuccess = updateBatchById(updateEOList);
+
+		// 消息内容
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = listByIds(Arrays.asList(paramsCollectManifestIdStr));
+		List<String> sdtList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getSdt).distinct().collect(Collectors.toList());
+		for(String sdt : sdtList) {
+
+			StringBuilder connectBuilder = new StringBuilder();
+			connectBuilder.append("You are required to fll in ");
+			for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
+				if (sdt.equals(paramsCollectManifestEO.getSdt())) {
+					connectBuilder.append(paramsCollectManifestEO.getNioNumber()).append("-").append(paramsCollectManifestEO.getParamsName()).append(",");
+				}
+			}
+			String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it.";
+
+			SysUser sysUser = sysUserService.getUserByName(sdt);
+			String[] thirdIds = new String[1];
+			thirdIds[0] = sysUser.getThirdId();
+			String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + projectId; // TODO 后续可能有变动
+			String href = "<a href='/ParameterItemCollection?id=" + projectId + "'" + " target='_blank'>the link</a>,";
+			String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " to handle it.";
+
+			// 发送系统消息
+			SysAnnouncement sysAnnouncement  = new SysAnnouncement();
+			sysAnnouncement.setDelFlag("0");
+			sysAnnouncement.setSendStatus("0");
+			sysAnnouncement.setSendTime(new Date());
+			sysAnnouncement.setMsgCategory(MessageTypeEnum.COLLECT.getValue());//消息类型
+			sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
+			sysAnnouncement.setMsgContent(content);
+			sysAnnouncement.setMsgContentInfo(contentInfo);
+			sysAnnouncement.setUserIds(sysUser.getId());
+			sysAnnouncementService.saveAnnouncement(sysAnnouncement);
+
+			// 发送飞书消息
+			try {
+				feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.PUSH.getName(), hrefFeishu);
+			} catch (IOException e) {
+				log.error("飞书消息推送失败");
+			}
+		}
+
+		return isSuccess;
+	}
+
+	@Override
+	public List<Map<String, String>> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+
+		// 查询未冻结配置列
+		LambdaQueryWrapper<ParamsConfigEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId);
+		queryWrapper.eq(ParamsConfigEO::getIsLock, ConfigLockEnum.NO.getValue());
+		queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq);
+		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.list(queryWrapper);
+
+		List<Map<String, String>> configLabelList = new ArrayList<>();
+		if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
+			for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
+				Map<String, String> map = new HashMap<>();
+				map.put("label", paramsConfigEO.getConfigName());
+				map.put("value", paramsConfigEO.getId());
+				configLabelList.add(map);
+			}
+		}
+
+		return configLabelList;
+	}
+
+	@Override
+	public boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsConfigIds = paramsCollectManifestVO.getParamsConfigIds();
+		String[] paramsConfigIdStr = paramsConfigIds.split(",");
+
+		List<ParamsConfigEO> updateConfigEOList = new ArrayList<>();
+		for (int i=0; i<paramsConfigIdStr.length; i++) {
+			ParamsConfigEO updateConfigEO = new ParamsConfigEO();
+			updateConfigEO.setId(paramsConfigIdStr[i]);
+			updateConfigEO.setIsLock(ConfigLockEnum.YES.getValue());
+			updateConfigEOList.add(updateConfigEO);
+		}
+		return paramsConfigEOService.updateBatchById(updateConfigEOList);
+	}
+
 	/**
 	 * 实体对象转成Map
 	 * @param obj 实体对象

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+import com.jero.modules.cert.collect.enums.ConfigLockEnum;
 import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
 import com.jero.modules.cert.collect.mapper.ParamsConfigDataEOMapper;
 import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper;
@@ -58,6 +59,7 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
 		for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
 			paramsConfigEO.setParamsManifestId(paramsManifestId);
 			paramsConfigEO.setDisplaySeq(ind);
+			paramsConfigEO.setIsLock(ConfigLockEnum.NO.getValue());
 			if (StringUtils.isEmpty(paramsConfigEO.getId())) {
 				addConfigList.add(paramsConfigEO);
 			} else {

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java

@@ -1,8 +1,11 @@
 package com.jero.modules.cert.collect.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -13,14 +16,22 @@ import java.util.Map;
  */
 @Data
 public class ParamsCollectManifestVO {
-    private String paramsTemplateId;
+    private String paramsTemplateId; // 参数模板id
-    private String paramsTemplatePublishVersion;
+    private String paramsTemplatePublishVersion; // 参数模板发布版本
-    private String nioNumber;
+    private String nioNumber; // nio编号
-    private String paramsName;
+    private String paramsName; // 参数名称
-    private String dutyTerritory;
+    private String dutyTerritory; // 责任领域
-    private String paramsManifestId;
+    private String paramsManifestId; // 参数清单id
 
-    private String projectId;
+    private String projectId; // 项目id
     private List<ParamsInfoPublishEO> paramsInfoPublishEOList; // 添加专用
     private List<Map<String, Object>> configDataList; // 提交专用
+
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date deadline; // 截止时间
+    private String ids; // 收集参数项ids
+    private String sdt; // 工程接口人
+    private String dre; // 填写人
+    private String paramsConfigIds; // 参数配置ids
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java

@@ -14,6 +14,7 @@ import java.util.Map;
 public class ParamsConfigDataVO {
     private String type; // 类型：文本，单选，多选，附件
     private String isMust; // 是否必填 1-必填  0-非必填
+    private String isLock; // 是否必填 1-冻结  0-非冻结
     private String controlVerify; // 控件校验
     private List<Map<String, String>> controlValue; // 控件备选值
     private String dataValue; // 配置具体数据