diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
deleted file mode 100644
index 35ac3b4..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.controller.workbench;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 所有业务消息提醒 前端控制器
- *
- *
- * @author wangpeng
- * @since 2023-02-23
- */
-@RestController
-@RequestMapping("/workbenchMessage")
-public class WorkbenchMessageController {
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
deleted file mode 100644
index 35ac3b4..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.controller.workbench;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 所有业务消息提醒 前端控制器
- *
- *
- * @author wangpeng
- * @since 2023-02-23
- */
-@RestController
-@RequestMapping("/workbenchMessage")
-public class WorkbenchMessageController {
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
new file mode 100644
index 0000000..4ec8dac
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 所有业务消息提醒 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-23
+ */
+@RestController
+@RequestMapping("/workbench/remindMessage")
+public class WorkbenchRemindMessageController {
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
deleted file mode 100644
index 35ac3b4..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.controller.workbench;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 所有业务消息提醒 前端控制器
- *
- *
- * @author wangpeng
- * @since 2023-02-23
- */
-@RestController
-@RequestMapping("/workbenchMessage")
-public class WorkbenchMessageController {
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
new file mode 100644
index 0000000..4ec8dac
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 所有业务消息提醒 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-23
+ */
+@RestController
+@RequestMapping("/workbench/remindMessage")
+public class WorkbenchRemindMessageController {
+
+}
diff --git "a/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..22f3ead
--- /dev/null
+++ "b/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,144 @@
+export default {
+ "code": "200",
+ "msg": "success",
+ "data": {
+ "formId":"",//表单id
+ "formName":"",//表单名称
+ "formDesc":"",//表单描述
+ "tableId": 1,//审批id
+ "workFlowDef": {
+ "flowKey":"",//流程定义key,更新流程定义使用(更新必传)
+ "directorId":"",//传入用户id,代表流程负责人
+ "name": "合同审批",//审批名称
+ "decisionItem":1,//可选决策项(1同意驳回拒绝 2同意驳回 3同意拒绝)
+ "noticeStarter":1//是否通知发起人(1是 0否)
+ },
+ "directorMaxLevel": 4,//审批主管最大层级
+ "flowPermission": [],//发起人
+ "nodeConfig": {
+ "nodeName": "发起人",//节点名称
+ "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
+ // "priorityLevel": "",// 条件优先级
+ "settype": "",// 审批人设置 1指定成员 11指定角色 2主管 4发起人自选 5发起人自己 7连续多级主管
+ // "selectMode": "", //审批人数 1选一个人 2选多个人
+ "selectRange": "", //选择范围 1.全公司 2指定成员 2指定角色
+ "directorLevel": 2, //审批终点 最高层主管数
+ "examineMode": "", //多人审批时采用的审批方式 1依次审批 2会签 3或签
+ "noHanderAction": "",//审批人为空时 1自动审批通过 2自动审批拒绝 3转交给审核管理员
+ // "examineEndDirectorLevel": "", //审批终点 第n层主管
+ // "ccSelfSelectFlag": "", //允许发起人自选抄送人
+ "conditionList": [], //当审批单同时满足以下条件时进入此流程
+ "nodeUserList": [], //操作人
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false, //当前审批是否通过校验
+ "type": 1,
+ "settype": 2,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "路由",
+ "type": 4,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "抄送人",
+ "type": 2,
+ "ccSelfSelectFlag": 1,
+ "childNode": null,
+ "nodeUserList": [],
+ "error": false
+ },
+ "conditionNodes": [{ //条件节点
+ "nodeName": "条件1",
+ "type": 3,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [{ //当前条件
+ "columnId": 0, //发起人
+ "type": 1, //1 发起人 2其他
+ "optType": "", //["", "<", ">", "≤", "=", "≥"][optType]
+ "zdy1": "",//左侧自定义内容
+ "zdy2": "",//右侧自定义内容
+ "opt1": "",//左侧符号 < ≤
+ "opt2": "",//右侧符号 < ≤
+ "columnDbname": "",//条件字段名称
+ "columnType": "",//条件字段类型
+ "showType": "",//3多选 其他
+ "showName": "",//展示名
+ "fixedDownBoxValue": ""//多选数组
+ }],
+ "nodeUserList": [{
+ "targetId": 85,
+ "type": 1, //1具体人员 2角色 3部门
+ "name": "天旭"
+ }],
+ "childNode": {
+ "nodeName": "审核人",
+ "type": 1,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [{
+ "targetId": 2515744,
+ "type": 1,
+ "name": "哈哈哈哈"
+ }],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ },
+ "conditionNodes": [],
+ "error": false
+ }, {
+ "nodeName": "条件2",
+ "type": 3,
+ "priorityLevel": 2,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ }]
+ },
+ "nodeUserList": []
+ },
+ "conditionNodes": []
+ }
+ }
+}
\ No newline at end of file
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
deleted file mode 100644
index 35ac3b4..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.controller.workbench;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 所有业务消息提醒 前端控制器
- *
- *
- * @author wangpeng
- * @since 2023-02-23
- */
-@RestController
-@RequestMapping("/workbenchMessage")
-public class WorkbenchMessageController {
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
new file mode 100644
index 0000000..4ec8dac
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 所有业务消息提醒 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-23
+ */
+@RestController
+@RequestMapping("/workbench/remindMessage")
+public class WorkbenchRemindMessageController {
+
+}
diff --git "a/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..22f3ead
--- /dev/null
+++ "b/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,144 @@
+export default {
+ "code": "200",
+ "msg": "success",
+ "data": {
+ "formId":"",//表单id
+ "formName":"",//表单名称
+ "formDesc":"",//表单描述
+ "tableId": 1,//审批id
+ "workFlowDef": {
+ "flowKey":"",//流程定义key,更新流程定义使用(更新必传)
+ "directorId":"",//传入用户id,代表流程负责人
+ "name": "合同审批",//审批名称
+ "decisionItem":1,//可选决策项(1同意驳回拒绝 2同意驳回 3同意拒绝)
+ "noticeStarter":1//是否通知发起人(1是 0否)
+ },
+ "directorMaxLevel": 4,//审批主管最大层级
+ "flowPermission": [],//发起人
+ "nodeConfig": {
+ "nodeName": "发起人",//节点名称
+ "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
+ // "priorityLevel": "",// 条件优先级
+ "settype": "",// 审批人设置 1指定成员 11指定角色 2主管 4发起人自选 5发起人自己 7连续多级主管
+ // "selectMode": "", //审批人数 1选一个人 2选多个人
+ "selectRange": "", //选择范围 1.全公司 2指定成员 2指定角色
+ "directorLevel": 2, //审批终点 最高层主管数
+ "examineMode": "", //多人审批时采用的审批方式 1依次审批 2会签 3或签
+ "noHanderAction": "",//审批人为空时 1自动审批通过 2自动审批拒绝 3转交给审核管理员
+ // "examineEndDirectorLevel": "", //审批终点 第n层主管
+ // "ccSelfSelectFlag": "", //允许发起人自选抄送人
+ "conditionList": [], //当审批单同时满足以下条件时进入此流程
+ "nodeUserList": [], //操作人
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false, //当前审批是否通过校验
+ "type": 1,
+ "settype": 2,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "路由",
+ "type": 4,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "抄送人",
+ "type": 2,
+ "ccSelfSelectFlag": 1,
+ "childNode": null,
+ "nodeUserList": [],
+ "error": false
+ },
+ "conditionNodes": [{ //条件节点
+ "nodeName": "条件1",
+ "type": 3,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [{ //当前条件
+ "columnId": 0, //发起人
+ "type": 1, //1 发起人 2其他
+ "optType": "", //["", "<", ">", "≤", "=", "≥"][optType]
+ "zdy1": "",//左侧自定义内容
+ "zdy2": "",//右侧自定义内容
+ "opt1": "",//左侧符号 < ≤
+ "opt2": "",//右侧符号 < ≤
+ "columnDbname": "",//条件字段名称
+ "columnType": "",//条件字段类型
+ "showType": "",//3多选 其他
+ "showName": "",//展示名
+ "fixedDownBoxValue": ""//多选数组
+ }],
+ "nodeUserList": [{
+ "targetId": 85,
+ "type": 1, //1具体人员 2角色 3部门
+ "name": "天旭"
+ }],
+ "childNode": {
+ "nodeName": "审核人",
+ "type": 1,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [{
+ "targetId": 2515744,
+ "type": 1,
+ "name": "哈哈哈哈"
+ }],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ },
+ "conditionNodes": [],
+ "error": false
+ }, {
+ "nodeName": "条件2",
+ "type": 3,
+ "priorityLevel": 2,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ }]
+ },
+ "nodeUserList": []
+ },
+ "conditionNodes": []
+ }
+ }
+}
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 7bb2954..6c5dbb0 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -39,4 +39,6 @@
//资产类型1(测量设备)
String ASSET_TYPE_1 = "1";
+ String MEASURE_STATUS = "measureStatus";
+
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
deleted file mode 100644
index 35ac3b4..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.controller.workbench;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 所有业务消息提醒 前端控制器
- *
- *
- * @author wangpeng
- * @since 2023-02-23
- */
-@RestController
-@RequestMapping("/workbenchMessage")
-public class WorkbenchMessageController {
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
new file mode 100644
index 0000000..4ec8dac
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 所有业务消息提醒 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-23
+ */
+@RestController
+@RequestMapping("/workbench/remindMessage")
+public class WorkbenchRemindMessageController {
+
+}
diff --git "a/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..22f3ead
--- /dev/null
+++ "b/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,144 @@
+export default {
+ "code": "200",
+ "msg": "success",
+ "data": {
+ "formId":"",//表单id
+ "formName":"",//表单名称
+ "formDesc":"",//表单描述
+ "tableId": 1,//审批id
+ "workFlowDef": {
+ "flowKey":"",//流程定义key,更新流程定义使用(更新必传)
+ "directorId":"",//传入用户id,代表流程负责人
+ "name": "合同审批",//审批名称
+ "decisionItem":1,//可选决策项(1同意驳回拒绝 2同意驳回 3同意拒绝)
+ "noticeStarter":1//是否通知发起人(1是 0否)
+ },
+ "directorMaxLevel": 4,//审批主管最大层级
+ "flowPermission": [],//发起人
+ "nodeConfig": {
+ "nodeName": "发起人",//节点名称
+ "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
+ // "priorityLevel": "",// 条件优先级
+ "settype": "",// 审批人设置 1指定成员 11指定角色 2主管 4发起人自选 5发起人自己 7连续多级主管
+ // "selectMode": "", //审批人数 1选一个人 2选多个人
+ "selectRange": "", //选择范围 1.全公司 2指定成员 2指定角色
+ "directorLevel": 2, //审批终点 最高层主管数
+ "examineMode": "", //多人审批时采用的审批方式 1依次审批 2会签 3或签
+ "noHanderAction": "",//审批人为空时 1自动审批通过 2自动审批拒绝 3转交给审核管理员
+ // "examineEndDirectorLevel": "", //审批终点 第n层主管
+ // "ccSelfSelectFlag": "", //允许发起人自选抄送人
+ "conditionList": [], //当审批单同时满足以下条件时进入此流程
+ "nodeUserList": [], //操作人
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false, //当前审批是否通过校验
+ "type": 1,
+ "settype": 2,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "路由",
+ "type": 4,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "抄送人",
+ "type": 2,
+ "ccSelfSelectFlag": 1,
+ "childNode": null,
+ "nodeUserList": [],
+ "error": false
+ },
+ "conditionNodes": [{ //条件节点
+ "nodeName": "条件1",
+ "type": 3,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [{ //当前条件
+ "columnId": 0, //发起人
+ "type": 1, //1 发起人 2其他
+ "optType": "", //["", "<", ">", "≤", "=", "≥"][optType]
+ "zdy1": "",//左侧自定义内容
+ "zdy2": "",//右侧自定义内容
+ "opt1": "",//左侧符号 < ≤
+ "opt2": "",//右侧符号 < ≤
+ "columnDbname": "",//条件字段名称
+ "columnType": "",//条件字段类型
+ "showType": "",//3多选 其他
+ "showName": "",//展示名
+ "fixedDownBoxValue": ""//多选数组
+ }],
+ "nodeUserList": [{
+ "targetId": 85,
+ "type": 1, //1具体人员 2角色 3部门
+ "name": "天旭"
+ }],
+ "childNode": {
+ "nodeName": "审核人",
+ "type": 1,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [{
+ "targetId": 2515744,
+ "type": 1,
+ "name": "哈哈哈哈"
+ }],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ },
+ "conditionNodes": [],
+ "error": false
+ }, {
+ "nodeName": "条件2",
+ "type": 3,
+ "priorityLevel": 2,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ }]
+ },
+ "nodeUserList": []
+ },
+ "conditionNodes": []
+ }
+ }
+}
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 7bb2954..6c5dbb0 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -39,4 +39,6 @@
//资产类型1(测量设备)
String ASSET_TYPE_1 = "1";
+ String MEASURE_STATUS = "measureStatus";
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchMessageMapper.java
deleted file mode 100644
index 2c52c55..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchMessageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.mapper.workbench;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.workbench.WorkbenchMessage;
-
-/**
- *
- * 所有业务消息提醒 Mapper 接口
- *
- *
- * @author wangpeng
- * @since 2023-02-23
- */
-public interface WorkbenchMessageMapper extends BaseMapper {
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
deleted file mode 100644
index 35ac3b4..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.controller.workbench;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 所有业务消息提醒 前端控制器
- *
- *
- * @author wangpeng
- * @since 2023-02-23
- */
-@RestController
-@RequestMapping("/workbenchMessage")
-public class WorkbenchMessageController {
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
new file mode 100644
index 0000000..4ec8dac
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 所有业务消息提醒 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-23
+ */
+@RestController
+@RequestMapping("/workbench/remindMessage")
+public class WorkbenchRemindMessageController {
+
+}
diff --git "a/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..22f3ead
--- /dev/null
+++ "b/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,144 @@
+export default {
+ "code": "200",
+ "msg": "success",
+ "data": {
+ "formId":"",//表单id
+ "formName":"",//表单名称
+ "formDesc":"",//表单描述
+ "tableId": 1,//审批id
+ "workFlowDef": {
+ "flowKey":"",//流程定义key,更新流程定义使用(更新必传)
+ "directorId":"",//传入用户id,代表流程负责人
+ "name": "合同审批",//审批名称
+ "decisionItem":1,//可选决策项(1同意驳回拒绝 2同意驳回 3同意拒绝)
+ "noticeStarter":1//是否通知发起人(1是 0否)
+ },
+ "directorMaxLevel": 4,//审批主管最大层级
+ "flowPermission": [],//发起人
+ "nodeConfig": {
+ "nodeName": "发起人",//节点名称
+ "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
+ // "priorityLevel": "",// 条件优先级
+ "settype": "",// 审批人设置 1指定成员 11指定角色 2主管 4发起人自选 5发起人自己 7连续多级主管
+ // "selectMode": "", //审批人数 1选一个人 2选多个人
+ "selectRange": "", //选择范围 1.全公司 2指定成员 2指定角色
+ "directorLevel": 2, //审批终点 最高层主管数
+ "examineMode": "", //多人审批时采用的审批方式 1依次审批 2会签 3或签
+ "noHanderAction": "",//审批人为空时 1自动审批通过 2自动审批拒绝 3转交给审核管理员
+ // "examineEndDirectorLevel": "", //审批终点 第n层主管
+ // "ccSelfSelectFlag": "", //允许发起人自选抄送人
+ "conditionList": [], //当审批单同时满足以下条件时进入此流程
+ "nodeUserList": [], //操作人
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false, //当前审批是否通过校验
+ "type": 1,
+ "settype": 2,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "路由",
+ "type": 4,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "抄送人",
+ "type": 2,
+ "ccSelfSelectFlag": 1,
+ "childNode": null,
+ "nodeUserList": [],
+ "error": false
+ },
+ "conditionNodes": [{ //条件节点
+ "nodeName": "条件1",
+ "type": 3,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [{ //当前条件
+ "columnId": 0, //发起人
+ "type": 1, //1 发起人 2其他
+ "optType": "", //["", "<", ">", "≤", "=", "≥"][optType]
+ "zdy1": "",//左侧自定义内容
+ "zdy2": "",//右侧自定义内容
+ "opt1": "",//左侧符号 < ≤
+ "opt2": "",//右侧符号 < ≤
+ "columnDbname": "",//条件字段名称
+ "columnType": "",//条件字段类型
+ "showType": "",//3多选 其他
+ "showName": "",//展示名
+ "fixedDownBoxValue": ""//多选数组
+ }],
+ "nodeUserList": [{
+ "targetId": 85,
+ "type": 1, //1具体人员 2角色 3部门
+ "name": "天旭"
+ }],
+ "childNode": {
+ "nodeName": "审核人",
+ "type": 1,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [{
+ "targetId": 2515744,
+ "type": 1,
+ "name": "哈哈哈哈"
+ }],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ },
+ "conditionNodes": [],
+ "error": false
+ }, {
+ "nodeName": "条件2",
+ "type": 3,
+ "priorityLevel": 2,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ }]
+ },
+ "nodeUserList": []
+ },
+ "conditionNodes": []
+ }
+ }
+}
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 7bb2954..6c5dbb0 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -39,4 +39,6 @@
//资产类型1(测量设备)
String ASSET_TYPE_1 = "1";
+ String MEASURE_STATUS = "measureStatus";
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchMessageMapper.java
deleted file mode 100644
index 2c52c55..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchMessageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.mapper.workbench;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.workbench.WorkbenchMessage;
-
-/**
- *
- * 所有业务消息提醒 Mapper 接口
- *
- *
- * @author wangpeng
- * @since 2023-02-23
- */
-public interface WorkbenchMessageMapper extends BaseMapper {
-
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchRemindMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchRemindMessageMapper.java
new file mode 100644
index 0000000..c59408e
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchRemindMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
+
+/**
+ *
+ * 所有业务消息提醒 Mapper 接口
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-23
+ */
+public interface WorkbenchRemindMessageMapper extends BaseMapper {
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
deleted file mode 100644
index 35ac3b4..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchMessageController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.controller.workbench;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 所有业务消息提醒 前端控制器
- *
- *
- * @author wangpeng
- * @since 2023-02-23
- */
-@RestController
-@RequestMapping("/workbenchMessage")
-public class WorkbenchMessageController {
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
new file mode 100644
index 0000000..4ec8dac
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 所有业务消息提醒 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-23
+ */
+@RestController
+@RequestMapping("/workbench/remindMessage")
+public class WorkbenchRemindMessageController {
+
+}
diff --git "a/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..22f3ead
--- /dev/null
+++ "b/casic-metering-common/src/main/java/com/casic/missiles/config/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,144 @@
+export default {
+ "code": "200",
+ "msg": "success",
+ "data": {
+ "formId":"",//表单id
+ "formName":"",//表单名称
+ "formDesc":"",//表单描述
+ "tableId": 1,//审批id
+ "workFlowDef": {
+ "flowKey":"",//流程定义key,更新流程定义使用(更新必传)
+ "directorId":"",//传入用户id,代表流程负责人
+ "name": "合同审批",//审批名称
+ "decisionItem":1,//可选决策项(1同意驳回拒绝 2同意驳回 3同意拒绝)
+ "noticeStarter":1//是否通知发起人(1是 0否)
+ },
+ "directorMaxLevel": 4,//审批主管最大层级
+ "flowPermission": [],//发起人
+ "nodeConfig": {
+ "nodeName": "发起人",//节点名称
+ "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
+ // "priorityLevel": "",// 条件优先级
+ "settype": "",// 审批人设置 1指定成员 11指定角色 2主管 4发起人自选 5发起人自己 7连续多级主管
+ // "selectMode": "", //审批人数 1选一个人 2选多个人
+ "selectRange": "", //选择范围 1.全公司 2指定成员 2指定角色
+ "directorLevel": 2, //审批终点 最高层主管数
+ "examineMode": "", //多人审批时采用的审批方式 1依次审批 2会签 3或签
+ "noHanderAction": "",//审批人为空时 1自动审批通过 2自动审批拒绝 3转交给审核管理员
+ // "examineEndDirectorLevel": "", //审批终点 第n层主管
+ // "ccSelfSelectFlag": "", //允许发起人自选抄送人
+ "conditionList": [], //当审批单同时满足以下条件时进入此流程
+ "nodeUserList": [], //操作人
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false, //当前审批是否通过校验
+ "type": 1,
+ "settype": 2,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "路由",
+ "type": 4,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "抄送人",
+ "type": 2,
+ "ccSelfSelectFlag": 1,
+ "childNode": null,
+ "nodeUserList": [],
+ "error": false
+ },
+ "conditionNodes": [{ //条件节点
+ "nodeName": "条件1",
+ "type": 3,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [{ //当前条件
+ "columnId": 0, //发起人
+ "type": 1, //1 发起人 2其他
+ "optType": "", //["", "<", ">", "≤", "=", "≥"][optType]
+ "zdy1": "",//左侧自定义内容
+ "zdy2": "",//右侧自定义内容
+ "opt1": "",//左侧符号 < ≤
+ "opt2": "",//右侧符号 < ≤
+ "columnDbname": "",//条件字段名称
+ "columnType": "",//条件字段类型
+ "showType": "",//3多选 其他
+ "showName": "",//展示名
+ "fixedDownBoxValue": ""//多选数组
+ }],
+ "nodeUserList": [{
+ "targetId": 85,
+ "type": 1, //1具体人员 2角色 3部门
+ "name": "天旭"
+ }],
+ "childNode": {
+ "nodeName": "审核人",
+ "type": 1,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [{
+ "targetId": 2515744,
+ "type": 1,
+ "name": "哈哈哈哈"
+ }],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ },
+ "conditionNodes": [],
+ "error": false
+ }, {
+ "nodeName": "条件2",
+ "type": 3,
+ "priorityLevel": 2,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ }]
+ },
+ "nodeUserList": []
+ },
+ "conditionNodes": []
+ }
+ }
+}
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 7bb2954..6c5dbb0 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -39,4 +39,6 @@
//资产类型1(测量设备)
String ASSET_TYPE_1 = "1";
+ String MEASURE_STATUS = "measureStatus";
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchMessageMapper.java
deleted file mode 100644
index 2c52c55..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchMessageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.mapper.workbench;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.workbench.WorkbenchMessage;
-
-/**
- *
- * 所有业务消息提醒 Mapper 接口
- *
- *
- * @author wangpeng
- * @since 2023-02-23
- */
-public interface WorkbenchMessageMapper extends BaseMapper {
-
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchRemindMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchRemindMessageMapper.java
new file mode 100644
index 0000000..c59408e
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchRemindMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
+
+/**
+ *
+ * 所有业务消息提醒 Mapper 接口
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-23
+ */
+public interface WorkbenchRemindMessageMapper extends BaseMapper {
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 87613eb..f486c47 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -58,11 +58,11 @@