项目库-删除: 关联删除收集清单

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

@@ -0,0 +1,592 @@
+package com.jero.modules.cert.collect.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
+import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * @Description: 参数项收集清单
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Api(tags="参数项收集清单")
+@RestController
+@RequestMapping("/params/collectManifest")
+@Slf4j
+public class ParamsCollectManifestEOController extends JeroController<ParamsCollectManifestEO, IParamsCollectManifestEOService> {
+	@Autowired
+	private IParamsCollectManifestEOService paramsCollectManifestEOService;
+
+	@Autowired
+	private ISysUserService sysUserService;
+
+	/**
+	 * 表头中英文切换
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-表头中英文切换")
+	@ApiOperation(value="参数项收集清单-表头中英文切换", notes="参数项收集清单-表头中英文切换")
+	@GetMapping(value = "/getHeader")
+//	@RequiresPermissions("params:collectManifest:list")
+	public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
+													   @RequestParam(name = "flag") String flag,
+													   @RequestParam(name = "cut") String cut) {
+		List<Map<String, Object>> list = paramsCollectManifestEOService.getHeader(paramsManifestId, flag, cut);
+		return Result.OK(list);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-列表查询")
+    @ApiOperation(value="参数项收集清单-列表查询", notes="参数项收集清单-列表查询")
+	@GetMapping(value = "/list")
+//	@RequiresPermissions("params:collectManifest:list")
+	public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
+							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
+							   @RequestParam(name = "cut") String cut,
+							   HttpServletRequest req) {
+//		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
+//			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) {
+//			paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
+//			paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
+//		}
+
+		IPage page = new Page(pageNo, pageSize);
+		IPage list = paramsCollectManifestEOService.queryList(page, paramsCollectManifestEO, cut, req);
+        return Result.OK(list);
+	}
+
+	/**
+	 *   提交
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-提交")
+	@ApiOperation(value="参数项收集清单-提交", notes="参数项收集清单-提交")
+	@PostMapping(value = "/submit")
+//	@RequiresPermissions("params:collectManifest:submit")
+	public Result<?> submit(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.submit(paramsCollectManifestVO.getConfigDataList());
+		if (isSuccess) {
+			return Result.OK("提交成功！");
+		} else {
+			return Result.error("提交失败！");
+		}
+	}
+
+	/**
+	 * 暂存
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-暂存")
+	@ApiOperation(value="参数项收集清单-暂存", notes="参数项收集清单-暂存")
+	@PostMapping(value = "/save")
+//	@RequiresPermissions("params:collectManifest:save")
+	public Result<?> save(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.save(paramsCollectManifestVO.getConfigDataList(), paramsCollectManifestVO.getParamsManifestId());
+		if (isSuccess) {
+			return Result.OK("暂存成功！");
+		} else {
+			return Result.error("暂存失败！");
+		}
+	}
+
+	/**
+	 * 查询清单所用模版参数项列表（过滤清单已添加的参数项）
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-添加查询")
+	@ApiOperation(value="参数项收集清单-添加查询", notes="参数项收集清单-添加查询")
+	@GetMapping(value = "/paramsInfoList")
+//	@RequiresPermissions("params:collectManifest:add")
+	public Result<List<Map<String, Object>>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO,
+															@RequestParam(name = "cut") String cut) {
+		if (StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber())) {
+			paramsCollectManifestVO.setNioNumber(paramsCollectManifestVO.getNioNumber().replace("%","\\%"));
+		}
+		if (StringUtils.isNotEmpty(paramsCollectManifestVO.getParamsName())) {
+			paramsCollectManifestVO.setParamsName(paramsCollectManifestVO.getParamsName().replace("%","\\%"));
+		}
+
+		List<Map<String, Object>> list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO);
+		return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-添加")
+	@ApiOperation(value="参数项收集清单-添加", notes="参数项收集清单-添加")
+	@PostMapping(value = "/add")
+//	@RequiresPermissions("params:collectManifest:add")
+	public Result<?> add(@Validated @RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.add(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("添加成功！");
+		} else {
+			return Result.error("添加失败！");
+		}
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-批量删除")
+	@ApiOperation(value="参数项收集清单-批量删除", notes="参数项收集清单-批量删除")
+	@PostMapping(value = "/deleteBatch")
+//	@RequiresPermissions("params:collectManifest:delete")
+	public Result<?> deleteBatch(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.deleteBatch(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("批量删除成功！");
+		} else {
+			return Result.error("批量删除失败！");
+		}
+	}
+
+	/**
+	 * 查询工程接口人列表
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-查询工程接口人列表")
+	@ApiOperation(value="参数项收集清单-查询工程接口人列表", notes="参数项收集清单-查询工程接口人列表")
+	@GetMapping(value = "/querySdtList")
+//	@RequiresPermissions("params:collectManifest:sdt")
+	public Result<List<Map<String,String>>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<Map<String,String>> sdtList = paramsCollectManifestEOService.querySdtList(paramsCollectManifestVO);
+		return Result.OK(sdtList);
+	}
+
+	/**
+	 * 判断当前登录用户在当前项目下的角色：homo,sdt,dre
+	 * 一个用户可以有多个用户类型
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-判断当前登录用户类型")
+	@ApiOperation(value="参数项收集清单-判断当前登录用户类型", notes="参数项收集清单-判断当前登录用户类型")
+	@GetMapping(value = "/getLoginUserType")
+//	@RequiresPermissions("params:collectManifest:list")
+	public Result<?> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO,
+									   @RequestParam(name="cut") String cut) {
+		List<Map<String, String>> loginUserType = paramsCollectManifestEOService.getLoginUserTypes(paramsCollectManifestVO, cut);
+		return Result.OK(loginUserType);
+	}
+
+	/**
+	 *  退回
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-退回")
+	@ApiOperation(value="参数项收集清单-退回", notes="参数项收集清单-退回")
+	@PostMapping(value = "/back")
+//	@RequiresPermissions("params:collectManifest: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")
+//	@RequiresPermissions("params:collectManifest: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")
+//	@RequiresPermissions("params:collectManifest:deadline")
+	public Result<?> updateDeadlineBatch(@RequestBody 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 = "/updateDutyTerritory")
+//	@RequiresPermissions("params:collectManifest:sdt")
+	public Result<?> updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.updateDutyTerritory(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("修改责任领域成功！");
+		} else {
+			return Result.error("修改责任领域失败！");
+		}
+	}
+
+	/**
+	 *  分配工程接口人
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-分配工程接口人")
+	@ApiOperation(value="参数项收集清单-分配工程接口人", notes="参数项收集清单-分配工程接口人")
+	@PostMapping(value = "/updateSdt")
+//	@RequiresPermissions("params:collectManifest:sdt")
+	public Result<?> updateSdt(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.updateSdt(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("分配工程接口人成功！");
+		} else {
+			return Result.error("分配工程接口人失败！");
+		}
+	}
+
+	/**
+	 * 获取用户列表数据
+	 *
+	 * @param user
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "填写人-分页查询")
+	@ApiOperation(value="填写人-分页查询", notes="填写人-分页查询")
+	@GetMapping(value = "/drePage")
+	public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+												@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+		Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+		QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
+		//TODO 外部模拟登陆临时账号，列表不显示
+		queryWrapper.ne("username", "_reserve_user_external");
+		Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+		IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
+
+		//批量查询用户的所属部门
+		//step.1 先拿到全部的 useids
+		//step.2 通过 useids，一次性查询用户的所属部门名字
+		List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
+		if (userIds != null && userIds.size() > 0) {
+			Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+			pageList.getRecords().forEach(item -> {
+				item.setOrgCodeTxt(useDepNames.get(item.getId()));
+			});
+		}
+		result.setSuccess(true);
+		result.setResult(pageList);
+		log.info(pageList.toString());
+		return result;
+	}
+
+	/**
+	 *  分配工程接口人
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-分配填写人")
+	@ApiOperation(value="参数项收集清单-分配填写人", notes="参数项收集清单-分配填写人")
+	@PostMapping(value = "/updateDreBatch")
+//	@RequiresPermissions("params:collectManifest:dre")
+	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")
+//	@RequiresPermissions("params:collectManifest:issue")
+	public Result<List<String>> issueCollection(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<String> msgList = paramsCollectManifestEOService.issueCollection(paramsCollectManifestVO);
+		return Result.OK(msgList);
+	}
+
+	/**
+	 *  一键下发收集
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-一键下发收集")
+	@ApiOperation(value="参数项收集清单-一键下发收集", notes="参数项收集清单-一键下发收集")
+	@PostMapping(value = "/issueCollectionAll")
+//	@RequiresPermissions("params:collectManifest:issue")
+	public Result<List<String>> issueCollectionAll(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<String> msgList = paramsCollectManifestEOService.issueCollectionAll(paramsCollectManifestVO);
+		return Result.OK(msgList);
+	}
+
+	/**
+	 *  冻结配置-下拉选项
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-配置下拉选项(冻结配置)")
+	@ApiOperation(value="参数项收集清单-配置下拉选项(冻结配置)", notes="参数项收集清单-配置下拉选项(冻结配置)")
+	@PostMapping(value = "/getConfigLableList")
+//	@RequiresPermissions("params:collectManifest:lock")
+	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="参数项收集清单-回显已冻结的配置")
+	@GetMapping(value = "/getLockedConfigIdList")
+//	@RequiresPermissions("params:collectManifest:lock")
+	public Result<?> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<String> lockedConfigIdList = paramsCollectManifestEOService.getLockedConfigIdList(paramsCollectManifestVO);
+		return Result.OK(lockedConfigIdList);
+	}
+
+	/**
+	 *  冻结配置
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-冻结配置")
+	@ApiOperation(value="参数项收集清单-冻结配置", notes="参数项收集清单-冻结配置")
+	@PostMapping(value = "/lockConfigColumn")
+//	@RequiresPermissions("params:collectManifest:lock")
+	public Result<?> lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.lockConfigColumn(paramsCollectManifestVO);
+		if (isSuccess) {
+			if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsConfigIds())) {
+				return Result.OK("解冻配置成功！");
+			} else {
+				return Result.OK("冻结配置成功！");
+			}
+		} else {
+			return Result.error("冻结配置失败！");
+		}
+	}
+
+	/**
+	 *  引用参数-下拉选项
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-配置下拉选项(引用参数)")
+	@ApiOperation(value="参数项收集清单-配置下拉选项(引用参数)", notes="参数项收集清单-配置下拉选项(引用参数)")
+	@PostMapping(value = "/getConfigLableListR")
+//	@RequiresPermissions("params:collectManifest:refer")
+	public Result<?> getConfigLableListRefer(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<Map<String, String>> configLableList = paramsCollectManifestEOService.getConfigLabelList(paramsCollectManifestVO);
+		return Result.OK(configLableList);
+	}
+
+	/**
+	 *  引用参数
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-引用参数")
+	@ApiOperation(value="参数项收集清单-引用参数", notes="参数项收集清单-引用参数")
+	@PostMapping(value = "/referParams")
+//	@RequiresPermissions("params:collectManifest:refer")
+	public Result<?> referParams(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.referParams(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("引用参数成功！");
+		} else {
+			return Result.error("引用参数失败！");
+		}
+	}
+
+	/**
+	 *  同步上报库
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-同步上报库")
+	@ApiOperation(value="参数项收集清单-同步上报库", notes="参数项收集清单-同步上报库")
+	@PostMapping(value = "/syncReport")
+//	@RequiresPermissions("params:collectManifest:sync")
+	public Result<?> syncReport(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.syncReport(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("同步上报库成功！");
+		} else {
+			return Result.error("同步上报库失败！");
+		}
+	}
+
+	/**
+	 *  带入工程接口人
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-带入工程接口人")
+	@ApiOperation(value="参数项收集清单-带入工程接口人", notes="参数项收集清单-带入工程接口人")
+	@GetMapping(value = "/bringSdtInto")
+//	@RequiresPermissions("params:collectManifest:bring")
+	public Result<?> bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
+		paramsCollectManifestEOService.bringSdtInto(paramsCollectManifestVO);
+		return Result.OK("带入工程接口人成功！");
+	}
+
+	@ApiOperation(value = "参数项收集清单-全部导出")
+	@GetMapping(value = "/exportAll")
+//	@RequiresPermissions("report:detail:export:normal")
+	public void exportAll(ParamsCollectManifestVO paramsCollectManifestVO,
+							 HttpServletResponse response,
+							 HttpServletRequest request) {
+		paramsCollectManifestEOService.exportAll(paramsCollectManifestVO, response, request);
+	}
+
+	/**
+	 *  调整责任领域
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-调整责任领域")
+	@ApiOperation(value="参数项收集清单-调整责任领域", notes="参数项收集清单-调整责任领域")
+	@PostMapping(value = "/updateBatchDutyTerritory")
+//	@RequiresPermissions("params:collectManifest:bring")
+	public Result<List<String>> updateBatchDutyTerritory(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<String> msgList = paramsCollectManifestEOService.updateBatchDutyTerritory(paramsCollectManifestVO);
+		return Result.OK(msgList);
+	}
+
+
+
+
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-通过id查询")
+	@ApiOperation(value="参数项收集清单-通过id查询", notes="参数项收集清单-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ParamsCollectManifestEO paramsCollectManifestEO = paramsCollectManifestEOService.queryById(id);
+		if(paramsCollectManifestEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(paramsCollectManifestEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param paramsCollectManifestEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ParamsCollectManifestEO paramsCollectManifestEO) {
+        return super.exportXls(request, paramsCollectManifestEO, ParamsCollectManifestEO.class, "参数项收集清单");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ParamsCollectManifestEO.class);
+    }
+
+}

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

@@ -0,0 +1,102 @@
+package com.jero.modules.cert.collect.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestHistoryEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 参数项收集清单
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Api(tags="历史参数项收集清单")
+@RestController
+@RequestMapping("/params/collectManifestHistory")
+@Slf4j
+public class ParamsCollectManifestHistoryEOController extends JeroController<ParamsCollectManifestEO, IParamsCollectManifestEOService> {
+	@Autowired
+	private IParamsCollectManifestHistoryEOService paramsCollectManifestHistoryEOService;
+
+	@Autowired
+	private IParamsConfigHistoryEOService paramsConfigHistoryEOService;
+
+	/**
+	 * 表头中英文切换
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "历史参数项收集清单-表头中英文切换")
+	@ApiOperation(value="历史参数项收集清单-表头中英文切换", notes="历史参数项收集清单-表头中英文切换")
+	@GetMapping(value = "/getHeader")
+//	@RequiresPermissions("params:manifest:history")
+	public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
+													   @RequestParam(name = "flag") String flag,
+													   @RequestParam(name = "cut") String cut) {
+		List<Map<String, Object>> list = paramsCollectManifestHistoryEOService.getHeader(paramsManifestId, flag, cut);
+		return Result.OK(list);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "历史参数项收集清单-列表查询")
+    @ApiOperation(value="历史参数项收集清单-列表查询", notes="历史参数项收集清单-列表查询")
+	@GetMapping(value = "/list")
+//	@RequiresPermissions("params:manifest:history")
+	public Result<?> queryList(ParamsCollectManifestHistoryEO paramsCollectManifestHistoryEO,
+							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+							   @RequestParam(name="pageSize", defaultValue="500") Integer pageSize,
+							   @RequestParam(name = "cut") String cut,
+							   HttpServletRequest req) {
+//		if (StringUtils.isNotEmpty(paramsCollectManifestHistoryEO.getNioNumber())) {
+//			paramsCollectManifestHistoryEO.setNioNumber(paramsCollectManifestHistoryEO.getNioNumber().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestHistoryEO.getParamsName())) {
+//			paramsCollectManifestHistoryEO.setParamsName(paramsCollectManifestHistoryEO.getParamsName().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestHistoryEO.getDre())) {
+//			paramsCollectManifestHistoryEO.setDre(paramsCollectManifestHistoryEO.getDre().replace("%","\\%"));
+//		}
+
+		IPage page = new Page(pageNo, pageSize);
+		IPage list = paramsCollectManifestHistoryEOService.queryList(page, paramsCollectManifestHistoryEO, cut, req);
+        return Result.OK(list);
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "历史参数配置-查看单个详情")
+	@ApiOperation(value="历史参数配置-查看单个详情", notes="历史参数配置-查看单个详情")
+	@GetMapping(value = "/getConfigById")
+	public Result<ParamsConfigHistoryEO> getConfigById(@RequestParam(name = "id") String configId) {
+		ParamsConfigHistoryEO paramsConfigHistoryEO = paramsConfigHistoryEOService.getById(configId);
+		return Result.OK(paramsConfigHistoryEO);
+	}
+}

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

@@ -0,0 +1,63 @@
+package com.jero.modules.cert.collect.controller;
+
+import com.jero.common.api.vo.Result;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 参数项收集切换角色日志表
+ * @Author: jero-boot
+ * @Date:   2022-07-01
+ * @Version: V1.0
+ */
+@Api(tags="参数项收集切换角色日志表")
+@RestController
+@RequestMapping("/params/userTypeLog")
+@Slf4j
+public class ParamsCollectManifestUserTypeLogEOController extends JeroController<ParamsCollectManifestUserTypeLogEO, IParamsCollectManifestUserTypeLogEOService> {
+	@Autowired
+	private IParamsCollectManifestUserTypeLogEOService paramsCollectManifestUserTypeLogEOService;
+
+
+	/**
+	 *  编辑
+	 *
+	 * @param paramsCollectManifestUserTypeLogEO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集切换角色日志表-编辑")
+	@ApiOperation(value="参数项收集切换角色日志表-编辑", notes="参数项收集切换角色日志表-编辑")
+	@PostMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO) {
+		paramsCollectManifestUserTypeLogEOService.editById(paramsCollectManifestUserTypeLogEO);
+		return Result.OK("编辑成功!");
+	}
+
+
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集切换角色日志表-查询当前用户类型")
+	@ApiOperation(value="参数项收集切换角色日志表-查询当前用户类型", notes="参数项收集切换角色日志表-查询当前用户类型")
+	@GetMapping(value = "/queryCurrentType")
+	public Result<?> queryById(@RequestParam(name="projectId",required=true) String projectId,
+							   @RequestParam(name="paramsManifestId",required=true) String paramsManifestId,
+							   @RequestParam(name="userId",required=true) String userId) {
+		ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO = paramsCollectManifestUserTypeLogEOService.queryCurrentType(projectId,paramsManifestId,userId);
+		return Result.OK(paramsCollectManifestUserTypeLogEO);
+	}
+
+}

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

@@ -0,0 +1,173 @@
+package com.jero.modules.cert.collect.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
+import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+
+ /**
+ * @Description: 参数配置数据
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Api(tags="参数配置数据")
+@RestController
+@RequestMapping("/params/configData")
+@Slf4j
+public class ParamsConfigDataEOController extends JeroController<ParamsConfigDataEO, IParamsConfigDataEOService> {
+	@Autowired
+	private IParamsConfigDataEOService paramsConfigDataEOService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param paramsConfigDataEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "参数配置数据-分页列表查询")
+	@ApiOperation(value="参数配置数据-分页列表查询", notes="参数配置数据-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ParamsConfigDataEO paramsConfigDataEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ParamsConfigDataEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsConfigDataEO, req.getParameterMap());
+		Page<ParamsConfigDataEO> page = new Page<ParamsConfigDataEO>(pageNo, pageSize);
+		IPage<ParamsConfigDataEO> pageList = paramsConfigDataEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "参数配置数据-列表查询")
+    @ApiOperation(value="参数配置数据-列表查询", notes="参数配置数据-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ParamsConfigDataEO>> queryList() {
+        List<ParamsConfigDataEO> list = paramsConfigDataEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param paramsConfigDataEO
+	 * @return
+	 */
+	@AutoLog(value = "参数配置数据-添加")
+	@ApiOperation(value="参数配置数据-添加", notes="参数配置数据-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ParamsConfigDataEO paramsConfigDataEO) {
+		paramsConfigDataEOService.add(paramsConfigDataEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param paramsConfigDataEO
+	 * @return
+	 */
+	@AutoLog(value = "参数配置数据-编辑")
+	@ApiOperation(value="参数配置数据-编辑", notes="参数配置数据-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ParamsConfigDataEO paramsConfigDataEO) {
+		paramsConfigDataEOService.editById(paramsConfigDataEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "参数配置数据-通过id删除")
+	@ApiOperation(value="参数配置数据-通过id删除", notes="参数配置数据-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		paramsConfigDataEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "参数配置数据-批量删除")
+	@ApiOperation(value="参数配置数据-批量删除", notes="参数配置数据-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.paramsConfigDataEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param paramsConfigId
+	 * @param paramsCollectManifestId
+	 * @return
+	 */
+	@AutoLog(value = "参数配置数据-通过id查询")
+	@ApiOperation(value="参数配置数据-通过id查询", notes="参数配置数据-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="paramsConfigId",required=true) String paramsConfigId,
+							   @RequestParam(name="paramsCollectManifestId",required=true) String paramsCollectManifestId) {
+		ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId);
+		if(paramsConfigDataEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(paramsConfigDataEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param paramsConfigDataEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ParamsConfigDataEO paramsConfigDataEO) {
+        return super.exportXls(request, paramsConfigDataEO, ParamsConfigDataEO.class, "参数配置数据");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ParamsConfigDataEO.class);
+    }
+
+}

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

@@ -0,0 +1,79 @@
+package com.jero.modules.cert.collect.controller;
+
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+import com.jero.modules.cert.collect.service.IParamsConfigEOService;
+import com.jero.modules.cert.collect.vo.ParamsConfigVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+ /**
+ * @Description: 参数配置
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Api(tags="参数配置")
+@RestController
+@RequestMapping("/params/config")
+@Slf4j
+public class ParamsConfigEOController extends JeroController<ParamsConfigEO, IParamsConfigEOService> {
+	@Autowired
+	private IParamsConfigEOService paramsConfigEOService;
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "参数配置-列表查询")
+    @ApiOperation(value="参数配置-列表查询", notes="参数配置-列表查询")
+	@GetMapping(value = "/list")
+//	@RequiresPermissions("params:config:list")
+	public Result<List<ParamsConfigEO>> queryList(@RequestParam(name = "cut") String cut,
+												  @RequestParam(name = "paramsManifestId") String paramsManifestId) {
+        List<ParamsConfigEO> list = paramsConfigEOService.queryList(paramsManifestId);
+        return Result.OK(cut, list);
+	}
+
+	 /**
+	  * 批量添加
+	  * @param paramsConfigVO
+	  * @return
+	  */
+	@AutoLog(value = "参数配置-批量添加")
+	@ApiOperation(value="参数配置-批量添加", notes="参数配置-批量添加")
+	@PostMapping(value = "/addBatch")
+//	@RequiresPermissions("params:config:addBatch")
+	public Result<?> addBatch(@RequestBody ParamsConfigVO paramsConfigVO) {
+		String paramsManifestId = paramsConfigVO.getParamsManifestId();
+		if (StringUtils.isBlank(paramsManifestId)) {
+			return Result.error("参数不能为空");
+		}
+		paramsConfigEOService.addBatch(paramsConfigVO);
+		return Result.OK("添加成功！");
+	}
+
+	 /**
+	  * 列表查询
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "参数配置-查看单个详情")
+	 @ApiOperation(value="参数配置-查看单个详情", notes="参数配置-查看单个详情")
+	 @GetMapping(value = "/getById")
+//	 @RequiresPermissions("params:config:list")
+	 public Result<ParamsConfigEO> getById(@RequestParam(name = "id") String id) {
+		 ParamsConfigEO paramsConfigEO = paramsConfigEOService.getById(id);
+		 return Result.OK(paramsConfigEO);
+	 }
+}

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

@@ -0,0 +1,371 @@
+package com.jero.modules.cert.collect.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+import com.jero.modules.cert.collect.entity.ParamsManifestEO;
+import com.jero.modules.cert.collect.enums.ManifestStateEnum;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigEOService;
+import com.jero.modules.cert.collect.service.IParamsManifestEOService;
+import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
+import com.jero.modules.cert.collect.vo.ParamsManifestVO;
+import com.jero.modules.cert.template.entity.ParamsTemplateEO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 参数清单
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Api(tags="参数清单")
+@RestController
+@RequestMapping("/params/manifest")
+@Slf4j
+public class ParamsManifestEOController extends JeroController<ParamsManifestEO, IParamsManifestEOService> {
+	@Autowired
+	private IParamsManifestEOService paramsManifestEOService;
+
+	@Autowired
+	private IParamsCollectManifestEOService paramsCollectManifestEOService;
+
+	@Autowired
+	private IParamsConfigEOService paramsConfigEOService;
+
+	/**
+	/**
+	 * 分页列表查询
+	 *
+	 * @param paramsManifestEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-分页列表查询")
+	@ApiOperation(value="参数清单-分页列表查询", notes="参数清单-分页列表查询")
+	@GetMapping(value = "/page")
+	@RequiresPermissions("params:manifest:page")
+	public Result<?> queryPageList(ParamsManifestEO paramsManifestEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   @RequestParam(name="cut") String cut,
+								   HttpServletRequest req) {
+		if (StringUtils.isNotEmpty(paramsManifestEO.getTitle())) {
+			paramsManifestEO.setTitle(paramsManifestEO.getTitle().replace("%","\\%"));
+		}
+
+		IPage page = new Page(pageNo, pageSize);
+		IPage pageList = paramsManifestEOService.pageInfo(page, paramsManifestEO);
+		List<ParamsManifestEO> rows = pageList.getRecords();
+		// 处理 状态 中英文
+		Map<String, String> stateMap = ManifestStateEnum.toMap(cut);
+		rows.forEach(manifestEO -> {
+			manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId()).getProjectName());
+			manifestEO.setState(stateMap.get(manifestEO.getState()));
+		});
+		return Result.OK(cut, pageList);
+	}
+
+	/**
+	 * 参数模板列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-参数模板列表查询")
+    @ApiOperation(value="参数清单-参数模板列表查询", notes="参数清单-参数模板列表查询")
+	@GetMapping(value = "/getParamsTemplatePage")
+//	@RequiresPermissions("params:manifest:add")
+	public Result<?> getParamsTemplatePage(ParamsTemplateEO paramsTemplateEO,
+										   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+										   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+										   @RequestParam(name="cut") String cut) {
+		Page<ParamsTemplateEO> page = new Page<ParamsTemplateEO>(pageNo, pageSize);
+		IPage<ParamsTemplateEO> pageList = paramsManifestEOService.getNewestPublishPage(page, paramsTemplateEO);
+        return Result.OK(cut, pageList);
+	}
+
+	/**
+	 * 标题唯一校验 同一项目下标题唯一
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-标题唯一校验")
+    @ApiOperation(value="参数清单-标题唯一校验", notes="参数清单-标题唯一校验")
+	@GetMapping(value = "/verifyTitle")
+//	@RequiresPermissions("params:manifest:add")
+	public Result<?> verifyTitle(String title, String projectId) {
+		LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsManifestEO::getTitle, title);
+		queryWrapper.eq(ParamsManifestEO::getProjectId, projectId);
+		List<ParamsManifestEO> paramsManifestEOList = paramsManifestEOService.list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+			return Result.OK(false); // 有重复
+		}
+		return Result.OK(true); // 无重复
+	}
+
+	/**
+	 * 获取配置标识
+	 * 判断是否可新增配置，清单参数项状态为 待发起、变更时，可添加配置
+	 * true-可添加配置；false-不可添加配置
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-获取配置标识")
+	@ApiOperation(value="参数清单-获取配置标识", notes="参数清单-获取配置标识")
+	@GetMapping(value = "/getConfigFlag")
+	@RequiresPermissions("params:manifest:page")
+	public Result<?> getManifestConfigFlag(@RequestParam(name="paramsManifestId", required = true) String paramsManifestId) {
+		boolean configFlag = paramsCollectManifestEOService.getManifestConfigFlag(paramsManifestId);
+		return Result.OK(configFlag);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param paramsManifestEO
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-添加")
+	@ApiOperation(value="参数清单-添加", notes="参数清单-添加")
+	@PostMapping(value = "/add")
+	@RequiresPermissions("params:manifest:add")
+	public Result<?> add(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
+		boolean isSuccess = paramsManifestEOService.add(paramsManifestEO);
+		if (isSuccess) {
+			return Result.OK("添加成功！");
+		} else {
+			return Result.error("添加失败！");
+		}
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param paramsManifestEO
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-编辑")
+	@ApiOperation(value="参数清单-编辑", notes="参数清单-编辑")
+	@PostMapping(value = "/edit")
+	@RequiresPermissions("params:manifest:edit")
+	public Result<?> edit(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
+		boolean isSuccess = paramsManifestEOService.editById(paramsManifestEO);
+		if (isSuccess) {
+			return Result.OK("编辑成功!");
+		} else {
+			return Result.error("编辑失败!");
+		}
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-通过id删除")
+	@ApiOperation(value="参数清单-通过id删除", notes="参数清单-通过id删除")
+	@GetMapping(value = "/delete")
+	@RequiresPermissions("params:manifest:delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) {
+		boolean isSuccess = paramsManifestEOService.deleteById(id, cut);
+		if (isSuccess) {
+			return Result.OK("删除成功!");
+		} else {
+			return Result.error("删除失败！");
+		}
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param paramsManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-批量删除")
+	@ApiOperation(value="参数清单-批量删除", notes="参数清单-批量删除")
+	@PostMapping(value = "/deleteBatch")
+	@RequiresPermissions("params:manifest:deleteBatch")
+	public Result<?> deleteBatch(@RequestBody ParamsManifestVO paramsManifestVO) {
+		if (StringUtils.isEmpty(paramsManifestVO.getIds()) || StringUtils.isEmpty(paramsManifestVO.getCut())) {
+			return Result.error("参数不能为空！");
+		}
+		boolean isSuccess = paramsManifestEOService.deleteByIds(Arrays.asList(paramsManifestVO.getIds().split(",")), paramsManifestVO.getCut());
+		if (isSuccess) {
+			return Result.OK("批量删除成功!");
+		} else {
+			return Result.error("批量删除失败！");
+		}
+	}
+
+	 /**
+	  * 变更扩展
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "参数清单-变更扩展")
+	 @ApiOperation(value="参数清单-变更扩展", notes="参数清单-变更扩展")
+	 @GetMapping(value = "/changeExtension")
+	 @RequiresPermissions("params:manifest:change")
+	 public Result<?> changeExtension(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) {
+		 boolean isSuccess = paramsManifestEOService.changeExtension(id, cut);
+		 if(isSuccess) {
+			 return Result.OK("变更扩展成功！");
+		 } else {
+		 	return Result.error("变更扩展失败！");
+		 }
+	 }
+
+	 /**
+	  * 历史版本
+	  * 根据标题查询
+	  * @param paramsManifestId
+	  * @return
+	  */
+	 @AutoLog(value = "参数清单-历史版本")
+	 @ApiOperation(value="参数清单-历史版本", notes="参数清单-历史版本")
+	 @GetMapping(value = "/history")
+	 @RequiresPermissions("params:manifest:history")
+	 public Result<?> history(@RequestParam(name="paramsManifestId",required=true) String paramsManifestId) {
+		 List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(paramsManifestId);
+		 return Result.OK(historyVersionList);
+	 }
+
+	 /**
+	  * 查询所有项目的所有参数清单
+	  * 分页
+	  * @param
+	  * @return
+	  */
+	 @AutoLog(value = "参数清单-查询所有项目的所有参数清单")
+	 @ApiOperation(value="参数清单-查询所有项目的所有参数清单", notes="参数清单-查询所有项目的所有参数清单")
+	 @PostMapping(value = "/getAllManifest")
+	 @RequiresPermissions("params:manifest:copy")
+	 public Result<?> getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									 @RequestParam(name="projectName",required=false) String projectName) {
+		 IPage page = new Page(pageNo, pageSize);
+		 IPage paramsManifestVOPage = paramsManifestEOService.getAllManifest(page, projectName);
+		 return Result.OK(paramsManifestVOPage);
+	 }
+
+	 /**
+	  * 参数模板列表查询
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "参数清单-复制-参数模板列表查询")
+	 @ApiOperation(value="参数清单-复制-参数模板列表查询", notes="参数清单-复制-参数模板列表查询")
+	 @GetMapping(value = "/getParamsTemplatePageOfCopy")
+	@RequiresPermissions("params:manifest:copy")
+	 public Result<?> getParamsTemplatePageOfCopy(ParamsTemplateEO paramsTemplateEO,
+												  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												  @RequestParam(name="cut") String cut) {
+		 Page<ParamsTemplateEO> page = new Page<ParamsTemplateEO>(pageNo, pageSize);
+		 IPage<ParamsTemplateEO> pageList = paramsManifestEOService.getNewestPublishPage(page, paramsTemplateEO);
+		 return Result.OK(cut, pageList);
+	 }
+
+	 /**
+	  * 复制清单
+	  * 分页
+	  * @param
+	  * @return
+	  */
+	 @AutoLog(value = "参数清单-复制清单")
+	 @ApiOperation(value="参数清单-复制清单", notes="参数清单-复制清单")
+	 @PostMapping(value = "/copy")
+	 @RequiresPermissions("params:manifest:copy")
+	 public Result<?> copy(@RequestBody ParamsManifestVO paramsManifestVO) {
+		 ParamsManifestEO paramsManifestEO = new ParamsManifestEO();
+		 BeanUtils.copyProperties(paramsManifestVO, paramsManifestEO);
+		 ParamsManifestEO manifestEO = paramsManifestEOService.copy(paramsManifestEO, paramsManifestVO.getSourceManifestId());
+		 return Result.OK(manifestEO);
+	 }
+
+	/**
+	 * 判断配置列表是否为空
+	 * 用于参数收集前的校验
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-判断配置列表是否为空")
+	@ApiOperation(value="参数清单-判断配置列表是否为空", notes="参数清单-判断配置列表是否为空")
+	@GetMapping(value = "/verifyConfig")
+	@RequiresPermissions("params:manifest:page")
+	public Result<?> queryList(@RequestParam(name = "paramsManifestId") String paramsManifestId) {
+		List<ParamsConfigEO> list = paramsConfigEOService.queryList(paramsManifestId);
+		if (CollectionUtil.isNotEmpty(list)) {
+			return Result.OK(true); // 不为空
+		} else {
+			return Result.OK(false); // 为空
+		}
+	}
+
+
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-通过id查询")
+	@ApiOperation(value="参数清单-通过id查询", notes="参数清单-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(id);
+		if(paramsManifestEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(paramsManifestEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param paramsManifestEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ParamsManifestEO paramsManifestEO) {
+        return super.exportXls(request, paramsManifestEO, ParamsManifestEO.class, "参数清单");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ParamsManifestEO.class);
+    }
+
+}

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

@@ -0,0 +1,50 @@
+package com.jero.modules.cert.collect.controller;
+
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.modules.cert.collect.service.IParamsManifestEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@Api(tags="项目详情-参数收集统计接口")
+@RestController
+@RequestMapping("/project/projectLibraryBase")
+@Slf4j
+public class ProjectDetailsStatisticsCollectManifestController {
+    @Autowired
+    private IParamsManifestEOService paramsManifestEOService;
+
+    /**
+     * 项目详情-参数收集统计接口-清单下拉选项
+     * @return
+     */
+    @AutoLog(value = "项目详情-参数收集统计接口-清单下拉选项")
+    @ApiOperation(value="项目详情-参数收集统计接口-清单下拉选项", notes="项目详情-参数收集统计接口-清单下拉选项")
+    @GetMapping(value = "/getProjectDetailsStatisticsCollectManifestLabel")
+    public Result<?> getProjectDetailsStatisticsCollectManifestLabel(@RequestParam(name="id",required=true) String id) {
+        List<Map<String, String>> labelList =  paramsManifestEOService.labelListForProjectDetails(id);
+        return Result.OK(labelList);
+    }
+
+    /**
+     * 项目详情-参数收集统计接口-统计结果
+     * @return
+     */
+    @AutoLog(value = "项目详情-参数收集统计接口-统计结果")
+    @ApiOperation(value="项目详情-参数收集统计接口-统计结果", notes="项目详情-参数收集统计接口-统计结果")
+    @GetMapping(value = "/getProjectDetailsStatisticsCollectManifestData")
+    public Result<?> getProjectDetailsStatisticsCollectManifestData(@RequestParam(name="paramsManifestId",required=true) String paramsManifestId,
+                                                                    @RequestParam(name="cut",required=true) String cut) {
+       Map<String, Object> data =  paramsManifestEOService.getStatisticsForProjectDetails(paramsManifestId, cut);
+        return Result.OK(data);
+    }
+}

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

@@ -0,0 +1,145 @@
+package com.jero.modules.cert.collect.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 15:15 2022/5/27
+ */
+@Data
+public class ParamsCollectManifestBaseEO implements Serializable {
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+    /**nio编号*/
+    @Excel(name = "nio编号", width = 15)
+    @ApiModelProperty(value = "nio编号")
+    private String nioNumber;
+
+    /**是否必填*/
+    @Excel(name = "是否必填", width = 15)
+    @ApiModelProperty(value = "是否必填")
+    private String isMust;
+
+    /**参数名称*/
+    @Excel(name = "参数名称", width = 15)
+    @ApiModelProperty(value = "参数名称")
+    private String paramsName;
+
+    /**技术领域*/
+    @Excel(name = "技术领域", width = 15)
+    @ApiModelProperty(value = "技术领域")
+    private String technologyTerritory;
+
+    /**参数批次*/
+    @Excel(name = "参数批次", width = 15)
+    @ApiModelProperty(value = "参数批次")
+    private String paramsBatch;
+
+    /**责任领域*/
+    @Excel(name = "责任领域", width = 15)
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory;
+
+    /**参数说明*/
+    @Excel(name = "参数说明", width = 15)
+    @ApiModelProperty(value = "参数说明")
+    private String description;
+
+    /**认证类别*/
+    @Excel(name = "认证类别", width = 15)
+    @ApiModelProperty(value = "认证类别")
+    private String certCategory;
+
+    /**控件类型*/
+    @Excel(name = "控件类型", width = 15)
+    @ApiModelProperty(value = "控件类型")
+    private String controlType;
+
+    /**控件备选值*/
+    @Excel(name = "控件备选值", width = 15)
+    @ApiModelProperty(value = "控件备选值")
+    private String controlValues;
+
+    /**控件校验*/
+    @Excel(name = "控件校验", width = 15)
+    @ApiModelProperty(value = "控件校验")
+    private String controlVerify;
+
+    /**附件模板*/
+    @Excel(name = "附件模板", width = 15)
+    @ApiModelProperty(value = "附件模板")
+    private String fileTemplateConnectId;
+
+    /**参数模板id*/
+    @Excel(name = "参数模板id", width = 15)
+    @ApiModelProperty(value = "参数模板id")
+    private String paramsTemplateId;
+
+    /**状态*/
+    @Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private String state;
+
+    /**工程接口人*/
+    @Excel(name = "工程接口人", width = 15)
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt;
+
+    /**填写人*/
+    @Excel(name = "填写人", width = 15)
+    @ApiModelProperty(value = "填写人")
+    private String dre;
+
+    /**截止时间*/
+    @Excel(name = "截止时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止时间")
+    private java.util.Date deadline;
+
+    /**参数清单id*/
+    @Excel(name = "参数清单id", width = 15)
+    @ApiModelProperty(value = "参数清单id")
+    private String paramsManifestId;
+
+    /**标题默认值*/
+    @Excel(name = "默认值", width = 15)
+    @ApiModelProperty(value = "标题默认值")
+    private String titleDefaultValue;
+}

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

@@ -0,0 +1,50 @@
+package com.jero.modules.cert.collect.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 参数收集清单
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_collect_manifest")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_collect_manifest对象", description="参数收集清单")
+public class ParamsCollectManifestEO extends ParamsCollectManifestBaseEO implements Serializable {
+//    private static final long serialVersionUID = 1L;
+
+	/**变更标识*/
+	@Excel(name = "变更标识", width = 15)
+    @ApiModelProperty(value = "变更标识")
+    private String changeFlag;
+
+    /**删除标识*/
+	@Excel(name = "删除标识", width = 15)
+    @ApiModelProperty(value = "删除标识")
+    private String delFlag;
+
+    /**添加标识*/
+	@Excel(name = "添加标识", width = 15)
+    @ApiModelProperty(value = "添加标识")
+    private String addFlag;
+
+	@TableField(exist = false)
+    private String userTypes;
+
+    @TableField(exist = false)
+    private String dreForAuth;
+
+}

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

@@ -0,0 +1,25 @@
+package com.jero.modules.cert.collect.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 参数项收集清单历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_collect_manifest_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_collect_manifest_history对象", description="参数项收集清单历史版本")
+public class ParamsCollectManifestHistoryEO extends ParamsCollectManifestBaseEO implements Serializable {
+
+}

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

@@ -0,0 +1,84 @@
+package com.jero.modules.cert.collect.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 参数项收集切换角色日志表
+ * @Author: jero-boot
+ * @Date:   2022-07-01
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_collect_manifest_user_type_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_collect_manifest_user_type_log对象", description="参数项收集切换角色日志表")
+public class ParamsCollectManifestUserTypeLogEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**项目id*/
+	@Excel(name = "项目id", width = 15)
+    @ApiModelProperty(value = "项目id")
+    private String projectId;
+
+	/**参数清单id*/
+	@Excel(name = "参数清单id", width = 15)
+    @ApiModelProperty(value = "参数清单id")
+    private String paramsManifestId;
+
+	/**用户id*/
+	@Excel(name = "用户id", width = 15)
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+	/**用户类型*/
+	@Excel(name = "用户类型", width = 15)
+    @ApiModelProperty(value = "用户类型")
+    private String userType;
+
+}

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

@@ -0,0 +1,91 @@
+package com.jero.modules.cert.collect.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 参数配置数据
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_config_data")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_config_data对象", description="参数配置数据")
+public class ParamsConfigDataEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**文本类型数据*/
+	@Excel(name = "文本类型数据", width = 15)
+    @ApiModelProperty(value = "文本类型数据")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String textData;
+
+	/**下拉类型数据*/
+	@Excel(name = "下拉类型数据", width = 15)
+    @ApiModelProperty(value = "下拉类型数据")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String pullData;
+
+	/**附件类型数据*/
+	@Excel(name = "附件类型数据", width = 15)
+    @ApiModelProperty(value = "附件类型数据")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String fileConnectId;
+
+	/**参数配置id*/
+	@Excel(name = "参数配置id", width = 15)
+    @ApiModelProperty(value = "参数配置id")
+    private String paramsConfigId;
+
+	/**参数收集清单id*/
+	@Excel(name = "参数收集清单id", width = 15)
+    @ApiModelProperty(value = "参数收集清单id")
+    private String paramsCollectManifestId;
+
+}

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

