From 0ad39f65475c05a5bc58307e20886cd9e8cdafe7 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 30 十一月 2023 15:19:20 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java | 9 +++++++++
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 2 +-
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java | 2 ++
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java | 2 ++
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 23 +++++++++++++++++++++--
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 14 +++++++++++++-
6 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java
index 13810f6..7bad93b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java
@@ -9,6 +9,7 @@
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
import com.zt.life.sys.dto.OssDto;
+import com.zt.modules.workflow.dto.FlowInfoDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,6 +27,7 @@
@ApiModelProperty(value = "閰嶇疆椤瑰叆搴�")
private ConfigItemWarehouse configItemWarehouse;
+ private FlowInfoDto flowInfoDto;
@ApiModelProperty(value = "鍏ュ簱閰嶇疆椤�")
private List<WarehouseConfigItem> configItemList = new ArrayList<>();
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java
index 1e24a90..08b6147 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java
@@ -45,6 +45,9 @@
@ApiModelProperty(value = "QA瀹℃牳浜�")
private String qaAuditor;
+ @ApiModelProperty(value = "QA瀹℃牳浜篒D")
+ private String qaAuditorId;
+
@ApiModelProperty(value = "QA瀹℃牳鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date qaAuditDate;
@@ -54,6 +57,9 @@
@ApiModelProperty(value = "CM瀹℃牳浜�")
private String cmAuditor;
+
+ @ApiModelProperty(value = "CM瀹℃牳浜篒D")
+ private String cmAuditorId;
@ApiModelProperty(value = "CM瀹℃牳鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -75,6 +81,9 @@
@ApiModelProperty(value = "鎿嶄綔浜�")
private String operator;
+ @ApiModelProperty(value = "鎿嶄綔浜篒D")
+ private String operatorId;
+
@ApiModelProperty(value = "鎿嶄綔鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date operateDate;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java
index 9460079..1985365 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java
@@ -1,5 +1,6 @@
package com.zt.life.modules.configItemWarehouse.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import com.zt.life.sys.dto.OssDto;
@@ -43,6 +44,7 @@
@ApiModelProperty(value = "瀵嗙骇")
private String secretClass;
+ @TableField(exist = false)
@ApiModelProperty(value = "闄勪欢")
private OssDto files;
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
index 862c230..c47a870 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -18,6 +18,8 @@
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.service.SysOssService;
+import com.zt.modules.workflow.dto.FlowInfoDto;
+import com.zt.modules.workflow.service.WorkflowService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
@@ -42,7 +44,7 @@
private SysOssService sysOssService;
@Autowired
- private TestAgencyInfoService testAgencyInfoService;
+ private WorkflowService workflowService;
@Autowired
private SysCodeRuleService sysCodeRuleService;
@@ -122,6 +124,16 @@
qaAuditService.insert(qaAudit);
}
}
+
+ Long bizId = configItemDto.getConfigItemWarehouse().getId();
+ FlowInfoDto flowInfoDto = configItemDto.getFlowInfoDto();
+
+ if (flowInfoDto != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
+ if ("tj".equals(flowInfoDto.getSubmitType())) {
+ workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
+ }
+ workflowService.approvePass(flowInfoDto.getFlowCode(), bizId, flowInfoDto.getStepIdMark());
+ }
return true;
}
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index 974750f..270a1a7 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -1,5 +1,5 @@
<template>
- <zt-dialog ref="dialog" column="3" @confirm="formSubmit">
+ <zt-dialog ref="dialog" column="3" :title="title" :stepMarker="stepMarker" @confirm="formSubmit" >
<el-form ref="dataForm" style="padding-top: 0" :inline="true" :disabled="dataForm.disabled" :model="dataForm" label-width="120px" class="warehouseFormAuto">
<div >
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
@@ -208,6 +208,8 @@
return {
disabled:true,
dataForm: {
+ stepMarker: '',
+ title: '鏌ョ湅',
id: '',
configItemWarehouse:{
id:"",
@@ -253,6 +255,15 @@
this.dataForm.projectId = row.projectId
// this.dataForm.disabled
this.getInfo()
+ if (!this.dataForm.disabled) {
+ if (!row.stepMarker) {
+ this.stepMarker = 'pzxrk_first'
+ this.title = '鍏ュ簱鐢宠'
+ } else {
+ this.title = row.stepName
+ this.stepMarker = row.stepMarker
+ }
+ }
console.log(this.dataForm.id,this.dataForm.projectId,'params params')
},
addConfigItemWarehouseRow(){
@@ -276,7 +287,15 @@
console.log(this.dataForm,"getInfo this.dataForm")
},
// 琛ㄥ崟鎻愪氦
- async formSubmit() {
+ async formSubmit(submitType) {
+ if (submitType == 'tj' || submitType == 'bl') {
+ let flowInfo = {
+ flowCode: 'pzxrk',
+ stepIdMark: this.stepMarker,
+ submitType: submitType
+ }
+ this.dataForm.flowInfoDto = flowInfo;
+ }
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/configItemWarehouse/ConfigItemWarehouse/', this.dataForm)
if (res.success) {
await this.$tip.success()
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 6afe80e..71b9ee4 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -311,7 +311,7 @@
if(row.projectId){
this.dataForm.projectId =row.projectId
} else {
- this.dataForm.projectId=row.bizGroupId
+ this.dataForm.projectId=row.bizId
}
// this.dataForm.disabled
this.getInfo()
--
Gitblit v1.9.1