合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!76

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -238,3 +238,87 @@ CREATE TABLE `laws_technology_evaluation`  (
    `prc_num` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程编号',
    PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估表' ROW_FORMAT = DYNAMIC;
+
+--  法规技术评估-流程明细表
+CREATE TABLE `laws_technology_evaluation_flow_detail`  (
+   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+   `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+   `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+   `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+   `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+   `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
+   `acti_proc_inst_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
+   `prc_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程编号',
+   `prc_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程名称',
+   `evaluator_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估人id',
+   PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-流程明细表' ROW_FORMAT = Dynamic;
+
+-- 工作流数据库增加数据。
+INSERT INTO `t_form` (
+    `OBJECT_ID`,`CODE`,`CREATE_TIME`,`WIDGET_JSON`,`JSON`,`NAME`,`SHOW_KEY`,`IS_DELETED`,
+    `MODEL_ID`,`JSON_EVAL`,`HTML`,`RUN_TYPE`,`CATEGORY_ID`,`HTML_READONLY`
+)
+VALUES
+(
+    'fgjspglc','0006','2022-07-11 15:45:33',NULL,NULL,'法规技术评估流程',NULL,
+    0,'15007',NULL,NULL,'json','4bdf0b396b4aa6ea10dd5e19956a1e22',NULL
+);
+
+-- 法规技术评估-条款信息评估结果表
+CREATE TABLE `laws_technology_evaluation_item_result`  (
+   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+   `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+   `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+   `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+   `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+   `item_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款id',
+   `item_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款号',
+   `item_name` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款名称',
+   `item_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款内容',
+   `evaluation_methods` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估方式',
+   `technical_file_name` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术文件名称',
+   `section` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节',
+   `opinion` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '意见',
+   `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件',
+   `compliance_result` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '符合性结果',
+   `evaluator_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估人id',
+   `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
+   `sponsor_feedback` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发起人反馈',
+   `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
+   PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-条款信息评估结果表' ROW_FORMAT = Dynamic;
+
+-- 法规技术评估-评估人反馈-符合性结果表
+CREATE TABLE `laws_technology_evaluation_compliance_result`  (
+     `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+     `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+     `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+     `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+     `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+     `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+     `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
+     `compliance_result` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '符合性结果',
+     `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
+     PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-评估人反馈-符合性结果表' ROW_FORMAT = Dynamic;
+
+-- 法规技术评估-评估结果表
+CREATE TABLE `laws_technology_evaluation_result`  (
+      `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+      `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+      `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+      `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+      `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+      `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+      `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
+      `related_section` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关章节',
+      `issue_or_suggest` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议',
+      `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '理由',
+      `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件',
+      `submit_time` datetime NULL DEFAULT NULL COMMENT '提出时间',
+      `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
+      PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-评估结果表' ROW_FORMAT = Dynamic;

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java

@@ -145,6 +145,12 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/wkflow/processHistoryEO/processCall", "anon"); // 流程历史 工作流处理数据接口排除
         filterChainDefinitionMap.put("/lawsOpinionGather/lawsOpinionGatherEO/processCall", "anon"); // 法规收集表 工作流处理数据接口排除
         filterChainDefinitionMap.put("/lawsOpinionGather/lawsProcessHistoryEO/processCall", "anon"); // 法规收集历史 工作流处理数据接口排除
+        // 法规技术评估表-流程明细 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO/processCall", "anon");
+        // 法规技术评估表 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/processCall", "anon");
+        // 法规技术评估-条款信息评估结果表 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/processCall", "anon");
         filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
 
         // 添加自己的过滤器并且取名为jwt

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java

@@ -902,6 +902,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	}
 
 	private List<Map> queryForExportCustom(ParamsReportDetailVO paramsReportDetailVO) {
+		paramsReportDetailVO.setSeparator("&"); // 设置分隔符
+
 		List<String> idList = new ArrayList<>();
 		if (StringUtils.isNotEmpty(paramsReportDetailVO.getIds())) {
 			idList = Arrays.asList(paramsReportDetailVO.getIds().split(","));

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java

@@ -0,0 +1,170 @@
+package com.jero.modules.lawsTechnologyEvaluation.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.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
+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-07-11
+ * @Version: V1.0
+ */
+@Api(tags="法规技术评估-评估人反馈-符合性结果表")
+@RestController
+@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO")
+@Slf4j
+public class LawsTechnologyEvaluationComplianceResultEOController extends JeroController<LawsTechnologyEvaluationComplianceResultEO, ILawsTechnologyEvaluationComplianceResultEOService> {
+	@Autowired
+	private ILawsTechnologyEvaluationComplianceResultEOService lawsTechnologyEvaluationComplianceResultEOService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-分页列表查询")
+	@ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-分页列表查询", notes="法规技术评估-评估人反馈-符合性结果表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsTechnologyEvaluationComplianceResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationComplianceResultEO, req.getParameterMap());
+		Page<LawsTechnologyEvaluationComplianceResultEO> page = new Page<LawsTechnologyEvaluationComplianceResultEO>(pageNo, pageSize);
+		IPage<LawsTechnologyEvaluationComplianceResultEO> pageList = lawsTechnologyEvaluationComplianceResultEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-列表查询")
+    @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-列表查询", notes="法规技术评估-评估人反馈-符合性结果表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsTechnologyEvaluationComplianceResultEO>> queryList() {
+        List<LawsTechnologyEvaluationComplianceResultEO> list = lawsTechnologyEvaluationComplianceResultEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-添加")
+	@ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-添加", notes="法规技术评估-评估人反馈-符合性结果表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) {
+		lawsTechnologyEvaluationComplianceResultEOService.add(lawsTechnologyEvaluationComplianceResultEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-编辑")
+	@ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-编辑", notes="法规技术评估-评估人反馈-符合性结果表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) {
+		lawsTechnologyEvaluationComplianceResultEOService.editById(lawsTechnologyEvaluationComplianceResultEO);
+		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) {
+		lawsTechnologyEvaluationComplianceResultEOService.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.lawsTechnologyEvaluationComplianceResultEOService.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) {
+		LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO = lawsTechnologyEvaluationComplianceResultEOService.queryById(id);
+		if(lawsTechnologyEvaluationComplianceResultEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsTechnologyEvaluationComplianceResultEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsTechnologyEvaluationComplianceResultEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) {
+        return super.exportXls(request, lawsTechnologyEvaluationComplianceResultEO, LawsTechnologyEvaluationComplianceResultEO.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, LawsTechnologyEvaluationComplianceResultEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java

@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
@@ -167,4 +169,16 @@ public class LawsTechnologyEvaluationEOController extends JeroController<LawsTec
         return super.importExcel(request, response, LawsTechnologyEvaluationEO.class);
     }
 
+	 /**
+	  * 流程调用接口
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "法规意见收集表-流程调用")
+	 @ApiOperation(value="法规意见收集表-流程调用", notes="法规意见收集细表-流程调用")
+	 @PostMapping(value = "/processCall")
+	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
+		 return this.lawsTechnologyEvaluationEOService.processCall(jsonObject);
+	 }
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java

@@ -0,0 +1,184 @@
+package com.jero.modules.lawsTechnologyEvaluation.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
+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-07-11
+ * @Version: V1.0
+ */
+@Api(tags="法规技术评估表-流程明细")
+@RestController
+@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO")
+@Slf4j
+public class LawsTechnologyEvaluationFlowDetailEOController extends JeroController<LawsTechnologyEvaluationFlowDetailEO, ILawsTechnologyEvaluationFlowDetailEOService> {
+	@Autowired
+	private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-分页列表查询")
+	@ApiOperation(value="法规技术评估表-流程明细-分页列表查询", notes="法规技术评估表-流程明细-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsTechnologyEvaluationFlowDetailEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationFlowDetailEO, req.getParameterMap());
+		Page<LawsTechnologyEvaluationFlowDetailEO> page = new Page<LawsTechnologyEvaluationFlowDetailEO>(pageNo, pageSize);
+		IPage<LawsTechnologyEvaluationFlowDetailEO> pageList = lawsTechnologyEvaluationFlowDetailEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-列表查询")
+    @ApiOperation(value="法规技术评估表-流程明细-列表查询", notes="法规技术评估表-流程明细-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsTechnologyEvaluationFlowDetailEO>> queryList() {
+        List<LawsTechnologyEvaluationFlowDetailEO> list = lawsTechnologyEvaluationFlowDetailEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-添加")
+	@ApiOperation(value="法规技术评估表-流程明细-添加", notes="法规技术评估表-流程明细-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
+		lawsTechnologyEvaluationFlowDetailEOService.add(lawsTechnologyEvaluationFlowDetailEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-编辑")
+	@ApiOperation(value="法规技术评估表-流程明细-编辑", notes="法规技术评估表-流程明细-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
+		lawsTechnologyEvaluationFlowDetailEOService.editById(lawsTechnologyEvaluationFlowDetailEO);
+		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) {
+		lawsTechnologyEvaluationFlowDetailEOService.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.lawsTechnologyEvaluationFlowDetailEOService.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) {
+		LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO = lawsTechnologyEvaluationFlowDetailEOService.queryById(id);
+		if(lawsTechnologyEvaluationFlowDetailEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsTechnologyEvaluationFlowDetailEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsTechnologyEvaluationFlowDetailEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
+        return super.exportXls(request, lawsTechnologyEvaluationFlowDetailEO, LawsTechnologyEvaluationFlowDetailEO.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, LawsTechnologyEvaluationFlowDetailEO.class);
+    }
+
+	 /**
+	  * 流程调用接口
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "法规技术评估-流程明细表-流程调用")
+	 @ApiOperation(value="法规技术评估-流程明细表-流程调用", notes="法规技术评估-流程明细表-流程调用")
+	 @PostMapping(value = "/processCall")
+	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
+		 return this.lawsTechnologyEvaluationFlowDetailEOService.processCall(jsonObject);
+	 }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java

@@ -0,0 +1,197 @@
+package com.jero.modules.lawsTechnologyEvaluation.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationItemResultEOService;
+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-07-11
+ * @Version: V1.0
+ */
+@Api(tags="法规技术评估-条款信息评估结果表")
+@RestController
+@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO")
+@Slf4j
+public class LawsTechnologyEvaluationItemResultEOController extends JeroController<LawsTechnologyEvaluationItemResultEO, ILawsTechnologyEvaluationItemResultEOService> {
+	@Autowired
+	private ILawsTechnologyEvaluationItemResultEOService lawsTechnologyEvaluationItemResultEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-分页列表查询")
+	@ApiOperation(value="法规技术评估-条款信息评估结果表-分页列表查询", notes="法规技术评估-条款信息评估结果表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsTechnologyEvaluationItemResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationItemResultEO, req.getParameterMap());
+		Page<LawsTechnologyEvaluationItemResultEO> page = new Page<LawsTechnologyEvaluationItemResultEO>(pageNo, pageSize);
+		IPage<LawsTechnologyEvaluationItemResultEO> pageList = lawsTechnologyEvaluationItemResultEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-列表查询")
+    @ApiOperation(value="法规技术评估-条款信息评估结果表-列表查询", notes="法规技术评估-条款信息评估结果表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsTechnologyEvaluationItemResultEO>> queryList() {
+        List<LawsTechnologyEvaluationItemResultEO> list = lawsTechnologyEvaluationItemResultEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-添加")
+	@ApiOperation(value="法规技术评估-条款信息评估结果表-添加", notes="法规技术评估-条款信息评估结果表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) {
+		lawsTechnologyEvaluationItemResultEOService.add(lawsTechnologyEvaluationItemResultEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-编辑")
+	@ApiOperation(value="法规技术评估-条款信息评估结果表-编辑", notes="法规技术评估-条款信息评估结果表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) {
+		lawsTechnologyEvaluationItemResultEOService.editById(lawsTechnologyEvaluationItemResultEO);
+		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) {
+		lawsTechnologyEvaluationItemResultEOService.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.lawsTechnologyEvaluationItemResultEOService.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) {
+		LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO = lawsTechnologyEvaluationItemResultEOService.queryById(id);
+		if(lawsTechnologyEvaluationItemResultEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsTechnologyEvaluationItemResultEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsTechnologyEvaluationItemResultEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) {
+        return super.exportXls(request, lawsTechnologyEvaluationItemResultEO, LawsTechnologyEvaluationItemResultEO.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, LawsTechnologyEvaluationItemResultEO.class);
+    }
+
+	 /**
+	  * 流程调用接口
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "法规技术评估-条款信息评估结果表-流程调用")
+	 @ApiOperation(value="法规技术评估-条款信息评估结果表-流程调用", notes="法规技术评估-条款信息评估结果表-流程调用")
+	 @PostMapping(value = "/processCall")
+	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
+		 return this.lawsTechnologyEvaluationItemResultEOService.processCall(jsonObject);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "法规技术评估-条款信息评估结果表-批量更新")
+	 @ApiOperation(value="法规技术评估-条款信息评估结果表-批量更新", notes="法规技术评估-条款信息评估结果表-批量更新")
+	 @PostMapping(value = "/batchUpdate")
+	 public Result<?> batchUpdate(@RequestBody JSONObject jsonObject) {
+		 this.lawsTechnologyEvaluationItemResultEOService.batchUpdate(jsonObject);
+		 return Result.OK("编辑成功!");
+	 }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java

@@ -0,0 +1,186 @@
+package com.jero.modules.lawsTechnologyEvaluation.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService;
+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-07-11
+ * @Version: V1.0
+ */
+@Api(tags="法规技术评估-评估结果表")
+@RestController
+@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO")
+@Slf4j
+public class LawsTechnologyEvaluationResultEOController extends JeroController<LawsTechnologyEvaluationResultEO, ILawsTechnologyEvaluationResultEOService> {
+	@Autowired
+	private ILawsTechnologyEvaluationResultEOService lawsTechnologyEvaluationResultEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-分页列表查询")
+	@ApiOperation(value="法规技术评估-评估结果表-分页列表查询", notes="法规技术评估-评估结果表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsTechnologyEvaluationResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationResultEO, req.getParameterMap());
+		Page<LawsTechnologyEvaluationResultEO> page = new Page<LawsTechnologyEvaluationResultEO>(pageNo, pageSize);
+		IPage<LawsTechnologyEvaluationResultEO> pageList = lawsTechnologyEvaluationResultEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-列表查询")
+    @ApiOperation(value="法规技术评估-评估结果表-列表查询", notes="法规技术评估-评估结果表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsTechnologyEvaluationResultEO>> queryList() {
+        List<LawsTechnologyEvaluationResultEO> list = lawsTechnologyEvaluationResultEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-添加")
+	@ApiOperation(value="法规技术评估-评估结果表-添加", notes="法规技术评估-评估结果表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) {
+		lawsTechnologyEvaluationResultEOService.add(lawsTechnologyEvaluationResultEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-编辑")
+	@ApiOperation(value="法规技术评估-评估结果表-编辑", notes="法规技术评估-评估结果表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) {
+		lawsTechnologyEvaluationResultEOService.editById(lawsTechnologyEvaluationResultEO);
+		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) {
+		lawsTechnologyEvaluationResultEOService.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.lawsTechnologyEvaluationResultEOService.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) {
+		LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO = lawsTechnologyEvaluationResultEOService.queryById(id);
+		if(lawsTechnologyEvaluationResultEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsTechnologyEvaluationResultEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsTechnologyEvaluationResultEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) {
+        return super.exportXls(request, lawsTechnologyEvaluationResultEO, LawsTechnologyEvaluationResultEO.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, LawsTechnologyEvaluationResultEO.class);
+    }
+
+
+	 /**
+	  *   添加
+	  *
+	  * @param json
+	  * @return
+	  */
+	 @AutoLog(value = "法规技术评估-评估结果表-批量添加")
+	 @ApiOperation(value="法规技术评估-评估结果表-批量添加", notes="法规技术评估-评估结果表-批量添加")
+	 @PostMapping(value = "/evaluatorSaveResult")
+	 public Result<?> evaluatorSaveResult(@RequestBody JSONObject json) {
+		 lawsTechnologyEvaluationResultEOService.evaluatorSaveResult(json);
+		 return Result.OK("添加成功！");
+	 }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java

@@ -0,0 +1,79 @@
+package com.jero.modules.lawsTechnologyEvaluation.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-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_technology_evaluation_compliance_result")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_technology_evaluation_compliance_result对象", description="法规技术评估-评估人反馈-符合性结果表")
+public class LawsTechnologyEvaluationComplianceResultEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.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 java.lang.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 java.lang.String sysOrgCode;
+
+	/**法规技术评估表id*/
+	@Excel(name = "法规技术评估表id", width = 15)
+    @ApiModelProperty(value = "法规技术评估表id")
+    private java.lang.String lawsTechnologyEvaluationId;
+
+	/**符合性结果*/
+	@Excel(name = "符合性结果", width = 15)
+    @ApiModelProperty(value = "符合性结果")
+    private java.lang.String complianceResult;
+
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+    private java.lang.String actiProcInstId;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java

@@ -0,0 +1,89 @@
+package com.jero.modules.lawsTechnologyEvaluation.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-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_technology_evaluation_flow_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_technology_evaluation_flow_detail对象", description="法规技术评估表-流程明细")
+public class LawsTechnologyEvaluationFlowDetailEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.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 java.lang.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 java.lang.String sysOrgCode;
+
+	/**法规技术评估表id*/
+	@Excel(name = "法规技术评估表id", width = 15)
+    @ApiModelProperty(value = "法规技术评估表id")
+    private java.lang.String lawsTechnologyEvaluationId;
+
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+    private java.lang.String actiProcInstId;
+
+	/**流程编号*/
+	@Excel(name = "流程编号", width = 15)
+    @ApiModelProperty(value = "流程编号")
+    private java.lang.String prcNum;
+
+	/**流程名称*/
+	@Excel(name = "流程名称", width = 15)
+    @ApiModelProperty(value = "流程名称")
+    private java.lang.String prcName;
+
+	/**评估人id*/
+	@Excel(name = "评估人id", width = 15)
+    @ApiModelProperty(value = "评估人id")
+    private java.lang.String evaluatorId;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java

@@ -0,0 +1,132 @@
+package com.jero.modules.lawsTechnologyEvaluation.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-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_technology_evaluation_item_result")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_technology_evaluation_item_result对象", description="法规技术评估-条款信息评估结果表")
+public class LawsTechnologyEvaluationItemResultEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.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 java.lang.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 java.lang.String sysOrgCode;
+
+	/**条款id*/
+	@Excel(name = "条款id", width = 15)
+    @ApiModelProperty(value = "条款id")
+    private java.lang.String itemId;
+
+	/**条款号*/
+	@Excel(name = "条款号", width = 15)
+    @ApiModelProperty(value = "条款号")
+    private java.lang.String itemNum;
+
+	/**条款名称*/
+	@Excel(name = "条款名称", width = 15)
+    @ApiModelProperty(value = "条款名称")
+    private java.lang.String itemName;
+
+	/**条款内容*/
+	@Excel(name = "条款内容", width = 15)
+    @ApiModelProperty(value = "条款内容")
+    private java.lang.String itemContent;
+
+	/**评估方式*/
+	@Excel(name = "评估方式", width = 15)
+    @ApiModelProperty(value = "评估方式")
+    private java.lang.String evaluationMethods;
+
+	/**技术文件名称*/
+	@Excel(name = "技术文件名称", width = 15)
+    @ApiModelProperty(value = "技术文件名称")
+    private java.lang.String technicalFileName;
+
+	/**章节*/
+	@Excel(name = "章节", width = 15)
+    @ApiModelProperty(value = "章节")
+    private java.lang.String section;
+
+	/**意见*/
+	@Excel(name = "意见", width = 15)
+    @ApiModelProperty(value = "意见")
+    private java.lang.String opinion;
+
+	/**附件*/
+	@Excel(name = "附件", width = 15)
+    @ApiModelProperty(value = "附件")
+    private java.lang.String accessoryFile;
+
+	/**符合性结果*/
+	@Excel(name = "符合性结果", width = 15)
+    @ApiModelProperty(value = "符合性结果")
+    private java.lang.String complianceResult;
+
+	/**评估人id*/
+	@Excel(name = "评估人id", width = 15)
+    @ApiModelProperty(value = "评估人id")
+    private java.lang.String evaluatorId;
+
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+    private java.lang.String actiProcInstId;
+
+	/**发起人反馈*/
+	@Excel(name = "发起人反馈", width = 15)
+    @ApiModelProperty(value = "发起人反馈")
+    private java.lang.String sponsorFeedback;
+
+    /**法规技术评估表id*/
+    @ApiModelProperty(value = "法规技术评估表id")
+    private java.lang.String lawsTechnologyEvaluationId;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java

@@ -0,0 +1,101 @@
+package com.jero.modules.lawsTechnologyEvaluation.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-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_technology_evaluation_result")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_technology_evaluation_result对象", description="法规技术评估-评估结果表")
+public class LawsTechnologyEvaluationResultEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.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 java.lang.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 java.lang.String sysOrgCode;
+
+	/**法规技术评估表id*/
+	@Excel(name = "法规技术评估表id", width = 15)
+    @ApiModelProperty(value = "法规技术评估表id")
+    private java.lang.String lawsTechnologyEvaluationId;
+
+	/**相关章节*/
+	@Excel(name = "相关章节", width = 15)
+    @ApiModelProperty(value = "相关章节")
+    private java.lang.String relatedSection;
+
+	/**问题/建议*/
+	@Excel(name = "问题/建议", width = 15)
+    @ApiModelProperty(value = "问题/建议")
+    private java.lang.String issueOrSuggest;
+
+	/**理由*/
+	@Excel(name = "理由", width = 15)
+    @ApiModelProperty(value = "理由")
+    private java.lang.String reason;
+
+	/**附件*/
+	@Excel(name = "附件", width = 15)
+    @ApiModelProperty(value = "附件")
+    private java.lang.String accessoryFile;
+
+	/**提出时间*/
+	@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 submitTime;
+
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+    private java.lang.String actiProcInstId;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java

@@ -0,0 +1,51 @@
+package com.jero.modules.lawsTechnologyEvaluation.enums;
+
+import com.alibaba.druid.util.StringUtils;
+import com.jero.common.constant.enums.CutEnum;
+
+/**
+ * 评估类型枚举类
+ */
+public enum EvaluationTypeEnum {
+    FEED_BACK("反馈评估","Feedback evaluation"),
+    ITEM("条款评估","Item evaluation"),
+    ;
+
+    String name;
+    String value;
+
+    private EvaluationTypeEnum(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;
+    }
+
+    public static String getTextByValue(String value,String cut) {
+        EvaluationTypeEnum[] values = values();
+        for (EvaluationTypeEnum certificationProgressEnum : values) {
+            if (certificationProgressEnum.value.equals(value)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return certificationProgressEnum.name;
+                }else {
+                    return certificationProgressEnum.value;
+                }
+            }
+        }
+        return null;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationComplianceResultEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.lawsTechnologyEvaluation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规技术评估-评估人反馈-符合性结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface LawsTechnologyEvaluationComplianceResultEOMapper extends BaseMapper<LawsTechnologyEvaluationComplianceResultEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.lawsTechnologyEvaluation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规技术评估表-流程明细
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface LawsTechnologyEvaluationFlowDetailEOMapper extends BaseMapper<LawsTechnologyEvaluationFlowDetailEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationItemResultEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.lawsTechnologyEvaluation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规技术评估-条款信息评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface LawsTechnologyEvaluationItemResultEOMapper extends BaseMapper<LawsTechnologyEvaluationItemResultEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationResultEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.lawsTechnologyEvaluation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规技术评估-评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface LawsTechnologyEvaluationResultEOMapper extends BaseMapper<LawsTechnologyEvaluationResultEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationComplianceResultEOMapper.xml

@@ -0,0 +1,15 @@
+<?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.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper">
+    <resultMap id="LawsTechnologyEvaluationComplianceResultEOResultMap" type="com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO">
+        <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="laws_technology_evaluation_id" property="lawsTechnologyEvaluationId" />
+        <result column="compliance_result" property="complianceResult" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.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.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationFlowDetailEOMapper">
+    <resultMap id="LawsTechnologyEvaluationFlowDetailEOResultMap" type="com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO">
+        <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="laws_technology_evaluation_id" property="lawsTechnologyEvaluationId" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+        <result column="prc_num" property="prcNum" />
+        <result column="prc_name" property="prcName" />
+        <result column="evaluator_id" property="evaluatorId" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationItemResultEOMapper.xml

@@ -0,0 +1,25 @@
+<?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.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationItemResultEOMapper">
+    <resultMap id="LawsTechnologyEvaluationItemResultEOResultMap" type="com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO">
+        <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="item_id" property="itemId" />
+        <result column="item_num" property="itemNum" />
+        <result column="item_name" property="itemName" />
+        <result column="item_content" property="itemContent" />
+        <result column="evaluation_methods" property="evaluationMethods" />
+        <result column="technical_file_name" property="technicalFileName" />
+        <result column="section" property="section" />
+        <result column="opinion" property="opinion" />
+        <result column="accessory_file" property="accessoryFile" />
+        <result column="compliance_result" property="complianceResult" />
+        <result column="evaluator_id" property="evaluatorId" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+        <result column="sponsor_feedback" property="sponsorFeedback" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationResultEOMapper.xml

@@ -0,0 +1,19 @@
+<?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.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationResultEOMapper">
+    <resultMap id="LawsTechnologyEvaluationResultEOResultMap" type="com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO">
+        <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="laws_technology_evaluation_id" property="lawsTechnologyEvaluationId" />
+        <result column="related_section" property="relatedSection" />
+        <result column="issue_or_suggest" property="issueOrSuggest" />
+        <result column="reason" property="reason" />
+        <result column="accessory_file" property="accessoryFile" />
+        <result column="submit_time" property="submitTime" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java

@@ -0,0 +1,61 @@
+package com.jero.modules.lawsTechnologyEvaluation.service;
+
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 法规技术评估-评估人反馈-符合性结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface ILawsTechnologyEvaluationComplianceResultEOService extends IService<LawsTechnologyEvaluationComplianceResultEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+    void add(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+    void editById(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsTechnologyEvaluationComplianceResultEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsTechnologyEvaluationComplianceResultEO> queryList();
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java

@@ -1,5 +1,7 @@
 package com.jero.modules.lawsTechnologyEvaluation.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
@@ -58,4 +60,11 @@ public interface ILawsTechnologyEvaluationEOService extends IService<LawsTechnol
 	 * @return
 	 */
     List<LawsTechnologyEvaluationEO> queryList();
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+    Result<?> processCall(JSONObject jsonObject);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java

@@ -0,0 +1,70 @@
+package com.jero.modules.lawsTechnologyEvaluation.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 法规技术评估表-流程明细
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface ILawsTechnologyEvaluationFlowDetailEOService extends IService<LawsTechnologyEvaluationFlowDetailEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+    void add(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+    void editById(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsTechnologyEvaluationFlowDetailEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsTechnologyEvaluationFlowDetailEO> queryList();
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+    Result<?> processCall(JSONObject jsonObject);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java

@@ -0,0 +1,76 @@
+package com.jero.modules.lawsTechnologyEvaluation.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 法规技术评估-条款信息评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface ILawsTechnologyEvaluationItemResultEOService extends IService<LawsTechnologyEvaluationItemResultEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+    void add(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+    void editById(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsTechnologyEvaluationItemResultEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsTechnologyEvaluationItemResultEO> queryList();
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+    Result<?> processCall(JSONObject jsonObject);
+
+	/**
+	 * 批量更新
+	 * @param jsonObject
+	 */
+	void batchUpdate(JSONObject jsonObject);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java

@@ -0,0 +1,68 @@
+package com.jero.modules.lawsTechnologyEvaluation.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 法规技术评估-评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface ILawsTechnologyEvaluationResultEOService extends IService<LawsTechnologyEvaluationResultEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+    void add(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+    void editById(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsTechnologyEvaluationResultEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsTechnologyEvaluationResultEO> queryList();
+
+	/**
+	 * 评估人保存/提交
+	 * @param json
+	 */
+    void evaluatorSaveResult(JSONObject json);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java

@@ -0,0 +1,89 @@
+package com.jero.modules.lawsTechnologyEvaluation.service.impl;
+
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
+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-11
+ * @Version: V1.0
+ */
+@Service
+public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationComplianceResultEOMapper, LawsTechnologyEvaluationComplianceResultEO> implements ILawsTechnologyEvaluationComplianceResultEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) {
+        Date now = new Date();
+        lawsTechnologyEvaluationComplianceResultEO.setCreateTime(now);
+        lawsTechnologyEvaluationComplianceResultEO.setUpdateTime(now);
+        save(lawsTechnologyEvaluationComplianceResultEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) {
+    	Date now = new Date();
+        lawsTechnologyEvaluationComplianceResultEO.setUpdateTime(now);
+    	saveOrUpdate(lawsTechnologyEvaluationComplianceResultEO);
+    }
+
+	/**
+	 * 通过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 LawsTechnologyEvaluationComplianceResultEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsTechnologyEvaluationComplianceResultEO> queryList() {
+        return list();
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java

@@ -1,9 +1,20 @@
 package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.exception.JeroBootException;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -86,4 +97,29 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
     public List<LawsTechnologyEvaluationEO> queryList() {
         return list();
     }
+
+	@Override
+	public Result<?> processCall(JSONObject jsonObject) {
+		String requestSource = jsonObject.getString("requestSource");
+		if(StringUtils.isEmpty(requestSource)){
+			throw new JeroBootException("请求来源不能为空！");
+		}
+		if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){
+			throw new JeroBootException("来源有误，没有权限调用该接口！");
+		}
+
+		String operatorType = jsonObject.getString("operatorType");
+		if(StringUtils.isEmpty(operatorType)){
+			throw new JeroBootException("操作类型不能为空！");
+		}
+		if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){
+			LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("lawsTechnologyEvaluationEO")),LawsTechnologyEvaluationEO.class);
+			this.save(lawsTechnologyEvaluationEO);
+		}else if(StringUtils.equals(operatorType,OperatorTypeEnum.UPDATE_STATUS.getValue())){
+			LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("lawsTechnologyEvaluationEO")),LawsTechnologyEvaluationEO.class);
+			this.updateById(lawsTechnologyEvaluationEO);
+		}
+
+		return new Result<>().success("调用成功！");
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java

@@ -0,0 +1,129 @@
+package com.jero.modules.lawsTechnologyEvaluation.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.exception.JeroBootException;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationFlowDetailEOMapper;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 法规技术评估表-流程明细
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Service
+public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationFlowDetailEOMapper, LawsTechnologyEvaluationFlowDetailEO> implements ILawsTechnologyEvaluationFlowDetailEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
+        Date now = new Date();
+        lawsTechnologyEvaluationFlowDetailEO.setCreateTime(now);
+        lawsTechnologyEvaluationFlowDetailEO.setUpdateTime(now);
+        save(lawsTechnologyEvaluationFlowDetailEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
+    	Date now = new Date();
+        lawsTechnologyEvaluationFlowDetailEO.setUpdateTime(now);
+    	saveOrUpdate(lawsTechnologyEvaluationFlowDetailEO);
+    }
+
+	/**
+	 * 通过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 LawsTechnologyEvaluationFlowDetailEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsTechnologyEvaluationFlowDetailEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public Result<?> processCall(JSONObject jsonObject) {
+		String requestSource = jsonObject.getString("requestSource");
+		if(StringUtils.isEmpty(requestSource)){
+			throw new JeroBootException("请求来源不能为空！");
+		}
+		if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){
+			throw new JeroBootException("来源有误，没有权限调用该接口！");
+		}
+
+		String operatorType = jsonObject.getString("operatorType");
+		if(StringUtils.isEmpty(operatorType)){
+			throw new JeroBootException("操作类型不能为空！");
+		}
+		if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){
+			JSONArray lawsTechnologyEvaluationListArray = jsonObject.getJSONArray("lawsTechnologyEvaluationList");
+			List<LawsTechnologyEvaluationFlowDetailEO> detailList = new ArrayList<>();
+			LawsTechnologyEvaluationFlowDetailEO detailEO = null;
+			for (Object lawsTechnologyEvaluation : lawsTechnologyEvaluationListArray) {
+				detailEO = JSONObject.parseObject(JSONObject.toJSONString(lawsTechnologyEvaluation),LawsTechnologyEvaluationFlowDetailEO.class);
+				detailList.add(detailEO);
+			}
+			if(CollectionUtils.isNotEmpty(detailList)){
+				this.saveBatch(detailList);
+			}
+		}
+
+		return new Result<>().success("调用成功！");
+	}
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java

@@ -0,0 +1,150 @@
+package com.jero.modules.lawsTechnologyEvaluation.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.exception.JeroBootException;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationItemResultEOMapper;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationItemResultEOService;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 法规技术评估-条款信息评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Service
+public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationItemResultEOMapper, LawsTechnologyEvaluationItemResultEO> implements ILawsTechnologyEvaluationItemResultEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) {
+        Date now = new Date();
+        lawsTechnologyEvaluationItemResultEO.setCreateTime(now);
+        lawsTechnologyEvaluationItemResultEO.setUpdateTime(now);
+        save(lawsTechnologyEvaluationItemResultEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) {
+    	Date now = new Date();
+        lawsTechnologyEvaluationItemResultEO.setUpdateTime(now);
+    	saveOrUpdate(lawsTechnologyEvaluationItemResultEO);
+    }
+
+	/**
+	 * 通过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 LawsTechnologyEvaluationItemResultEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsTechnologyEvaluationItemResultEO> queryList() {
+        return list();
+    }
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+	@Override
+	public Result<?> processCall(JSONObject jsonObject) {
+		String requestSource = jsonObject.getString("requestSource");
+		if(StringUtils.isEmpty(requestSource)){
+			throw new JeroBootException("请求来源不能为空！");
+		}
+		if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){
+			throw new JeroBootException("来源有误，没有权限调用该接口！");
+		}
+
+		String operatorType = jsonObject.getString("operatorType");
+		if(StringUtils.isEmpty(operatorType)){
+			throw new JeroBootException("操作类型不能为空！");
+		}
+		if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){
+			JSONArray itemResultEOList = jsonObject.getJSONArray("itemResultEOList");
+			List<LawsTechnologyEvaluationItemResultEO> itemResultList = new ArrayList<>();
+			LawsTechnologyEvaluationItemResultEO itemResultEO = null;
+			for (Object itemResult : itemResultEOList) {
+				itemResultEO = JSONObject.parseObject(JSONObject.toJSONString(itemResult),LawsTechnologyEvaluationItemResultEO.class);
+				itemResultList.add(itemResultEO);
+			}
+			if(CollectionUtils.isNotEmpty(itemResultList)){
+				this.saveBatch(itemResultList);
+			}
+		}
+
+		return new Result<>().success("调用成功！");
+	}
+
+	@Override
+	public void batchUpdate(JSONObject jsonObject) {
+		JSONArray itemResultArray = jsonObject.getJSONArray("itemResultList");
+		List<LawsTechnologyEvaluationItemResultEO> itemResultEOList = new ArrayList<>();
+		LawsTechnologyEvaluationItemResultEO itemResultEO = null;
+		for (Object itemResult : itemResultArray) {
+			itemResultEO = JSONObject.parseObject(JSONObject.toJSONString(itemResult),LawsTechnologyEvaluationItemResultEO.class);
+			itemResultEOList.add(itemResultEO);
+		}
+
+		if(CollectionUtils.isNotEmpty(itemResultEOList)){
+			this.updateBatchById(itemResultEOList);
+		}
+	}
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java

@@ -0,0 +1,138 @@
+package com.jero.modules.lawsTechnologyEvaluation.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationResultEOMapper;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 法规技术评估-评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Service
+public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationResultEOMapper, LawsTechnologyEvaluationResultEO> implements ILawsTechnologyEvaluationResultEOService {
+
+	@Autowired
+	private ILawsTechnologyEvaluationComplianceResultEOService complianceResultEOService;
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) {
+        Date now = new Date();
+        lawsTechnologyEvaluationResultEO.setCreateTime(now);
+        lawsTechnologyEvaluationResultEO.setUpdateTime(now);
+        save(lawsTechnologyEvaluationResultEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) {
+    	Date now = new Date();
+        lawsTechnologyEvaluationResultEO.setUpdateTime(now);
+    	saveOrUpdate(lawsTechnologyEvaluationResultEO);
+    }
+
+	/**
+	 * 通过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 LawsTechnologyEvaluationResultEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsTechnologyEvaluationResultEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public void evaluatorSaveResult(JSONObject json) {
+		String actiProcInstId = json.getString("actiProcInstId");
+		String lawsTechnologyEvaluationId = json.getString("lawsTechnologyEvaluationId");
+
+		String complianceResult = json.getString("complianceResult");
+
+		//删除符合性结果信息
+		QueryWrapper<LawsTechnologyEvaluationComplianceResultEO> removeComplianceResultWrapper = new QueryWrapper<>();
+		removeComplianceResultWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getActiProcInstId,actiProcInstId);
+		removeComplianceResultWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationId);
+		complianceResultEOService.remove(removeComplianceResultWrapper);
+
+		LawsTechnologyEvaluationComplianceResultEO complianceResultEO = new LawsTechnologyEvaluationComplianceResultEO();
+		complianceResultEO.setActiProcInstId(actiProcInstId);
+		complianceResultEO.setLawsTechnologyEvaluationId(lawsTechnologyEvaluationId);
+		complianceResultEO.setComplianceResult(complianceResult);
+		complianceResultEOService.save(complianceResultEO);
+
+		//删除之前提交的评估信息
+		QueryWrapper<LawsTechnologyEvaluationResultEO> deleteWrapper = new QueryWrapper<>();
+		deleteWrapper.lambda().eq(LawsTechnologyEvaluationResultEO::getActiProcInstId,actiProcInstId);
+		deleteWrapper.lambda().eq(LawsTechnologyEvaluationResultEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationId);
+		this.baseMapper.delete(deleteWrapper);
+
+		JSONArray evaluationResultList = json.getJSONArray("evaluationResultList");
+		List<LawsTechnologyEvaluationResultEO> evaluationResultEOList = new ArrayList<>();
+		LawsTechnologyEvaluationResultEO evaluationResultEO = null;
+		for (Object evaluationResult : evaluationResultList) {
+			evaluationResultEO = JSONObject.parseObject(JSONObject.toJSONString(evaluationResult),LawsTechnologyEvaluationResultEO.class);
+			evaluationResultEOList.add(evaluationResultEO);
+		}
+		if(CollectionUtils.isNotEmpty(evaluationResultEOList)){
+			this.saveBatch(evaluationResultEOList);
+		}
+	}
+}

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

@@ -1,5 +1,7 @@
 package com.jero.modules.report.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -23,6 +25,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -186,13 +189,20 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController<L
 
 	 /**
 	  * 上移下移
-	  * @param lawsMonthlyReportTitleTemplateEOS
+	  * @param jsonObject
 	  * @return
 	  */
 	 @AutoLog(value = "上移下移")
 	 @ApiOperation(value="上移下移", notes="上移下移")
 	 @PostMapping(value = "/move")
-	 public Result<?> move(@RequestBody List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS) {
+	 public Result<?> move(@RequestBody JSONObject jsonObject) {
+		 JSONArray lawsMonthlyReportTitleTemplateJson = jsonObject.getJSONArray("lawsMonthlyReportTitleTemplateEOS");
+		 LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO = null;
+		 List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = new ArrayList<>();
+		 for (Object o : lawsMonthlyReportTitleTemplateJson) {
+			 lawsMonthlyReportTitleTemplateEO=JSONObject.parseObject(JSONObject.toJSONString(o),LawsMonthlyReportTitleTemplateEO.class);
+			 lawsMonthlyReportTitleTemplateEOS.add(lawsMonthlyReportTitleTemplateEO);
+		 }
 		 lawsMonthlyReportTitleTemplateEOService.move(lawsMonthlyReportTitleTemplateEOS);
 		 return Result.OK("操作成功！");
 	 }

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

@@ -9,6 +9,7 @@ import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -27,6 +29,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -184,4 +187,14 @@ public class LawsMonthlyReportWriteEOController extends JeroController<LawsMonth
 		 return lawsMonthlyReportWriteEOService.exportMonthlyReport(lawsMonthlyReportWriteEO);
 	 }
 
+	@ApiOperation(value="带入标准信息--分页", notes="带入标准信息--分页")
+	@PostMapping(value = "/queryPageDocument")
+	@ResponseBody
+	public JSONObject queryPageDocument(@RequestBody Map<String,Object> parameter) {
+		IPage infoPage = lawsMonthlyReportWriteEOService.queryPageDocument(parameter);
+		Result<IPage> ok = Result.OK(infoPage);
+		JSONObject jsonResult = JSONObject.fromObject(ok);
+		return jsonResult;
+	}
+
 }

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

@@ -7,6 +7,7 @@ import org.springframework.http.ResponseEntity;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 月报填写
@@ -77,4 +78,6 @@ public interface ILawsMonthlyReportWriteEOService extends IService<LawsMonthlyRe
 												HttpServletRequest req);
 
 	ResponseEntity<byte[]> exportMonthlyReport(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO);
+
+	IPage queryPageDocument(Map<String, Object> parameter);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java

@@ -6,7 +6,13 @@ 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.constant.enums.ModuleEnum;
 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.document.enums.FieldTypeEnum;
+import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
+import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
 import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
 import com.jero.modules.report.entity.LawsMonthlyReportWriteEO;
 import com.jero.modules.report.entity.NewOpinionTemplateEO;
@@ -20,7 +26,9 @@ import com.jero.modules.report.service.INewOpinionTemplateEOService;
 import com.jero.modules.report.service.INewStandardTemplateEOService;
 import com.jero.modules.report.util.WordUtil;
 import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
+import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.system.util.StringUtils;
 import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
@@ -37,6 +45,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -58,6 +67,14 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 	private SysCategoryServiceImpl sysCategoryService;
 	@Value(value = "${jero.path.upload}")
 	private String uploadpath;
+	@Autowired
+	private OnlCgformFieldServiceImpl onlCgformFieldService;
+	@Autowired
+	private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService;
+	@Autowired
+	private BussDocumentLibraryEOMapper bussDocumentLibraryEOMapper;
+	@Autowired
+	private SysDictItemServiceImpl sysDictItemServiceImpl;
 	/**
 	 * 保存
 	 *
@@ -344,6 +361,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		return null;
 	}
 
+
 	/**
 	 *
 	 * @param path
@@ -377,8 +395,75 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		} catch (IOException e) {
 			log.error("文件创建异常,异常信息为：" + e.getMessage());
 		}
+	}
 
+	@Override
+	public IPage queryPageDocument(Map<String, Object> parameter) {
+		String cut = (String) parameter.get("cut");//中英文切换标识
+		//文档库字段
+		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+		//需要查询的字段
+		List<String> fieldListQuery = new ArrayList<>();
+		fieldListQuery.add("serial_number");
+		fieldListQuery.add("title");
+		fieldListQuery.add("title_en");
+		fieldListQuery.add("state");
+		fieldListQuery.add("region");
+		fieldListQuery.add("technology_territory");
+		fieldListQuery.add("xin1_che1_xing2_shi2_shi1_ri4_qi1");
+		fieldListQuery.add("implement_time");
+		fieldListQuery.add("corresponding_standard");
+		fieldListQuery.add("shi4_yong4_che1_xing2");
+		fieldListQuery.add("shi4_yong4_fan4_wei2");
 
+		List<String> fieldListNew = new ArrayList<>();
+		fieldListNew.add("id");
 
+		//转时间格式
+		for (String field : fieldListQuery) {
+			String fieldTemp = null;
+			if ("xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(field) || "implement_time".equals(field)) {
+				String fieldNew = "date_format(" + field + ", '%Y-%m-%d')";
+				fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field;
+				fieldListNew.add(fieldTemp);
+			} else {
+				fieldTemp = "case when " + field + " is null then \"\" else " + field + " end " + field;
+				fieldListNew.add(fieldTemp);
 			}
 		}
+		//封装查询条件
+		String condition = bussDocumentLibraryEOService.getConditionStr(parameter);
+		int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
+		int pageSize = Integer.parseInt(parameter.get("pageSize").toString());
+		IPage page = new Page(pageNo, pageSize);
+
+		IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), condition);
+
+		//树形数据字典
+		List<SysCategory> categoryList = sysCategoryService.list();
+		//过滤出树形字段
+		List<OnlCgformField> treeFieldList = fieldList.stream()
+				.filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
+				.collect(Collectors.toList());
+
+
+		List<Map> records = infoPage.getRecords();
+		//数据字典
+		List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
+		//下拉选处理数据字典
+		for (Map record : records) {
+			Map<String, Object> record1 = (Map) record;
+			record1.put("state_dict",record1.get("state"));//状态
+			record1.put("technology_territory_dict",record1.get("technology_territory"));//相关领域
+			record1.put("shi4_yong4_fan4_wei2_dict",record1.get("shi4_yong4_fan4_wei2"));//适用范围
+			record1.put("shi4_yong4_che1_xing2_dict",record1.get("shi4_yong4_che1_xing2"));//适用车型
+			for (Map.Entry<String, Object> entry : record1.entrySet()) {
+				//下拉选处理数据字典
+				bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null);
+				bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null);
+			}
+		}
+		return infoPage;
+	}
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java

@@ -71,6 +71,9 @@ public class workFlowController {
         }else if(StringUtils.equals(type,FlowTypeEnum.FGYJSJLC.getValue())){
             jsonObject.put("id", FlowTypeEnum.FGYJSJLC.getProcessDefinitionKey());
             return this.activiti_define_start(jsonObject);
+        }else if(StringUtils.equals(type,FlowTypeEnum.FGJSPG.getValue())){
+            jsonObject.put("processDefinitionKey", FlowTypeEnum.FGJSPG.getProcessDefinitionKey());
+            return this.startLawsTechnologyEvaluationProcess(jsonObject);
         }else{
             return null;
         }
@@ -192,4 +195,12 @@ public class workFlowController {
         conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO);
     }
 
+    /**
+     * 启动流程-法规技术评估流程
+     * @param jsonObject
+     * @return
+     */
+    public Result startLawsTechnologyEvaluationProcess(@RequestBody JSONObject jsonObject){
+        return  workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject);
+    }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java

@@ -45,7 +45,9 @@ public class TaskCommonQuery {
 	@ApiModelProperty(value = "流程类型")
 	private String prcType;
 
-	private String prcTypes = FlowTypeEnum.RWQRLC.getValue() + "," + FlowTypeEnum.FGYJSJLC.getValue();
+	private String prcTypes = FlowTypeEnum.RWQRLC.getValue()
+			+ "," + FlowTypeEnum.FGYJSJLC.getValue()
+			+ "," + FlowTypeEnum.FGJSPG.getValue();
 
 	@ApiModelProperty(value = "高级搜索字符串")
 	private String advanceSearchVOStr;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java

@@ -10,6 +10,7 @@ public enum FlowTypeEnum {
     PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc"),
     YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc"),
     FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc"),
+    FGJSPG("6","法规技术评估","FGJSPG","法规技术评估流程","fgjspglc"),
     ;
 
     private String value;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java

@@ -137,4 +137,12 @@ public interface WorkFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/task/completeTaskByPids",method = RequestMethod.GET)
     Result<String> completeTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds);
+
+    /**
+     * 启动流程-法规技术评估流程
+     * @param jsonObject
+     * @return
+     */
+    @RequestMapping(value = "/bat-wkflow/startLawsTechnologyEvaluationProcess",method = RequestMethod.POST,headers = {"content-type=application/json"})
+    Result<String> startLawsTechnologyEvaluationProcess(String jsonObject);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java

@@ -157,4 +157,14 @@ public class WorkFlowFeignClientImpl{
     public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
         return  workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu);
     }
+
+    /**
+     * 启动流程-法规技术评估流程
+     * @param jsonObject
+     * @return
+     */
+    public Result startLawsTechnologyEvaluationProcess(@RequestBody net.sf.json.JSONObject jsonObject){
+        Result<String> stringWrapper = workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject.toString());
+        return Result.OK(stringWrapper.getResult());
+    }
 }

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

@@ -1106,4 +1106,10 @@ module.exports = {
   PreHomoNotification:'Pre-Homo Notification',
   ValidationComplianceNotification:'Validation Compliance Notification',
   RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification',
+  evaluationMethod:'Evaluation method',
+  uploadRelevantMaterials:'Upload relevant materials',
+  processBackground:'Process background',
+  selectedStandard:'Selected standard',
+  standardDecompositionDocument:'Standard decomposition document',
+  pleaseSelectStandardFirst:'Please select a standard first',
 }

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

@@ -1110,4 +1110,10 @@ module.exports = {
   PreHomoNotification:'Pre-Homo通知',
   ValidationComplianceNotification:'验证符合性通知',
   RegulationTaskConfirmationNotification:'任务确认通知',
+  evaluationMethod:'评估方式',
+  uploadRelevantMaterials:'相关资料上传',
+  processBackground:'流程背景',
+  selectedStandard:'所选标准',
+  standardDecompositionDocument:'带入标准分解单',
+  pleaseSelectStandardFirst:'请先选择标准',
 }

jero-web/src/components/layouts/TabLayout.vue

@@ -97,6 +97,8 @@
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/projectStatusAndProgress' ||
           this.$route.path == '/TaskPlanList' ||
+          this.$route.path == '/evaluationProcess' ||
+          this.$route.path == '/evaluationInitiationProcess' ||
           this.$route.path == '/historicalVersion' ||
           this.$route.path == '/dashboard/analysis' ||
           this.$route.path == '/processDetails') {

jero-web/src/config/router.config.js

@@ -342,6 +342,11 @@ export const constantRouterMap = [
     name: 'initiatingProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess')
   },
+  {
+    path: '/evaluationInitiationProcess',
+    name: 'evaluationInitiationProcess',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/initiatingProcess')
+  },
   // {
   //   path: '/ParameterItemCollection',
   //   name: 'ParameterItemCollection',
@@ -362,6 +367,11 @@ export const constantRouterMap = [
     name: 'taskListProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/taskListProcess/index')
   },
+  {
+    path: '/evaluationProcess',
+    name: 'evaluationProcess',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/evaluationProcess/index')
+  },
   {
     path: '/handshakeProcess',
     name: 'handshakeProcess',

jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue

@@ -207,7 +207,7 @@
           queryConditionVOList: JSON.stringify(queryConditionVOList)
         }
         this.loading = true
-        postAction('/dummy/dummyInventoryInfoEO/queryPageDummy', query).then((res) => {
+        postAction('/report/lawsMonthlyReportWriteEO/queryPageDocument', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue

@@ -28,9 +28,9 @@
         :data-source="dataSource"
         :columns="columns"
       >
-        <span slot="operation" slot-scope="text,record">
+        <span slot="operation" slot-scope="text,record,index">
-           <a class="text-operation" @click="moveUpClick(record)">{{$t('moveUp')}}</a>
+           <a class="text-operation" @click="moveUpClick(record,index)">{{$t('moveUp')}}</a>
-           <a class="text-operation" @click="moveDownClick(record)">{{$t('moveDown')}}</a>
+           <a class="text-operation" @click="moveDownClick(record,index)">{{$t('moveDown')}}</a>
            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
            <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
@@ -69,6 +69,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 10,
+        sortList: [],
         total: 0,
         columns: [
           {
@@ -146,11 +147,49 @@
           }
         })
       },
-      moveUpClick() {
+      moveUpClick(row, index) {
-
+        this.sortList = []
+        this.sortList.push(row)
+        if (row.parentId) {
+          let content = this.dataSource.filter(res => {
+            return row.parentId == res.id
+          })
+          if (index != 0) {
+            this.sortList.push(content[0].children[index - 1])
+          }
+        } else {
+          if (index != 0) {
+            this.sortList.push(this.dataSource[index - 1])
+          }
+        }
+        this.move()
       },
-      moveDownClick() {
+      moveDownClick(row, index) {
-
+        this.sortList = []
+        this.sortList.push(row)
+        if (row.parentId) {
+          let content = this.dataSource.filter(res => {
+            return row.parentId == res.id
+          })
+          if (index != (content[0].children.length - 1)) {
+            this.sortList.push(content[0].children[index + 1])
+          }
+        } else {
+          if (index != (this.dataSource.length - 1)) {
+            this.sortList.push(this.dataSource[index + 1])
+          }
+        }
+        this.move()
+      },
+      move() {
+        postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       },
       deleteLib(val) {
         let _this = this
@@ -185,6 +224,7 @@
     text-align: right;
     margin-bottom: 16px;
   }
+
   .text-operation {
     margin-right: 8px;
   }

jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue

@@ -0,0 +1,70 @@
+<template>
+  <div class="box" style="margin-bottom: 20px">
+    <a-table
+      :columns="columns"
+      :scroll="{x: '100%'}"
+      :data-source="dataList"
+      :pagination="false"
+      :loading="loading">
+
+    </a-table>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'TermInformation',
+    data() {
+      return {
+        columns: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'items_num',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'items_name',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'iterms_conditions',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethod',
+            align: 'center',
+            scopedSlots: { customRender: 'evaluationMethod' }
+          },
+          {
+            title: this.$t('Assessor'),
+            dataIndex: 'Assessor',
+            align: 'center',
+            scopedSlots: { customRender: 'Assessor' }
+          },
+          {
+            title: this.$t('operation'),
+            dataIndex: 'Assessor',
+            align: 'center',
+            width: 100,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        dataList: [],
+        loading: false
+      }
+    },
+    mounted() {
+    },
+    methods: {}
+  }
+</script>
+
+<style scoped>
+
+</style>

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -0,0 +1,569 @@
+<template>
+  <div id="examineBox">
+    <headerProcess
+      :title="title"
+    />
+    <div class="detail-box">
+      <div class="detail-content" style="padding: 20px">
+        <div class="table-page-search-wrapper">
+          <search ref="searchRef"
+                  :flag="'1'"
+                  :url="url"/>
+        </div>
+        <a-table
+          ref="table"
+          size="middle"
+          :loading="loading"
+          :pagination="false"
+          :scroll="{x: '100%'}"
+          rowKey="id"
+          :data-source="dataSource"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
+          :columns="columns"
+        >
+        </a-table>
+        <div class="page" v-if="dataSource && dataSource.length > 0">
+          <a-pagination
+            :show-total="total => $t('total')+` ${total} `+$t('strip')"
+            show-quick-jumper
+            :page-size.sync="pageSize"
+            :total="total"
+            :current="pageNo"
+            @change="pageOnChange"
+            @showSizeChange="SizeChange"
+          />
+        </div>
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24" style="margin-bottom: 10px">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('selectedStandard')">{{$t('selectedStandard')}}</span>
+                </div>
+                <div class="title-text-content"
+                     :class="{'title-text-content-one':!isTrue}">
+                  件大事发的科技示范和的空间是否和是科技示范的空间是多少
+                </div>
+                <div class="title-text-right" v-if="isTrue">
+                  <span @click="standardDecompositionDocumentClick">
+                    {{$t('standardDecompositionDocument')}}
+                  </span>
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="endTime">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                 @change="dateChange('endTime')"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 format="YYYY-MM-DD"
+                                 v-model="formInline['endTime']"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="accessory_id">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('accessory_id')">
+                    {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
+                    formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('processBackground')">{{$t('processBackground')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="taskExplain">
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
+                              v-model="formInline.taskExplain"
+                              :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="remarks">
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
+                              v-model="formInline.remarks"
+                              :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="!isTrue">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="evaluatorIdsName">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
+                            class="box-input"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            allowClear
+                            v-model="formInline.gatherResult">
+                    <a-select-option v-for="(item, key) in gatherResultList"
+                                     :key="key"
+                                     :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="evaluatorIdsName">
+                  <PersonnelSelection class="box-input"
+                                      :personneQuery="formInline"
+                                      :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
+                                      :isInput="true"
+                                      @change="PersonnelSelectionChange"
+                                      v-model="formInline.evaluatorIdsName"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+        <TermInformation v-if="isTrue"/>
+        <footerProcess
+          @submit="submit"
+          :isSubmit="true"
+        />
+      </div>
+    </div>
+    <JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+    <standardDecompositionSheet ref="standardDecompositionSheetRef"
+                                @standardDecompositionSheetForm="standardDecompositionSheetForm"/>
+  </div>
+</template>
+
+<script>
+  import headerProcess from '../../../processCenter/components/headerProcess'
+  import search from '@/components/search/index'
+  import uploadFile from '@/components/uploadFile/file'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import footerProcess from '../../../processCenter/components/footerProcess'
+  import standardDecompositionSheet from './standardDecompositionSheet'
+  import TermInformation from './TermInformation'
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+  import eventBUs from '../../../../common/event'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'evaluationInitiationProcess',
+    components: {
+      headerProcess,
+      search,
+      uploadFile,
+      footerProcess,
+      PersonnelSelection,
+      standardDecompositionSheet,
+      TermInformation
+    },
+    data() {
+      return {
+        title: this.$t('regulatoryEngineer') + this.$t('initiatingProcess'),
+        //url传参严格按照当前命名
+        url: {
+          seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
+          addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
+        },
+        loading: false,
+        JLoading: false,
+        isTrue: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        formInline: {},
+        gatherResultList: [
+          {
+            value: 'Underway',
+            name: this.$t('inProgress')
+          },
+          {
+            value: 'Completed',
+            name: this.$t('Finished')
+          }
+        ],
+        rules: {
+          endTime: [
+            {
+              required: true,
+              message: this.$t('closingDate') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          evaluatorIdsName: [
+            {
+              required: true,
+              message: this.$t('Assessor') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        searchParmes: {},
+        selectedRowKeysRecord: [],
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serial_number',
+            width: 170,
+            scopedSlots: { customRender: 'serial_number' }
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170,
+            scopedSlots: { customRender: 'titleName' }
+          },
+          {
+            title: this.$t('status'),
+            align: 'center',
+            width: 140,
+            ellipsis: true,
+            dataIndex: 'state'
+          },
+          {
+            title: this.$t('zoneOfApplication'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'region'
+          },
+          {
+            title: this.$t('technicalField'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'technology_territory'
+          },
+          {
+            title: this.$t('correspondingStandard'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'corresponding_standard'
+          }
+        ]
+      }
+    },
+    mounted() {
+      document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
+      this.getList()
+      if (this.$route.query.whetherTobring == '1') {
+        this.isTrue = true
+      } else {
+        this.isTrue = false
+      }
+      eventBUs.$on('searchQuery', search => {
+        Object.keys(search).forEach(res => {
+          if (search[res] instanceof Array) {
+            search[res] = search[res].join(',')
+          }
+        })
+        this.pageNo = 1
+        this.searchParmes = search
+        this.getList()
+      })
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.searchParmes
+        }
+        this.loading = true
+        postAction(this.url.addModelList, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value, record) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+          record.shift()
+        }
+        this.selectedRowKeysRecord = record
+      },
+      standardDecompositionDocumentClick() {
+        if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) {
+          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeysRecord[0])))
+        } else {
+          this.$message.warning(this.$t('pleaseSelectStandardFirst'))
+        }
+      },
+      standardDecompositionSheetForm(value) {
+
+      },
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      dateChange(item) {
+        this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
+      },
+      getUUID() {
+        var str = []
+        var Chars = '0123456789abcdefghijklmnopqrstuvwxyz'
+        for (var i = 0; i < 36; i++) {
+          str[i] = Chars.substr(Math.floor(Math.random() * 16), 1)
+        }
+        str[0] = str[8] = str[13] = str[18] = str[23] = '-'
+        return str.join('')
+      },
+      submit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
+              this.$message.warning(this.$t('pleaseSelectStandard'))
+            } else {
+              this.JLoading = true
+              let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
+              value.standId = value.id
+              value.taskAffirmDueDate = value.endTime
+              delete value.id
+              value.id = this.getUUID()
+              value.currentUserName = this.userInfo().username
+              Object.keys(value).forEach(res => {
+                if (value[res] && value[res] instanceof String) {
+                  value[res] = value[res].replace(/\"/g, '“')
+                  value[res] = value[res].replace(/\'/g, '‘')
+                }
+              })
+              this.startProcess(value)
+            }
+          }
+        })
+      },
+      startProcess(value) {
+        let query = {
+          type: 5,
+          msg: JSON.stringify(value).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/startProcess', query).then((res) => {
+          if (res.success) {
+            this.completeTask(value, res.result)
+          } else {
+            this.JLoading = false
+          }
+        })
+      },
+      completeTask(value, taskId) {
+        let query = {
+          userid: this.userInfo().id,
+          taskId: taskId,
+          json: JSON.stringify(value).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/completeTask', query).then((res) => {
+          if (res.success) {
+            // setTimeout(() => {
+            //   window.close()
+            // }, 1000)
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.JLoading = false
+            this.$router.push({
+              path: '/collectionOfRegulatoryOpinions'
+            })
+          } else {
+            this.JLoading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .detail-box {
+    padding: 67px 0 0 0;
+    background: #ffffff;
+    height: 100%;
+    overflow: auto;
+  }
+
+  #examineBox {
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    position: relative;
+    height: 100%;
+    overflow-y: auto;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 88px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 12px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-top: 20px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .title-text-content {
+    display: inline-block;
+    width: calc(100% - 334px);
+    text-align: center;
+    border: 1px solid #d9d9d9;
+    line-height: 38px;
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .title-text-right {
+    width: 200px;
+    text-align: center;
+    border: 1px solid #d9d9d9;
+    line-height: 38px;
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+    border-left: none;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: #21c9cc;
+    cursor: pointer;
+  }
+
+  .title-text-content-one {
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+    width: calc(100% - 128px);
+  }
+</style>

jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue

@@ -0,0 +1,247 @@
+<template>
+  <a-drawer
+    :title="$t('StandardBreakdown')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standard')">
+                  <span>{{$t('standard')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                         v-model="queryParam.serial_number"></a-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-top: 4px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                   <div @click="handleModule" class="operator-text">
+                       <a-icon type="download"/>
+                      {{$t('templateDownload')}}
+                    </div>
+                    <div class="operator-text">
+                      <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"
+                                  @getList="getPersonnelList"/>
+                     </div>
+                    </a-col>
+            </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 1200}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+`${total}`+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" type="danger" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import ImportFile from '@/components/ImportFile/index'
+
+  export default {
+    name: 'standardDecompositionSheet',
+    components: {
+      ImportFile
+    },
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        url: {
+          list: '/split/sarFileSplitItems/getSplitItemsByPage'
+        },
+        columns: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'items_num',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'items_name',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'iterms_conditions',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('technicalField'),
+            dataIndex: 'technology_territory',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('informationCategory'),
+            dataIndex: 'information_category',
+            align: 'center',
+            ellipsis: true
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        standData: {},
+        fieldList: [],
+        queryConditionVOList: []
+      }
+    },
+    methods: {
+      handleModule() {
+
+      },
+      getData(row) {
+        this.standData = row
+        this.visible = true
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      getPersonnelList() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          info_id: this.standData.id,
+          menu_id:'',
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+
+      },
+      onSelectChange() {
+
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 33px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -0,0 +1,433 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('technicalField')">
+                <span>{{$t('technicalField')}}</span>
+              </div>
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="queryParam.technologyTerritory"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="CategoryTreeList"
+                tree-checkable
+                :placeholder="$t('PleaseSelect')+$t('technicalField')"
+              />
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('ProcessStatus')">
+                  <span>{{$t('ProcessStatus')}}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="queryParam.gatherResult">
+                  <a-select-option v-for="(item, key) in gatherResultList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
+          </template>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                   <a @click="handleToggleSearch" style="margin-left: 8px">
+                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiatingProcess')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+         <span slot="operation" slot-scope="text,record">
+           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
+           <a class="text-operation" v-if="record.gatherResult == 'Completed'"
+              @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+    <a-modal
+      :title="$t('initiatingProcess')"
+      :width="600"
+      :visible="visible"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="visible = false"
+    >
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text" style="margin-top: -18px">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('standardDecompositionDocument')">{{$t('standardDecompositionDocument')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="whetherTobring">
+                <a-select :placeholder="$t('PleaseSelect')+$t('standardDecompositionDocument')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="formInline.whetherTobring">
+                  <a-select-option v-for="(item, key) in whetherTobringList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '',
+          getSysCategoryTree: '/sys/category/getSysCategoryTree'
+        },
+        visible: false,
+        loading: false,
+        toggleSearchStatus: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        CategoryTreeList: [],
+        queryParam: {},
+        formInline: {},
+        rules: {
+          whetherTobring: [
+            {
+              required: true,
+              message: this.$t('standardDecompositionDocument') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        whetherTobringList: [
+          {
+            value: '1',
+            name: '是'
+          },
+          {
+            value: '2',
+            name: '否'
+          }
+        ],
+        gatherResultList: [
+          {
+            value: 'Underway',
+            name: this.$t('inProgress')
+          },
+          {
+            value: 'Completed',
+            name: this.$t('Finished')
+          }
+        ],
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('technicalField'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'technologyTerritory'
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'evaluationMethod'
+          },
+          {
+            title: this.$t('ProcessStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'ProcessStatus'
+          },
+          {
+            title: this.$t('dateOfInitiation'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'startTime'
+          },
+          {
+            title: this.$t('closingDate'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'endTime'
+          },
+          {
+            title: this.$t('remarks'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'remarks'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 260,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+      this.getSysCategoryTree()
+    },
+    methods: {
+      getSysCategoryTree() {
+        getAction(this.url.getSysCategoryTree, {}).then((res) => {
+          if (res.success) {
+            this.CategoryTreeList = res.result
+          } else {
+            this.CategoryTreeList = []
+          }
+        })
+      },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.visible = false
+            // let newUrl = this.$router.resolve({
+            //   path: '/evaluationInitiationProcess',
+            //   query: this.formInline
+            // })
+            let newUrl = this.$router.resolve({
+              path: '/evaluationProcess'
+            })
+            window.open(newUrl.href, '_blank')
+          }
+        })
+      },
+      initiatingProcessClick() {
+        this.visible = true
+        this.formInline = {}
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      viewProcessClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: 6,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      evaluationResultsClick(row) {
+        this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row)))
+      }
+    }
+  }
+</script>
+
+<style>
+  .tree-select .ant-select-tree-dropdown {
+    height: 298px !important;
+  }
+</style>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+</style>

jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

@@ -0,0 +1,209 @@
+<template>
+  <div id="examineBox">
+    <headerProcess
+      :title="title"
+    />
+    <div class="detail-box">
+      <div class="detail-content" style="padding: 10px 0 0 0">
+        <standardContent
+          v-if="isDisplay"
+          :title="$t('essentialInformation')"
+          :standardContentList="standardContentList"
+          :url="url"
+          :standardContentQuery="queryProject"
+        />
+        <feedbackInformation
+          v-if="isDisplay"
+          ref="feedbackInformationRef"
+          :feedbackDataList="feedbackDataList"
+          :title="$t('feedbackInformation')"
+        />
+        <footerProcess
+          v-if="isDisplay"
+          isPreservation
+          :isSubmit="true"
+          @preservation="preservation"
+          @submit="submit"
+        />
+        <circulationHistory v-if="isDisplay"/>
+      </div>
+    </div>
+    <JLoading :loading="loading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+  </div>
+</template>
+
+<script>
+  import headerProcess from '../../components/headerProcess'
+  import standardContent from '../../components/standardContent'
+  import circulationHistory from '../../components/regulatoryCirculationHistory'
+  import footerProcess from '../../components/footerProcess'
+  import feedbackInformation from '../../components/feedbackInformation'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import moment from 'moment'
+  import { mapGetters } from 'vuex'
+  export default {
+    name: 'evaluationProcess',
+    components: {
+      headerProcess,
+      standardContent,
+      circulationHistory,
+      footerProcess,
+      feedbackInformation
+    },
+    data() {
+
+      return {
+        title: this.$t('collectionOfRegulatoryOpinions'),
+        url: {
+          queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
+          list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list'
+        },
+        loading: false,
+        isDisplay: true,
+        feedbackDataList: [],
+        queryProject: {},
+        standardContentList: [
+          {
+            title: this.$t('standard'),
+            value: 'serial_number'
+          },
+          {
+            title: this.$t('title'),
+            value: 'title'
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            value: 'currentUserName'
+          },
+          {
+            title: this.$t('closingDate'),
+            value: 'endTime'
+          },
+          {
+            title: this.$t('enclosure'),
+            value: 'accessory_id',
+            type: 2
+          },
+          {},
+          {
+            title: this.$t('taskDescription'),
+            value: 'taskExplain'
+          }
+          // {
+          //   title: this.$t('remarks'),
+          //   value: 'remark'
+          // }
+        ]
+      }
+    },
+    mounted() {
+      this.isDisplay = false
+      this.queryTaskDetailByTask(() => {
+        this.lawsOpinionAssessmentResult()
+      })
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      queryTaskDetailByTask(callback) {
+        this.loading = true
+        getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
+          if (res instanceof String) {
+            this.queryProject = JSON.parse(res) || {}
+            callback && callback()
+          } else {
+            this.queryProject = res || {}
+            callback && callback()
+          }
+        })
+      },
+      lawsOpinionAssessmentResult() {
+        getAction(this.url.list, {
+          lawsOpinionGatherId: this.queryProject.id,
+          actiProcInstId: this.$route.query.prcId
+        }).then((res) => {
+          if (res.success) {
+            this.feedbackDataList = res.result || []
+            this.loading = false
+          } else {
+            this.feedbackDataList = []
+            this.loading = false
+          }
+          this.isDisplay = true
+        })
+      },
+      preservation() {
+        this.loading = true
+        let dataList = this.$refs.feedbackInformationRef.dataList
+        this.insertBatch(dataList, 1)
+      },
+      insertBatch(list, num) {
+        list.forEach(res => {
+          res.lawsOpinionGatherId = this.queryProject.id
+          res.actiProcInstId = this.$route.query.prcId
+        })
+        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
+          if (res.success) {
+            if (num == 1) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$router.push({
+                path: '/collectionOfRegulatoryOpinions'
+              })
+              this.loading = false
+            } else {
+              this.completeTask()
+            }
+          } else {
+            if (num == 1) {
+              this.loading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }
+        })
+      },
+      submit() {
+        let dataList = this.$refs.feedbackInformationRef.dataList
+        this.insertBatch(dataList, 2)
+      },
+      completeTask() {
+        let query = {
+          userid: this.userInfo().id,
+          taskId: this.$route.query.taskIds,
+          json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/completeTask', query).then((res) => {
+          if (res.success) {
+            // setTimeout(() => {
+            //   window.close()
+            // }, 1000)
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.loading = false
+            this.$router.push({
+              path: '/collectionOfRegulatoryOpinions'
+            })
+          } else {
+            this.loading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .detail-box {
+    padding: 67px 0 0 0;
+    background: #ffffff;
+    height: 100%;
+    overflow: auto;
+  }
+
+  #examineBox {
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    position: relative;
+    height: 100%;
+    overflow-y: auto;
+  }
+</style>