@@ -0,0 +1,26 @@
+package com.jero.modules.cert.collect.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 参数配置数据历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_config_data_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_config_data_history对象", description="参数配置数据历史版本")
+public class ParamsConfigDataHistoryEO extends ParamsConfigDataEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,101 @@
+package com.jero.modules.cert.collect.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 参数配置
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_config对象", description="参数配置")
+public class ParamsConfigEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**配置名称*/
+	@Excel(name = "配置名称", width = 15)
+    @ApiModelProperty(value = "配置名称")
+    private String configName;
+
+	/**版本*/
+	@Excel(name = "版本", width = 15)
+    @ApiModelProperty(value = "版本")
+    private String version;
+
+	/**车型*/
+	@Excel(name = "车型", width = 15)
+    @ApiModelProperty(value = "车型")
+    private String carType;
+
+	/**电池*/
+	@Excel(name = "电池", width = 15)
+    @ApiModelProperty(value = "电池")
+    private String battery;
+
+	/**电机*/
+	@Excel(name = "电机", width = 15)
+    @ApiModelProperty(value = "电机")
+    private String motor;
+
+	/**参数清单id*/
+	@Excel(name = "参数清单id", width = 15)
+    @ApiModelProperty(value = "参数清单id")
+    private String paramsManifestId;
+
+	/**展示顺序*/
+	@Excel(name = "展示顺序", width = 15)
+    @ApiModelProperty(value = "展示顺序")
+    private Integer displaySeq;
+
+    /**是否冻结*/
+    @Excel(name = "是否冻结", width = 15)
+    @ApiModelProperty(value = "是否冻结")
+    private String isLock;
+
+}

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

@@ -0,0 +1,26 @@
+package com.jero.modules.cert.collect.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 参数配置历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_config_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_config_history对象", description="参数配置历史版本")
+public class ParamsConfigHistoryEO extends ParamsConfigEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,106 @@
+package com.jero.modules.cert.collect.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 参数清单
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_manifest")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_manifest对象", description="参数清单")
+public class ParamsManifestEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**标题*/
+	@Excel(name = "标题", width = 15)
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+	/**状态: 收集中，已完成*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private String state;
+
+	/**收集完成时间*/
+	@Excel(name = "收集完成时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "收集完成时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private java.util.Date finishTime;
+
+	/**版本*/
+	@Excel(name = "版本", width = 15)
+    @ApiModelProperty(value = "版本")
+    private Integer version;
+
+	/**项目id*/
+	@Excel(name = "项目id", width = 15)
+    @ApiModelProperty(value = "项目id")
+    private String projectId;
+
+	/**参数模板id*/
+	@Excel(name = "参数模板id", width = 15)
+    @ApiModelProperty(value = "参数模板id")
+    private String paramsTemplateId;
+
+	/**对应参数模板发布版本*/
+	@Excel(name = "对应参数模板发布版本", width = 15)
+    @ApiModelProperty(value = "对应参数模板发布版本")
+    private Integer paramsTemplatePublishVersion;
+
+    @ApiModelProperty(value = "参数模板名称")
+    private String paramsTemplateName;
+
+    @TableField(exist = false)
+    private String cut;
+
+    @TableField(exist = false)
+    private String projectName;
+
+}

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

@@ -0,0 +1,32 @@
+package com.jero.modules.cert.collect.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 参数清单历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_manifest_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_manifest_history对象", description="参数清单历史版本")
+public class ParamsManifestHistoryEO extends ParamsManifestEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**版本*/
+    @Excel(name = "源参数清单id", width = 15)
+    @ApiModelProperty(value = "源参数清单id")
+    private String sourceParamsManifestId;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java

