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 @@ SELECT bleti.measure_dept_id AS measureSegmentId, sd.SIMPLE_NAME AS measureSegment, - bleti.measure_person_id, su.NAME AS measurePerson, bleti.update_time + bleti.measure_person_id, ms.name AS measurePerson, bleti.update_time FROM business_lab_executive_template_info bleti JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID - LEFT JOIN sys_user su ON bleti.measure_person_id = su.id + LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id WHERE bleti.is_del = 0 AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC 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 @@ SELECT bleti.measure_dept_id AS measureSegmentId, sd.SIMPLE_NAME AS measureSegment, - bleti.measure_person_id, su.NAME AS measurePerson, bleti.update_time + bleti.measure_person_id, ms.name AS measurePerson, bleti.update_time FROM business_lab_executive_template_info bleti JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID - LEFT JOIN sys_user su ON bleti.measure_person_id = su.id + LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id WHERE bleti.is_del = 0 AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml deleted file mode 100644 index 707df30..0000000 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time - - - 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 @@ SELECT bleti.measure_dept_id AS measureSegmentId, sd.SIMPLE_NAME AS measureSegment, - bleti.measure_person_id, su.NAME AS measurePerson, bleti.update_time + bleti.measure_person_id, ms.name AS measurePerson, bleti.update_time FROM business_lab_executive_template_info bleti JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID - LEFT JOIN sys_user su ON bleti.measure_person_id = su.id + LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id WHERE bleti.is_del = 0 AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml deleted file mode 100644 index 707df30..0000000 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time - - - diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml new file mode 100644 index 0000000..8bb7bb6 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time + + + 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 @@ SELECT bleti.measure_dept_id AS measureSegmentId, sd.SIMPLE_NAME AS measureSegment, - bleti.measure_person_id, su.NAME AS measurePerson, bleti.update_time + bleti.measure_person_id, ms.name AS measurePerson, bleti.update_time FROM business_lab_executive_template_info bleti JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID - LEFT JOIN sys_user su ON bleti.measure_person_id = su.id + LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id WHERE bleti.is_del = 0 AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml deleted file mode 100644 index 707df30..0000000 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time - - - diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml new file mode 100644 index 0000000..8bb7bb6 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java index 9e31fa0..0fdbe21 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java @@ -97,7 +97,7 @@ @ExcelProperty(value = "分发性质", order = 14) private String handOutProperty; - @JSONField(serialize = false) + @ApiModelProperty(value = "委托书id", dataType = "Long") private Long orderId; @JSONField(serialize = false) 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 @@ SELECT bleti.measure_dept_id AS measureSegmentId, sd.SIMPLE_NAME AS measureSegment, - bleti.measure_person_id, su.NAME AS measurePerson, bleti.update_time + bleti.measure_person_id, ms.name AS measurePerson, bleti.update_time FROM business_lab_executive_template_info bleti JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID - LEFT JOIN sys_user su ON bleti.measure_person_id = su.id + LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id WHERE bleti.is_del = 0 AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml deleted file mode 100644 index 707df30..0000000 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time - - - diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml new file mode 100644 index 0000000..8bb7bb6 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java index 9e31fa0..0fdbe21 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java @@ -97,7 +97,7 @@ @ExcelProperty(value = "分发性质", order = 14) private String handOutProperty; - @JSONField(serialize = false) + @ApiModelProperty(value = "委托书id", dataType = "Long") private Long orderId; @JSONField(serialize = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java deleted file mode 100644 index 563ae8b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.missiles.model.workbench; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 所有业务消息提醒 - *

- * - * @author wangpeng - * @since 2023-02-23 - */ -@Data -@TableName("workbench_message") -public class WorkbenchMessage implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 消息提醒的用户id - */ - @TableField("remind_id") - private Long remindId; - - /** - * 消息提醒的用户部门id - */ - @TableField("remind_dept_id") - private Long remindDeptId; - - /** - * 消息提醒的业务表id - */ - @TableField("business_id") - private Long businessId; - - /** - * 消息提醒的业务内容编码 - */ - @TableField("business_code") - private String businessCode; - - /** - * 消息提醒的业务类型 - */ - @TableField("message_type") - private String messageType; - - /** - * 消息主题(冗余) - */ - @TableField("message_title") - private String messageTitle; - - /** - * 消息内容(消息提醒的业务内容名称) - */ - @TableField("message_content") - private String messageContent; - - /** - * 1已读0未读 - */ - @TableField("status") - private Integer status; - - /** - * 发起提醒人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 发起提醒人名字 - */ - @TableField("create_user_name") - private String createUserName; - - /** - * 发起时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - -} 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 @@ SELECT bleti.measure_dept_id AS measureSegmentId, sd.SIMPLE_NAME AS measureSegment, - bleti.measure_person_id, su.NAME AS measurePerson, bleti.update_time + bleti.measure_person_id, ms.name AS measurePerson, bleti.update_time FROM business_lab_executive_template_info bleti JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID - LEFT JOIN sys_user su ON bleti.measure_person_id = su.id + LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id WHERE bleti.is_del = 0 AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml deleted file mode 100644 index 707df30..0000000 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time - - - diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml new file mode 100644 index 0000000..8bb7bb6 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java index 9e31fa0..0fdbe21 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java @@ -97,7 +97,7 @@ @ExcelProperty(value = "分发性质", order = 14) private String handOutProperty; - @JSONField(serialize = false) + @ApiModelProperty(value = "委托书id", dataType = "Long") private Long orderId; @JSONField(serialize = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java deleted file mode 100644 index 563ae8b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.missiles.model.workbench; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 所有业务消息提醒 - *

- * - * @author wangpeng - * @since 2023-02-23 - */ -@Data -@TableName("workbench_message") -public class WorkbenchMessage implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 消息提醒的用户id - */ - @TableField("remind_id") - private Long remindId; - - /** - * 消息提醒的用户部门id - */ - @TableField("remind_dept_id") - private Long remindDeptId; - - /** - * 消息提醒的业务表id - */ - @TableField("business_id") - private Long businessId; - - /** - * 消息提醒的业务内容编码 - */ - @TableField("business_code") - private String businessCode; - - /** - * 消息提醒的业务类型 - */ - @TableField("message_type") - private String messageType; - - /** - * 消息主题(冗余) - */ - @TableField("message_title") - private String messageTitle; - - /** - * 消息内容(消息提醒的业务内容名称) - */ - @TableField("message_content") - private String messageContent; - - /** - * 1已读0未读 - */ - @TableField("status") - private Integer status; - - /** - * 发起提醒人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 发起提醒人名字 - */ - @TableField("create_user_name") - private String createUserName; - - /** - * 发起时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java new file mode 100644 index 0000000..8f24e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -0,0 +1,100 @@ +package com.casic.missiles.model.workbench; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 所有业务消息提醒 + *

+ * + * @author wangpeng + * @since 2023-02-23 + */ +@Data +@TableName("workbench_remind_message") +public class WorkbenchRemindMessage implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 消息提醒的用户id + */ + @TableField("remind_id") + private Long remindId; + + /** + * 消息提醒的用户部门id + */ + @TableField("remind_dept_id") + private Long remindDeptId; + + /** + * 消息提醒的业务表id + */ + @TableField("business_id") + private Long businessId; + + /** + * 消息提醒的业务内容编码 + */ + @TableField("business_code") + private String businessCode; + + /** + * 消息提醒的业务类型 + */ + @TableField("message_type") + private String messageType; + + /** + * 消息主题(冗余) + */ + @TableField("message_title") + private String messageTitle; + + /** + * 消息内容(消息提醒的业务内容名称) + */ + @TableField("message_content") + private String messageContent; + + /** + * 1已读0未读 + */ + @TableField("status") + private Integer status; + + /** + * 发起提醒人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 发起提醒人名字 + */ + @TableField("create_user_name") + private String createUserName; + + /** + * 发起时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + +} 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 @@ SELECT bleti.measure_dept_id AS measureSegmentId, sd.SIMPLE_NAME AS measureSegment, - bleti.measure_person_id, su.NAME AS measurePerson, bleti.update_time + bleti.measure_person_id, ms.name AS measurePerson, bleti.update_time FROM business_lab_executive_template_info bleti JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID - LEFT JOIN sys_user su ON bleti.measure_person_id = su.id + LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id WHERE bleti.is_del = 0 AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml deleted file mode 100644 index 707df30..0000000 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time - - - diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml new file mode 100644 index 0000000..8bb7bb6 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java index 9e31fa0..0fdbe21 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java @@ -97,7 +97,7 @@ @ExcelProperty(value = "分发性质", order = 14) private String handOutProperty; - @JSONField(serialize = false) + @ApiModelProperty(value = "委托书id", dataType = "Long") private Long orderId; @JSONField(serialize = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java deleted file mode 100644 index 563ae8b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.missiles.model.workbench; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 所有业务消息提醒 - *

- * - * @author wangpeng - * @since 2023-02-23 - */ -@Data -@TableName("workbench_message") -public class WorkbenchMessage implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 消息提醒的用户id - */ - @TableField("remind_id") - private Long remindId; - - /** - * 消息提醒的用户部门id - */ - @TableField("remind_dept_id") - private Long remindDeptId; - - /** - * 消息提醒的业务表id - */ - @TableField("business_id") - private Long businessId; - - /** - * 消息提醒的业务内容编码 - */ - @TableField("business_code") - private String businessCode; - - /** - * 消息提醒的业务类型 - */ - @TableField("message_type") - private String messageType; - - /** - * 消息主题(冗余) - */ - @TableField("message_title") - private String messageTitle; - - /** - * 消息内容(消息提醒的业务内容名称) - */ - @TableField("message_content") - private String messageContent; - - /** - * 1已读0未读 - */ - @TableField("status") - private Integer status; - - /** - * 发起提醒人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 发起提醒人名字 - */ - @TableField("create_user_name") - private String createUserName; - - /** - * 发起时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java new file mode 100644 index 0000000..8f24e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -0,0 +1,100 @@ +package com.casic.missiles.model.workbench; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 所有业务消息提醒 + *

+ * + * @author wangpeng + * @since 2023-02-23 + */ +@Data +@TableName("workbench_remind_message") +public class WorkbenchRemindMessage implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 消息提醒的用户id + */ + @TableField("remind_id") + private Long remindId; + + /** + * 消息提醒的用户部门id + */ + @TableField("remind_dept_id") + private Long remindDeptId; + + /** + * 消息提醒的业务表id + */ + @TableField("business_id") + private Long businessId; + + /** + * 消息提醒的业务内容编码 + */ + @TableField("business_code") + private String businessCode; + + /** + * 消息提醒的业务类型 + */ + @TableField("message_type") + private String messageType; + + /** + * 消息主题(冗余) + */ + @TableField("message_title") + private String messageTitle; + + /** + * 消息内容(消息提醒的业务内容名称) + */ + @TableField("message_content") + private String messageContent; + + /** + * 1已读0未读 + */ + @TableField("status") + private Integer status; + + /** + * 发起提醒人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 发起提醒人名字 + */ + @TableField("create_user_name") + private String createUserName; + + /** + * 发起时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index afdc42a..cf5144b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; @@ -14,6 +15,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.HandOutPropertyEnum; import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -63,6 +65,8 @@ private BusinessLabExecutiveTemplateInfoMapper labExecutiveTemplateInfoMapper; @Autowired private MeterOrganizeMapper organizeMapper; + @Autowired + private AbstractDictService dictService; @Override public Page handOutListPage(Page page, SampleHandOutListRequest handOutListRequest) throws Exception{ @@ -132,12 +136,14 @@ } //根据样品id和委托书id查询检定流程、退回信息 List measureProcessDTOS = labExecutiveInfoMapper.selectExecutiveList(request.getOrderId(), request.getSampleId()); + measureProcessDTOS.forEach(measureProcessDTO -> { + measureProcessDTO.setMeasureStatusName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_STATUS, measureProcessDTO.getMeasureStatus())); + }); List measureSendBackDTOS = labExecutiveOperateLogMapper.selectExecutiveOperateLogList(request.getOrderId(), request.getSampleId()); sampleDetail.setMeasureProcessList(measureProcessDTOS); sampleDetail.setMeasureSendBackList(measureSendBackDTOS); DictCodeUtils.convertDictCodeToName(sampleDetail); return sampleDetail; - } @Override @@ -191,7 +197,7 @@ } //更新样品状态为检测中 int updateFlag = orderSampleRelationMapper.updateByOrderIdAndSampleId(orderId, sampleId, SampleStatusEnum.IN_MEASURE); - if(this.saveBatch(labExecutiveInfos) && updateFlag> 0){ + if(this.saveBatch(labExecutiveInfos) && updateFlag > 0){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); 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 @@ SELECT bleti.measure_dept_id AS measureSegmentId, sd.SIMPLE_NAME AS measureSegment, - bleti.measure_person_id, su.NAME AS measurePerson, bleti.update_time + bleti.measure_person_id, ms.name AS measurePerson, bleti.update_time FROM business_lab_executive_template_info bleti JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID - LEFT JOIN sys_user su ON bleti.measure_person_id = su.id + LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id WHERE bleti.is_del = 0 AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml deleted file mode 100644 index 707df30..0000000 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time - - - diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml new file mode 100644 index 0000000..8bb7bb6 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java index 9e31fa0..0fdbe21 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java @@ -97,7 +97,7 @@ @ExcelProperty(value = "分发性质", order = 14) private String handOutProperty; - @JSONField(serialize = false) + @ApiModelProperty(value = "委托书id", dataType = "Long") private Long orderId; @JSONField(serialize = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java deleted file mode 100644 index 563ae8b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.missiles.model.workbench; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 所有业务消息提醒 - *

- * - * @author wangpeng - * @since 2023-02-23 - */ -@Data -@TableName("workbench_message") -public class WorkbenchMessage implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 消息提醒的用户id - */ - @TableField("remind_id") - private Long remindId; - - /** - * 消息提醒的用户部门id - */ - @TableField("remind_dept_id") - private Long remindDeptId; - - /** - * 消息提醒的业务表id - */ - @TableField("business_id") - private Long businessId; - - /** - * 消息提醒的业务内容编码 - */ - @TableField("business_code") - private String businessCode; - - /** - * 消息提醒的业务类型 - */ - @TableField("message_type") - private String messageType; - - /** - * 消息主题(冗余) - */ - @TableField("message_title") - private String messageTitle; - - /** - * 消息内容(消息提醒的业务内容名称) - */ - @TableField("message_content") - private String messageContent; - - /** - * 1已读0未读 - */ - @TableField("status") - private Integer status; - - /** - * 发起提醒人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 发起提醒人名字 - */ - @TableField("create_user_name") - private String createUserName; - - /** - * 发起时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java new file mode 100644 index 0000000..8f24e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -0,0 +1,100 @@ +package com.casic.missiles.model.workbench; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 所有业务消息提醒 + *

+ * + * @author wangpeng + * @since 2023-02-23 + */ +@Data +@TableName("workbench_remind_message") +public class WorkbenchRemindMessage implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 消息提醒的用户id + */ + @TableField("remind_id") + private Long remindId; + + /** + * 消息提醒的用户部门id + */ + @TableField("remind_dept_id") + private Long remindDeptId; + + /** + * 消息提醒的业务表id + */ + @TableField("business_id") + private Long businessId; + + /** + * 消息提醒的业务内容编码 + */ + @TableField("business_code") + private String businessCode; + + /** + * 消息提醒的业务类型 + */ + @TableField("message_type") + private String messageType; + + /** + * 消息主题(冗余) + */ + @TableField("message_title") + private String messageTitle; + + /** + * 消息内容(消息提醒的业务内容名称) + */ + @TableField("message_content") + private String messageContent; + + /** + * 1已读0未读 + */ + @TableField("status") + private Integer status; + + /** + * 发起提醒人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 发起提醒人名字 + */ + @TableField("create_user_name") + private String createUserName; + + /** + * 发起时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index afdc42a..cf5144b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; @@ -14,6 +15,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.HandOutPropertyEnum; import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -63,6 +65,8 @@ private BusinessLabExecutiveTemplateInfoMapper labExecutiveTemplateInfoMapper; @Autowired private MeterOrganizeMapper organizeMapper; + @Autowired + private AbstractDictService dictService; @Override public Page handOutListPage(Page page, SampleHandOutListRequest handOutListRequest) throws Exception{ @@ -132,12 +136,14 @@ } //根据样品id和委托书id查询检定流程、退回信息 List measureProcessDTOS = labExecutiveInfoMapper.selectExecutiveList(request.getOrderId(), request.getSampleId()); + measureProcessDTOS.forEach(measureProcessDTO -> { + measureProcessDTO.setMeasureStatusName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_STATUS, measureProcessDTO.getMeasureStatus())); + }); List measureSendBackDTOS = labExecutiveOperateLogMapper.selectExecutiveOperateLogList(request.getOrderId(), request.getSampleId()); sampleDetail.setMeasureProcessList(measureProcessDTOS); sampleDetail.setMeasureSendBackList(measureSendBackDTOS); DictCodeUtils.convertDictCodeToName(sampleDetail); return sampleDetail; - } @Override @@ -191,7 +197,7 @@ } //更新样品状态为检测中 int updateFlag = orderSampleRelationMapper.updateByOrderIdAndSampleId(orderId, sampleId, SampleStatusEnum.IN_MEASURE); - if(this.saveBatch(labExecutiveInfos) && updateFlag> 0){ + if(this.saveBatch(labExecutiveInfos) && updateFlag > 0){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 4137f95..ba06aff 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -670,7 +670,7 @@ private static String createServiceTask(JSONObject flowNode, Process process, List sequenceFlows) { List incoming = flowNode.getJSONArray("incoming").toJavaList(String.class); // 自动生成id - String id = id("servicGeTask"); + String id = id("serviceTask"); if (incoming != null && !incoming.isEmpty()) { ServiceTask serviceTask = new ServiceTask(); serviceTask.setName(flowNode.getString("nodeName")); 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 @@ SELECT bleti.measure_dept_id AS measureSegmentId, sd.SIMPLE_NAME AS measureSegment, - bleti.measure_person_id, su.NAME AS measurePerson, bleti.update_time + bleti.measure_person_id, ms.name AS measurePerson, bleti.update_time FROM business_lab_executive_template_info bleti JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID - LEFT JOIN sys_user su ON bleti.measure_person_id = su.id + LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id WHERE bleti.is_del = 0 AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml deleted file mode 100644 index 707df30..0000000 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time - - - diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml new file mode 100644 index 0000000..8bb7bb6 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java index 9e31fa0..0fdbe21 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java @@ -97,7 +97,7 @@ @ExcelProperty(value = "分发性质", order = 14) private String handOutProperty; - @JSONField(serialize = false) + @ApiModelProperty(value = "委托书id", dataType = "Long") private Long orderId; @JSONField(serialize = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java deleted file mode 100644 index 563ae8b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.missiles.model.workbench; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 所有业务消息提醒 - *

- * - * @author wangpeng - * @since 2023-02-23 - */ -@Data -@TableName("workbench_message") -public class WorkbenchMessage implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 消息提醒的用户id - */ - @TableField("remind_id") - private Long remindId; - - /** - * 消息提醒的用户部门id - */ - @TableField("remind_dept_id") - private Long remindDeptId; - - /** - * 消息提醒的业务表id - */ - @TableField("business_id") - private Long businessId; - - /** - * 消息提醒的业务内容编码 - */ - @TableField("business_code") - private String businessCode; - - /** - * 消息提醒的业务类型 - */ - @TableField("message_type") - private String messageType; - - /** - * 消息主题(冗余) - */ - @TableField("message_title") - private String messageTitle; - - /** - * 消息内容(消息提醒的业务内容名称) - */ - @TableField("message_content") - private String messageContent; - - /** - * 1已读0未读 - */ - @TableField("status") - private Integer status; - - /** - * 发起提醒人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 发起提醒人名字 - */ - @TableField("create_user_name") - private String createUserName; - - /** - * 发起时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java new file mode 100644 index 0000000..8f24e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -0,0 +1,100 @@ +package com.casic.missiles.model.workbench; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 所有业务消息提醒 + *

+ * + * @author wangpeng + * @since 2023-02-23 + */ +@Data +@TableName("workbench_remind_message") +public class WorkbenchRemindMessage implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 消息提醒的用户id + */ + @TableField("remind_id") + private Long remindId; + + /** + * 消息提醒的用户部门id + */ + @TableField("remind_dept_id") + private Long remindDeptId; + + /** + * 消息提醒的业务表id + */ + @TableField("business_id") + private Long businessId; + + /** + * 消息提醒的业务内容编码 + */ + @TableField("business_code") + private String businessCode; + + /** + * 消息提醒的业务类型 + */ + @TableField("message_type") + private String messageType; + + /** + * 消息主题(冗余) + */ + @TableField("message_title") + private String messageTitle; + + /** + * 消息内容(消息提醒的业务内容名称) + */ + @TableField("message_content") + private String messageContent; + + /** + * 1已读0未读 + */ + @TableField("status") + private Integer status; + + /** + * 发起提醒人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 发起提醒人名字 + */ + @TableField("create_user_name") + private String createUserName; + + /** + * 发起时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index afdc42a..cf5144b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; @@ -14,6 +15,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.HandOutPropertyEnum; import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -63,6 +65,8 @@ private BusinessLabExecutiveTemplateInfoMapper labExecutiveTemplateInfoMapper; @Autowired private MeterOrganizeMapper organizeMapper; + @Autowired + private AbstractDictService dictService; @Override public Page handOutListPage(Page page, SampleHandOutListRequest handOutListRequest) throws Exception{ @@ -132,12 +136,14 @@ } //根据样品id和委托书id查询检定流程、退回信息 List measureProcessDTOS = labExecutiveInfoMapper.selectExecutiveList(request.getOrderId(), request.getSampleId()); + measureProcessDTOS.forEach(measureProcessDTO -> { + measureProcessDTO.setMeasureStatusName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_STATUS, measureProcessDTO.getMeasureStatus())); + }); List measureSendBackDTOS = labExecutiveOperateLogMapper.selectExecutiveOperateLogList(request.getOrderId(), request.getSampleId()); sampleDetail.setMeasureProcessList(measureProcessDTOS); sampleDetail.setMeasureSendBackList(measureSendBackDTOS); DictCodeUtils.convertDictCodeToName(sampleDetail); return sampleDetail; - } @Override @@ -191,7 +197,7 @@ } //更新样品状态为检测中 int updateFlag = orderSampleRelationMapper.updateByOrderIdAndSampleId(orderId, sampleId, SampleStatusEnum.IN_MEASURE); - if(this.saveBatch(labExecutiveInfos) && updateFlag> 0){ + if(this.saveBatch(labExecutiveInfos) && updateFlag > 0){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 4137f95..ba06aff 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -670,7 +670,7 @@ private static String createServiceTask(JSONObject flowNode, Process process, List sequenceFlows) { List incoming = flowNode.getJSONArray("incoming").toJavaList(String.class); // 自动生成id - String id = id("servicGeTask"); + String id = id("serviceTask"); if (incoming != null && !incoming.isEmpty()) { ServiceTask serviceTask = new ServiceTask(); serviceTask.setName(flowNode.getString("nodeName")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchMessageService.java deleted file mode 100644 index 0c3a75c..0000000 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchMessageService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.service.workbench; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.workbench.WorkbenchMessage; - -/** - *

- * 所有业务消息提醒 服务类 - *

- * - * @author wangpeng - * @since 2023-02-23 - */ -public interface IWorkbenchMessageService extends IService { - -} 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 @@ SELECT bleti.measure_dept_id AS measureSegmentId, sd.SIMPLE_NAME AS measureSegment, - bleti.measure_person_id, su.NAME AS measurePerson, bleti.update_time + bleti.measure_person_id, ms.name AS measurePerson, bleti.update_time FROM business_lab_executive_template_info bleti JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID - LEFT JOIN sys_user su ON bleti.measure_person_id = su.id + LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id WHERE bleti.is_del = 0 AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml deleted file mode 100644 index 707df30..0000000 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchMessageMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time - - - diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml new file mode 100644 index 0000000..8bb7bb6 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java index 9e31fa0..0fdbe21 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java @@ -97,7 +97,7 @@ @ExcelProperty(value = "分发性质", order = 14) private String handOutProperty; - @JSONField(serialize = false) + @ApiModelProperty(value = "委托书id", dataType = "Long") private Long orderId; @JSONField(serialize = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java deleted file mode 100644 index 563ae8b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchMessage.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.missiles.model.workbench; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 所有业务消息提醒 - *

- * - * @author wangpeng - * @since 2023-02-23 - */ -@Data -@TableName("workbench_message") -public class WorkbenchMessage implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 消息提醒的用户id - */ - @TableField("remind_id") - private Long remindId; - - /** - * 消息提醒的用户部门id - */ - @TableField("remind_dept_id") - private Long remindDeptId; - - /** - * 消息提醒的业务表id - */ - @TableField("business_id") - private Long businessId; - - /** - * 消息提醒的业务内容编码 - */ - @TableField("business_code") - private String businessCode; - - /** - * 消息提醒的业务类型 - */ - @TableField("message_type") - private String messageType; - - /** - * 消息主题(冗余) - */ - @TableField("message_title") - private String messageTitle; - - /** - * 消息内容(消息提醒的业务内容名称) - */ - @TableField("message_content") - private String messageContent; - - /** - * 1已读0未读 - */ - @TableField("status") - private Integer status; - - /** - * 发起提醒人id - */ - @TableField("create_user") - private Long createUser; - - /** - * 发起提醒人名字 - */ - @TableField("create_user_name") - private String createUserName; - - /** - * 发起时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java new file mode 100644 index 0000000..8f24e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -0,0 +1,100 @@ +package com.casic.missiles.model.workbench; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 所有业务消息提醒 + *

+ * + * @author wangpeng + * @since 2023-02-23 + */ +@Data +@TableName("workbench_remind_message") +public class WorkbenchRemindMessage implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 消息提醒的用户id + */ + @TableField("remind_id") + private Long remindId; + + /** + * 消息提醒的用户部门id + */ + @TableField("remind_dept_id") + private Long remindDeptId; + + /** + * 消息提醒的业务表id + */ + @TableField("business_id") + private Long businessId; + + /** + * 消息提醒的业务内容编码 + */ + @TableField("business_code") + private String businessCode; + + /** + * 消息提醒的业务类型 + */ + @TableField("message_type") + private String messageType; + + /** + * 消息主题(冗余) + */ + @TableField("message_title") + private String messageTitle; + + /** + * 消息内容(消息提醒的业务内容名称) + */ + @TableField("message_content") + private String messageContent; + + /** + * 1已读0未读 + */ + @TableField("status") + private Integer status; + + /** + * 发起提醒人id + */ + @TableField("create_user") + private Long createUser; + + /** + * 发起提醒人名字 + */ + @TableField("create_user_name") + private String createUserName; + + /** + * 发起时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index afdc42a..cf5144b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; @@ -14,6 +15,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.HandOutPropertyEnum; import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -63,6 +65,8 @@ private BusinessLabExecutiveTemplateInfoMapper labExecutiveTemplateInfoMapper; @Autowired private MeterOrganizeMapper organizeMapper; + @Autowired + private AbstractDictService dictService; @Override public Page handOutListPage(Page page, SampleHandOutListRequest handOutListRequest) throws Exception{ @@ -132,12 +136,14 @@ } //根据样品id和委托书id查询检定流程、退回信息 List measureProcessDTOS = labExecutiveInfoMapper.selectExecutiveList(request.getOrderId(), request.getSampleId()); + measureProcessDTOS.forEach(measureProcessDTO -> { + measureProcessDTO.setMeasureStatusName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_STATUS, measureProcessDTO.getMeasureStatus())); + }); List measureSendBackDTOS = labExecutiveOperateLogMapper.selectExecutiveOperateLogList(request.getOrderId(), request.getSampleId()); sampleDetail.setMeasureProcessList(measureProcessDTOS); sampleDetail.setMeasureSendBackList(measureSendBackDTOS); DictCodeUtils.convertDictCodeToName(sampleDetail); return sampleDetail; - } @Override @@ -191,7 +197,7 @@ } //更新样品状态为检测中 int updateFlag = orderSampleRelationMapper.updateByOrderIdAndSampleId(orderId, sampleId, SampleStatusEnum.IN_MEASURE); - if(this.saveBatch(labExecutiveInfos) && updateFlag> 0){ + if(this.saveBatch(labExecutiveInfos) && updateFlag > 0){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 4137f95..ba06aff 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -670,7 +670,7 @@ private static String createServiceTask(JSONObject flowNode, Process process, List sequenceFlows) { List incoming = flowNode.getJSONArray("incoming").toJavaList(String.class); // 自动生成id - String id = id("servicGeTask"); + String id = id("serviceTask"); if (incoming != null && !incoming.isEmpty()) { ServiceTask serviceTask = new ServiceTask(); serviceTask.setName(flowNode.getString("nodeName")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchMessageService.java deleted file mode 100644 index 0c3a75c..0000000 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchMessageService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.service.workbench; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.workbench.WorkbenchMessage; - -/** - *

- * 所有业务消息提醒 服务类 - *

- * - * @author wangpeng - * @since 2023-02-23 - */ -public interface IWorkbenchMessageService extends IService { - -} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchRemindMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchRemindMessageService.java new file mode 100644 index 0000000..ccb5bdc --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchRemindMessageService.java @@ -0,0 +1,17 @@ +package com.casic.missiles.service.workbench; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.workbench.WorkbenchRemindMessage; + +/** + *

+ * 所有业务消息提醒 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface IWorkbenchRemindMessageService extends IService { + +}