From 05d0018873847e62f7c31b2e43b4acf92cc09f70 Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Fri, 27 Oct 2023 09:09:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81=E6=A0=87?= =?UTF-8?q?=E5=87=86/=E6=94=BF=E7=AD=96=E5=90=88=E8=A7=84=E6=80=A7?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E3=80=81=E5=AF=B9=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 7 ++ .../workFlowFeignClientImpl.java | 4 ++ .../controller/WorkFlowController.java | 14 ++++ doc/sql/20231017_政策相关开发sql.sql | 72 ++++++++++++++++++- 4 files changed, 96 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index f1f20500..333d1a60 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -512,4 +512,11 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/policySolicitOpinion/queryPolicitOpinionEOList",method = RequestMethod.GET) ResponseMessage> queryPolicitOpinionEOList(@RequestParam Map params); + + /** + * 查询重点认证标准/政策合规性项目审查任务明细 + * @return + */ + @RequestMapping(value = "/bat-wkflow/queryZchgxxmscTaskDetail",method = RequestMethod.GET) + BusProcessNew queryZchgxxmscTaskDetail(@RequestParam Map params); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 7bd54f5a..e3326927 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -483,4 +483,8 @@ public class workFlowFeignClientImpl { public ResponseMessage> queryPolicitOpinionEOList(@RequestParam Map params) { return this.workFlowFeignClient.queryPolicitOpinionEOList(params); } + + public BusProcessNew queryZchgxxmscTaskDetail(@RequestParam Map params){ + return workFlowFeignClient.queryZchgxxmscTaskDetail(params); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 60a1ac1a..ac49000e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -1611,4 +1611,18 @@ public class WorkFlowController extends BaseController { IOUtils.closeQuietly(os); } } + + @ApiOperation(value = "查询重点认证标准/政策合规性项目审查任务明细") + @GetMapping("/queryZchgxxmscTaskDetail") + public BusProcessNew queryZchgxxmscTaskDetail(@RequestParam Map params) { + /** + * params: + * taskIds + * prcId + * taskDefinitionKey + */ + String currentUserId = LoginUserUtil.getUserId(); + params.put("currentUserId", currentUserId); + return workFlowFeignClient.queryZchgxxmscTaskDetail(params); + } } diff --git a/doc/sql/20231017_政策相关开发sql.sql b/doc/sql/20231017_政策相关开发sql.sql index 0e671c37..a35b0544 100644 --- a/doc/sql/20231017_政策相关开发sql.sql +++ b/doc/sql/20231017_政策相关开发sql.sql @@ -35,4 +35,74 @@ CREATE TABLE `t_flow_user_rel_info` ( `create_time` datetime NULL COMMENT '创建时间', `create_by` varchar(64) NULL COMMENT '创建人id', PRIMARY KEY (`id`) USING BTREE -) COMMENT = '流程用户关系表'; \ No newline at end of file +) COMMENT = '流程用户关系表'; + +-- 流程数据库，增加 重点认证标准/政策合规性项目审查-事业部数据表 +CREATE TABLE `zchgxxmsc_syb_data` ( + `id` char(64) NOT NULL COMMENT '主键id', + `law_id` char(64) DEFAULT NULL COMMENT '标准/政策id', + `prc_id` char(64) DEFAULT NULL COMMENT '流程实例id', + `zrr_user_id` char(64) DEFAULT NULL COMMENT '责任人用户id', + `data_source` char(20) DEFAULT NULL COMMENT '数据来源', + `law_code` varchar(255) DEFAULT NULL COMMENT '标准/政策编号', + `law_name` varchar(255) DEFAULT NULL COMMENT '标准/政策名称', + `product_type` varchar(255) DEFAULT NULL COMMENT '产品类型', + `impl_time` varchar(255) DEFAULT NULL COMMENT '实施日期', + `impl_require` varchar(255) DEFAULT NULL COMMENT '实施要求', + `resource_accordwith_circumstance` varchar(600) DEFAULT NULL COMMENT '资源符合情况', + `dev_plan` varchar(600) DEFAULT NULL COMMENT '开发计划', + `sop_date` varchar(255) DEFAULT NULL COMMENT 'sop时间', + `finish_circumstance` varchar(600) DEFAULT NULL COMMENT '完成情况', + `sop_date_solutions` varchar(600) DEFAULT NULL COMMENT 'sop时间超过法规时限的空挡期的业务应对方案', + `CREATE_USER_ID` varchar(64) NULL COMMENT '创建人id', + `CREATE_TIME` datetime NULL COMMENT '创建时间', + `MODIFY_USER_ID` varchar(64) NULL COMMENT '更新人id', + `MODIFY_TIME` datetime NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='重点认证标准/政策合规性项目审查-事业部数据表'; + +-- 流程数据库，增加 重点认证标准/政策合规性项目审查-产品规划部数据表 +CREATE TABLE `zchgxxmsc_cpghb_data` ( + `id` char(64) NOT NULL COMMENT '主键id', + `prc_id` char(64) DEFAULT NULL COMMENT '流程实例id', + `zrr_user_id` char(64) DEFAULT NULL COMMENT '责任人用户id', + `business` varchar(600) DEFAULT NULL COMMENT '业务', + `platform` varchar(600) DEFAULT NULL COMMENT '平台', + `project` varchar(600) DEFAULT NULL COMMENT '项目', + `project_description` varchar(600) DEFAULT NULL COMMENT '项目描述', + `current_node` varchar(600) DEFAULT NULL COMMENT '当前节点', + `g_zero_date` datetime DEFAULT NULL COMMENT 'G0', + `g_one_date` datetime DEFAULT NULL COMMENT 'G1', + `g_two_date` datetime DEFAULT NULL COMMENT 'G2', + `g_three_date` datetime DEFAULT NULL COMMENT 'G3', + `g_four_date` datetime DEFAULT NULL COMMENT 'G4', + `g_five_date` datetime DEFAULT NULL COMMENT 'G5', + `g_six_date` datetime DEFAULT NULL COMMENT 'G6', + `g_seven_date` datetime DEFAULT NULL COMMENT 'G7', + `g_eight_date` datetime DEFAULT NULL COMMENT 'G8', + `g_nine_date` datetime DEFAULT NULL COMMENT 'G9', + `g_ten_date` datetime DEFAULT NULL COMMENT 'G10', + `g_eleven_date` datetime DEFAULT NULL COMMENT 'G11', + `g_twelve_date` datetime DEFAULT NULL COMMENT 'G12', + `g_thirteen_date` datetime DEFAULT NULL COMMENT 'G13', + `info_table_data` longtext COMMENT '标准填写信息', + `conceptual_state` varchar(600) DEFAULT NULL COMMENT '概念状态', + `concept_plan_release_time` datetime DEFAULT NULL COMMENT '概念计划下发时间', + `concept_revision_plan` varchar(600) DEFAULT NULL COMMENT '概念修订计划', + `additional_notes` varchar(600) DEFAULT NULL COMMENT '其它说明', + `create_user_id` varchar(64) DEFAULT NULL COMMENT '创建人id', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `modify_user_id` varchar(64) DEFAULT NULL COMMENT '更新人id', + `modify_time` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='重点认证标准/政策合规性项目审查-产品规划部数据表'; + +-- 流程数据库，增加 重点认证标准/政策合规性项目审查-产品规划部数据明细表 +CREATE TABLE `zchgxxmsc_cpghb_data_detail` ( + `id` char(64) NOT NULL COMMENT '主键id', + `prc_id` char(64) DEFAULT NULL COMMENT '流程实例id', + `zchgxxmsc_cpghb_data_id` char(64) DEFAULT NULL COMMENT '产品规划部数据id', + `law_id` char(64) DEFAULT NULL COMMENT '标准/政策id', + `input_value` varchar(600) DEFAULT NULL COMMENT '输入值' + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='重点认证标准/政策合规性项目审查-产品规划部数据明细表'; \ No newline at end of file