@@ -0,0 +1,39 @@
+package com.jero.modules.cert.collect.enums;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 17:49 2022/5/16
+ */
+public enum CollectManifestChangeFlagEnum {
+    CHANGE_BEFORE("变更前","0"), // 指控件类型没变
+    CHANGE_AFTER("变更后","1"), // 指控件类型变了
+    DELETE_BEFORE("变更时未删除","0"),
+    DELETE_AFTER("变更时已删除","1"),
+    ADD_BEFORE("非添加参数项","0"),
+    ADD_AFTER("添加参数项","1");
+
+    String name;
+    String value;
+
+    CollectManifestChangeFlagEnum(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-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java

@@ -0,0 +1,97 @@
+package com.jero.modules.cert.collect.enums;
+
+import cn.hutool.core.collection.CollectionUtil;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 10:56 2022/6/11
+ */
+public enum CollectManifestRoleIdEnum {
+//    STUDIO_ID("R&H Studio","R&H Studio","studio","1534019911296118786",1),
+    ADMIN_ID("R&H Manager","R&H Manager","manager","1534020391015444481",2),
+    MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",3);
+
+    String name;
+    String enName;
+    String value;
+    String id;
+    Integer order;
+
+    CollectManifestRoleIdEnum(String name, String enName, String value, String id, Integer order) {
+        this.name = name;
+        this.enName = enName;
+        this.value = value;
+        this.id = id;
+        this.order = order;
+    }
+
+    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;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getOrder() {
+        return order;
+    }
+
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+
+    public static List<String> getIdList() {
+        List<String> idList = new ArrayList<>();
+        CollectManifestRoleIdEnum[] values = values();
+        for (CollectManifestRoleIdEnum collectManifestRoleIdEnum : values) {
+            idList.add(collectManifestRoleIdEnum.getId());
+        }
+        return  idList;
+    }
+
+    public static List<CollectManifestRoleIdEnum> getByIdList(List<String> idList) {
+        List<CollectManifestRoleIdEnum> collectManifestRoleIdEnums = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(idList)) {
+            CollectManifestRoleIdEnum[] values = values();
+            for (CollectManifestRoleIdEnum collectManifestRoleIdEnum : values) {
+                if (idList.contains(collectManifestRoleIdEnum.getId())) {
+                  collectManifestRoleIdEnums.add(collectManifestRoleIdEnum);
+                }
+            }
+        }
+        if (CollectionUtil.isNotEmpty(collectManifestRoleIdEnums) && collectManifestRoleIdEnums.size() > 1) {
+            collectManifestRoleIdEnums.stream().sorted(Comparator.comparing(CollectManifestRoleIdEnum :: getOrder));
+        }
+        return  collectManifestRoleIdEnums;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java

@@ -0,0 +1,71 @@
+package com.jero.modules.cert.collect.enums;
+
+import com.jero.common.constant.enums.CutEnum;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: liyawei
+ * @Description: 参数收集清单-状态
+ * @Date: Created in 15:17 2022/5/7
+ */
+public enum CollectManifestStateEnum {
+    WAIT_COLLECT("待发起收集","To be collected","1"),
+    WAIT_SDT("待工程接口人处理","To be processed by eng. interface","2"),
+    SDT_BACK("工程接口人退回","Rejected by eng. interface","3"),
+    WAIT_FILL("待填写","To be filled","4"),
+    DRE_BACK("填写人退回","Rejected by the applicant","5"),
+    SUBMIT("已提交","Submitted","6"),
+    CERT_BACK("认证工程师退回","Rejected by homo engineer","7"),
+    SYNC_REPORT("已同步至上报库","Synced to library","8"),
+    CHANGE("变更","Modify","9");
+
+    String name;
+    String enName;
+    String value;
+
+    CollectManifestStateEnum(String name, String enName, String value) {
+        this.name = name;
+        this.enName = enName;
+        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;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public static Map<String,String> toMap(String cut){
+        Map<String,String> map = new HashMap<>();
+        if (CutEnum.CN.getValue().equals(cut)) {
+            for (CollectManifestStateEnum collectManifestStateEnum : CollectManifestStateEnum.values()) {
+                map.put(collectManifestStateEnum.getValue(), collectManifestStateEnum.getName());
+            }
+        } else if (CutEnum.EN.getValue().equals(cut)) {
+            for (CollectManifestStateEnum collectManifestStateEnum : CollectManifestStateEnum.values()) {
+                map.put(collectManifestStateEnum.getValue(), collectManifestStateEnum.getEnName());
+            }
+        }
+        return map;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStatisticsStateEnum.java

@@ -0,0 +1,61 @@
+package com.jero.modules.cert.collect.enums;
+
+import com.jero.common.constant.enums.CutEnum;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum CollectManifestStatisticsStateEnum {
+    NOT_START("未开始","Not start","not start"),
+    COLLECTING("收集中","Collecting","collecting"),
+    SUBMIT("已提交","Submit","submit"),
+    SYNC_REPORT("已同步至上报库","Sync Report","sync report");
+
+    String name;
+    String enName;
+    String value;
+
+    CollectManifestStatisticsStateEnum(String name, String enName, String value) {
+        this.name = name;
+        this.enName = enName;
+        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;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public static Map<String,String> toMap(String cut){
+        Map<String,String> map = new HashMap<>();
+        if (CutEnum.CN.getValue().equals(cut)) {
+            for (CollectManifestStatisticsStateEnum collectManifestStatisticsStateEnum : CollectManifestStatisticsStateEnum.values()) {
+                map.put(collectManifestStatisticsStateEnum.getValue(), collectManifestStatisticsStateEnum.getName());
+            }
+        } else if (CutEnum.EN.getValue().equals(cut)) {
+            for (CollectManifestStatisticsStateEnum collectManifestStatisticsStateEnum : CollectManifestStatisticsStateEnum.values()) {
+                map.put(collectManifestStatisticsStateEnum.getValue(), collectManifestStatisticsStateEnum.getEnName());
+            }
+        }
+        return map;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java

@@ -0,0 +1,67 @@
+package com.jero.modules.cert.collect.enums;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 16:47 2022/5/11
+ */
+public enum CollectManifestUserTypeEnum {
+    HOMO("认证工程师", "Homo Engineer", "homo"),
+    SDT("工程接口人", "Eng. Interface","sdt"),
+    DRE("填写人", "Filled by","dre"),
+    STUDIO("R&H Studio","R&H Studio","studio"),
+    MANAGER("R&H Manager","R&H Manager","manager"),
+    ADMIN("系统","Administrator","admin"),
+    GUEST("游客", "Guest","guest");
+
+    String name;
+    String enName;
+    String value;
+
+    CollectManifestUserTypeEnum(String name, String enName, String value) {
+        this.name = name;
+        this.enName = enName;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static boolean doesValueExist(String value) {
+        CollectManifestUserTypeEnum[] values = values();
+
+        List<String> valueList = new ArrayList<>();
+        for (CollectManifestUserTypeEnum collectManifestUserTypeEnum : values) {
+            valueList.add(collectManifestUserTypeEnum.getValue());
+        }
+
+        if (valueList.contains(value)) {
+            return true;
+        }
+        return false;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java

@@ -0,0 +1,37 @@
+package com.jero.modules.cert.collect.enums;
+
+/**
+ * @Author: liyawei
+ * @Description: 参数收集清单-配置数据单个类型
+ * @Date: Created in 11:33 2022/5/7
+ */
+public enum ConfigDataTypeEnum {
+    TEXT("文本","text"),
+    PULL("单选","pull"),
+    PULL_MORE("多选","pull_more"),
+    FILE("附件","file");
+
+    String name;
+    String value;
+
+    ConfigDataTypeEnum(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-modules/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-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java

@@ -0,0 +1,64 @@
+package com.jero.modules.cert.collect.enums;
+
+import com.jero.common.constant.enums.CutEnum;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: liyawei
+ * @Description: 参数清单-状态
+ * @Date: Created in 16:19 2022/5/5
+ */
+public enum ManifestStateEnum {
+    COLLECTING("收集中","Collecting","收集中"),
+    FINISHED("已完成","Finished","已完成");
+
+    String name;
+    String enName;
+    String value;
+
+    ManifestStateEnum(String name, String enName, String value) {
+        this.name = name;
+        this.enName = enName;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static Map<String,String> toMap(String cut){
+        Map<String,String> map = new HashMap<>();
+        if (CutEnum.CN.getValue().equals(cut)) {
+            for (ManifestStateEnum manifestStateEnum : ManifestStateEnum.values()) {
+                map.put(manifestStateEnum.getValue(), manifestStateEnum.getName());
+            }
+        } else if (CutEnum.EN.getValue().equals(cut)) {
+            for (ManifestStateEnum manifestStateEnum : ManifestStateEnum.values()) {
+                map.put(manifestStateEnum.getValue(), manifestStateEnum.getEnName());
+            }
+        }
+        return map;
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.jero.modules.cert.collect.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 参数收集清单
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectManifestEO> {
+
+    List<ParamsCollectManifestEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
+
+    List<Map<String, Object>> listInfoForExport(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
+
+    // 查询控件类型为 标题的 参数项
+    List<ParamsCollectManifestEO> listInfoOfTitle(@Param("paramsManifestId") String paramsManifestId);
+
+    IPage pageInfo(@Param("page") IPage page, @Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
+ }

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

@@ -0,0 +1,22 @@
+package com.jero.modules.cert.collect.mapper;
+
+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.ParamsCollectManifestHistoryEO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Description: 参数项收集清单历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+public interface ParamsCollectManifestHistoryEOMapper extends BaseMapper<ParamsCollectManifestHistoryEO> {
+
+    List<ParamsCollectManifestHistoryEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
+
+    IPage pageInfo(@Param("page") IPage page, @Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
+}

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

@@ -0,0 +1,14 @@
+package com.jero.modules.cert.collect.mapper;
+
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 参数项收集切换角色日志表
+ * @Author: jero-boot
+ * @Date:   2022-07-01
+ * @Version: V1.0
+ */
+public interface ParamsCollectManifestUserTypeLogEOMapper extends BaseMapper<ParamsCollectManifestUserTypeLogEO> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.jero.modules.cert.collect.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description: 参数配置数据
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+public interface ParamsConfigDataEOMapper extends BaseMapper<ParamsConfigDataEO> {
+
+    int deleteByConfigIdsAndCollectManifestIds(@Param("paramsConfigIds") String paramsConfigIds,
+                                @Param("paramsCollectManifestIds") String paramsCollectManifestIds);
+}

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

@@ -0,0 +1,14 @@
+package com.jero.modules.cert.collect.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
+
+/**
+ * @Description: 参数配置数据历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+public interface ParamsConfigDataHistoryEOMapper extends BaseMapper<ParamsConfigDataHistoryEO> {
+
+}

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

@@ -0,0 +1,21 @@
+package com.jero.modules.cert.collect.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Description: 参数配置
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+public interface ParamsConfigEOMapper extends BaseMapper<ParamsConfigEO> {
+
+    int deleteByParamsManifestIds(@Param("paramsManifestIds") String paramsManifestIds);
+
+    int updateForeach(@Param("list") List<ParamsConfigEO> list);
+
+}

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

@@ -0,0 +1,14 @@
+package com.jero.modules.cert.collect.mapper;
+
+import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 参数配置历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+public interface ParamsConfigHistoryEOMapper extends BaseMapper<ParamsConfigHistoryEO> {
+
+}

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

@@ -0,0 +1,30 @@
+package com.jero.modules.cert.collect.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.cert.collect.entity.ParamsManifestEO;
+import com.jero.modules.cert.collect.vo.ParamsManifestVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 参数清单
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+public interface ParamsManifestEOMapper extends BaseMapper<ParamsManifestEO> {
+    IPage pageInfo(@Param("page") IPage page, @Param("paramsManifestEO") ParamsManifestEO paramsManifestEO);
+
+    IPage pageInfoAll(@Param("projectName") String projectName,
+                      @Param("state") String state,
+                      IPage page);
+
+    List<ParamsManifestVO> listInfoAll(@Param("idList") List<String> idList);
+
+    ParamsManifestVO getProjectById(@Param("projectId") String projectId);
+
+    List<Map<String, String>> labelListForProjectDetails(@Param("projectId") String projectId);
+}

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

@@ -0,0 +1,14 @@
+package com.jero.modules.cert.collect.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.cert.collect.entity.ParamsManifestHistoryEO;
+
+/**
+ * @Description: 参数清单历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+public interface ParamsManifestHistoryEOMapper extends BaseMapper<ParamsManifestHistoryEO> {
+
+}

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

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper">
+    <resultMap id="ParamsCollectManifestEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsCollectManifestEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="nio_number" property="nioNumber" />
+        <result column="is_must" property="isMust" />
+        <result column="params_name" property="paramsName" />
+        <result column="technology_territory" property="technologyTerritory" />
+        <result column="params_batch" property="paramsBatch" />
+        <result column="duty_territory" property="dutyTerritory" />
+        <result column="description" property="description" />
+        <result column="cert_category" property="certCategory" />
+        <result column="control_type" property="controlType" />
+        <result column="control_values" property="controlValues" />
+        <result column="control_verify" property="controlVerify" />
+        <result column="file_template_connect_id" property="fileTemplateConnectId" />
+        <result column="params_template_id" property="paramsTemplateId" />
+        <result column="state" property="state" />
+        <result column="sdt" property="sdt" />
+        <result column="dre" property="dre" />
+        <result column="deadline" property="deadline" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="change_flag" property="changeFlag" />
+        <result column="del_flag" property="delFlag" />
+        <result column="add_flag" property="addFlag" />
+        <result column="title_default_value" property="titleDefaultValue" />
+    </resultMap>
+    <sql id="BaseQuerySql">
+        <where>
+            <if test="paramsCollectManifestEO != null">
+                <if test="paramsCollectManifestEO.nioNumber !=null and paramsCollectManifestEO.nioNumber !=''">
+                    AND nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%')
+                </if>
+                <if test="paramsCollectManifestEO.paramsName !=null and paramsCollectManifestEO.paramsName !=''">
+                    AND params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%')
+                </if>
+                <if test="paramsCollectManifestEO.certCategory !=null and paramsCollectManifestEO.certCategory !=''">
+                    AND cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%')
+                </if>
+                <if test="paramsCollectManifestEO.dre !=null and paramsCollectManifestEO.dre !=''">
+                    AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%')
+                </if>
+                <if test="paramsCollectManifestEO.dutyTerritory !=null and paramsCollectManifestEO.dutyTerritory !=''">
+                    AND duty_territory = #{paramsCollectManifestEO.dutyTerritory}
+                </if>
+                <if test="paramsCollectManifestEO.state !=null and paramsCollectManifestEO.state !=''">
+                    AND state = #{paramsCollectManifestEO.state}
+                </if>
+                <if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
+                    AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
+                </if>
+                <if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
+                    <choose>
+                        <when test="paramsCollectManifestEO.userTypes == 'sdt'">
+                            AND sdt = #{paramsCollectManifestEO.sdt} AND state in ('2','4','5','6','7','8')
+                        </when>
+                        <when test="paramsCollectManifestEO.userTypes == 'dre'">
+                            AND dre = #{paramsCollectManifestEO.dreForAuth} AND state in ('4','6','7','8')
+                        </when>
+                        <when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
+                            AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state in ('2','4','5','6','7','8')
+                        </when>
+                    </choose>
+                </if>
+
+            </if>
+        </where>
+    </sql>
+
+    <select id="listInfo" resultMap="ParamsCollectManifestEOResultMap">
+        select *
+        from params_collect_manifest
+        <include refid="BaseQuerySql"/>
+        order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
+    </select>
+
+    <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
+        select *
+        from params_collect_manifest
+        <include refid="BaseQuerySql"/>
+        and control_type != '11'
+        order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
+    </select>
+
+    <select id="listInfoOfTitle" resultMap="ParamsCollectManifestEOResultMap">
+        select *
+        from params_collect_manifest
+        where params_manifest_id = #{paramsManifestId} and control_type = '11'
+        order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
+    </select>
+
+    <select id="pageInfo" resultMap="ParamsCollectManifestEOResultMap">
+        select *
+        from params_collect_manifest
+        <include refid="BaseQuerySql"/>
+        and control_type != '11'
+        order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
+    </select>
+
+</mapper>

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

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsCollectManifestHistoryEOMapper">
+    <resultMap id="ParamsCollectManifestHistoryEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="nio_number" property="nioNumber" />
+        <result column="cert_category" property="certCategory" />
+        <result column="is_must" property="isMust" />
+        <result column="params_name" property="paramsName" />
+        <result column="technology_territory" property="technologyTerritory" />
+        <result column="params_batch" property="paramsBatch" />
+        <result column="description" property="description" />
+        <result column="control_type" property="controlType" />
+        <result column="control_values" property="controlValues" />
+        <result column="control_verify" property="controlVerify" />
+        <result column="file_template_connect_id" property="fileTemplateConnectId" />
+        <result column="params_template_id" property="paramsTemplateId" />
+        <result column="state" property="state" />
+        <result column="duty_territory" property="dutyTerritory" />
+        <result column="sdt" property="sdt" />
+        <result column="dre" property="dre" />
+        <result column="deadline" property="deadline" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="title_default_value" property="titleDefaultValue" />
+    </resultMap>
+    <sql id="BaseQuerySql">
+        <where>
+            <if test="paramsCollectManifestEO != null">
+                <if test="paramsCollectManifestEO.nioNumber !=null and paramsCollectManifestEO.nioNumber !=''">
+                    AND nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%')
+                </if>
+                <if test="paramsCollectManifestEO.paramsName !=null and paramsCollectManifestEO.paramsName !=''">
+                    AND params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%')
+                </if>
+                <if test="paramsCollectManifestEO.certCategory !=null and paramsCollectManifestEO.certCategory !=''">
+                    AND cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%')
+                </if>
+                <if test="paramsCollectManifestEO.dre !=null and paramsCollectManifestEO.dre !=''">
+                    AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%')
+                </if>
+                <if test="paramsCollectManifestEO.dutyTerritory !=null and paramsCollectManifestEO.dutyTerritory !=''">
+                    AND duty_territory = #{paramsCollectManifestEO.dutyTerritory}
+                </if>
+                <if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
+                    AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
+                </if>
+                <if test="paramsCollectManifestEO.state !=null and paramsCollectManifestEO.state !=''">
+                    AND state = #{paramsCollectManifestEO.state}
+                </if>
+            </if>
+        </where>
+    </sql>
+
+    <select id="listInfo" resultMap="ParamsCollectManifestHistoryEOResultMap">
+        select *
+        from params_collect_manifest_history
+        <include refid="BaseQuerySql"/>
+        order by nio_number asc
+    </select>
+
+    <select id="pageInfo" resultMap="ParamsCollectManifestHistoryEOResultMap">
+        select *
+        from params_collect_manifest_history
+        <include refid="BaseQuerySql"/>
+        and control_type != '11'
+        order by nio_number asc
+    </select>
+</mapper>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsCollectManifestUserTypeLogEOMapper">
+    <resultMap id="ParamsCollectManifestUserTypeLogEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="project_id" property="projectId" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="user_id" property="userId" />
+        <result column="user_type" property="userType" />
+    </resultMap>
+</mapper>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsConfigDataEOMapper">
+    <resultMap id="ParamsConfigDataEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsConfigDataEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="text_data" property="textData" />
+        <result column="pull_data" property="pullData" />
+        <result column="file_connect_id" property="fileConnectId" />
+        <result column="params_config_id" property="paramsConfigId" />
+        <result column="params_collect_manifest_id" property="paramsCollectManifestId" />
+    </resultMap>
+
+    <delete id="deleteByConfigIdsAndCollectManifestIds" parameterType="java.lang.String">
+        delete from params_config_data
+        where params_config_id in
+        <foreach collection="paramsConfigIds.split(',')" index="index" separator="," open="(" close=")" item="paramsConfigId">
+            #{paramsConfigId}
+        </foreach>
+        and params_collect_manifest_id in
+        <foreach collection="paramsCollectManifestIds.split(',')" index="index" separator="," open="(" close=")" item="paramsCollectManifestId">
+            #{paramsCollectManifestId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsConfigDataHistoryEOMapper">
+    <resultMap id="ParamsConfigDataHistoryEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="text_data" property="textData" />
+        <result column="pull_data" property="pullData" />
+        <result column="file_connect_id" property="fileConnectId" />
+        <result column="params_config_id" property="paramsConfigId" />
+        <result column="params_collect_manifest_id" property="paramsCollectManifestId" />
+    </resultMap>
+</mapper>

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper">
+    <resultMap id="ParamsConfigEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsConfigEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="config_name" property="configName" />
+        <result column="version" property="version" />
+        <result column="car_type" property="carType" />
+        <result column="battery" property="battery" />
+        <result column="motor" property="motor" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="display_seq" property="displaySeq" />
+        <result column="is_lock" property="isLock" />
+    </resultMap>
+
+    <update id="updateForeach" parameterType="java.util.List">
+        <foreach collection="list" item="item" index="index" separator=";">
+            update params_config
+            <set >
+                config_name = #{item.configName, jdbcType=VARCHAR},
+                version = #{item.version, jdbcType=VARCHAR},
+                car_type = #{item.carType, jdbcType=VARCHAR},
+                battery = #{item.battery, jdbcType=VARCHAR},
+                motor = #{item.motor, jdbcType=VARCHAR},
+                display_seq = #{item.displaySeq, jdbcType=INTEGER},
+                update_by = #{item.updateBy, jdbcType=VARCHAR},
+                update_time = #{item.updateTime, jdbcType=TIMESTAMP},
+            </set>
+            where id = #{item.id, jdbcType=VARCHAR}
+        </foreach>;
+    </update>
+
+    <delete id="deleteByParamsManifestIds" parameterType="java.lang.String">
+        delete from params_config
+        where params_manifest_id in
+        <foreach collection="paramsManifestIds.split(',')" index="index" separator="," open="(" close=")" item="item">
+            #{item}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsConfigHistoryEOMapper">
+    <resultMap id="ParamsConfigHistoryEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="config_name" property="configName" />
+        <result column="car_type" property="carType" />
+        <result column="version" property="version" />
+        <result column="battery" property="battery" />
+        <result column="motor" property="motor" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="display_seq" property="displaySeq" />
+        <result column="is_lock" property="isLock" />
+    </resultMap>
+</mapper>

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

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper">
+    <resultMap id="ParamsManifestEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsManifestEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="title" property="title" />
+        <result column="state" property="state" />
+        <result column="finish_time" property="finishTime" />
+        <result column="version" property="version" />
+        <result column="project_id" property="projectId" />
+        <result column="params_template_id" property="paramsTemplateId" />
+        <result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
+        <result column="params_template_name" property="paramsTemplateName" />
+    </resultMap>
+    <resultMap id="ParamsManifestEOResultMapForCopy" type="com.jero.modules.cert.collect.vo.ParamsManifestVO">
+        <id column="id" property="id" />
+        <result column="title" property="title" />
+        <result column="version" property="version" />
+        <result column="project_id" property="projectId" />
+        <result column="project_name" property="projectName" />
+        <result column="state" property="state" />
+        <result column="params_template_name" property="paramsTemplateName" />
+        <result column="params_template_id" property="paramsTemplateId" />
+        <result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
+    </resultMap>
+
+    <sql id="BaseColumnList">
+        pm.id as id,
+        pm.create_by as create_by,
+        pm.create_time as create_time,
+        pm.update_by as update_by,
+        pm.update_time as update_time,
+        pm.sys_org_code as sys_org_code,
+        pm.title as title,
+        pm.state as state,
+        pm.finish_time as finish_time,
+        pm.version as version,
+        pm.project_id as project_id,
+        pm.params_template_id as params_template_id,
+        pm.params_template_publish_version as params_template_publish_version,
+        if (pt.params_template_name is not null, pt.params_template_name, pm.params_template_name) as params_template_name
+    </sql>
+
+    <sql id="BaseQuerySql">
+        <where>
+            <if test="paramsManifestEO != null">
+                <if test="paramsManifestEO.title !=null and paramsManifestEO.title !=''">
+                    AND title LIKE CONCAT(CONCAT('%',#{paramsManifestEO.title}),'%')
+                </if>
+                <if test="paramsManifestEO.projectId !=null and paramsManifestEO.projectId !=''">
+                    AND project_id LIKE CONCAT(CONCAT('%',#{paramsManifestEO.projectId}),'%')
+                </if>
+            </if>
+        </where>
+    </sql>
+
+    <select id="pageInfo" resultMap="ParamsManifestEOResultMap">
+        select tmp_tb.* from(
+        select <include refid="BaseColumnList"/>
+        from params_manifest pm left join params_template pt on pm.params_template_id = pt.id
+        ) tmp_tb
+        <include refid="BaseQuerySql"/>
+        order by create_time desc
+    </select>
+
+    <select id="pageInfoAll" resultMap="ParamsManifestEOResultMapForCopy">
+        select tmp_tb.* from(
+        select
+            pm.id as id,
+            pm.title as title,
+            pm.version as version,
+            pm.project_id as project_id,
+            pm.state as state,
+            concat(pni.project_name,'-',pyni.year_name) as project_name,
+            pm.params_template_id as params_template_id,
+            if (pt.params_template_name is not null, pt.params_template_name, pm.params_template_name) as params_template_name,
+            pm.params_template_publish_version as params_template_publish_version,
+            pm.create_time as create_time
+        from params_manifest pm
+        left join params_template pt on pm.params_template_id = pt.id
+        left join project_library_base as plb on plb.id = pm.project_id
+        left join project_name_info as pni on plb.project_name_id = pni.id
+        left join project_year_name_info as pyni on plb.year_name_id=pyni.id
+        ) tmp_tb
+        where 1=1 and state = #{state}
+          <if test="projectName !=null and projectName !=''">
+            AND project_name LIKE CONCAT(CONCAT('%',#{projectName}),'%')
+          </if>
+        order by create_time desc
+    </select>
+
+    <select id="listInfoAll" resultMap="ParamsManifestEOResultMapForCopy">
+        select tmp_tb.* from(
+        select
+            pm.id as id,
+            pm.version as version,
+            pm.title as title,
+            concat(pni.project_name,'-',pyni.year_name) as project_name
+        from params_manifest pm
+        left join project_library_base as plb on plb.id = pm.project_id
+        left join project_name_info as pni on plb.project_name_id = pni.id
+        left join project_year_name_info as pyni on plb.year_name_id=pyni.id
+        ) tmp_tb
+        where 1=1 and id in
+            <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+
+    </select>
+
+    <select id="getProjectById" resultMap="ParamsManifestEOResultMapForCopy">
+        select tmp_tb.* from(
+        select
+            plb.id as project_id,
+            concat(pni.project_name,'-',pyni.year_name,' ',target_market) as project_name
+        from project_library_base plb
+        left join project_name_info as pni on plb.project_name_id = pni.id
+        left join project_year_name_info as pyni on plb.year_name_id = pyni.id
+        ) tmp_tb
+        where project_id = #{projectId}
+    </select>
+
+    <select id="labelListForProjectDetails" resultType="java.util.LinkedHashMap">
+        select
+            title as label,
+            id as value
+        from params_manifest
+        where project_id = #{projectId}
+        order by create_time desc
+    </select>
+</mapper>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsManifestHistoryEOMapper">
+    <resultMap id="ParamsManifestHistoryEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsManifestHistoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="title" property="title" />
+        <result column="state" property="state" />
+        <result column="params_template_id" property="paramsTemplateId" />
+        <result column="finish_time" property="finishTime" />
+        <result column="version" property="version" />
+        <result column="project_id" property="projectId" />
+        <result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
+        <result column="source_params_manifest_id" property="sourceParamsManifestId" />
+    </resultMap>
+</mapper>

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

@@ -0,0 +1,167 @@
+package com.jero.modules.cert.collect.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 参数项收集清单
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+public interface IParamsCollectManifestEOService extends IService<ParamsCollectManifestEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+    boolean add(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsCollectManifestEO
+	 * @return
+	 */
+    void editById(ParamsCollectManifestEO paramsCollectManifestEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除-参数清单页面级
+	 *
+	 * @param ids
+	 * @return
+	 */
+	boolean deleteByIds(List<String> ids);
+
+
+	/**
+	 * 批量删除-参数项收集页面级
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	boolean deleteBatch(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsCollectManifestEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 * @param page
+	 * @param paramsCollectManifestEO
+	 * @param cut
+	 * @return
+	 */
+	IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut, HttpServletRequest req);
+
+	/**
+	 * 列表表头中英文切换
+	 * @param paramsManifestId
+	 * @param flag
+	 * @param cut
+	 * @return
+	 */
+	List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut);
+
+	/**
+	 * 提交
+	 * @param configDataList
+	 * @return
+	 */
+	boolean submit(List<Map<String, Object>> configDataList);
+
+	/**
+	 * 保存
+	 * @param configDataList
+	 * @param paramsManifestId
+	 * @return
+	 */
+	boolean save(List<Map<String, Object>> configDataList, String paramsManifestId);
+
+	/**
+	 * 查询清单所用模版参数项列表（过滤清单已添加的参数项）
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	List<Map<String, Object>> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	List<Map<String,String>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	List<Map<String, String>> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO, String cut);
+
+	Map<String, Object> isCollectFinished(String paramsManifestId);
+
+	boolean getManifestConfigFlag(String paramsManifestId);
+
+	Map<String, List<ParamsCollectManifestEO>> queryByManifestIdList(List<String> manifestIdList);
+
+	// 退回
+	boolean goBack(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 撤回
+	boolean withdraw(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 批量设置截止时间
+	boolean updateDeadlineBatch(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 修改责任领域
+	boolean updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 修改工程接口人
+	boolean updateSdt(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 分配填写人
+	boolean updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 下发收集
+	List<String> issueCollection(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 一键下发收集
+	List<String> issueCollectionAll(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 配置-下拉选项
+	List<Map<String, String>> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 冻结配置-回显已冻结的配置
+	List<String> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 冻结配置
+	boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 引用参数
+	boolean referParams(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 同步上报库
+	boolean syncReport(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 带入工程接口人
+	boolean bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 全部导出
+	void exportAll(ParamsCollectManifestVO paramsCollectManifestVO, HttpServletResponse response, HttpServletRequest request);
+
+	// 调整责任领域
+	List<String> updateBatchDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO);
+}

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

@@ -0,0 +1,45 @@
+package com.jero.modules.cert.collect.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 参数项收集清单历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+public interface IParamsCollectManifestHistoryEOService extends IService<ParamsCollectManifestHistoryEO> {
+
+	/**
+	 * 列表查询
+	 * @param page
+	 * @param paramsCollectManifestHistoryEO
+	 * @param cut
+	 * @return
+	 */
+	IPage queryList(IPage page, ParamsCollectManifestHistoryEO paramsCollectManifestHistoryEO, String cut, HttpServletRequest req);
+
+	/**
+	 * 列表表头中英文切换
+	 * @param paramsManifestId
+	 * @param flag
+	 * @param cut
+	 * @return
+	 */
+	List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	boolean deleteByIds(List<String> ids);
+
+}

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

@@ -0,0 +1,63 @@
+package com.jero.modules.cert.collect.service;
+
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 参数项收集切换角色日志表
+ * @Author: jero-boot
+ * @Date:   2022-07-01
+ * @Version: V1.0
+ */
+public interface IParamsCollectManifestUserTypeLogEOService extends IService<ParamsCollectManifestUserTypeLogEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsCollectManifestUserTypeLogEO
+	 * @return
+	 */
+    void add(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsCollectManifestUserTypeLogEO
+	 * @return
+	 */
+    void editById(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsCollectManifestUserTypeLogEO queryById(String id);
+
+    ParamsCollectManifestUserTypeLogEO queryCurrentType(String projectId, String paramsManifestId, String userId);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsCollectManifestUserTypeLogEO> queryList();
+}

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

@@ -0,0 +1,72 @@
+package com.jero.modules.cert.collect.service;
+
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 参数配置数据
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+public interface IParamsConfigDataEOService extends IService<ParamsConfigDataEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsConfigDataEO
+	 * @return
+	 */
+    void add(ParamsConfigDataEO paramsConfigDataEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsConfigDataEO
+	 * @return
+	 */
+    void editById(ParamsConfigDataEO paramsConfigDataEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+
+    int deleteByParamsCollectManifestIdList(List<String> paramsCollectManifestIdList);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param paramsConfigId
+	 * @param paramsCollectManifestId
+	 * @return
+	 */
+    ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsConfigDataEO> queryList();
+
+	/**
+	 * 查询清单的所有配置数据
+	 * @param configIdList
+	 * @return
+	 */
+    List<ParamsConfigDataEO> queryListByConfigIdList(List<String> configIdList);
+}

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

@@ -0,0 +1,34 @@
+package com.jero.modules.cert.collect.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
+
+import java.util.List;
+
+/**
+ * @Description: 参数配置数据历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+public interface IParamsConfigDataHistoryEOService extends IService<ParamsConfigDataHistoryEO> {
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param paramsConfigId
+	 * @param paramsCollectManifestId
+	 * @return
+	 */
+	ParamsConfigDataHistoryEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
+
+	/**
+	 * 查询清单的所有配置数据
+	 * @param configIdList
+	 * @return
+	 */
+	List<ParamsConfigDataHistoryEO> queryListByConfigIdList(List<String> configIdList);
+
+	int deleteByParamsCollectManifestIdList(List<String> paramsCollectManifestIdList);
+
+}

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

@@ -0,0 +1,63 @@
+package com.jero.modules.cert.collect.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.collect.vo.ParamsConfigVO;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+
+import java.util.List;
+
+/**
+ * @Description: 参数配置
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+public interface IParamsConfigEOService extends IService<ParamsConfigEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsConfigVO
+	 * @return
+	 */
+	void addBatch(ParamsConfigVO paramsConfigVO);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsConfigEO
+	 * @return
+	 */
+    void editById(ParamsConfigEO paramsConfigEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsConfigEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsConfigEO> queryList(String paramsManifestId);
+}

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

@@ -0,0 +1,17 @@
+package com.jero.modules.cert.collect.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
+
+import java.util.List;
+
+/**
+ * @Description: 参数配置历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+public interface IParamsConfigHistoryEOService extends IService<ParamsConfigHistoryEO> {
+
+	List<ParamsConfigHistoryEO> queryList(String paramsManifestId);
+}

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

@@ -0,0 +1,100 @@
+package com.jero.modules.cert.collect.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.collect.entity.ParamsManifestEO;
+import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
+import com.jero.modules.cert.collect.vo.ParamsManifestVO;
+import com.jero.modules.cert.template.entity.ParamsTemplateEO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 参数清单
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsManifestEO
+	 * @return
+	 */
+    boolean add(ParamsManifestEO paramsManifestEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsManifestEO
+	 * @return
+	 */
+    boolean editById(ParamsManifestEO paramsManifestEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    boolean deleteById(String id, String cut);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    boolean deleteByIds(List<String> ids, String cut);
+
+	/**
+	 * 删除项目下的所有收集清单
+	 * @param projectId
+	 * @return
+	 */
+    boolean deleteByProjectId(String projectId);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsManifestEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsManifestEO> queryList();
+
+	/**
+	 * 查询已发布的最新版的参数模板列表
+	 * @return
+	 */
+	IPage<ParamsTemplateEO> getNewestPublishPage(Page<ParamsTemplateEO> page, ParamsTemplateEO paramsTemplateEO);
+
+	IPage pageInfo(IPage page, ParamsManifestEO paramsManifestEO);
+
+	boolean changeExtension(String id, String cut);
+
+	List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId);
+
+	IPage getAllManifest(IPage page, String projectName);
+
+	ParamsManifestEO copy(ParamsManifestEO paramsManifestEO, String sourceManifestId);
+
+	ParamsManifestVO getProjectById(String projectId);
+
+	List<Map<String, String>> labelListForProjectDetails(String projectId);
+
+	Map<String, Object> getStatisticsForProjectDetails(String paramsManifestId, String cut);
+
+	// 参数模板删除时，记录参数模板名称到清单
+	boolean setTemplateName(List<String> paramsTemplateIds);
+}

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

@@ -0,0 +1,22 @@
+package com.jero.modules.cert.collect.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.collect.entity.ParamsManifestHistoryEO;
+import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
+
+import java.util.List;
+
+/**
+ * @Description: 参数清单历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+public interface IParamsManifestHistoryEOService extends IService<ParamsManifestHistoryEO> {
+
+	void addForChangeExtension(String paramsManifestId);
+
+	List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId);
+
+	void deleteAllHistoryVersion(List<String> paramsManifestIdList);
+}

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

@@ -0,0 +1,573 @@
+package com.jero.modules.cert.collect.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.constant.enums.CutEnum;
+import com.jero.common.constant.enums.YesOrNoEnum;
+import com.jero.common.system.query.QueryGenerator;
+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.enums.CollectManifestStateEnum;
+import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
+import com.jero.modules.cert.collect.mapper.ParamsCollectManifestHistoryEOMapper;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestHistoryEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService;
+import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
+import com.jero.modules.cert.template.enums.ControlTypeEnum;
+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.system.entity.SysDictItem;
+import com.jero.modules.system.service.ISysDictItemService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 参数项收集清单历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+@Service
+public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<ParamsCollectManifestHistoryEOMapper, ParamsCollectManifestHistoryEO> implements IParamsCollectManifestHistoryEOService {
+
+	@Autowired
+	private ParamsCollectManifestHistoryEOMapper paramsCollectManifestHistoryEOMapper;
+
+	@Autowired
+	private OnlCgformFieldServiceImpl onlCgformFieldService;
+
+	@Autowired
+	private IParamsConfigHistoryEOService paramsConfigHistoryEOService;
+
+	@Autowired
+	private IParamsConfigDataHistoryEOService paramsConfigDataHistoryEOService;
+
+	@Autowired
+	private ISysDictItemService sysDictItemService;
+
+	@Autowired
+	private IOSSFileService ossFileService;
+
+
+	private ParamsConfigDataHistoryEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List<ParamsConfigDataHistoryEO> paramsConfigDataEOList) {
+		List<ParamsConfigDataHistoryEO> configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList());
+		if (CollectionUtil.isNotEmpty(configDataEOList)) {
+			return configDataEOList.get(0);
+		}
+		return null;
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+	public IPage queryList(IPage page, ParamsCollectManifestHistoryEO paramsCollectManifestHistoryEO, String cut, HttpServletRequest req) {
+		QueryWrapper<ParamsCollectManifestHistoryEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestHistoryEO, req.getParameterMap());
+		queryWrapper.lambda().notIn(ParamsCollectManifestHistoryEO::getControlType, ControlTypeEnum.Title.getValue())
+				.orderByAsc(ParamsCollectManifestHistoryEO::getNioNumber);
+
+		String paramsManifestId = paramsCollectManifestHistoryEO.getParamsManifestId();
+
+		IPage pageInfo = page(page, queryWrapper); // 查询固定列
+//		IPage pageInfo = paramsCollectManifestHistoryEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
+		List<ParamsCollectManifestHistoryEO> list = pageInfo.getRecords(); // 查询固定列
+		List<ParamsConfigHistoryEO> paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列
+		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
+		List<ParamsConfigDataHistoryEO> paramsConfigDataEOList = paramsConfigDataHistoryEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
+
+
+		// 普通数据字典
+		List<SysDictItem> dictItemList = new ArrayList<>();
+		List<String> dictCodeList = new ArrayList<>();
+		dictCodeList.add("duty_territory");
+		dictCodeList.add("cert_category");
+		for (String dictCode : dictCodeList) {
+			List<SysDictItem> dictItems = sysDictItemService.selectItemsByDictCode(dictCode);
+			dictItemList.addAll(dictItems);
+		}
+
+		List<Map<String, Object>> listMap = new ArrayList<>();
+		list.forEach(collectManifestEO -> { // 参数收集清单
+			// 处理数据字典字段 中英文切换 认证类型，责任领域
+			List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
+			List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
+			String certCategoryName = "";
+			String dutyTerritoryName = "";
+			if (CutEnum.CN.getValue().equals(cut)) {
+				certCategoryName = dictItemList.stream()
+						.filter(e -> certCategory.contains(e.getItemValue()))
+						.map(SysDictItem::getItemText)
+						.collect(Collectors.joining(","));
+
+				dutyTerritoryName = dictItemList.stream()
+						.filter(e -> dutyTerritory.contains(e.getItemValue()))
+						.map(SysDictItem::getItemText)
+						.collect(Collectors.joining(","));
+
+			} else if (CutEnum.EN.getValue().equals(cut)) {
+				certCategoryName = dictItemList.stream()
+						.filter(e -> certCategory.contains(e.getItemValue()))
+						.map(SysDictItem::getEnName)
+						.collect(Collectors.joining(","));
+
+				dutyTerritoryName = dictItemList.stream()
+						.filter(e -> dutyTerritory.contains(e.getItemValue()))
+						.map(SysDictItem::getEnName)
+						.collect(Collectors.joining(","));
+
+			}
+
+
+//			String certCategoryName = sysDictService.queryDictItemByValue("cert_category", collectManifestEO.getCertCategory(), cut);
+			collectManifestEO.setCertCategory(certCategoryName);
+//			String dutyTerritoryName = sysDictService.queryDictItemByValue("duty_territory", collectManifestEO.getDutyTerritory(), cut);
+			collectManifestEO.setDutyTerritory(dutyTerritoryName);
+
+			// 处理状态字段
+			Map<String, String> collectManifestStateMap = CollectManifestStateEnum.toMap(cut);
+			String stateName = collectManifestStateMap.get(collectManifestEO.getState());
+			collectManifestEO.setState(stateName);
+
+			List<String> configIdList = new ArrayList<>(); // 配置列名
+
+			Map<String, Object> manifestMap = objectToMap(collectManifestEO); // 对象转map
+			String controlType = collectManifestEO.getControlType();
+			String paramsCollectManifestId = collectManifestEO.getId();
+
+			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
+				paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
+					Map<String, Object> configMap = new HashMap<>();
+					String paramsConfigId = paramsConfigEO.getId();
+//					ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
+					ParamsConfigDataHistoryEO paramsConfigDataHistoryEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
+					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataHistoryEO, collectManifestEO); // 重新组合配置数据
+					configMap.put("controlType", controlType);
+					configMap.put("list", paramsConfigDataVOList);
+					manifestMap.put(paramsConfigEO.getId(), configMap);
+
+					configIdList.add(paramsConfigEO.getId());
+				});
+			}
+
+			// 处理工程接口人
+			Map<String, Object> sdtMap = new HashMap<>();
+			sdtMap.put("id", collectManifestEO.getId());
+			sdtMap.put("state", collectManifestEO.getState());
+			sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ","));
+			sdtMap.put("dataValue", collectManifestEO.getSdt());
+			manifestMap.put("sdt", sdtMap);
+
+			// 配置列名数组
+			manifestMap.put("configIds", configIdList);
+
+			listMap.add(manifestMap);
+		});
+
+		pageInfo.setRecords(listMap);
+		return pageInfo;
+	}
+
+	/**
+	 * 重新组装配置数据 用于返回前端
+	 * @param controlType
+	 * @param paramsConfigDataEO
+	 * @param paramsCollectManifestEO
+	 * @return
+	 */
+	private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataHistoryEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) {
+		List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
+		String templateId = null;
+		String templateName = null;
+		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) {
+			List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplateConnectId());
+
+			if (CollectionUtil.isNotEmpty(ossFiles)) {
+				templateId = ossFiles.get(0).getId();
+				templateName = ossFiles.get(0).getFileName();
+			}
+		}
+		if (ControlTypeEnum.TEXT.getValue().equals(controlType)) {
+
+			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());
+			}
+			paramsConfigDataVOList.add(configDataVO);
+
+		} else if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)) {
+
+			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());
+			}
+			paramsConfigDataVOList.add(configDataVO);
+
+		} else if (ControlTypeEnum.PULL_MORE.getValue().equals(controlType)) {
+
+			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());
+			}
+			paramsConfigDataVOList.add(configDataVO);
+
+		} else if (ControlTypeEnum.FILE.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
+			configDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
+			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			configDataVO.setIsLock(paramsConfigEO.getIsLock());
+			configDataVO.setTemplateId(templateId);
+			configDataVO.setTemplateName(templateName);
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
+				configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
+			}
+			paramsConfigDataVOList.add(configDataVO);
+
+		} else if (ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)) {
+
+			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());
+			}
+			paramsConfigDataVOList.add(textConfigDataVO);
+
+			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());
+			}
+			paramsConfigDataVOList.add(pullConfigDataVO);
+
+		} else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) {
+
+			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());
+			}
+			paramsConfigDataVOList.add(textConfigDataVO);
+
+			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());
+			}
+			paramsConfigDataVOList.add(pullMoreConfigDataVO);
+
+		} else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) {
+
+			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());
+			}
+			paramsConfigDataVOList.add(textConfigDataVO);
+
+			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
+			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
+			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
+			fileConfigDataVO.setTemplateId(templateId);
+			fileConfigDataVO.setTemplateName(templateName);
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
+				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
+			}
+			paramsConfigDataVOList.add(fileConfigDataVO);
+
+		} else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)) {
+
+			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());
+			}
+			paramsConfigDataVOList.add(pullConfigDataVO);
+
+			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
+			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
+			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
+			fileConfigDataVO.setTemplateId(templateId);
+			fileConfigDataVO.setTemplateName(templateName);
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
+				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
+			}
+			paramsConfigDataVOList.add(fileConfigDataVO);
+
+		} else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) {
+
+			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());
+			}
+			paramsConfigDataVOList.add(pullMoreConfigDataVO);
+
+			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
+			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
+			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
+			fileConfigDataVO.setTemplateId(templateId);
+			fileConfigDataVO.setTemplateName(templateName);
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
+				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
+			}
+			paramsConfigDataVOList.add(fileConfigDataVO);
+
+		} else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
+
+			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());
+			}
+			paramsConfigDataVOList.add(textConfigDataVO);
+
+			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());
+			}
+			paramsConfigDataVOList.add(pullConfigDataVO);
+
+			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
+			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
+			fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
+			fileConfigDataVO.setTemplateId(templateId);
+			fileConfigDataVO.setTemplateName(templateName);
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
+				fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
+			}
+			paramsConfigDataVOList.add(fileConfigDataVO);
+
+		}
+		return paramsConfigDataVOList;
+	}
+
+	private List<Map<String, String>> getControlValueMapList(String controlValue) {
+		List<Map<String, String>> controlValueMapList = new ArrayList<>();
+		if (StringUtils.isNotEmpty(controlValue)) {
+			controlValue = controlValue.replace("，", ",");
+			String[] controlValueStr = controlValue.split(",");
+			for (int i = 0; i < controlValueStr.length; i++) {
+				Map<String, String> controlValueMap = new HashMap<>();
+				controlValueMap.put("label", controlValueStr[i]);
+				controlValueMap.put("value", controlValueStr[i]);
+				controlValueMapList.add(controlValueMap);
+			}
+		}
+		return controlValueMapList;
+	}
+
+	/**
+	 * 列表表头中英文切换
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut) {
+		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag); // flag--->7
+		if (fieldList.size() != 0) {
+			//过滤列表字段(is_show_list-->列表是否显示0否 1是)
+			fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
+		}
+		List<ParamsConfigHistoryEO> paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId);
+		List<Map<String, Object>> listConfig = new LinkedList<>();
+		for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
+			Map<String, Object> map = new HashMap<>();
+			map.put("db_field_name", paramsConfigEO.getId());
+			map.put("db_field_txt", paramsConfigEO.getConfigName());
+			map.put("type", true); //配置列 标识
+			listConfig.add(map);
+		}
+
+		List<Map<String, Object>> list = new LinkedList<>();
+		int indexOfDescription = 1; // 参数说明的位置
+		for (int i = 0; i < fieldList.size(); i++) {
+			OnlCgformField onlCgformField = fieldList.get(i);
+			Map<String, Object> map = new HashMap<>();
+			String dbFieldName = onlCgformField.getDbFieldName();
+			if ("description".equals(dbFieldName)) {
+				indexOfDescription = i;
+				map.put("click2", true);
+			}
+			if ("sdt".equals(dbFieldName)) {
+				map.put("click", true);
+			}
+			map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
+			if(CutEnum.CN.getValue().equals(cut)){
+				map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
+			}else{
+				map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
+			}
+			list.add(map);
+		}
+
+		list.addAll(indexOfDescription+1, listConfig);
+		return list;
+	}
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+	public boolean deleteByIds(List<String> ids) {
+		// 关联删除配置数据
+		paramsConfigDataHistoryEOService.deleteByParamsCollectManifestIdList(ids);
+		return removeByIds(ids);
+	}
+
+	/**
+	 * 获取一个类和其父类的所有属性
+	 *
+	 * @param clazz
+	 * @return
+	 */
+	private List<Field> findAllFieldsOfSelfAndSuperClass(Class clazz) {
+		Field[] fields = null;
+		List fieldList = Lists.newArrayList();
+		while (true) {
+			if (clazz == null) {
+				break;
+			} else {
+				fields = clazz.getDeclaredFields();
+				for (int i = 0; i < fields.length; i++) {
+					fieldList.add(fields[i]);
+				}
+				clazz = clazz.getSuperclass();
+			}
+		}
+		return fieldList;
+	}
+
+	/**
+	 * 将对象转Map
+	 * @param obj 待转对象
+	 * @return
+	 */
+	private Map<String, Object> objectToMap(Object obj) {
+
+		Map<String, Object> map = new HashMap<>();
+		// 获取f对象对应类中的所有属性域
+		List<Field> list = findAllFieldsOfSelfAndSuperClass(obj.getClass());
+		for (Field field : list) {
+
+			String varName = field.getName();
+			try {
+				// 获取原来的访问控制权限
+				boolean accessFlag = field.isAccessible();
+				// 修改访问控制权限
+				field.setAccessible(true);
+				// 获取在对象f中属性fields[i]对应的对象中的变量
+				Object o = field.get(obj);
+				if (o != null) {
+					if (Date.class.equals(field.getType())) {
+						Date date = (Date) o;
+						String pattern = "";
+						if ("deadline".equals(varName)) {
+							pattern = "yyyy-MM-dd";
+						} else {
+							pattern = "yyyy-MM-dd HH:mm:ss";
+						}
+						SimpleDateFormat formatter=new SimpleDateFormat(pattern);
+						String time=formatter.format(date);
+						map.put(varName, time);
+					} else {
+						map.put(varName, o);
+					}
+				}
+				// 恢复访问控制权限
+				field.setAccessible(accessFlag);
+			} catch (IllegalArgumentException ex) {
+				ex.printStackTrace();
+			} catch (IllegalAccessException ex) {
+				ex.printStackTrace();
+			}
+		}
+		return map;
+
+	}
+
+	/**
+	 * 实体对象转成Map
+	 * @param obj 实体对象
+	 * @return
+	 */
+//	private Map<String, Object> objectToMap(Object obj) {
+//		Map<String, Object> map = new HashMap<>();
+//		if (obj == null) {
+//			return map;
+//		}
+//		Class clazz = obj.getClass();
+//		Field[] fields = clazz.getDeclaredFields();
+//		try {
+//			for (Field field : fields) {
+//				field.setAccessible(true);
+//				map.put(field.getName(), field.get(obj));
+//			}
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//		return map;
+//	}
+}

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

