法规技术评估流程开发。

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

@@ -265,3 +265,60 @@ 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

@@ -149,6 +149,8 @@ public class ShiroConfig {
         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-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/LawsTechnologyEvaluationFlowDetailEOController.java

@@ -174,8 +174,8 @@ public class LawsTechnologyEvaluationFlowDetailEOController extends JeroControll
 	  * @param jsonObject
 	  * @return
 	  */
-	 @AutoLog(value = "法规意见收集-流程明细表-流程调用")
+	 @AutoLog(value = "法规技术评估-流程明细表-流程调用")
-	 @ApiOperation(value="法规意见收集-流程明细表-流程调用", notes="法规意见收集-流程明细表-流程调用")
+	 @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/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/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/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/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/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

@@ -115,6 +115,9 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		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/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);
+		}
+	}
+}