From 61ec02e4c9996ec86055729bad07d5da615054ed Mon Sep 17 00:00:00 2001 From: xusd Date: Fri, 20 Sep 2024 09:29:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=20=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E8=A1=A8=E5=8D=95=20=E5=AE=A1=E6=89=B9=E4=BA=BA?= =?UTF-8?q?=EF=BC=9A=E5=8F=91=E8=B5=B7=E4=BA=BA=E8=87=AA=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaintenanceOrderController.java | 11 +- .../vo/MaintenanceSubmitApproveVO.java | 24 +++ .../maintenance/MaintenanceOrderService.java | 9 +- .../MaintenanceOrderServiceImpl.java | 14 +- .../src/api/system/maintenance/maintenance.js | 7 +- .../bpm/processInstance/create/index.vue | 89 ++++++++-- .../maintenance/maintenanceInfo/create.vue | 71 +++++++- .../maintenance/maintenanceInfo/index.vue | 162 +++++++++++++++++- 8 files changed, 337 insertions(+), 50 deletions(-) create mode 100644 imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/maintenance/vo/MaintenanceSubmitApproveVO.java diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/maintenance/MaintenanceOrderController.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/maintenance/MaintenanceOrderController.java index 540d1c0..2a6fe69 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/maintenance/MaintenanceOrderController.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/maintenance/MaintenanceOrderController.java @@ -1,10 +1,7 @@ package com.inspur.module.system.controller.maintenance; import com.inspur.framework.common.pojo.PageResult; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderPageReqVO; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderRecordsPageReqVO; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderRespVO; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderSaveReqVO; +import com.inspur.module.system.controller.maintenance.vo.*; import com.inspur.module.system.dal.dataobject.maintenance.MaintenanceOrderDO; import com.inspur.module.system.service.maintenance.MaintenanceOrderService; import org.springframework.web.bind.annotation.*; @@ -110,9 +107,9 @@ public class MaintenanceOrderController { @Operation(summary = "提交审批") @PreAuthorize("@ss.hasPermission('imt:remote-maintenance-order:submitApprove')") - @GetMapping("/submitApprove/{id}") - public Boolean submitApprove(@PathVariable("id") String id){ - return maintenanceOrderService.submitApprove(id); + @PostMapping("/submitApprove") + public Boolean submitApprove(@Valid @RequestBody MaintenanceSubmitApproveVO vo){ + return maintenanceOrderService.submitApprove(vo); } } \ No newline at end of file diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/maintenance/vo/MaintenanceSubmitApproveVO.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/maintenance/vo/MaintenanceSubmitApproveVO.java new file mode 100644 index 0000000..44a502b --- /dev/null +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/maintenance/vo/MaintenanceSubmitApproveVO.java @@ -0,0 +1,24 @@ +package com.inspur.module.system.controller.maintenance.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; +import java.util.Map; + +/** + * @Author xusd + * @Date 2024/9/19 17:51 + **/ +@Data +public class MaintenanceSubmitApproveVO { + + @Schema(description = "维修工单id", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "维修工单id不能为空") + private String maintenanceOrderId; + + @Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}") + private Map> startUserSelectAssignees; + +} diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderService.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderService.java index cff86fd..2f4c8b6 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderService.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderService.java @@ -1,10 +1,7 @@ package com.inspur.module.system.service.maintenance; import com.inspur.framework.common.pojo.PageResult; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderPageReqVO; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderRecordsPageReqVO; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderRespVO; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderSaveReqVO; +import com.inspur.module.system.controller.maintenance.vo.*; import com.inspur.module.system.dal.dataobject.maintenance.MaintenanceOrderDO; import javax.validation.*; @@ -98,8 +95,8 @@ public interface MaintenanceOrderService { * * @Author xusd * @Date 18:19 2024/9/12 - * @param id + * @param vo * @return java.lang.Boolean */ - Boolean submitApprove(String id); + Boolean submitApprove(MaintenanceSubmitApproveVO vo); } \ No newline at end of file diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderServiceImpl.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderServiceImpl.java index 14f11d8..73db251 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderServiceImpl.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderServiceImpl.java @@ -12,10 +12,7 @@ import com.inspur.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import com.inspur.module.system.controller.baseData.vo.CustomerInfoSelectionVO; import com.inspur.module.system.controller.equip.vo.ComponentSelectionVO; import com.inspur.module.system.controller.equip.vo.EquipSelectionVO; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderPageReqVO; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderRecordsPageReqVO; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderRespVO; -import com.inspur.module.system.controller.maintenance.vo.MaintenanceOrderSaveReqVO; +import com.inspur.module.system.controller.maintenance.vo.*; import com.inspur.module.system.dal.dataobject.maintenance.MaintenanceOrderDO; import com.inspur.module.system.dal.dataobject.maintenance.MaintenanceReportDO; import com.inspur.module.system.dal.dataobject.user.AdminUserDO; @@ -237,20 +234,19 @@ public class MaintenanceOrderServiceImpl implements MaintenanceOrderService { @Override @Transactional(rollbackFor = Exception.class) - public Boolean submitApprove(String id) { + public Boolean submitApprove(MaintenanceSubmitApproveVO vo) { // 发起 BPM 流程 // Map processInstanceVariables = new HashMap<>(); // processInstanceVariables.put("day", day); - Map> startUserSelectAssignees = new HashMap<>(); String processInstanceId = processInstanceApi.createProcessInstance(getLoginUserId(), new BpmProcessInstanceCreateReqDTO() .setProcessDefinitionKey(PROCESS_KEY) // .setVariables(processInstanceVariables) - .setBusinessKey(String.valueOf(id)) - .setStartUserSelectAssignees(startUserSelectAssignees)); + .setBusinessKey(vo.getMaintenanceOrderId()) + .setStartUserSelectAssignees(vo.getStartUserSelectAssignees())); // 将工作流的编号、状态、审批状态，更新到 业务表 中 return maintenanceOrderMapper.updateById(new MaintenanceOrderDO() - .setMaintenanceOrderId(id) + .setMaintenanceOrderId(vo.getMaintenanceOrderId()) .setProcessInstanceId(processInstanceId) .setStatus(1) .setApproveStatus(1)) > 0; diff --git a/imt-ui/src/api/system/maintenance/maintenance.js b/imt-ui/src/api/system/maintenance/maintenance.js index a1cbbc1..938558b 100644 --- a/imt-ui/src/api/system/maintenance/maintenance.js +++ b/imt-ui/src/api/system/maintenance/maintenance.js @@ -70,9 +70,10 @@ export function getRemoteMaintenanceOrderRecord(id) { } // 提交审批 -export function submitMaintenanceApprove(id) { +export function submitMaintenanceApprove(data) { return request({ - url: '/maintenance/submitApprove/' + id, - method: 'get' + url: '/maintenance/submitApprove', + method: 'post', + data: data }) } diff --git a/imt-ui/src/views/bpm/processInstance/create/index.vue b/imt-ui/src/views/bpm/processInstance/create/index.vue index a5a16d4..4ae654a 100644 --- a/imt-ui/src/views/bpm/processInstance/create/index.vue +++ b/imt-ui/src/views/bpm/processInstance/create/index.vue @@ -33,10 +33,45 @@ 申请信息【{{ selectProcessInstance.name }}】 选择其它流程 - +
+
+ +
@@ -61,6 +96,7 @@ import {DICT_TYPE, getDictDatas} from "@/utils/dict"; import {decodeFields} from "@/utils/formGenerator"; import Parser from '@/components/parser/Parser' import {createProcessInstance} from "@/api/bpm/processInstance"; +import {listSimpleUsers} from '@/api/system/user' import {getModel} from "@/api/bpm/model"; // 流程实例的发起 @@ -71,6 +107,7 @@ export default { }, data() { return { + test:[], // 遮罩层 loading: true, // 表格数据 @@ -95,6 +132,9 @@ export default { // 数据字典 categoryDictDatas: getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY), + startUserSelectAssigneesFormRules:{}, + startUserSelectTasks:[], + userList:[], }; }, created() { @@ -123,24 +163,49 @@ export default { }, /** 处理选择流程的按钮操作 **/ handleSelect(row) { + console.log("row",row); // 设置选择的流程 this.selectProcessInstance = row; - console.log(row) + this.startUserSelectAssignees = {} + console.log("row",row) // 流程表单 - if (row.formId) { - // 设置对应的表单 - this.detailForm = { - ...JSON.parse(row.formConf), - fields: decodeFields(row.formFields) - } - + if (row.formType === 10) { // 加载流程图 - getProcessDefinitionBpmnXML(row.id).then(response => { + getProcessDefinitionBpmnXML(row.id).then(async response => { + console.log("response.data", response.data) this.bpmnXML = response.data.bpmnXml; + this.startUserSelectTasks = response.data.startUserSelectTasks; + // 设置指定审批人 + if (this.startUserSelectTasks.length > 0) { + console.log("this.startUserSelectTasks",this.startUserSelectTasks) + // this.detailForm.formRules.push({ + // type: 'startUserSelect', + // props: { + // title: '指定审批人' + // } + // }) + // 设置校验规则 + for (const userTask of this.startUserSelectTasks) { + this.$set(this.startUserSelectAssignees, userTask.id, []); + this.$set(this.startUserSelectAssigneesFormRules, userTask.id, [{required: true, message: '请选择审批人', trigger: 'change'}]); + } + // 加载用户列表 + await listSimpleUsers().then(res=>{ + this.userList = res.data; + console.log("this.userList",this.userList); + }) + } + console.log("this.startUserSelectAssigneesFormRules",this.startUserSelectAssigneesFormRules) + // 设置对应的表单 + this.detailForm = { + ...JSON.parse(row.formConf), + fields: decodeFields(row.formFields), + formRules: this.startUserSelectAssigneesFormRules, + } + console.log("this.detailForm",this.detailForm) }) } else if (row.formCustomCreatePath) { - this.$router.push({ path: row.formCustomCreatePath}); - // 这里暂时无需加载流程图，因为跳出到另外个 Tab； + this.$router.push({ path: row.formCustomCreatePath, query: { id: row.id}}); } }, /** 提交按钮 */ diff --git a/imt-ui/src/views/system/maintenance/maintenanceInfo/create.vue b/imt-ui/src/views/system/maintenance/maintenanceInfo/create.vue index e748e6d..851530b 100644 --- a/imt-ui/src/views/system/maintenance/maintenanceInfo/create.vue +++ b/imt-ui/src/views/system/maintenance/maintenanceInfo/create.vue @@ -79,7 +79,36 @@ -
+ + + + + + + + + + +
提 交
@@ -92,12 +121,17 @@ import {getEquipCascader} from "@/api/system/equip/equipInfo"; import {getComponentSelection} from "@/api/system/equip/componentInfo"; import {getCustomerSelection} from "@/api/system/baseData/customerInfo"; import {listSimpleUsers} from "@/api/system/user"; +import {getProcessDefinitionBpmnXML} from "@/api/bpm/definition"; +import {decodeFields} from "@/utils/formGenerator"; export default { name: "RemoteMaintenanceOrderForm", data() { return { + startUserSelectAssignees:{}, + startUserSelectAssigneesFormRules:{}, + startUserSelectTasks:[], userList:[], cascaderValue:[], equipCascader:[], @@ -129,17 +163,18 @@ export default { // 表单校验 // 表单校验 formRules: { - equipId: [{ required: true, message: '机床设备不能为空', trigger: 'blur' }], - componentId: [{ required: true, message: '机床组件不能为空', trigger: 'blur' }], - faultType: [{ required: true, message: '故障类型不能为空', trigger: 'blur' }], - description: [{ required: true, message: '故障描述不能为空', trigger: 'blur' }], - priority: [{ required: true, message: '优先级不能为空', trigger: 'blur' }], + equipId: [{ required: true, message: '机床设备不能为空', trigger: 'change' }], + componentId: [{ required: true, message: '机床组件不能为空', trigger: 'change' }], + faultType: [{ required: true, message: '故障类型不能为空', trigger: 'change' }], + description: [{ required: true, message: '故障描述不能为空', trigger: 'change' }], + priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }], customerId: [{ required: true, message: '机床客户信息不能为空', trigger: 'blur' }], }, }; }, created() { this.initSelection(); + this.getApproverForm(); }, methods: { //回显(多级) @@ -211,13 +246,37 @@ export default { } this.dialogTitle = "新增远程维修工单"; }, + getApproverForm(){ + // 加载流程图 + getProcessDefinitionBpmnXML(this.$route.query.id).then(async response => { + console.log("response.data", response.data) + this.bpmnXML = response.data.bpmnXml; + this.startUserSelectTasks = response.data.startUserSelectTasks; + // 设置指定审批人 + if (this.startUserSelectTasks.length > 0) { + console.log("this.startUserSelectTasks",this.startUserSelectTasks) + // 设置校验规则 + for (const userTask of this.startUserSelectTasks) { + this.$set(this.startUserSelectAssignees, userTask.id, []); + this.$set(this.startUserSelectAssigneesFormRules, userTask.id, [{required: true, message: '请选择审批人', trigger: 'change'}]); + } + } + console.log("this.startUserSelectAssigneesFormRules",this.startUserSelectAssigneesFormRules) + console.log("this.startUserSelectAssignees",this.startUserSelectAssignees); + }) + }, /** 提交按钮 */ async submitForm() { + console.log("this.startUserSelectAssignees",this.startUserSelectAssignees); console.log(this.formData) // 校验主表 await this.$refs["formRef"].validate(); + if (this.startUserSelectTasks.length > 0){ + await this.$refs["startUserSelectAssigneesFormRef"].validate(); + } this.formData.status = 1; console.log(this.formData) + this.formData.startUserSelectAssignees = this.startUserSelectAssignees; await RemoteMaintenanceOrderApi.createRemoteMaintenanceOrder(this.formData) this.$modal.msgSuccess("提交成功"); this.$tab.closeOpenPage({ path: "/maintenance/remote-maintenance-order" }); diff --git a/imt-ui/src/views/system/maintenance/maintenanceInfo/index.vue b/imt-ui/src/views/system/maintenance/maintenanceInfo/index.vue index c2ff122..e265c82 100644 --- a/imt-ui/src/views/system/maintenance/maintenanceInfo/index.vue +++ b/imt-ui/src/views/system/maintenance/maintenanceInfo/index.vue @@ -107,7 +107,7 @@ 审批记录 - 提交审批 @@ -119,6 +119,105 @@ + + + + + + + {{ submitApproveForm.maintenanceOrderNo }} + + + + + {{ submitApproveForm.equipNo }} + + + + + {{ submitApproveForm.componentName }} + + + + + {{ submitApproveForm.customerName }} + + + + + + + + + + {{ submitApproveForm.description }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 提 交 + 取 消 +
+
@@ -130,6 +229,8 @@ import {getCustomerSelection} from '@/api/system/baseData/customerInfo' import RemoteMaintenanceOrderForm from './RemoteMaintenanceOrderForm.vue'; import {DICT_TYPE} from "@/utils/dict"; import ApproveRecord from "@/views/bpm/processInstance/approveRecord.vue"; +import {getProcessDefinitionBpmnXML} from "@/api/bpm/definition"; +import {listSimpleUsers} from "@/api/system/user"; export default { name: "RemoteMaintenanceOrder", @@ -144,6 +245,12 @@ export default { }, data() { return { + submitApproveForm:{}, + startUserSelectAssignees:{}, + startUserSelectAssigneesFormRules:{}, + startUserSelectTasks:[], + userList:[], + submitApproveOpen: false, cascaderValue:[], equipCascader:[], componentSelection:[], @@ -180,14 +287,55 @@ export default { this.initSelection(); }, methods: { - submitApprove(row){ + closeSubmitApprove(){ + this.submitApproveOpen = false; + this.$refs.startUserSelectAssigneesFormRef.resetFields(); + }, + openSubmitApprove(row){ const maintenanceOrderId = row.maintenanceOrderId; - this.$modal.confirm('是否确认提交维修工单编号为"' + row.maintenanceOrderNo + '"的数据项?').then(()=>{ + console.log(maintenanceOrderId); + // 加载流程图实体 + getProcessDefinitionBpmnXML(null,"maintenance_approve").then(async response => { + console.log("response.data", response.data) + this.bpmnXML = response.data.bpmnXml; + this.startUserSelectTasks = response.data.startUserSelectTasks; + // 设置指定审批人 + if (this.startUserSelectTasks.length > 0) { + this.submitApproveOpen = true; + RemoteMaintenanceOrderApi.getRemoteMaintenanceOrderRecord(maintenanceOrderId).then(res=>{ + console.log("res.data",res.data); + this.submitApproveForm = res.data; + }) + listSimpleUsers().then(res=>{ + this.userList = res.data; + }) + console.log("this.startUserSelectTasks",this.startUserSelectTasks) + // 设置校验规则 + for (const userTask of this.startUserSelectTasks) { + this.$set(this.startUserSelectAssignees, userTask.id, []); + this.$set(this.startUserSelectAssigneesFormRules, userTask.id, [{required: true, message: '请选择审批人', trigger: 'change'}]); + } + }else { + this.$modal.confirm('是否确认提交维修工单编号为"' + row.maintenanceOrderNo + '"的数据项?').then(()=>{ + this.submitApprove(row.maintenanceOrderId); + }) + } + }) + }, + async submitApprove(maintenanceOrderId){ + console.log(maintenanceOrderId); + if (this.startUserSelectTasks.length > 0) { + await this.$refs.startUserSelectAssigneesFormRef.validate(); + } + const data = { + maintenanceOrderId:maintenanceOrderId, + startUserSelectAssignees: this.startUserSelectAssignees + } + await RemoteMaintenanceOrderApi.submitMaintenanceApprove(data).then(res=>{ this.loading = true; - RemoteMaintenanceOrderApi.submitMaintenanceApprove(maintenanceOrderId).then(res=>{ - this.getList(); - this.$modal.msgSuccess("提交审批成功"); - }) + this.$modal.msgSuccess("提交审批成功"); + this.submitApproveOpen = false; + this.getList(); }) }, openApproveRecord(approveId){