@@ -0,0 +1,114 @@
+package com.jero.modules.cert.collect.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
+import com.jero.modules.cert.collect.mapper.ParamsCollectManifestUserTypeLogEOMapper;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 参数项收集切换角色日志表
+ * @Author: jero-boot
+ * @Date:   2022-07-01
+ * @Version: V1.0
+ */
+@Service
+public class ParamsCollectManifestUserTypeLogEOServiceImpl extends ServiceImpl<ParamsCollectManifestUserTypeLogEOMapper, ParamsCollectManifestUserTypeLogEO> implements IParamsCollectManifestUserTypeLogEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsCollectManifestUserTypeLogEO
+	 * @return
+	 */
+	@Override
+    public void add(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO) {
+        Date now = new Date();
+        paramsCollectManifestUserTypeLogEO.setCreateTime(now);
+        paramsCollectManifestUserTypeLogEO.setUpdateTime(now);
+        save(paramsCollectManifestUserTypeLogEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsCollectManifestUserTypeLogEO
+	 * @return
+	 */
+	@Override
+    public void editById(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO) {
+		String projectId = paramsCollectManifestUserTypeLogEO.getProjectId();
+		String paramsManifestId = paramsCollectManifestUserTypeLogEO.getParamsManifestId();
+		String userId = paramsCollectManifestUserTypeLogEO.getUserId();
+
+		ParamsCollectManifestUserTypeLogEO oldEO = queryCurrentType(projectId, paramsManifestId, userId);
+		if (ObjectUtil.isNotEmpty(oldEO)) {
+			paramsCollectManifestUserTypeLogEO.setId(oldEO.getId());
+		}
+    	Date now = new Date();
+        paramsCollectManifestUserTypeLogEO.setUpdateTime(now);
+    	saveOrUpdate(paramsCollectManifestUserTypeLogEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ParamsCollectManifestUserTypeLogEO queryById(String id) {
+        return getById(id);
+    }
+
+	@Override
+    public ParamsCollectManifestUserTypeLogEO queryCurrentType(String projectId, String paramsManifestId, String userId) {
+		ParamsCollectManifestUserTypeLogEO result = new ParamsCollectManifestUserTypeLogEO();
+		LambdaQueryWrapper<ParamsCollectManifestUserTypeLogEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsCollectManifestUserTypeLogEO::getProjectId, projectId)
+				.eq(ParamsCollectManifestUserTypeLogEO::getParamsManifestId, paramsManifestId)
+				.eq(ParamsCollectManifestUserTypeLogEO::getUserId, userId);
+		List<ParamsCollectManifestUserTypeLogEO> resultList = list(queryWrapper);
+		if(CollectionUtils.isNotEmpty(resultList)){
+			result = resultList.get(0);
+		}
+		return result;
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ParamsCollectManifestUserTypeLogEO> queryList() {
+        return list();
+    }
+}

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

@@ -0,0 +1,126 @@
+package com.jero.modules.cert.collect.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
+import com.jero.modules.cert.collect.mapper.ParamsConfigDataEOMapper;
+import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 参数配置数据
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataEOMapper, ParamsConfigDataEO> implements IParamsConfigDataEOService {
+
+	@Autowired
+	private ParamsConfigDataEOMapper paramsConfigDataEOMapper;
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsConfigDataEO
+	 * @return
+	 */
+	@Override
+    public void add(ParamsConfigDataEO paramsConfigDataEO) {
+        Date now = new Date();
+        paramsConfigDataEO.setCreateTime(now);
+        paramsConfigDataEO.setUpdateTime(now);
+        save(paramsConfigDataEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsConfigDataEO
+	 * @return
+	 */
+	@Override
+    public void editById(ParamsConfigDataEO paramsConfigDataEO) {
+    	Date now = new Date();
+        paramsConfigDataEO.setUpdateTime(now);
+    	saveOrUpdate(paramsConfigDataEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	@Override
+	public int deleteByParamsCollectManifestIdList(List<String> paramsCollectManifestIdList) {
+		LambdaQueryWrapper<ParamsConfigDataEO> 	queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestIdList);
+		return paramsConfigDataEOMapper.delete(queryWrapper);
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param paramsConfigId
+	 * @param paramsCollectManifestId
+	 * @return
+	 */
+	@Override
+    public ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) {
+		LambdaQueryWrapper<ParamsConfigDataEO> 	queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId);
+		queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
+		getOne(queryWrapper);
+        return getOne(queryWrapper);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ParamsConfigDataEO> queryList() {
+        return list();
+    }
+
+	/**
+	 * 查询清单的所有配置数据
+	 * @param configIdList
+	 * @return
+	 */
+	@Override
+    public List<ParamsConfigDataEO> queryListByConfigIdList(List<String> configIdList) {
+		if (CollectionUtil.isNotEmpty(configIdList)) {
+			LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.in(ParamsConfigDataEO::getParamsConfigId, configIdList);
+			return list(queryWrapper);
+		}
+		return null;
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.jero.modules.cert.collect.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
+import com.jero.modules.cert.collect.mapper.ParamsConfigDataHistoryEOMapper;
+import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description: 参数配置数据历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+@Service
+public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl<ParamsConfigDataHistoryEOMapper, ParamsConfigDataHistoryEO> implements IParamsConfigDataHistoryEOService {
+
+	@Autowired
+	private ParamsConfigDataHistoryEOMapper paramsConfigDataHistoryEOMapper;
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param paramsConfigId
+	 * @param paramsCollectManifestId
+	 * @return
+	 */
+	@Override
+	public ParamsConfigDataHistoryEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) {
+		LambdaQueryWrapper<ParamsConfigDataHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsConfigDataHistoryEO::getParamsConfigId, paramsConfigId);
+		queryWrapper.eq(ParamsConfigDataHistoryEO::getParamsCollectManifestId, paramsCollectManifestId);
+		getOne(queryWrapper);
+		return getOne(queryWrapper);
+	}
+
+	/**
+	 * 查询清单的所有配置数据
+	 * @param configIdList
+	 * @return
+	 */
+	@Override
+	public List<ParamsConfigDataHistoryEO> queryListByConfigIdList(List<String> configIdList) {
+		if (CollectionUtil.isNotEmpty(configIdList)) {
+			LambdaQueryWrapper<ParamsConfigDataHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.in(ParamsConfigDataHistoryEO::getParamsConfigId, configIdList);
+			return list(queryWrapper);
+		}
+		return null;
+	}
+
+	@Override
+	public int deleteByParamsCollectManifestIdList(List<String> paramsCollectManifestIdList) {
+		LambdaQueryWrapper<ParamsConfigDataHistoryEO> 	queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestIdList);
+		return paramsConfigDataHistoryEOMapper.delete(queryWrapper);
+	}
+
+}

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

@@ -0,0 +1,197 @@
+package com.jero.modules.cert.collect.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+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.exception.JeroBootException;
+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.CollectManifestStateEnum;
+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;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigEOService;
+import com.jero.modules.cert.collect.vo.ParamsConfigVO;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 参数配置
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper, ParamsConfigEO> implements IParamsConfigEOService {
+
+	@Autowired
+	private ParamsConfigEOMapper paramsConfigEOMapper;
+	@Autowired
+	private ParamsConfigDataEOMapper paramsConfigDataEOMapper;
+	@Autowired
+	private ParamsCollectManifestEOMapper paramsCollectManifestEOMapper;
+
+	@Autowired
+	private IParamsCollectManifestEOService paramsCollectManifestEOService;
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsConfigVO
+	 * @return
+	 */
+	@Override
+    public void addBatch(ParamsConfigVO paramsConfigVO) {
+		String paramsManifestId = paramsConfigVO.getParamsManifestId();
+		List<ParamsConfigEO> paramsConfigEOList = paramsConfigVO.getParamsConfigEOList();
+
+		int ind = 1;
+		List<ParamsConfigEO> addConfigList = new ArrayList<>(); // 新增的配置
+		List<ParamsConfigEO> updateConfigList = new ArrayList<>(); // 修改的配置
+		for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
+			paramsConfigEO.setParamsManifestId(paramsManifestId);
+			paramsConfigEO.setDisplaySeq(ind);
+			paramsConfigEO.setIsLock(ConfigLockEnum.NO.getValue());
+			if (StringUtils.isEmpty(paramsConfigEO.getId())) {
+				addConfigList.add(paramsConfigEO);
+			} else {
+				updateConfigList.add(paramsConfigEO);
+			}
+			ind++;
+		}
+
+		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+		paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+
+		// 删除的配置
+		String deleteConfigIds = paramsConfigVO.getDeleteConfigIds();
+		if (StringUtils.isNotBlank(deleteConfigIds)) {
+			List<String> deleteConfigIdList = Arrays.asList(deleteConfigIds.split(","));
+			paramsConfigEOMapper.deleteBatchIds(deleteConfigIdList);
+			// 级联删除配置数据
+			if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+				String paramsCollectManifestIds = paramsCollectManifestEOList.stream()
+						.map(ParamsCollectManifestEO::getId).collect(Collectors.joining(","));
+				paramsConfigDataEOMapper.deleteByConfigIdsAndCollectManifestIds(deleteConfigIds, paramsCollectManifestIds);
+			}
+		}
+		// 新增的配置
+		if (CollectionUtil.isNotEmpty(addConfigList)) {
+			// 判断是否可新增配置，清单参数项状态为 待发起、变更时，可添加配置
+			boolean configFlag = paramsCollectManifestEOService.getManifestConfigFlag(paramsManifestId);
+			if (!configFlag) {
+				if (CutEnum.CN.getValue().equals(paramsConfigVO.getCut())) {
+					throw new JeroBootException("当前不可添加配置！");
+				} else {
+					throw new JeroBootException("Currently not available to add a configuration!");
+				}
+			}
+			addConfigList.forEach(paramsConfigEO -> {
+				paramsConfigEO.setParamsManifestId(paramsManifestId);
+			});
+//			saveBatch(addConfigList);
+			// 修改所有参数项状态为：待发起收集
+			List<ParamsCollectManifestEO> updateList = paramsCollectManifestEOList.stream()
+					.filter(e-> !CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
+			if (CollectionUtil.isNotEmpty(updateList)) {
+				List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
+				updateList.forEach(collectManifestEO -> {
+					ParamsCollectManifestEO updateCollectManifestEO  = new ParamsCollectManifestEO();
+					updateCollectManifestEO.setId(collectManifestEO.getId());
+					updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
+					updateCollectManifestEOList.add(updateCollectManifestEO);
+				});
+				paramsCollectManifestEOService.updateBatchById(updateCollectManifestEOList);
+			}
+		}
+		// 修改的配置
+		if (CollectionUtil.isNotEmpty(updateConfigList)) {
+			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			updateConfigList.forEach(paramsConfigEO -> {
+				Date now = new Date();
+				paramsConfigEO.setUpdateBy(sysUser.getUsername());
+				paramsConfigEO.setUpdateTime(now);
+			});
+//			paramsConfigEOMapper.updateForeach(updateConfigList); 批量修改不行
+		}
+
+		updateConfigList.addAll(addConfigList);
+		saveOrUpdateBatch(updateConfigList);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsConfigEO
+	 * @return
+	 */
+	@Override
+    public void editById(ParamsConfigEO paramsConfigEO) {
+    	Date now = new Date();
+        paramsConfigEO.setUpdateTime(now);
+    	saveOrUpdate(paramsConfigEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ParamsConfigEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ParamsConfigEO> queryList(String paramsManifestId) {
+		LambdaQueryWrapper<ParamsConfigEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId);
+		queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq);
+		List<ParamsConfigEO> list = list(queryWrapper);
+        return list;
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.jero.modules.cert.collect.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
+import com.jero.modules.cert.collect.mapper.ParamsConfigHistoryEOMapper;
+import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description: 参数配置历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+@Service
+public class ParamsConfigHistoryEOServiceImpl extends ServiceImpl<ParamsConfigHistoryEOMapper, ParamsConfigHistoryEO> implements IParamsConfigHistoryEOService {
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+	public List<ParamsConfigHistoryEO> queryList(String paramsManifestId) {
+		LambdaQueryWrapper<ParamsConfigHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsConfigHistoryEO::getParamsManifestId, paramsManifestId);
+		queryWrapper.orderByAsc(ParamsConfigHistoryEO::getDisplaySeq);
+		List<ParamsConfigHistoryEO> list = list(queryWrapper);
+		return list;
+	}
+}

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

@@ -0,0 +1,810 @@
+package com.jero.modules.cert.collect.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.vo.DictModel;
+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.entity.ParamsManifestEO;
+import com.jero.modules.cert.collect.enums.CollectManifestChangeFlagEnum;
+import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
+import com.jero.modules.cert.collect.enums.ManifestStateEnum;
+import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
+import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper;
+import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper;
+import com.jero.modules.cert.collect.service.*;
+import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
+import com.jero.modules.cert.collect.vo.ParamsManifestVO;
+import com.jero.modules.cert.report.service.IParamsReportEOService;
+import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
+import com.jero.modules.cert.template.entity.ParamsTemplateEO;
+import com.jero.modules.cert.template.enums.ControlTypeEnum;
+import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
+import com.jero.modules.cert.template.service.IParamsTemplateEOService;
+import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.project.service.IProjectRelatedPersonnelService;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.mapper.SysDictMapper;
+import com.jero.modules.system.service.ISysUserService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.NumberFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 参数清单
+ * @Author: jero-boot
+ * @Date:   2022-05-05
+ * @Version: V1.0
+ */
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMapper, ParamsManifestEO> implements IParamsManifestEOService {
+
+	@Autowired
+	private ParamsManifestEOMapper paramsManifestEOMapper;
+
+	@Autowired
+	private IParamsTemplateEOService paramsTemplateEOService;
+
+	@Autowired
+	private IParamsCollectManifestEOService paramsCollectManifestEOService;
+
+	@Autowired
+	private IParamsInfoPublishEOService paramsInfoPublishEOService;
+
+	@Autowired
+	private IProjectRelatedPersonnelService projectRelatedPersonnelService;
+
+	@Autowired
+	private ISysUserService sysUserService;
+
+	@Autowired
+	private ParamsConfigEOMapper paramsConfigEOMapper;
+
+	@Autowired
+	private ParamsCollectManifestEOMapper paramsCollectManifestEOMapper;
+
+	@Autowired
+	private IParamsManifestHistoryEOService paramsManifestHistoryEOService;
+
+	@Autowired
+	private IParamsConfigEOService paramsConfigEOService;
+
+	@Autowired
+	private IParamsConfigDataEOService paramsConfigDataEOService;
+
+	@Autowired
+	private IParamsReportEOService paramsReportEOService;
+
+	@Autowired
+	private SysDictMapper sysDictMapper;
+
+
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsManifestEO
+	 * @return
+	 */
+	@Override
+    public boolean add(ParamsManifestEO paramsManifestEO) {
+		LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
+		queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
+		List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+			if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) {
+				throw new JeroBootException("Title already exists!");
+			} else {
+				throw new JeroBootException("标题已存在！");
+			}
+		}
+
+		String paramsManifestId = UUID.randomUUID().toString().replace("-","");
+
+		// 根据参数模板id发布版本查询对应参数项集合
+		List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(paramsManifestEO.getParamsTemplateId(),paramsManifestEO.getParamsTemplatePublishVersion());
+
+		// 复制参数项
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = new ArrayList<>();
+		for (ParamsInfoPublishEO source : paramsInfoPublishEOList) {
+			ParamsCollectManifestEO target = new ParamsCollectManifestEO();
+			BeanUtils.copyProperties(source, target);
+			target.setId(UUID.randomUUID().toString().replace("-",""));
+			target.setParamsManifestId(paramsManifestId);
+			target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
+			target.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 设置删除标识
+			target.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 设置添加标识
+			target.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 设置变更标识
+
+
+			if (!ControlTypeEnum.Title.getValue().equals(source.getControlType())) {
+				// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+				ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectId(), source.getDutyTerritory());
+				if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+					String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+					if (StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+						SysUser sysUser = sysUserService.getById(sdtId);
+						if (ObjectUtil.isNotEmpty(sysUser)) {
+							target.setSdt(sysUser.getUsername());
+						}
+					}
+				}
+			}
+
+			paramsCollectManifestEOList.add(target);
+		}
+		paramsCollectManifestEOService.saveBatch(paramsCollectManifestEOList);
+
+		// 对应参数模板发布版本  前端传过来
+		paramsManifestEO.setId(paramsManifestId);
+		paramsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
+		paramsManifestEO.setVersion(1); // 默认版本为 1
+        Date now = new Date();
+        paramsManifestEO.setCreateTime(now);
+        paramsManifestEO.setUpdateTime(now);
+        return save(paramsManifestEO);
+    }
+
+	/**
+	 * 更新 只对标题进行编辑
+	 *
+	 * @param paramsManifestEO
+	 * @return
+	 */
+	@Override
+    public boolean editById(ParamsManifestEO paramsManifestEO) {
+		ParamsManifestEO oldParamsManifestEO = getById(paramsManifestEO.getId());
+		if (!oldParamsManifestEO.getTitle().equals(paramsManifestEO.getTitle())) {
+			LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
+			queryWrapper.eq(ParamsManifestEO::getProjectId, oldParamsManifestEO.getProjectId());
+			List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
+			if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+				if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) {
+					throw new JeroBootException("Title already exists!");
+				} else {
+					throw new JeroBootException("标题已存在！");
+				}
+			}
+		}
+
+		ParamsManifestEO updateEO = new ParamsManifestEO();
+		updateEO.setId(paramsManifestEO.getId());
+		updateEO.setTitle(paramsManifestEO.getTitle());
+    	Date now = new Date();
+		updateEO.setUpdateTime(now);
+    	return updateById(updateEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public boolean deleteById(String id, String cut) {
+		// 判断清单收集状态，已完成状态才可删除
+		Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(id);
+		Boolean finish = (Boolean) map.get("finish");
+		if (!finish) {
+			if (CutEnum.CN.getValue().equals(cut)) {
+				throw new JeroBootException("清单收集中，无法删除！");
+			} else {
+				throw new JeroBootException("Manifest collection, and cannot be deleted!");
+			}
+		}
+		// 关联删除配置
+		LambdaQueryWrapper<ParamsConfigEO>  configEOQueryWrapper = new LambdaQueryWrapper<>();
+		configEOQueryWrapper.eq(ParamsConfigEO::getParamsManifestId, id);
+		paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+		// 关联删除收集的参数项（包含配置数据）
+		LambdaQueryWrapper<ParamsCollectManifestEO>  queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, id);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+			List<String> paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+			paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+		}
+
+		// 删除对应的历史版本数据
+		List<String> idList = new ArrayList<>();
+		idList.add(id);
+		paramsManifestHistoryEOService.deleteAllHistoryVersion(idList);
+
+		// 添加上报库的项目名称和清单标题
+		paramsReportEOService.setProjectNameAndTitle(idList);
+
+        return removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public boolean deleteByIds(List<String> ids, String cut) {
+		// 判断清单收集状态，已完成状态才可删除
+		ids.forEach(id-> {
+			Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(id);
+			Boolean finish = (Boolean) map.get("finish");
+			if (!finish) {
+				ParamsManifestEO manifestEO = getById(id);
+
+				if (CutEnum.CN.getValue().equals(cut)) {
+					throw new JeroBootException("清单:" + manifestEO.getTitle() + "收集中，无法删除！");
+				} else {
+					throw new JeroBootException("Manifest " + manifestEO.getTitle() + "collection, and cannot be deleted!");
+				}
+			}
+		});
+		// 关联删除配置
+		LambdaQueryWrapper<ParamsConfigEO>  configEOQueryWrapper = new LambdaQueryWrapper<>();
+		configEOQueryWrapper.in(ParamsConfigEO::getParamsManifestId, ids);
+		paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+		// 关联删除收集的参数项（包含配置数据）
+		LambdaQueryWrapper<ParamsCollectManifestEO>  queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, ids);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+			List<String> paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+			paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+		}
+
+		// 删除对应的历史版本数据
+		paramsManifestHistoryEOService.deleteAllHistoryVersion(ids);
+
+		// 添加上报库的项目名称和清单标题
+		paramsReportEOService.setProjectNameAndTitle(ids);
+
+        return removeByIds(ids);
+    }
+
+	/**
+	 * 删除项目下的所有收集清单
+	 *
+	 * @param projectId
+	 * @return
+	 */
+	@Override
+    public boolean deleteByProjectId(String projectId) {
+		// 查询项目下的所有清单
+		LambdaQueryWrapper<ParamsManifestEO> manifestEOQueryWrapper = new LambdaQueryWrapper<>();
+		manifestEOQueryWrapper.eq(ParamsManifestEO :: getProjectId, projectId);
+		List<ParamsManifestEO> paramsManifestEOList = list(manifestEOQueryWrapper);
+		List<String> ids = new ArrayList<>();
+		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+			ids = paramsManifestEOList.stream().map(ParamsManifestEO::getId).collect(Collectors.toList());
+
+			// 关联删除配置
+			LambdaQueryWrapper<ParamsConfigEO> configEOQueryWrapper = new LambdaQueryWrapper<>();
+			configEOQueryWrapper.in(ParamsConfigEO::getParamsManifestId, ids);
+			paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+			// 关联删除收集的参数项（包含配置数据）
+			LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, ids);
+			List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+			if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+				List<String> paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+				paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+			}
+
+			// 删除对应的历史版本数据
+			paramsManifestHistoryEOService.deleteAllHistoryVersion(ids);
+
+			// 添加上报库的项目名称和清单标题
+			paramsReportEOService.setProjectNameAndTitle(ids);
+
+		}
+		return removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ParamsManifestEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ParamsManifestEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public IPage<ParamsTemplateEO> getNewestPublishPage(Page<ParamsTemplateEO> page, ParamsTemplateEO paramsTemplateEO) {
+		LambdaQueryWrapper<ParamsTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.gt(ParamsTemplateEO::getVersion, 0) // 已发布的
+		.eq(StringUtils.isNotEmpty(paramsTemplateEO.getRegion()), ParamsTemplateEO::getRegion, paramsTemplateEO.getRegion()) // 查询条件：适用地区
+		.like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName()) // 查询条件：参数模板
+		.orderByDesc(ParamsTemplateEO::getCreateTime); // 按创建时间倒叙排序
+		return paramsTemplateEOService.page(page, queryWrapper);
+	}
+
+	@Override
+	public IPage pageInfo(IPage page, ParamsManifestEO paramsManifestEO) {
+		IPage rows = paramsManifestEOMapper.pageInfo(page, paramsManifestEO);
+		return rows;
+	}
+
+	/**
+	 * 变更扩展
+	 * 仅能选择一条进行变更扩展
+	 * 状态为已完成的清单可进行变更扩展
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public boolean changeExtension(String id, String cut) {
+		// 变更扩展时，将历史清单数据 连同历史参数项收集数据 备份到相关历史表中
+		paramsManifestHistoryEOService.addForChangeExtension(id);
+
+		// 将模板最新版本和项目中参数项进行比对
+		ParamsManifestEO paramsManifestEO = getById(id);
+		Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(id);
+		Boolean finish = (Boolean) map.get("finish");
+		if (!finish) {
+			if (CutEnum.CN.getValue().equals(cut)) {
+				throw new JeroBootException("清单收集中，无法发起变更！");
+			} else {
+				throw new JeroBootException("Manifest collection, and cannot be initiated change!");
+			}
+		}
+//		if (paramsManifestEO.getState().equals(ManifestStateEnum.COLLECTING.getValue())) {
+//			throw new JeroBootException("清单收集中，无法发起变更！");
+//		}
+		// 查询项目引用的模板是否是最新版本
+		Integer newestVersion = paramsInfoPublishEOService.getNewestVersionByParamsTemplateId(paramsManifestEO.getParamsTemplateId());
+		if (newestVersion == null) {
+			if (CutEnum.CN.getValue().equals(cut)) {
+				throw new JeroBootException("查询不到模板最新发布版本！");
+			} else {
+				throw new JeroBootException("Can not find the latest template!");
+			}
+		}
+
+//		if (newestVersion == paramsManifestEO.getParamsTemplatePublishVersion()) {
+//			if (CutEnum.CN.getValue().equals(cut)) {
+//				throw new JeroBootException("当前已是模板最新发布版本！");
+//			} else {
+//				throw new JeroBootException("This is the latest template!");
+//			}
+//		}
+
+		// 查询最新版模板参数项
+		List<ParamsInfoPublishEO> newParamsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(paramsManifestEO.getParamsTemplateId(), newestVersion);
+		// 查询项目所有参数项（这时候参数项都收集完了）
+		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+		paramsCollectManifestEO.setParamsManifestId(id);
+		List<ParamsCollectManifestEO> oldParamsCollectManifestEOList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+
+		// 比较模板参数项 和 项目参数项
+		// nio编号一样时，比较参数填写规则（控件类型，控件备选值，控件校验）是否一样；nio编号不一样时，不用管，用户自己添加
+		List<String> oldNioNumberList = oldParamsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
+		List<ParamsInfoPublishEO> sameList = newParamsInfoPublishEOList.stream().filter(e->oldNioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
+
+		List<String> newNioNumberList = sameList.stream().map(ParamsInfoPublishEO::getNioNumber).collect(Collectors.toList());
+		List<ParamsCollectManifestEO> diffList = oldParamsCollectManifestEOList.stream().filter(e->!newNioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
+
+
+		List<String> delCollectManifestIdList = new ArrayList<>();
+		List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
+
+		// 模板里没有，清单里有
+		if (CollectionUtil.isNotEmpty(diffList)) {
+			for (ParamsCollectManifestEO oldCollectManifestEO : diffList) {
+				ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
+				updateCollectManifestEO.setId(oldCollectManifestEO.getId());
+				updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue());
+				updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项
+				updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_AFTER.getValue()); // 因新发布模板中没有该参数项，标记为变更时已删除参数项
+				updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项
+
+				updateCollectManifestEOList.add(updateCollectManifestEO);
+			}
+		}
+
+		// 模板里有，清单里也有
+		if (CollectionUtil.isNotEmpty(sameList)) {
+			for (ParamsInfoPublishEO paramsInfoPublishEO : sameList) {
+				ParamsCollectManifestEO oldCollectManifestEO = oldParamsCollectManifestEOList.stream()
+						.filter(e -> e.getNioNumber().equals(paramsInfoPublishEO.getNioNumber()))
+						.collect(Collectors.toList()).get(0);
+				String newControlType = paramsInfoPublishEO.getControlType();
+				String newControlVerify = paramsInfoPublishEO.getControlVerify();
+				String newControlValues = paramsInfoPublishEO.getControlValues();
+
+				String oldControlType = oldCollectManifestEO.getControlType();
+				String oldControlVerify = oldCollectManifestEO.getControlVerify();
+				String oldControlValues = oldCollectManifestEO.getControlValues();
+
+				ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
+				BeanUtils.copyProperties(paramsInfoPublishEO, updateCollectManifestEO);
+				// 比较参数填写规则
+				if (!newControlType.equals(oldControlType)
+						|| (newControlVerify != null && !newControlVerify.equals(oldControlVerify))
+						|| (oldControlVerify != null && !oldControlVerify.equals(newControlVerify))
+						|| (newControlValues != null && !newControlValues.equals(oldControlValues))
+						|| (oldControlValues != null && !oldControlValues.equals(newControlValues))) {
+
+					// 参数填写规则改变，删除参数项配置数据，状态变为：待发起收集，拍列表前边
+					updateCollectManifestEO.setId(oldCollectManifestEO.getId()); // 为收集参数项id
+					updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
+					updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue()); // 因新发布模板中该参数项控件变化，标记为变更后参数项
+					updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项
+					updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项
+//				updateCollectManifestEO.setControlType(newControlType);
+//				updateCollectManifestEO.setControlVerify(newControlVerify);
+//				updateCollectManifestEO.setControlValues(newControlValues);
+
+					delCollectManifestIdList.add(oldCollectManifestEO.getId());
+				} else {
+					// 参数填写规则没有改变，状态变为：变更
+					updateCollectManifestEO.setId(oldCollectManifestEO.getId());
+					updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue());
+					updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项
+					updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项
+					updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项
+
+				}
+				// 更新附件模板字段
+				if (StringUtils.isNotEmpty(paramsInfoPublishEO.getFileTemplateConnectId())) {
+					updateCollectManifestEO.setFileTemplateConnectId(paramsInfoPublishEO.getFileTemplateConnectId());
+				}
+
+				updateCollectManifestEOList.add(updateCollectManifestEO);
+			}
+		}
+		// 删除参数项配置数据
+		if (CollectionUtil.isNotEmpty(delCollectManifestIdList)) {
+			paramsConfigDataEOService.deleteByParamsCollectManifestIdList(delCollectManifestIdList);
+		}
+		// 更新项目参数项
+		paramsCollectManifestEOService.updateBatchById(updateCollectManifestEOList);
+
+		// 参数清单版本加 1
+		ParamsManifestEO updateManifestEO = new ParamsManifestEO();
+		updateManifestEO.setId(id);
+		updateManifestEO.setVersion(paramsManifestEO.getVersion() + 1);
+		updateManifestEO.setParamsTemplatePublishVersion(newestVersion);
+		updateManifestEO.setState(ManifestStateEnum.COLLECTING.getValue()); // 变更扩展后，清单状态为收集中
+		return updateById(updateManifestEO);
+	}
+
+	@Override
+	public List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId) {
+		return paramsManifestHistoryEOService.getHistoryVersionList(paramsManifestId);
+
+	}
+
+	@Override
+	public IPage getAllManifest(IPage page, String projectName) {
+		IPage rows = paramsManifestEOMapper.pageInfoAll(projectName, ManifestStateEnum.FINISHED.getValue(), page);
+		return rows;
+	}
+
+	@Override
+	public ParamsManifestEO copy(ParamsManifestEO paramsManifestEO, String sourceManifestId) {
+		// 判断清单收集状态，已完成状态才可复制
+		Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(sourceManifestId);
+		Boolean finish = (Boolean) map.get("finish");
+		if (!finish) {
+			if (CutEnum.CN.getValue().equals(paramsManifestEO.getCut())) {
+				throw new JeroBootException("清单收集中，无法复制！");
+			} else {
+				throw new JeroBootException("Manifest collection, and cannot be copied!");
+			}
+		}
+
+		String paramsTemplateId = paramsManifestEO.getParamsTemplateId();
+		int paramsTemplatePublishVersion = paramsManifestEO.getParamsTemplatePublishVersion();
+
+		LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
+		queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
+		List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+			if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) {
+				throw new JeroBootException("Title already exists!");
+			} else {
+				throw new JeroBootException("标题已存在！");
+			}
+		}
+
+		// 查询所有模板参数项
+		List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(paramsTemplateId, paramsTemplatePublishVersion);
+
+		// 查询所有清单参数项
+		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+		paramsCollectManifestEO.setParamsManifestId(sourceManifestId);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+
+		// 查询清单配置
+		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(sourceManifestId);
+
+		// 定义
+		Map<String, String> configIdMap = new HashMap<>(); // 旧-新配置id对应关系
+		List<ParamsCollectManifestEO> addCollectManifestEOList = new ArrayList<>(); // 需要添加的参数项
+		List<ParamsConfigEO> addConfigEOList = new ArrayList<>(); // 需要添加的配置
+		List<ParamsConfigDataEO> addConfigDataEOList = new ArrayList<>(); // 需要添加的配置数据
+
+		String addManifestId = UUID.randomUUID().toString().replace("-",""); // 参数清单id
+
+		// 配置： 复制清单的
+		for (ParamsConfigEO configEO : paramsConfigEOList) {
+			ParamsConfigEO addConfigEO = new ParamsConfigEO();
+			BeanUtils.copyProperties(configEO, addConfigEO);
+			String addConfigId = UUID.randomUUID().toString().replace("-", "");
+			addConfigEO.setId(addConfigId);
+			addConfigEO.setParamsManifestId(addManifestId);
+			addConfigEO.setCreateBy(null);
+			addConfigEO.setCreateTime(null);
+			addConfigEO.setUpdateBy(null);
+			addConfigEO.setUpdateTime(null);
+			addConfigEO.setSysOrgCode(null);
+			addConfigEOList.add(addConfigEO);
+
+			configIdMap.put(configEO.getId(), addConfigId);
+		}
+
+		// 将清单参数项 和 模板参数项 对比
+		for (ParamsInfoPublishEO publishEO : paramsInfoPublishEOList) {
+			String nioNumber = publishEO.getNioNumber();
+			String controlType = publishEO.getControlType();
+			String controlValues = publishEO.getControlValues();
+			String controlVerify = publishEO.getControlVerify();
+
+			List<ParamsCollectManifestEO> manifestEOList = paramsCollectManifestEOList.stream()
+					.filter(e->nioNumber.equals(e.getNioNumber())
+							&& controlType.equals(e.getControlType())
+							&& ((controlValues != null && controlValues.equals(e.getControlValues())) || (controlValues == null && null == e.getControlValues()))
+							&& ((controlVerify != null && controlVerify.equals(e.getControlVerify())) || (controlVerify == null && null == e.getControlVerify())))
+					.collect(Collectors.toList());
+
+
+			String addCollectManifestId = UUID.randomUUID().toString().replace("-",""); // 参数项id
+			if (CollectionUtil.isNotEmpty(manifestEOList)) {
+				ParamsCollectManifestEO collectManifestEO = manifestEOList.get(0);
+
+				// 配置数据： nio编号，控件类型，控件备选值，控件校验 均一致时 将清单参数项项复制到模板参数项，否则不复制
+				for (ParamsConfigEO configEO : paramsConfigEOList) {
+					ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
+
+					ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
+					if (ObjectUtil.isNotEmpty(configDataEO)) {
+						BeanUtils.copyProperties(configDataEO, addConfigDataEO);
+
+						addConfigDataEO.setId(null);
+						addConfigDataEO.setCreateBy(null);
+						addConfigDataEO.setCreateTime(null);
+						addConfigDataEO.setUpdateBy(null);
+						addConfigDataEO.setUpdateTime(null);
+						addConfigDataEO.setSysOrgCode(null);
+						addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
+						addConfigDataEO.setParamsCollectManifestId(addCollectManifestId);
+						addConfigDataEOList.add(addConfigDataEO);
+					}
+
+				}
+			}
+
+			// 固定列数据： 保留模板参数项的
+			ParamsCollectManifestEO addCollectManifestEO = new ParamsCollectManifestEO();
+			BeanUtils.copyProperties(publishEO, addCollectManifestEO);
+			addCollectManifestEO.setId(addCollectManifestId);
+			addCollectManifestEO.setParamsManifestId(addManifestId);
+			addCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
+			// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+			ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectId(), addCollectManifestEO.getDutyTerritory());
+			if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+				String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+				if (StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+					SysUser sysUser = sysUserService.getById(sdtId);
+					if (ObjectUtil.isNotEmpty(sysUser)) {
+						addCollectManifestEO.setSdt(sysUser.getUsername());
+					}
+				}
+			}
+
+			addCollectManifestEO.setCreateBy(null);
+			addCollectManifestEO.setCreateTime(null);
+			addCollectManifestEO.setUpdateBy(null);
+			addCollectManifestEO.setUpdateTime(null);
+			addCollectManifestEO.setSysOrgCode(null);
+			addCollectManifestEOList.add(addCollectManifestEO);
+
+		}
+
+		// 添加参数项
+		paramsCollectManifestEOService.saveBatch(addCollectManifestEOList);
+
+		// 添加配置
+		paramsConfigEOService.saveBatch(addConfigEOList);
+
+		// 添加配置数据
+		paramsConfigDataEOService.saveBatch(addConfigDataEOList);
+
+		// 添加参数清单
+		paramsManifestEO.setId(addManifestId);
+		paramsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
+		paramsManifestEO.setVersion(1); // 默认版本为 1
+		save(paramsManifestEO);
+
+		return paramsManifestEO;
+	}
+
+	@Override
+	public ParamsManifestVO getProjectById(String projectId) {
+		return paramsManifestEOMapper.getProjectById(projectId);
+	}
+
+	@Override
+	public List<Map<String, String>> labelListForProjectDetails(String projectId) {
+		return paramsManifestEOMapper.labelListForProjectDetails(projectId);
+	}
+
+	@Override
+	public Map<String, Object> getStatisticsForProjectDetails(String paramsManifestId, String cut) {
+		// 查询所有责任领域
+		List<DictModel> dutyTerritoryDictList = sysDictMapper.queryDictItemsByCode("duty_territory");
+
+		Map<String, Object> result = new LinkedHashMap<>();
+		List<String> dutyTerritoryNameList = new LinkedList<>();
+		List<Map<String, Object>> notStartList = new LinkedList<>();
+		List<Map<String, Object>> collectingList = new LinkedList<>();
+		List<Map<String, Object>> submitList = new LinkedList<>();
+		List<Map<String, Object>> syncReportList = new LinkedList<>();
+
+		// 统计清单参数
+		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+		paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
+		List<Map<String, Object>> listAll = paramsCollectManifestEOMapper.listInfoForExport(paramsCollectManifestEO);
+
+		// 循环责任领域，计算每个责任领域中的四种状态数据
+		for (DictModel item : dutyTerritoryDictList) {
+
+			// 计算数量
+			double notStartNumber = listAll.stream().filter(e -> (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.get("state"))
+							|| CollectManifestStateEnum.SDT_BACK.getValue().equals(e.get("state"))
+							|| CollectManifestStateEnum.CHANGE.getValue().equals(e.get("state"))) && item.getValue().equals(e.get("duty_territory")))
+					.count(); // 未开始的参数项 数量
+
+			double collectingNumber = listAll.stream().filter(e -> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.get("state"))
+							|| CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.get("state"))
+							|| CollectManifestStateEnum.DRE_BACK.getValue().equals(e.get("state"))
+							|| CollectManifestStateEnum.CERT_BACK.getValue().equals(e.get("state"))) && item.getValue().equals(e.get("duty_territory")))
+					.count(); // 收集中的参数项 数量
+
+			double submitNumber = listAll.stream().filter(e -> CollectManifestStateEnum.SUBMIT.getValue().equals(e.get("state")) && item.getValue().equals(e.get("duty_territory")))
+					.count(); // 已提交的参数项 数量
+
+			double syncReportNumber = listAll.stream().filter(e -> CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.get("state")) && item.getValue().equals(e.get("duty_territory")))
+					.count(); // 已同步上报库的参数项 数量
+
+			// 计算百分比
+			double total = notStartNumber + collectingNumber + submitNumber + syncReportNumber; // 当前责任领域参数项总数
+			String notStartPercent = getRatio(notStartNumber, total); // 未开始的参数项 百分比
+			String collectingPercent = getRatio(collectingNumber, total); // 收集中的参数项 百分比
+			String submitPercent = getRatio(submitNumber, total); // 已提交的参数项 百分比
+			String syncReportPercent = getRatio(syncReportNumber, total); // 已同步上报库的参数项 百分比
+
+			// 组装数据 返回前端
+			if (notStartNumber == collectingNumber && collectingNumber == submitNumber && submitNumber == syncReportNumber && syncReportNumber == 0) {
+				 continue;
+			}
+
+			if (CutEnum.EN.getValue().equals(cut)) {
+				dutyTerritoryNameList.add(item.getTextEn());
+			} else {
+				dutyTerritoryNameList.add(item.getText());
+			}
+
+			getData(notStartList, notStartNumber, notStartPercent);
+			getData(collectingList, collectingNumber, collectingPercent);
+			getData(submitList, submitNumber, submitPercent);
+			getData(syncReportList, syncReportNumber, syncReportPercent);
+
+		}
+
+		result.put("dutyTerritory", dutyTerritoryNameList);
+		result.put("notStart", notStartList);
+		result.put("collecting", collectingList);
+		result.put("submit", submitList);
+		result.put("syncReport", syncReportList);
+
+		return result;
+	}
+
+	@Override
+	public boolean setTemplateName(List<String> paramsTemplateIds) {
+		List<ParamsManifestEO> updateManifestEOList = new ArrayList<>();
+
+		// 查询被删除模板信息
+		LambdaQueryWrapper<ParamsTemplateEO> paramsTemplateEOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		paramsTemplateEOLambdaQueryWrapper.in(ParamsTemplateEO::getId, paramsTemplateIds);
+		List<ParamsTemplateEO> paramsTemplateEOList = paramsTemplateEOService.list(paramsTemplateEOLambdaQueryWrapper);
+		List<String> paramsTemplateIdList = paramsTemplateEOList.stream().map(ParamsTemplateEO::getId).collect(Collectors.toList());
+
+		// 查询被删除模板的所有清单
+		LambdaQueryWrapper<ParamsManifestEO> paramsManifestEOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		paramsManifestEOLambdaQueryWrapper.in(ParamsManifestEO::getParamsTemplateId, paramsTemplateIdList);
+		List<ParamsManifestEO> paramsManifestEOList = list(paramsManifestEOLambdaQueryWrapper);
+
+		paramsTemplateEOList.forEach(templateEO-> {
+			// 查询使用该模板的所有清单
+			List<ParamsManifestEO> paramsManifestEOS = paramsManifestEOList.stream()
+					.filter(e-> templateEO.getId().equals(e.getParamsTemplateId()))
+					.collect(Collectors.toList());
+
+			paramsManifestEOS.forEach(manifestEO -> {
+				ParamsManifestEO updateManifestEO = new ParamsManifestEO();
+				updateManifestEO.setId(manifestEO.getId());
+				updateManifestEO.setParamsTemplateName(templateEO.getParamsTemplateName());
+				updateManifestEO.setFinishTime(manifestEO.getFinishTime());
+
+				updateManifestEOList.add(updateManifestEO);
+			});
+
+		});
+		return updateBatchById(updateManifestEOList);
+	}
+
+	private void getData(List<Map<String, Object>> data, double quantity, String percentage) {
+		Map<String, Object> map = new HashMap<>();
+		map.put("quantity", quantity);
+		map.put("percentage", percentage);
+		data.add(map);
+	}
+
+	/**
+	 * 计算百分比
+	 * @param d1
+	 * @param d2
+	 * @return
+	 */
+	private String getRatio(Double d1, Double d2) {
+		if (d1 == null || d2 == null || d2 <= 0) {
+//			return "0.00%";
+			return "0.00"; // 前端不需要返百分号
+		}
+		NumberFormat percent = NumberFormat.getPercentInstance();
+		percent.setMaximumFractionDigits(2);
+		percent.setMinimumFractionDigits(2);
+		String result =  percent.format(d1/d2);
+		return result.substring(0,result.lastIndexOf("%")); // 前端不需要返百分号
+	}
+
+}

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

@@ -0,0 +1,187 @@
+package com.jero.modules.cert.collect.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.cert.collect.entity.*;
+import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
+import com.jero.modules.cert.collect.mapper.ParamsConfigHistoryEOMapper;
+import com.jero.modules.cert.collect.mapper.ParamsManifestHistoryEOMapper;
+import com.jero.modules.cert.collect.service.*;
+import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 参数清单历史版本
+ * @Author: jero-boot
+ * @Date:   2022-05-12
+ * @Version: V1.0
+ */
+@Service
+@Transactional
+public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManifestHistoryEOMapper, ParamsManifestHistoryEO> implements IParamsManifestHistoryEOService {
+
+	@Autowired
+	private IParamsManifestEOService paramsManifestEOService;
+
+	@Autowired
+	private ParamsCollectManifestEOMapper paramsCollectManifestEOMapper;
+
+	@Autowired
+	private IParamsConfigEOService paramsConfigEOService;
+
+	@Autowired
+	private IParamsConfigDataEOService paramsConfigDataEOService;
+
+	@Autowired
+	private IParamsCollectManifestHistoryEOService paramsCollectManifestHistoryEOService;
+
+	@Autowired
+	private IParamsConfigDataHistoryEOService paramsConfigDataHistoryEOService;
+
+	@Autowired
+	private IParamsConfigHistoryEOService paramsConfigHistoryEOService;
+
+	@Autowired
+	private IParamsManifestHistoryEOService paramsManifestHistoryEOService;
+
+
+	/**
+	 * 变更扩展时，将历史清单数据 连同历史参数项收集数据 备份到相关历史表中
+	 *
+	 * @param paramsManifestId
+	 */
+	@Override
+	public void addForChangeExtension(String paramsManifestId) {
+
+		// 备份参数清单
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId);
+		ParamsManifestHistoryEO paramsManifestHistoryEO = new ParamsManifestHistoryEO();
+		BeanUtils.copyProperties(paramsManifestEO, paramsManifestHistoryEO);
+		String paramsManifestHistoryId = UUID.randomUUID().toString().replace("-","");
+		paramsManifestHistoryEO.setId(paramsManifestHistoryId);
+		paramsManifestHistoryEO.setSourceParamsManifestId(paramsManifestId); // 绑定 源清单
+
+		// 查询清单下配置
+		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
+		// 备份清单的配置
+		List<ParamsConfigHistoryEO> paramsConfigHistoryEOList = new ArrayList<>();
+		Map<String, String> configIdMap = new HashMap<>();
+		paramsConfigEOList.forEach(sourceConfigEO -> {
+			ParamsConfigHistoryEO targetConfigEO = new ParamsConfigHistoryEO();
+			BeanUtils.copyProperties(sourceConfigEO, targetConfigEO);
+			String targetConfigId = UUID.randomUUID().toString().replace("-","");
+			targetConfigEO.setId(targetConfigId);
+			targetConfigEO.setParamsManifestId(paramsManifestHistoryId);
+
+			configIdMap.put(sourceConfigEO.getId(), targetConfigId);
+			paramsConfigHistoryEOList.add(targetConfigEO);
+		});
+
+		// 查询所有配置数据
+		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
+		LambdaQueryWrapper<ParamsConfigDataEO> 	queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ParamsConfigDataEO::getParamsConfigId, paramsConfigIdList);
+		List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.list(queryWrapper);
+
+		// 备份清单参数项
+		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+		paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+		List<ParamsCollectManifestHistoryEO> paramsCollectManifestHistoryEOList = new ArrayList<>();
+		List<ParamsConfigDataHistoryEO> paramsConfigDataHistoryEOList = new ArrayList<>();
+
+		paramsCollectManifestEOList.forEach(source -> {
+			ParamsCollectManifestHistoryEO target = new ParamsCollectManifestHistoryEO();
+			BeanUtils.copyProperties(source,target);
+			String paramsCollectManifestHistoryId = UUID.randomUUID().toString().replace("-","");
+			target.setId(paramsCollectManifestHistoryId);
+			target.setParamsManifestId(paramsManifestHistoryId);
+			paramsCollectManifestHistoryEOList.add(target);
+
+			// 备份参数项的配置数据
+			List<ParamsConfigDataEO> sourceConfigDataEOList = paramsConfigDataEOList.stream()
+					.filter(e->e.getParamsCollectManifestId().equals(source.getId()))
+					.collect(Collectors.toList());
+
+			sourceConfigDataEOList.forEach(sourceConfigDataEO -> {
+				ParamsConfigDataHistoryEO targetConfigDataHistoryEO = new ParamsConfigDataHistoryEO();
+				BeanUtils.copyProperties(sourceConfigDataEO, targetConfigDataHistoryEO);
+				targetConfigDataHistoryEO.setId(UUID.randomUUID().toString().replace("-",""));
+				targetConfigDataHistoryEO.setParamsCollectManifestId(paramsCollectManifestHistoryId);
+				targetConfigDataHistoryEO.setParamsConfigId(configIdMap.get(sourceConfigDataEO.getParamsConfigId()));
+				paramsConfigDataHistoryEOList.add(targetConfigDataHistoryEO);
+			});
+		});
+
+		// 批量添加参数项
+		paramsCollectManifestHistoryEOService.saveBatch(paramsCollectManifestHistoryEOList);
+
+		// 批量添加配置
+		paramsConfigHistoryEOService.saveBatch(paramsConfigHistoryEOList);
+
+		// 批量添加配置数据
+		paramsConfigDataHistoryEOService.saveBatch(paramsConfigDataHistoryEOList);
+
+		// 添加清单
+		paramsManifestHistoryEOService.save(paramsManifestHistoryEO);
+	}
+
+	@Override
+	public List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId) {
+		// 历史版本和当前版本通过id进行关联
+		LambdaQueryWrapper<ParamsManifestHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsManifestHistoryEO::getSourceParamsManifestId, paramsManifestId)
+				.orderByAsc(ParamsManifestHistoryEO::getVersion);
+		List<ParamsManifestHistoryEO> list = list(queryWrapper);
+		List<ParamsManifestHistoryVO> historyVersionList = new ArrayList<>();
+		list.forEach(paramsManifestHistoryEO -> {
+			ParamsManifestHistoryVO paramsManifestHistoryVO = new ParamsManifestHistoryVO();
+			paramsManifestHistoryVO.setId(paramsManifestHistoryEO.getId());
+			paramsManifestHistoryVO.setVersion(paramsManifestHistoryEO.getVersion());
+			historyVersionList.add(paramsManifestHistoryVO);
+		});
+
+		return historyVersionList;
+	}
+
+	@Autowired
+	private ParamsConfigHistoryEOMapper paramsConfigHistoryEOMapper;
+	@Autowired
+	private ParamsManifestHistoryEOMapper paramsManifestHistoryEOMapper;
+
+	@Override
+	public void deleteAllHistoryVersion(List<String> paramsManifestIdList) {
+		LambdaQueryWrapper<ParamsManifestHistoryEO> manifestHistoryEOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		manifestHistoryEOLambdaQueryWrapper.in(ParamsManifestHistoryEO::getSourceParamsManifestId, paramsManifestIdList);
+		List<ParamsManifestHistoryEO> list = list(manifestHistoryEOLambdaQueryWrapper);
+		if (CollectionUtil.isNotEmpty(list)) {
+			List<String> ids = list.stream().map(ParamsManifestHistoryEO::getId).collect(Collectors.toList());
+
+			// 关联删除配置
+			LambdaQueryWrapper<ParamsConfigHistoryEO> configEOQueryWrapper = new LambdaQueryWrapper<>();
+			configEOQueryWrapper.in(ParamsConfigHistoryEO::getParamsManifestId, ids);
+			paramsConfigHistoryEOMapper.delete(configEOQueryWrapper);
+
+			// 关联删除收集的参数项（包含配置数据）
+			LambdaQueryWrapper<ParamsCollectManifestHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.in(ParamsCollectManifestHistoryEO::getParamsManifestId, ids);
+			List<ParamsCollectManifestHistoryEO> paramsCollectManifestHistoryEOList = paramsCollectManifestHistoryEOService.list(queryWrapper);
+			if (CollectionUtil.isNotEmpty(paramsCollectManifestHistoryEOList)) {
+				List<String> paramsCollectManifestIdList = paramsCollectManifestHistoryEOList.stream().map(ParamsCollectManifestHistoryEO::getId).collect(Collectors.toList());
+				paramsCollectManifestHistoryEOService.deleteByIds(paramsCollectManifestIdList);
+
+			}
+
+			// 删除清单对应的所有历史版本清单
+			paramsManifestHistoryEOMapper.delete(manifestHistoryEOLambdaQueryWrapper);
+		}
+	}
+
+}

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

@@ -0,0 +1,80 @@
+package com.jero.modules.cert.collect.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 17:01 2022/5/9
+ */
+@Data
+public class ParamsCollectManifestVO {
+
+    @ApiModelProperty(value = "参数模板id")
+    private String paramsTemplateId; // 参数模板id
+
+    @ApiModelProperty(value = "参数模板发布版本")
+    private Integer paramsTemplatePublishVersion; // 参数模板发布版本
+
+    @ApiModelProperty(value = "nio编号")
+    private String nioNumber; // nio编号
+
+    @ApiModelProperty(value = "参数名称")
+    private String paramsName; // 参数名称
+
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory; // 责任领域
+
+    @ApiModelProperty(value = "参数清单id")
+    private String paramsManifestId; // 参数清单id
+
+    @ApiModelProperty(value = "项目id")
+    private String projectId; // 项目id
+
+    @ApiModelProperty(value = "添加专用")
+    private List<ParamsInfoPublishEO> paramsInfoPublishEOList; // 添加专用
+
+    @ApiModelProperty(value = "提交专用")
+    private List<Map<String, Object>> configDataList; // 提交专用
+
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "截止时间")
+    private Date deadline; // 截止时间
+
+    @ApiModelProperty(value = "收集参数项ids")
+    private String ids; // 收集参数项ids
+
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt; // 工程接口人
+
+    @ApiModelProperty(value = "填写人")
+    private String dre; // 填写人
+
+    @ApiModelProperty(value = "参数配置ids")
+    private String paramsConfigIds; // 参数配置ids
+
+    @ApiModelProperty(value = "配置列查询标识")
+    private String configFlag; // 1-全部配置 2-非冻结配置
+
+    @ApiModelProperty(value = "引用参数专用-从")
+    private String sourceConfigId; // 引用参数专用
+    @ApiModelProperty(value = "引用参数专用-到")
+    private String targetConfigIds; // 引用参数专用
+
+    private String cut; // 引用参数专用
+
+    private String exportName; // 导出文件名
+
+    @ApiModelProperty(value = "用户类型")
+    private String userTypes; // 用户类型
+
+}

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

@@ -0,0 +1,23 @@
+package com.jero.modules.cert.collect.vo;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 13:34 2022/5/7
+ */
+@Data
+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; // 配置具体数据
+    private String templateName; // 模板附件名称
+    private String templateId; // 模板附件id
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigVO.java

@@ -0,0 +1,20 @@
+package com.jero.modules.cert.collect.vo;
+
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 11:50 2022/5/6
+ */
+@Data
+public class ParamsConfigVO {
+
+    private String paramsManifestId;
+    private String deleteConfigIds;
+    private List<ParamsConfigEO> paramsConfigEOList;
+    private String cut;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java

@@ -0,0 +1,15 @@
+package com.jero.modules.cert.collect.vo;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 16:47 2022/5/12
+ */
+@Data
+public class ParamsManifestHistoryVO {
+    private String id;
+    private Integer version;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java

@@ -0,0 +1,27 @@
+package com.jero.modules.cert.collect.vo;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 9:27 2022/5/17
+ */
+@Data
+public class ParamsManifestVO {
+
+    private String id;
+    private String title;
+    private Integer version;
+    private String projectName;
+    private String projectId;
+    private String state;
+    private String paramsTemplateName;
+    private String paramsTemplateId;
+    private Integer paramsTemplatePublishVersion;
+
+    private String ids;
+    private String cut;
+    private String sourceManifestId;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java

@@ -0,0 +1,233 @@
+package com.jero.modules.cert.report.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
+import com.jero.modules.cert.report.enums.ExportTemplateStateEnum;
+import com.jero.modules.cert.report.service.IParamsExportTemplateEOService;
+import com.jero.modules.ocr.util.LineHumpUtil;
+import com.jero.modules.system.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 参数导出模板表
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+@Api(tags="参数导出模板表")
+@RestController
+@RequestMapping("/report/exportTemplate")
+@Slf4j
+public class ParamsExportTemplateEOController extends JeroController<ParamsExportTemplateEO, IParamsExportTemplateEOService> {
+	@Autowired
+	private IParamsExportTemplateEOService paramsExportTemplateEOService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param paramsExportTemplateEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param cut
+	 * @return
+	 */
+	@AutoLog(value = "参数导出模板表-分页列表查询")
+	@ApiOperation(value="参数导出模板表-分页列表查询", notes="参数导出模板表-分页列表查询")
+	@GetMapping(value = "/page")
+	@RequiresPermissions("report:exportTemplate:page")
+	public Result<?> queryPageList(ParamsExportTemplateEO paramsExportTemplateEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   @RequestParam(name="cut") String cut) {
+		if (StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName())) {
+			paramsExportTemplateEO.setTemplateName(paramsExportTemplateEO.getTemplateName().replace("%", "\\%"));
+		}
+
+		if (StringUtils.isNotBlank(paramsExportTemplateEO.getOrderByField())) {
+			paramsExportTemplateEO.setOrderByField(LineHumpUtil.humpToLine2(paramsExportTemplateEO.getOrderByField()));
+		}
+
+		QueryWrapper<ParamsExportTemplateEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName());
+		queryWrapper.orderBy(StringUtils.isNotBlank(paramsExportTemplateEO.getOrderByField()), "1".equals(paramsExportTemplateEO.getOrderBy())?true:false, paramsExportTemplateEO.getOrderByField())
+				.orderBy(StringUtils.isBlank(paramsExportTemplateEO.getOrderByField()), false, "create_time"); // 默认按创建时间降序
+
+		Page<ParamsExportTemplateEO> page = new Page<ParamsExportTemplateEO>(pageNo, pageSize);
+		IPage<ParamsExportTemplateEO> pageList = paramsExportTemplateEOService.page(page, queryWrapper);
+		// 处理 状态 中英文
+		List<ParamsExportTemplateEO> rows = pageList.getRecords();
+		Map<String, String> stateMap = ExportTemplateStateEnum.toMap(cut);
+		rows.forEach(exportTemplateEO -> {
+			exportTemplateEO.setState_dictText(stateMap.get(exportTemplateEO.getState()));
+		});
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "参数导出模板表-列表查询")
+    @ApiOperation(value="参数导出模板表-列表查询", notes="参数导出模板表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ParamsExportTemplateEO>> queryList() {
+        List<ParamsExportTemplateEO> list = paramsExportTemplateEOService.queryList();
+        return Result.OK(list);
+	}
+
+	 /**
+	  * 模板名称唯一校验
+	  * true-唯一，false-不唯一
+	  * @return
+	  */
+	 @AutoLog(value = "参数导出模板表-模板名称唯一校验")
+	 @ApiOperation(value="参数导出模板表-模板名称唯一校验", notes="参数导出模板表-模板名称唯一校验")
+	 @GetMapping(value = "/verifyTemplateName")
+//	 @RequiresPermissions("report:exportTemplate:add")
+	 public Result<?> verifyTemplateName(@RequestParam(name="templateName") String templateName) {
+		 boolean isRepeat = paramsExportTemplateEOService.verifyTemplateName(templateName);
+		 return Result.OK(isRepeat);
+	 }
+
+
+	/**
+	 *   添加
+	 *
+	 * @param paramsExportTemplateEO
+	 * @return
+	 */
+	@AutoLog(value = "参数导出模板表-添加")
+	@ApiOperation(value="参数导出模板表-添加", notes="参数导出模板表-添加")
+	@PostMapping(value = "/add")
+	@RequiresPermissions("report:exportTemplate:add")
+	public Result<?> add(@Validated @RequestBody ParamsExportTemplateEO paramsExportTemplateEO) {
+		boolean isSuccess = paramsExportTemplateEOService.add(paramsExportTemplateEO);
+		if (isSuccess) {
+			return Result.OK("添加成功！");
+		} else {
+			return Result.error("添加失败！");
+		}
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param paramsExportTemplateEO
+	 * @return
+	 */
+	@AutoLog(value = "参数导出模板表-编辑")
+	@ApiOperation(value="参数导出模板表-编辑", notes="参数导出模板表-编辑")
+	@PostMapping(value = "/edit")
+	@RequiresPermissions("report:exportTemplate:edit")
+	public Result<?> edit(@Validated @RequestBody ParamsExportTemplateEO paramsExportTemplateEO) {
+		boolean isSuccess = paramsExportTemplateEOService.editById(paramsExportTemplateEO);
+		if (isSuccess) {
+			return Result.OK("编辑成功！");
+		} else {
+			return Result.error("编辑失败！");
+		}
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "参数导出模板表-通过id删除")
+	@ApiOperation(value="参数导出模板表-通过id删除", notes="参数导出模板表-通过id删除")
+	@GetMapping(value = "/delete")
+	@RequiresPermissions("report:exportTemplate:delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		boolean isSuccess = paramsExportTemplateEOService.deleteById(id);
+		if (isSuccess) {
+			return Result.OK("删除成功！");
+		} else {
+			return Result.error("删除失败！");
+		}
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "参数导出模板表-批量删除")
+	@ApiOperation(value="参数导出模板表-批量删除", notes="参数导出模板表-批量删除")
+	@PostMapping(value = "/deleteBatch")
+	@RequiresPermissions("report:exportTemplate:deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		boolean isSuccess = paramsExportTemplateEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		if (isSuccess) {
+			return Result.OK("批量删除成功！");
+		} else {
+			return Result.error("批量删除失败！");
+		}
+	}
+
+
+
+
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "参数导出模板表-通过id查询")
+	@ApiOperation(value="参数导出模板表-通过id查询", notes="参数导出模板表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ParamsExportTemplateEO paramsExportTemplateEO = paramsExportTemplateEOService.queryById(id);
+		if(paramsExportTemplateEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(paramsExportTemplateEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param paramsExportTemplateEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ParamsExportTemplateEO paramsExportTemplateEO) {
+        return super.exportXls(request, paramsExportTemplateEO, ParamsExportTemplateEO.class, "参数导出模板表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ParamsExportTemplateEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java

@@ -0,0 +1,219 @@
+package com.jero.modules.cert.report.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
+import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
+import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
+import com.jero.modules.cert.report.service.IParamsExportTemplateEOService;
+import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
+import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
+import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 上报库参数项
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+@Api(tags="上报库参数项")
+@RestController
+@RequestMapping("/report/detail")
+@Slf4j
+public class ParamsReportDetailEOController extends JeroController<ParamsReportDetailEO, IParamsReportDetailEOService> {
+	@Autowired
+	private IParamsReportDetailEOService paramsReportDetailEOService;
+
+	@Autowired
+	private IParamsReportConfigEOService paramsReportConfigEOService;
+
+	@Autowired
+	private IOSSFileService ossFileService;
+
+	@Autowired
+	private IParamsExportTemplateEOService paramsExportTemplateEOService;
+
+
+	/**
+	 * 表头中英文切换
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "上报库参数项-表头中英文切换")
+	@ApiOperation(value="上报库参数项-表头中英文切换", notes="上报库参数项-表头中英文切换")
+	@GetMapping(value = "/getHeader")
+	@RequiresPermissions("report:detail:list")
+	public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
+													   @RequestParam(name = "flag") String flag,
+													   @RequestParam(name = "cut") String cut) {
+		List<Map<String, Object>> list = paramsReportDetailEOService.getHeader(paramsManifestId, flag, cut);
+		return Result.OK(list);
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "上报库参数项-列表查询")
+	@ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询")
+	@GetMapping(value = "/list")
+	@RequiresPermissions("report:detail:list")
+	public Result<?> queryList(ParamsReportDetailVO paramsReportDetailVO,
+							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
+							   @RequestParam(name = "cut") String cut) {
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getNioNumber())) {
+			paramsReportDetailVO.setNioNumber(paramsReportDetailVO.getNioNumber().replace("%","\\%"));
+		}
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getParamsName())) {
+			paramsReportDetailVO.setParamsName(paramsReportDetailVO.getParamsName().replace("%","\\%"));
+		}
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getSdtName())) {
+			paramsReportDetailVO.setSdt(paramsReportDetailVO.getSdtName().replace("%","\\%"));
+		}
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getDreName())) {
+			paramsReportDetailVO.setDre(paramsReportDetailVO.getDreName().replace("%","\\%"));
+		}
+
+		IPage page = new Page(pageNo, pageSize);
+		ParamsReportDetailEO paramsReportDetailEO = new ParamsReportDetailEO();
+		BeanUtils.copyProperties(paramsReportDetailVO, paramsReportDetailEO);
+		IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut);
+		return Result.OK(list);
+	}
+
+	@ApiOperation(value = "上报库参数项-常规导出")
+	@GetMapping(value = "/exportNormal")
+	@RequiresPermissions("report:detail:export:normal")
+	public void exportNormal(ParamsReportDetailVO paramsReportDetailVO,
+								   HttpServletResponse response,
+								   HttpServletRequest request) {
+		paramsReportDetailEOService.exportNormal(paramsReportDetailVO, response, request);
+	}
+
+	/**
+	 *  配置下拉选项(常规导出)
+	 *
+	 * @param paramsReportDetailVO
+	 * @return
+	 */
+	@AutoLog(value = "上报库参数项-配置下拉选项(常规导出)")
+	@ApiOperation(value="上报库参数项-配置下拉选项(常规导出)", notes="上报库参数项-配置下拉选项(常规导出)")
+	@GetMapping(value = "/getConfigLabelList")
+	@RequiresPermissions("report:detail:export:normal")
+	public Result<?> getConfigLableList(ParamsReportDetailVO paramsReportDetailVO) {
+		List<Map<String, String>> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO);
+		return Result.OK(configLabelList);
+	}
+
+	/**
+	 *  配置下拉选项(自定义导出)
+	 *
+	 * @param paramsReportDetailVO
+	 * @return
+	 */
+	@AutoLog(value = "上报库参数项-配置下拉选项(自定义导出)")
+	@ApiOperation(value="上报库参数项-配置下拉选项(自定义导出)", notes="上报库参数项-配置下拉选项(自定义导出)")
+	@GetMapping(value = "/getConfigLabelListCustom")
+	@RequiresPermissions("report:detail:export:custom")
+	public Result<?> getConfigLableListCustom(ParamsReportDetailVO paramsReportDetailVO) {
+		List<Map<String, String>> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO);
+		return Result.OK(configLabelList);
+	}
+
+	/**
+	 *  导出模板下拉选项
+	 *
+	 * @param
+	 * @return
+	 */
+	@AutoLog(value = "上报库参数项-导出模板下拉选项")
+	@ApiOperation(value="上报库参数项-导出模板下拉选项", notes="上报库参数项-导出模板下拉选项")
+	@GetMapping(value = "/getTemplateLabelList")
+	@RequiresPermissions("report:detail:export:custom")
+	public Result<?> getTemplateLabelList() {
+		List<Map<String, String>> templateLabelList = paramsReportDetailEOService.getTemplateLabelList();
+		return Result.OK(templateLabelList);
+	}
+
+	@ApiOperation(value = "上报库参数项-自定义导出")
+	@GetMapping(value = "/exportCustom")
+	@RequiresPermissions("report:detail:export:custom")
+	public void exportCustom(ParamsReportDetailVO paramsReportDetailVO,
+								   HttpServletResponse response,
+								   HttpServletRequest request) {
+		// 判断模板类型是word 还是 excel
+		ParamsExportTemplateEO paramsExportTemplateEO = paramsExportTemplateEOService.getById(paramsReportDetailVO.getExportTemplateId());
+		List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(paramsExportTemplateEO.getFileConnectId());
+		if (CollectionUtil.isNotEmpty(ossFiles)) {
+			String fileName = ossFiles.get(0).getFileName();
+			String templateFileType = fileName.substring(fileName.lastIndexOf("."));
+			if (".doc,.DOC,.docx,.DOCX".contains(templateFileType)) {
+				paramsReportDetailEOService.exportCustomWord(paramsReportDetailVO, response, request);
+
+			} else if (".xls, .XLS,.xlsx,.XLSX".contains(templateFileType)) {
+				paramsReportDetailEOService.exportCustomExcel(paramsReportDetailVO, response, request);
+
+			}
+		} else {
+			throw new JeroBootException("没有找到导出模板！");
+
+		}
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "上报库参数配置-查看单个详情")
+	@ApiOperation(value="上报库参数配置-查看单个详情", notes="上报库参数配置-查看单个详情")
+	@GetMapping(value = "/getConfig")
+	 @RequiresPermissions("report:detail:list")
+	public Result<ParamsReportConfigEO> getById(@RequestParam(name = "id") String id) {
+		ParamsReportConfigEO paramsReportConfigEO = paramsReportConfigEOService.getById(id);
+		return Result.OK(paramsReportConfigEO);
+	}
+
+	/**
+	 * 暂存
+	 *
+	 * @param paramsReportDetailVO
+	 * @return
+	 */
+	@AutoLog(value = "上报库参数项-保存")
+	@ApiOperation(value="参数项收集清单-保存", notes="参数项收集清单-保存")
+	@PostMapping(value = "/save")
+	@RequiresPermissions("report:detail:export:save")
+	public Result<?> save(@RequestBody ParamsReportDetailVO paramsReportDetailVO) {
+		boolean isSuccess = paramsReportDetailEOService.save(paramsReportDetailVO.getConfigDataList(), paramsReportDetailVO.getParamsManifestId());
+		if (isSuccess) {
+			return Result.OK("保存成功！");
+		} else {
+			return Result.error("保存失败！");
+		}
+	}
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java

@@ -0,0 +1,222 @@
+package com.jero.modules.cert.report.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.cert.report.entity.ParamsReportEO;
+import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
+import com.jero.modules.cert.report.service.IParamsReportEOService;
+import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
+import com.jero.modules.system.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+
+ /**
+ * @Description: 上报库
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+@Api(tags="上报库")
+@RestController
+@RequestMapping("/params/report")
+@Slf4j
+public class ParamsReportEOController extends JeroController<ParamsReportEO, IParamsReportEOService> {
+	@Autowired
+	private IParamsReportEOService paramsReportEOService;
+
+	@Autowired
+	private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param paramsReportEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "上报库-分页列表查询")
+	@ApiOperation(value="上报库-分页列表查询", notes="上报库-分页列表查询")
+	@GetMapping(value = "/page")
+	@RequiresPermissions("params:report:page")
+	public Result<?> queryPageList(ParamsReportEO paramsReportEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		if (StringUtils.isNotEmpty(paramsReportEO.getProjectName())) {
+			paramsReportEO.setProjectName(paramsReportEO.getProjectName().replace("%", "\\%"));
+		}
+
+		if (StringUtils.isNotEmpty(paramsReportEO.getTitle())) {
+			paramsReportEO.setTitle(paramsReportEO.getTitle().replace("%", "\\%"));
+		}
+
+		IPage page = new Page(pageNo, pageSize);
+		IPage pageList = paramsReportEOService.pageInfo(page, paramsReportEO);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param paramsReportExportHistoryEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@AutoLog(value = "上报库-导出历史分页查询")
+	@ApiOperation(value="上报库-导出历史分页查询", notes="上报库-导出历史分页查询")
+	@GetMapping(value = "/exportHistoryPage")
+	@RequiresPermissions("params:report:history")
+	public Result<?> exportHistoryPage(ParamsReportExportHistoryEO paramsReportExportHistoryEO,
+									   @RequestParam(name="cut") String cut,
+									   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		if (StringUtils.isNotEmpty(paramsReportExportHistoryEO.getProjectName())) {
+			paramsReportExportHistoryEO.setProjectName(paramsReportExportHistoryEO.getProjectName().replace("%", "\\%"));
+		}
+
+		if (StringUtils.isNotEmpty(paramsReportExportHistoryEO.getTitle())) {
+			paramsReportExportHistoryEO.setTitle(paramsReportExportHistoryEO.getTitle().replace("%", "\\%"));
+		}
+
+		IPage page = new Page(pageNo, pageSize);
+		IPage pageList = paramsReportExportHistoryEOService.queryPage(page, paramsReportExportHistoryEO, cut);
+		return Result.OK(pageList);
+	}
+
+	 /**
+	  *   通过id删除
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "上报库-通过id删除")
+	 @ApiOperation(value="上报库-通过id删除", notes="上报库-通过id删除")
+	 @GetMapping(value = "/delete")
+	 @RequiresPermissions("params:report:delete")
+	 public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		 boolean isSuccess = paramsReportEOService.deleteById(id);
+		 if (isSuccess) {
+			 return Result.OK("删除成功!");
+		 } else {
+			 return Result.error("删除失败！");
+		 }
+	 }
+
+
+
+
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "上报库-列表查询")
+    @ApiOperation(value="上报库-列表查询", notes="上报库-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ParamsReportEO>> queryList() {
+        List<ParamsReportEO> list = paramsReportEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param paramsReportEO
+	 * @return
+	 */
+	@AutoLog(value = "上报库-添加")
+	@ApiOperation(value="上报库-添加", notes="上报库-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ParamsReportEO paramsReportEO) {
+		paramsReportEOService.add(paramsReportEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param paramsReportEO
+	 * @return
+	 */
+	@AutoLog(value = "上报库-编辑")
+	@ApiOperation(value="上报库-编辑", notes="上报库-编辑")
+	@PostMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ParamsReportEO paramsReportEO) {
+		paramsReportEOService.editById(paramsReportEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "上报库-批量删除")
+	@ApiOperation(value="上报库-批量删除", notes="上报库-批量删除")
+	@PostMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.paramsReportEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "上报库-通过id查询")
+	@ApiOperation(value="上报库-通过id查询", notes="上报库-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ParamsReportEO paramsReportEO = paramsReportEOService.queryById(id);
+		if(paramsReportEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(paramsReportEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param paramsReportEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ParamsReportEO paramsReportEO) {
+        return super.exportXls(request, paramsReportEO, ParamsReportEO.class, "上报库");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ParamsReportEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java

@@ -0,0 +1,170 @@
+package com.jero.modules.cert.report.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
+import com.jero.modules.cert.report.service.IReportCertCategoryParamsInfoEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 上报库认证类别参数信息
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+@Api(tags="上报库认证类别参数信息")
+@RestController
+@RequestMapping("/cert.report/reportCertCategoryParamsInfoEO")
+@Slf4j
+public class ReportCertCategoryParamsInfoEOController extends JeroController<ReportCertCategoryParamsInfoEO, IReportCertCategoryParamsInfoEOService> {
+	@Autowired
+	private IReportCertCategoryParamsInfoEOService reportCertCategoryParamsInfoEOService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param reportCertCategoryParamsInfoEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "上报库认证类别参数信息-分页列表查询")
+	@ApiOperation(value="上报库认证类别参数信息-分页列表查询", notes="上报库认证类别参数信息-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ReportCertCategoryParamsInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(reportCertCategoryParamsInfoEO, req.getParameterMap());
+		Page<ReportCertCategoryParamsInfoEO> page = new Page<ReportCertCategoryParamsInfoEO>(pageNo, pageSize);
+		IPage<ReportCertCategoryParamsInfoEO> pageList = reportCertCategoryParamsInfoEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "上报库认证类别参数信息-列表查询")
+    @ApiOperation(value="上报库认证类别参数信息-列表查询", notes="上报库认证类别参数信息-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ReportCertCategoryParamsInfoEO>> queryList() {
+        List<ReportCertCategoryParamsInfoEO> list = reportCertCategoryParamsInfoEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param reportCertCategoryParamsInfoEO
+	 * @return
+	 */
+	@AutoLog(value = "上报库认证类别参数信息-添加")
+	@ApiOperation(value="上报库认证类别参数信息-添加", notes="上报库认证类别参数信息-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
+		reportCertCategoryParamsInfoEOService.add(reportCertCategoryParamsInfoEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param reportCertCategoryParamsInfoEO
+	 * @return
+	 */
+	@AutoLog(value = "上报库认证类别参数信息-编辑")
+	@ApiOperation(value="上报库认证类别参数信息-编辑", notes="上报库认证类别参数信息-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
+		reportCertCategoryParamsInfoEOService.editById(reportCertCategoryParamsInfoEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "上报库认证类别参数信息-通过id删除")
+	@ApiOperation(value="上报库认证类别参数信息-通过id删除", notes="上报库认证类别参数信息-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		reportCertCategoryParamsInfoEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "上报库认证类别参数信息-批量删除")
+	@ApiOperation(value="上报库认证类别参数信息-批量删除", notes="上报库认证类别参数信息-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.reportCertCategoryParamsInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "上报库认证类别参数信息-通过id查询")
+	@ApiOperation(value="上报库认证类别参数信息-通过id查询", notes="上报库认证类别参数信息-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO = reportCertCategoryParamsInfoEOService.queryById(id);
+		if(reportCertCategoryParamsInfoEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(reportCertCategoryParamsInfoEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param reportCertCategoryParamsInfoEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
+        return super.exportXls(request, reportCertCategoryParamsInfoEO, ReportCertCategoryParamsInfoEO.class, "上报库认证类别参数信息");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ReportCertCategoryParamsInfoEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java

@@ -0,0 +1,94 @@
+package com.jero.modules.cert.report.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;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 参数导出模板表
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_export_template")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_export_template对象", description="参数导出模板表")
+public class ParamsExportTemplateEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "最新变更时间")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**模板名称*/
+	@Excel(name = "模板名称", width = 15)
+    @ApiModelProperty(value = "模板名称")
+    private String templateName;
+
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private String state;
+
+	/**内容说明*/
+	@Excel(name = "内容说明", width = 15)
+    @ApiModelProperty(value = "内容说明")
+    private String description;
+
+	/**附件上传*/
+	@Excel(name = "附件上传", width = 15)
+    @ApiModelProperty(value = "附件上传")
+    private String fileConnectId;
+
+    @TableField(exist = false)
+    private String cut;
+
+    @TableField(exist = false)
+    private String state_dictText;
+
+    //排序
+    @TableField(exist = false)
+    private String orderBy; // 顺序 1-升序， 2-降序
+    @TableField(exist = false)
+    private String orderByField; // 字段
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java

@@ -0,0 +1,27 @@
+package com.jero.modules.cert.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 上报库参数配置数据
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_report_config_data")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_report_config_data对象", description="上报库参数配置数据")
+public class ParamsReportConfigDataEO extends ParamsConfigDataEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java

@@ -0,0 +1,34 @@
+package com.jero.modules.cert.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 上报库参数配置
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_report_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_report_config对象", description="上报库参数配置")
+public class ParamsReportConfigEO extends ParamsConfigEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**收集库参数配置id*/
+    @Excel(name = "收集库参数配置id", width = 15)
+    @ApiModelProperty(value = "收集库参数配置id")
+    private String oldParamsConfigId;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java

@@ -0,0 +1,38 @@
+package com.jero.modules.cert.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestBaseEO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 上报库参数项
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_report_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_report_detail对象", description="上报库参数项")
+public class ParamsReportDetailEO extends ParamsCollectManifestBaseEO implements Serializable {
+//    private static final long serialVersionUID = 1L;
+
+	/**同步时间*/
+	@Excel(name = "同步时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "同步时间")
+    private java.util.Date syncTime;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java

@@ -0,0 +1,78 @@
+package com.jero.modules.cert.report.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 上报库
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_report")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_report对象", description="上报库")
+public class ParamsReportEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+    /**收集库参数清单id*/
+    @Excel(name = "收集库参数清单id", width = 15)
+    @ApiModelProperty(value = "收集库参数清单id")
+    private String oldParamsManifestId;
+
+    @ApiModelProperty(value = "版本")
+    private Integer version;
+
+    @ApiModelProperty(value = "对应参数模板发布版本")
+    private Integer paramsTemplatePublishVersion;
+
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    @ApiModelProperty(value = "清单标题")
+    private String title;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java

@@ -0,0 +1,98 @@
+package com.jero.modules.cert.report.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+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 lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 上报库导出历史
+ * @Author: jero-boot
+ * @Date:   2022-07-04
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_report_export_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_report_export_history对象", description="上报库导出历史")
+public class ParamsReportExportHistoryEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**上报库id*/
+	@Excel(name = "上报库id", width = 15)
+    @ApiModelProperty(value = "上报库id")
+    private String paramsManifestId;
+
+	/**导出类型*/
+	@Excel(name = "导出类型", width = 15)
+    @ApiModelProperty(value = "导出类型")
+    private String exportType;
+
+	/**导出时间*/
+	@Excel(name = "导出时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "导出时间")
+    private java.util.Date exportTime;
+
+	/**导出文件id*/
+	@Excel(name = "导出文件id", width = 15)
+    @ApiModelProperty(value = "导出文件id")
+    private String exportFileId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "导出文件名称")
+    private String exportFileName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "清单标题")
+    private String title;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java

@@ -0,0 +1,36 @@
+package com.jero.modules.cert.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 上报库认证类别参数信息
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("report_cert_category_params_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="report_cert_category_params_info对象", description="上报库认证类别参数信息")
+public class ReportCertCategoryParamsInfoEO extends CertCategoryParamsInfoEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**发布时版本*/
+    @ApiModelProperty(value = "发布时版本")
+    private Integer version;
+
+    /**上报库id*/
+    @ApiModelProperty(value = "上报库id")
+    private String paramsManifestId;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java

@@ -0,0 +1,64 @@
+package com.jero.modules.cert.report.enums;
+
+import com.jero.common.constant.enums.CutEnum;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 11:29 2022/5/18
+ */
+public enum ExportTemplateStateEnum {
+    ENABLE("启用","0","Enable"),
+    DISABLE("禁用","1","Disable");
+
+    String name;
+    String value;
+    String enName;
+
+    ExportTemplateStateEnum(String name, String value, String enName) {
+        this.name = name;
+        this.value = value;
+        this.enName = enName;
+    }
+
+    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;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public static Map<String,String> toMap(String cut){
+        Map<String,String> map = new HashMap<>();
+        if (CutEnum.CN.getValue().equals(cut)) {
+            for (ExportTemplateStateEnum exportTemplateStateEnum : ExportTemplateStateEnum.values()) {
+                map.put(exportTemplateStateEnum.getValue(), exportTemplateStateEnum.getName());
+            }
+        } else if (CutEnum.EN.getValue().equals(cut)) {
+            for (ExportTemplateStateEnum exportTemplateStateEnum : ExportTemplateStateEnum.values()) {
+                map.put(exportTemplateStateEnum.getValue(), exportTemplateStateEnum.getEnName());
+            }
+        }
+        return map;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java

@@ -0,0 +1,59 @@
+package com.jero.modules.cert.report.enums;
+
+import com.jero.common.constant.enums.CutEnum;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ExportTypeEnum {
+    NORMAL("常规导出","1","Normal export"),
+    CUSTOM("自定义导出","2","Custom export");
+
+    String name;
+    String value;
+    String enName;
+
+    ExportTypeEnum(String name, String value, String enName) {
+        this.name = name;
+        this.value = value;
+        this.enName = enName;
+    }
+
+    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;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public static Map<String,String> toMap(String cut){
+        Map<String,String> map = new HashMap<>();
+        if (CutEnum.CN.getValue().equals(cut)) {
+            for (ExportTypeEnum exportTypeEnum : ExportTypeEnum.values()) {
+                map.put(exportTypeEnum.getValue(), exportTypeEnum.getName());
+            }
+        } else if (CutEnum.EN.getValue().equals(cut)) {
+            for (ExportTypeEnum exportTypeEnum : ExportTypeEnum.values()) {
+                map.put(exportTypeEnum.getValue(), exportTypeEnum.getEnName());
+            }
+        }
+        return map;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java

@@ -0,0 +1,14 @@
+package com.jero.modules.cert.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
+
+/**
+ * @Description: 参数导出模板表
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface ParamsExportTemplateEOMapper extends BaseMapper<ParamsExportTemplateEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java

@@ -0,0 +1,19 @@
+package com.jero.modules.cert.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Description: 上报库参数配置数据
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface ParamsReportConfigDataEOMapper extends BaseMapper<ParamsReportConfigDataEO> {
+
+    List<ParamsReportConfigDataEO> selectByConfigIdListAndCollectManifestId(@Param("configIdList") List<String> configIdList,
+                                                                            @Param("paramsCollectManifestId") String paramsCollectManifestId);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java

@@ -0,0 +1,14 @@
+package com.jero.modules.cert.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
+
+/**
+ * @Description: 上报库参数配置
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface ParamsReportConfigEOMapper extends BaseMapper<ParamsReportConfigEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java

@@ -0,0 +1,27 @@
+package com.jero.modules.cert.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
+import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 上报库参数项
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface ParamsReportDetailEOMapper extends BaseMapper<ParamsReportDetailEO> {
+
+    List<ParamsReportDetailEO> listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
+
+    IPage pageInfo(@Param("page") IPage page, @Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
+
+    List<Map<String, Object>> listInfoForExport(@Param("idList") List<String> idList,
+                                                @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO);
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java

@@ -0,0 +1,18 @@
+package com.jero.modules.cert.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.cert.report.entity.ParamsReportEO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description: 上报库
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface ParamsReportEOMapper extends BaseMapper<ParamsReportEO> {
+
+    IPage pageInfo(@Param("page") IPage page, @Param("paramsReportEO") ParamsReportEO paramsReportEO);
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.cert.report.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 上报库导出历史
+ * @Author: jero-boot
+ * @Date:   2022-07-04
+ * @Version: V1.0
+ */
+public interface ParamsReportExportHistoryEOMapper extends BaseMapper<ParamsReportExportHistoryEO> {
+
+    IPage pageInfo(@Param("page") IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java

@@ -0,0 +1,14 @@
+package com.jero.modules.cert.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
+
+/**
+ * @Description: 上报库认证类别参数信息
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface ReportCertCategoryParamsInfoEOMapper extends BaseMapper<ReportCertCategoryParamsInfoEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.report.mapper.ParamsExportTemplateEOMapper">
+    <resultMap id="ParamsExportTemplateEOResultMap" type="com.jero.modules.cert.report.entity.ParamsExportTemplateEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="template_name" property="templateName" />
+        <result column="state" property="state" />
+        <result column="description" property="description" />
+        <result column="file_connect_id" property="fileConnectId" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportConfigDataEOMapper">
+    <resultMap id="ParamsReportConfigDataEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportConfigDataEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="text_data" property="textData" />
+        <result column="pull_data" property="pullData" />
+        <result column="file_connect_id" property="fileConnectId" />
+        <result column="params_config_id" property="paramsConfigId" />
+        <result column="params_collect_manifest_id" property="paramsCollectManifestId" />
+    </resultMap>
+
+    <select id="selectByConfigIdListAndCollectManifestId" resultMap="ParamsReportConfigDataEOResultMap">
+        select *
+        from params_report_config_data prcd
+        left join params_report_config prc on prcd.params_config_id = prc.id
+        where prcd.params_collect_manifest_id = #{paramsCollectManifestId}
+            and prcd.params_config_id in
+            <foreach collection="configIdList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        order by prc.display_seq asc
+    </select>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportConfigEOMapper">
+    <resultMap id="ParamsReportConfigEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportConfigEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="config_name" property="configName" />
+        <result column="car_type" property="carType" />
+        <result column="version" property="version" />
+        <result column="battery" property="battery" />
+        <result column="motor" property="motor" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="is_lock" property="isLock" />
+        <result column="display_seq" property="displaySeq" />
+        <result column="old_params_config_id" property="oldParamsConfigId" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper">
+    <resultMap id="ParamsReportDetailEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportDetailEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="cert_category" property="certCategory" />
+        <result column="nio_number" property="nioNumber" />
+        <result column="is_must" property="isMust" />
+        <result column="params_name" property="paramsName" />
+        <result column="technology_territory" property="technologyTerritory" />
+        <result column="params_batch" property="paramsBatch" />
+        <result column="duty_territory" property="dutyTerritory" />
+        <result column="description" property="description" />
+        <result column="control_type" property="controlType" />
+        <result column="control_values" property="controlValues" />
+        <result column="control_verify" property="controlVerify" />
+        <result column="file_template_connect_id" property="fileTemplateConnectId" />
+        <result column="params_template_id" property="paramsTemplateId" />
+        <result column="state" property="state" />
+        <result column="sdt" property="sdt" />
+        <result column="dre" property="dre" />
+        <result column="deadline" property="deadline" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="sync_time" property="syncTime" />
+        <result column="title_default_value" property="titleDefaultValue" />
+    </resultMap>
+
+    <sql id="BaseQuerySql">
+        <where>
+            <if test="paramsReportDetailEO != null">
+                <if test="paramsReportDetailEO.nioNumber !=null and paramsReportDetailEO.nioNumber !=''">
+                    AND nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.nioNumber}),'%')
+                </if>
+                <if test="paramsReportDetailEO.paramsName !=null and paramsReportDetailEO.paramsName !=''">
+                    AND params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.paramsName}),'%')
+                </if>
+                <if test="paramsReportDetailEO.certCategory !=null and paramsReportDetailEO.certCategory !=''">
+                    AND
+                    <foreach collection="paramsReportDetailEO.certCategory.split(',')" index="" item="item" open="(" close=")" separator="or">
+                        cert_category LIKE CONCAT(CONCAT('%',#{item}),'%')
+                    </foreach>
+                </if>
+                <if test="paramsReportDetailEO.sdt !=null and paramsReportDetailEO.sdt !=''">
+                    AND sdt in
+                    <foreach collection="paramsReportDetailEO.sdt.split(',')" index="" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
+                <if test="paramsReportDetailEO.dre !=null and paramsReportDetailEO.dre !=''">
+                    AND dre in
+                    <foreach collection="paramsReportDetailEO.dre.split(',')" index="" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
+                <if test="paramsReportDetailEO.paramsManifestId !=null and paramsReportDetailEO.paramsManifestId !=''">
+                    AND params_manifest_id = #{paramsReportDetailEO.paramsManifestId}
+                </if>
+
+            </if>
+        </where>
+    </sql>
+
+    <sql id="BaseQuerySqlForExport">
+        <where>
+            <if test="paramsReportDetailVO != null">
+                <if test="paramsReportDetailVO.nioNumber !=null and paramsReportDetailVO.nioNumber !=''">
+                    AND prd.nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.nioNumber}),'%')
+                </if>
+                <if test="paramsReportDetailVO.paramsName !=null and paramsReportDetailVO.paramsName !=''">
+                    AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.paramsName}),'%')
+                </if>
+                <if test="paramsReportDetailVO.certCategory !=null and paramsReportDetailVO.certCategory !=''">
+                    AND rccpi.cert_category = #{paramsReportDetailVO.certCategory}
+                </if>
+                <if test="paramsReportDetailVO.paramsTemplatePublishVersion !=null and paramsReportDetailVO.paramsTemplatePublishVersion !=''">
+                    AND rccpi.version = #{paramsReportDetailVO.paramsTemplatePublishVersion}
+                </if>
+                <if test="paramsReportDetailVO.sdt !=null and paramsReportDetailVO.sdt !=''">
+                    AND prd.sdt LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.sdt}),'%')
+                </if>
+                <if test="paramsReportDetailVO.dre !=null and paramsReportDetailVO.dre !=''">
+                    AND prd.dre LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.dre}),'%')
+                </if>
+                <if test="paramsReportDetailVO.paramsManifestId !=null and paramsReportDetailVO.paramsManifestId !=''">
+                    AND prd.params_manifest_id = #{paramsReportDetailVO.paramsManifestId}
+                </if>
+
+            </if>
+        </where>
+    </sql>
+
+    <select id="listInfo" resultMap="ParamsReportDetailEOResultMap">
+        select *
+        from params_report_detail
+        <include refid="BaseQuerySql"/>
+        order by nio_number asc, sync_time desc
+    </select>
+
+    <select id="pageInfo" resultMap="ParamsReportDetailEOResultMap">
+        select *
+        from params_report_detail
+        <include refid="BaseQuerySql"/>
+        order by sync_time desc, nio_number asc
+    </select>
+
+    <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
+        select
+        prd.id as id,
+        prd.nio_number as nio_number,
+        prd.params_name as params_name,
+        prd.control_type as control_type,
+        prd.title_default_value as title_default_value,
+        rccpi.params_number as cert_number,
+        rccpi.params_name as cert_params_name
+        from params_report_detail prd
+        left join report_cert_category_params_info rccpi on (prd.params_manifest_id = rccpi.params_manifest_id  and prd.nio_number = rccpi.nio_number)
+        <include refid="BaseQuerySqlForExport"/>
+        <if test="idList != null and idList.size > 0">
+            and prd.id in
+            <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        order by prd.sync_time desc, prd.nio_number ASC
+    </select>
+
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportEOMapper">
+    <resultMap id="ParamsReportEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="title" property="title" />
+        <result column="version" property="version" />
+        <result column="project_name" property="projectName" />
+        <result column="old_params_manifest_id" property="oldParamsManifestId" />
+        <result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
+        <result column="project_name" property="projectName" />
+        <result column="title" property="title" />
+    </resultMap>
+
+    <sql id="BaseColumnList">
+        pr.id as id,
+        pr.old_params_manifest_id as old_params_manifest_id,
+        pr.version as version,
+        pr.params_template_publish_version as params_template_publish_version,
+        pr.create_by as create_by,
+        pr.create_time as create_time,
+        pr.update_by as update_by,
+        pr.update_time as update_time,
+        if (pm.title is not null, pm.title, pr.title) as title,
+        if (pni.project_name is not null, concat(pni.project_name,'-', pyni.year_name), pr.project_name) as project_name
+    </sql>
+
+    <sql id="BaseQuerySql">
+        <where>
+            <if test="paramsReportEO != null">
+                <if test="paramsReportEO.title !=null and paramsReportEO.title !=''">
+                    AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.title}),'%')
+                </if>
+                <if test="paramsReportEO.projectName !=null and paramsReportEO.projectName !=''">
+                    AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportEO.projectName}),'%')
+                </if>
+            </if>
+        </where>
+    </sql>
+
+    <select id="pageInfo" resultMap="ParamsReportEOResultMap">
+        select tmp_tb.* from(
+        select <include refid="BaseColumnList"/>
+        from params_report pr
+        left join params_manifest as pm on pm.id = pr.old_params_manifest_id
+        left join project_library_base as plb on plb.id = pm.project_id
+        left join project_name_info as pni on plb.project_name_id = pni.id
+        left join project_year_name_info as pyni on plb.year_name_id=pyni.id
+        ) tmp_tb
+        <include refid="BaseQuerySql"/>
+        order by create_time desc
+    </select>
+
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportExportHistoryEOMapper">
+    <resultMap id="ParamsReportExportHistoryEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="export_type" property="exportType" />
+        <result column="export_time" property="exportTime" />
+        <result column="export_file_id" property="exportFileId" />
+    </resultMap>
+
+    <sql id="BaseColumnList">
+        preh.id as id,
+        preh.export_type as export_type,
+        preh.export_time as export_time,
+        preh.export_file_id as export_file_id,
+        preh.params_manifest_id as params_manifest_id,
+        pr.create_by as create_by,
+        pr.create_time as create_time,
+        pr.update_by as update_by,
+        pr.update_time as update_time,
+        pm.title as title,
+        concat(pni.project_name,'-',pyni.year_name) as project_name
+    </sql>
+
+    <sql id="BaseQuerySql">
+        <where>
+            <if test="paramsReportExportHistoryEO != null">
+                <if test="paramsReportExportHistoryEO.projectName !=null and paramsReportExportHistoryEO.projectName !=''">
+                    AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.projectName}),'%')
+                </if>
+                <if test="paramsReportExportHistoryEO.title !=null and paramsReportExportHistoryEO.title !=''">
+                    AND title LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.title}),'%')
+                </if>
+                <if test="paramsReportExportHistoryEO.paramsManifestId !=null and paramsReportExportHistoryEO.paramsManifestId !=''">
+                    AND params_manifest_id = #{paramsReportExportHistoryEO.paramsManifestId}
+                </if>
+            </if>
+        </where>
+    </sql>
+
+    <select id="pageInfo" resultMap="ParamsReportExportHistoryEOResultMap">
+        select tmp_tb.* from(
+        select <include refid="BaseColumnList"/>
+        from params_report_export_history preh
+        left join params_report as pr on pr.id = preh.params_manifest_id
+        left join params_manifest as pm on pm.id = pr.old_params_manifest_id
+        left join project_library_base as plb on plb.id = pm.project_id
+        left join project_name_info as pni on plb.project_name_id = pni.id
+        left join project_year_name_info as pyni on plb.year_name_id = pyni.id
+        ) tmp_tb
+        <include refid="BaseQuerySql"/>
+        order by export_time desc
+    </select>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.report.mapper.ReportCertCategoryParamsInfoEOMapper">
+    <resultMap id="ReportCertCategoryParamsInfoEOResultMap" type="com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="params_number" property="paramsNumber" />
+        <result column="params_name" property="paramsName" />
+        <result column="description" property="description" />
+        <result column="nio_number" property="nioNumber" />
+        <result column="cert_category" property="certCategory" />
+        <result column="params_template_id" property="paramsTemplateId" />
+        <result column="version" property="version" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java

@@ -0,0 +1,63 @@
+package com.jero.modules.cert.report.service;
+
+import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 参数导出模板表
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface IParamsExportTemplateEOService extends IService<ParamsExportTemplateEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsExportTemplateEO
+	 * @return
+	 */
+    boolean add(ParamsExportTemplateEO paramsExportTemplateEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsExportTemplateEO
+	 * @return
+	 */
+    boolean editById(ParamsExportTemplateEO paramsExportTemplateEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	boolean deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	boolean deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsExportTemplateEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsExportTemplateEO> queryList();
+
+    boolean verifyTemplateName(String templateName);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java

@@ -0,0 +1,40 @@
+package com.jero.modules.cert.report.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
+
+import java.util.List;
+
+/**
+ * @Description: 上报库参数配置数据
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface IParamsReportConfigDataEOService extends IService<ParamsReportConfigDataEO> {
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param paramsConfigId
+	 * @param paramsCollectManifestId
+	 * @return
+	 */
+	ParamsReportConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
+
+	List<ParamsReportConfigDataEO> queryByConfigIdListAndCollectManifestId(List<String> paramsConfigIdList, String paramsCollectManifestId);
+
+	/**
+	 * 查询清单的所有配置数据
+	 * @param configIdList
+	 * @return
+	 */
+	List<ParamsReportConfigDataEO> queryListByConfigIdList(List<String> configIdList);
+
+	/**
+	 * 批量删除清单的所有配置数据
+	 * @param paramsReportDetailIdList
+	 * @return
+	 */
+	int deleteByParamsReportDetailIdList(List<String> paramsReportDetailIdList);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java

@@ -0,0 +1,22 @@
+package com.jero.modules.cert.report.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
+
+import java.util.List;
+
+/**
+ * @Description: 上报库参数配置
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface IParamsReportConfigEOService extends IService<ParamsReportConfigEO> {
+
+	/**
+	 * 列表查询
+	 * @param paramsManifestId
+	 * @return
+	 */
+	List<ParamsReportConfigEO> queryList(String paramsManifestId);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java

@@ -0,0 +1,64 @@
+package com.jero.modules.cert.report.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
+import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 上报库参数项
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface IParamsReportDetailEOService extends IService<ParamsReportDetailEO> {
+
+	/**
+	 * 列表查询
+	 * @param page
+	 * @param paramsReportDetailEO
+	 * @param cut
+	 * @return
+	 */
+	IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut);
+
+	/**
+	 * 列表表头中英文切换
+	 * @param paramsManifestId
+	 * @param flag
+	 * @param cut
+	 * @return
+	 */
+	List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut);
+
+	/**
+	 * 常规导出
+	 * @param paramsReportDetailVO
+	 * @param response
+	 * @param request
+	 */
+	void exportNormal(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request);
+
+	// 配置-下拉选项
+	List<Map<String, String>> getConfigLabelList(ParamsReportDetailVO paramsReportDetailVO);
+
+	// 导出模板下拉选项
+	List<Map<String, String>> getTemplateLabelList();
+
+	// 自定义导出-word模板
+	void exportCustomWord(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request);
+
+	// 自定义导出-excel模板
+	void exportCustomExcel(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request);
+
+	// 保存
+	boolean save(List<Map<String, Object>> configDataList, String paramsManifestId);
+
+	// 删除
+	boolean deleteByIds(List<String> ids);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java

@@ -0,0 +1,71 @@
+package com.jero.modules.cert.report.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.report.entity.ParamsReportEO;
+
+import java.util.List;
+
+/**
+ * @Description: 上报库
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface IParamsReportEOService extends IService<ParamsReportEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsReportEO
+	 * @return
+	 */
+    void add(ParamsReportEO paramsReportEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsReportEO
+	 * @return
+	 */
+    void editById(ParamsReportEO paramsReportEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	boolean deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsReportEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsReportEO> queryList();
+
+	IPage pageInfo(IPage page, ParamsReportEO paramsReportEO);
+
+	boolean isSync(String oldParamsManifestId, Integer version);
+
+	ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId, Integer version);
+
+	boolean setProjectNameAndTitle(List<String> oldParamsManifestIdList);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java

@@ -0,0 +1,66 @@
+package com.jero.modules.cert.report.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 上报库导出历史
+ * @Author: jero-boot
+ * @Date:   2022-07-04
+ * @Version: V1.0
+ */
+public interface IParamsReportExportHistoryEOService extends IService<ParamsReportExportHistoryEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsReportExportHistoryEO
+	 * @return
+	 */
+    void add(ParamsReportExportHistoryEO paramsReportExportHistoryEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsReportExportHistoryEO
+	 * @return
+	 */
+    void editById(ParamsReportExportHistoryEO paramsReportExportHistoryEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsReportExportHistoryEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsReportExportHistoryEO> queryList();
+
+	IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut);
+
+	void deleteByParamsManifestId(String paramsManifestId);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java

@@ -0,0 +1,61 @@
+package com.jero.modules.cert.report.service;
+
+import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 上报库认证类别参数信息
+ * @Author: jero-boot
+ * @Date:   2022-05-18
+ * @Version: V1.0
+ */
+public interface IReportCertCategoryParamsInfoEOService extends IService<ReportCertCategoryParamsInfoEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param reportCertCategoryParamsInfoEO
+	 * @return
+	 */
+    void add(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param reportCertCategoryParamsInfoEO
+	 * @return
+	 */
+    void editById(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ReportCertCategoryParamsInfoEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ReportCertCategoryParamsInfoEO> queryList();
+}