From 547d68b874dc4bb51d6ac39cc0fec2c227028ef0 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 07 十二月 2023 09:08:28 +0800
Subject: [PATCH] 修改
---
web/packages/components/zt-dialog/src/zt-dialog.vue | 2
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 54 +++++++++++++++--
zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml | 42 +++++++-------
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java | 2
modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml | 3
web/src/views/modules/sys/task/stay-task.vue | 7 ++
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java | 2
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 15 +++--
web/src/views/modules/project/Project-select.vue | 5 +
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 15 +++++
10 files changed, 106 insertions(+), 41 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java
index 49be760..65bed29 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java
@@ -5,6 +5,7 @@
import com.zt.life.modules.testCheckOrder.model.TestCheckOrder;
import com.zt.life.modules.testCheckOrder.model.TestCheckOrderList;
import com.zt.life.sys.dto.OssDto;
+import com.zt.modules.workflow.dto.FlowInfoDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,6 +21,7 @@
private Long configItemId;//閰嶇疆椤笽D
private String pageCode;//閰嶇疆椤圭被鍨�
+ private FlowInfoDto flowInfoDto;
@ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
private Project project;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java
index 21658a5..b71eb08 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java
@@ -33,7 +33,7 @@
private Long configItemId;
@ApiModelProperty(value = "閰嶇疆椤圭被鍨�")
- private Long pageCode;
+ private String pageCode;
@ApiModelProperty(value = "缂栧彿")
private String code;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
index f07502a..1a7d671 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
@@ -17,6 +17,7 @@
import com.zt.life.sys.dto.OssDto;
import com.zt.modules.coderule.service.SysCodeRuleService;
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;
@@ -44,6 +45,9 @@
@Autowired
private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private WorkflowService workflowService;
/**
@@ -82,6 +86,7 @@
} else {
TestCheckOrder checkOrder = new TestCheckOrder();
+ checkOrder.setPageCode(pageCode);
data.setCheckOrder(checkOrder);
List<TestCheckOrderList> checkOrderList = checkOrderListService.itemList(pageCode + "_check_item");
data.setCheckOrderList(checkOrderList);
@@ -117,6 +122,16 @@
checkOrderListService.insert(checkOrderList);
}
}
+
+ Long bizId = checkOrderDto.getCheckOrder().getId();
+ FlowInfoDto flowInfoDto = checkOrderDto.getFlowInfoDto();
+
+ if (flowInfoDto != null && flowInfoDto.getSubmitType() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
+ if ("tj".equals(flowInfoDto.getSubmitType())) {
+ workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
+ }
+ workflowService.approvePass(flowInfoDto.getFlowCode(), bizId, flowInfoDto.getStepIdMark());
+ }
return checkId;
}
}
diff --git a/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml b/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml
index 6eebb35..9f039bc 100644
--- a/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml
@@ -13,7 +13,8 @@
<select id="itemList" resultType="com.zt.life.modules.testCheckOrder.model.TestCheckOrderList">
SET @row_number = 0;
SELECT dd.dict_label AS checkContent,
- (@row_number := @row_number + 1) AS no
+ (@row_number := @row_number + 1) AS no,
+ #{pageCode}
FROM sys_dict_type dt
JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
<where>
diff --git a/web/packages/components/zt-dialog/src/zt-dialog.vue b/web/packages/components/zt-dialog/src/zt-dialog.vue
index 3118d99..bb441b7 100644
--- a/web/packages/components/zt-dialog/src/zt-dialog.vue
+++ b/web/packages/components/zt-dialog/src/zt-dialog.vue
@@ -106,7 +106,7 @@
}
if (this.$parent.init) {
- console.log(id, row, 'id row')
+ console.log(id, row,this.stepMarker, 'id row')
this.$parent.init(id, row)
}
if (id && this.$parent.getInfo) {
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index 3db991a..cd1a2b4 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -384,13 +384,16 @@
},
// 琛ㄥ崟鎻愪氦
async formSubmit(submitType) {
-/* if (this.stepMarker=='wplz_first' && submitType == 'bl') {
- for(666)
- if (this.pageNameCode[row.itemName] && !row.isCheck) {
- alert(444)
- return
+ if (this.showColumn && submitType == 'bl') {
+ for (let item of this.dataForm.configItemList) {
+ if (item) {
+ if (this.pageNameCode[item.itemName] && !item.checkId) {
+ this.$alert("鏈夋湭鎻愪氦鐨勬鏌ュ崟")
+ return
+ }
+ }
}
- }*/
+ }
if (submitType == 'tj' || submitType == 'bl') {
let flowInfo = {
flowCode: 'pzxrk',
diff --git a/web/src/views/modules/project/Project-select.vue b/web/src/views/modules/project/Project-select.vue
index 2ed3089..104e869 100644
--- a/web/src/views/modules/project/Project-select.vue
+++ b/web/src/views/modules/project/Project-select.vue
@@ -70,11 +70,12 @@
methods: {
init(tableName,row) {
this.dataForm.tableName = tableName
- this.pageCode = row.pageCode
+ if(row.pageCode!=null){
+ this.pageCode = row.pageCode
+ }
this.$nextTick(()=>{
this.$refs.tableObj.query()
})
- // console.log(this.dataForm,'this.dataForm')
},
async selectedProject(row) {
console.log(row, 'row')
diff --git a/web/src/views/modules/sys/task/stay-task.vue b/web/src/views/modules/sys/task/stay-task.vue
index d6c95e6..d4a7626 100644
--- a/web/src/views/modules/sys/task/stay-task.vue
+++ b/web/src/views/modules/sys/task/stay-task.vue
@@ -57,6 +57,7 @@
<!-- 寰呭姙浠诲姟寮圭獥寮圭獥, 鏂板 / 淇敼 -->
<ItemCirculatOrder ref="itemCirculatOrder" @refreshDataList="getQuery()"></ItemCirculatOrder>
<ConfigItemWarehouse ref="configItemWarehouse" @refreshDataList="getQuery()"></ConfigItemWarehouse>
+ <TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
<!-- </zt-table-wraper>-->
</div>
</template>
@@ -66,6 +67,7 @@
import InfiniteLoading from 'vue-infinite-loading'
import ItemCirculatOrder from '@/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate'
import ConfigItemWarehouse from '@/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate'
+ import TestCheckOrder from '@/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate'
export default {
data() {
@@ -105,7 +107,8 @@
components: {
InfiniteLoading,
ItemCirculatOrder,
- ConfigItemWarehouse
+ ConfigItemWarehouse,
+ TestCheckOrder
},
created() {
if (this.$route.path.indexOf('taskCenter') > 0 || this.system == 'smj') {
@@ -217,6 +220,8 @@
this.$refs.itemCirculatOrder.$refs.dialog.init(row.bizId, row)
} else if (row.flowCode === 'pzxrk') {
this.$refs.configItemWarehouse.$refs.dialog.init(row.bizId, row)
+ }else if (row.flowCode === 'csjcd') {
+ this.$refs.testCheckOrder.$refs.dialog.init(row.bizId, row)
} else {
if (row.stepRouterId === null) {
this.$tip.alert("娌℃湁閰嶇疆鑿滃崟id")
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index a348f1f..d530fe2 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -1,5 +1,5 @@
<template>
- <zt-dialog ref="dialog" column="2" @confirm="formSubmit" :append-to-body="true">
+ <zt-dialog ref="dialog" column="2" @confirm="formSubmit" :stepMarker="stepMarker" :append-to-body="true">
<el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled"
label-width="120px" class="testCheckFormAuto">
<div>
@@ -16,10 +16,15 @@
<el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鍚嶇О"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ヤ汉" style="width: 49%">
- <el-input v-model="dataForm.testCheckOrder.examiner" placeholder="妫�鏌ヤ汉"></el-input>
+ <el-input :disabled="stepMarker!=='csjcd_first'" v-model="dataForm.testCheckOrder.examiner" placeholder="妫�鏌ヤ汉"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ユ椂闂�" style="width: 49%">
- <el-input v-model="dataForm.testCheckOrder.examDate" placeholder="妫�鏌ユ椂闂�"></el-input>
+ <el-date-picker
+ :disabled="stepMarker!=='csjcd_first'"
+ v-model="dataForm.testCheckOrder.examDate"
+ type="date"
+ placeholder="璇烽�夋嫨妫�鏌ユ椂闂�">
+ </el-date-picker>
</el-form-item>
</div>
<div style="border-bottom: 1px solid rgba(0,0,0,.2);">
@@ -41,7 +46,7 @@
</el-table-column>
<el-table-column prop="checkResult" align="center" width="150" label="妫�鏌ョ粨鏋�">
<template v-slot="{ row }">
- <zt-dict v-model="row.checkResult" dict="is_or_not" :radio="true"></zt-dict>
+ <zt-dict v-model="row.checkResult" dict="tristate1" :radio="true"></zt-dict>
</template>
</el-table-column>
<el-table-column prop="remark" label="澶囨敞" width="100" align="center">
@@ -92,7 +97,7 @@
</div>
<div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- <el-input v-model="dataForm.testCheckOrder.processor" placeholder="澶勭悊浜�"></el-input>
+ <span>{{dataForm.testCheckOrder.processor}}</span>
</el-form-item>
</div>
<div style="width: 84px;text-align: center;font-weight: 600">
@@ -100,7 +105,7 @@
</div>
<div class="el-border-left acceptDate1" style="width: 40%;height: 40px;">
<el-form-item label-width="150px" style="width: 100%;padding-left:20px;margin-bottom:0">
- <el-input v-model="dataForm.testCheckOrder.verifier" placeholder="楠岃瘉浜�"></el-input>
+ <span>{{dataForm.testCheckOrder.verifier}}</span>
</el-form-item>
</div>
</div>
@@ -116,6 +121,7 @@
export default {
data() {
return {
+ stepMarker: '',
configDetailRow: null,
subtitle: '',
pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡'},
@@ -156,9 +162,18 @@
this.dataForm.projectId = row.projectId
}
console.log(id, row, this.subtitle, '杞欢娴嬭瘯璁″垝妫�鏌ュ崟')
-
+ if (this.configDetailRow) {
+ if (!row.stepMarker) {
+ this.stepMarker = 'csjcd_first'
+ this.title = '鍙戣捣娴嬭瘯妫�鏌ュ崟'
+ } else {
+ this.title = row.stepName
+ this.stepMarker = row.stepMarker
+ }
+ }
//this.dataForm.disabled
this.getInfo()
+
//console.log(this.dataForm.id, this.dataForm.projectId, this.stepMarker, 'this.dataForm.id, this.dataForm.projectId,this.stepMarker')
},
indexFormat(index) {
@@ -179,7 +194,30 @@
}
},
// 琛ㄥ崟鎻愪氦
- async formSubmit() {
+ async formSubmit(submitType) {
+ if (submitType == 'tj') {
+ let isFlow = false
+ for (let item of this.dataForm.checkOrderList) {
+ if (!item.checkResult) {
+ this.$alert("鏈夋湭濉啓鐨勬暟鎹�")
+ return
+ } else if (item.checkResult == "2") {
+ isFlow = true
+ }
+ }
+ if (submitType == 'tj' && !isFlow) {
+ submitType == ''
+ }
+ }
+ if (submitType == 'tj' || submitType == 'bl' && isFlow) {
+ let flowInfo = {
+ flowCode: 'csjcd',
+ stepIdMark: this.stepMarker,
+ submitType: submitType
+ }
+ this.dataForm.flowInfoDto = flowInfo;
+ }
+
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/testCheckOrder/TestCheckOrder/', this.dataForm)
if (res.success) {
await this.$tip.success()
diff --git a/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml b/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml
index eb8eaf6..de5bcca 100644
--- a/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml
+++ b/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml
@@ -4,17 +4,17 @@
<mapper namespace="com.zt.modules.workflow.dao.WfRunTaskDao">
<select id="getTaskUser" resultType="com.zt.core.sys.model.SysUser">
SELECT
- b.user_id as id
+ b. id
,b.dept_id
- ,b.user_name as username
- ,b.nick_name as real_name
- ,b.phonenumber as MOBILE
+ ,b.username
+ ,b.real_name
+ ,b.MOBILE
FROM
SYS_USER b
WHERE
- del_flag = 0
+ is_delete = 0
<if test="roleId!=null and roleId!=''">
- AND USER_ID IN(
+ AND ID IN(
SELECT
USER_ID
FROM
@@ -34,11 +34,11 @@
<if test="deptIds!=null and deptIds!=''">
AND dept_ID IN(
SELECT
- dept_id
+ id
FROM
SYS_DEPT
WHERE
- CONCAT( ',', #{deptIds}, ',' ) LIKE CONCAT( '%,', dept_id, ',%' )
+ CONCAT( ',', #{deptIds}, ',' ) LIKE CONCAT( '%,', id, ',%' )
)
</if>
@@ -48,14 +48,14 @@
</select>
<select id="getAssignUser" resultType="com.zt.core.sys.model.SysUser">
- SELECT b.user_id as id
+ SELECT b.id
, b.dept_id
- , b.user_name as username
- , b.nick_name as real_name
- , b.phonenumber as MOBILE
+ , b.username
+ , b.real_name
+ , b.MOBILE
FROM SYS_USER b
- WHERE del_flag = 0
- and user_id in (
+ WHERE is_delete = 0
+ and id in (
SELECT USER_ID
FROM SY_PROJECT_EXPERT
WHERE biz_ID = #{bizId}
@@ -66,14 +66,14 @@
</select>
<select id="getUserById" resultType="com.zt.core.sys.model.SysUser">
- SELECT b.user_id as id
+ SELECT b.id
, b.dept_id
- , b.user_name as username
- , b.nick_name as real_name
- , b.phonenumber as MOBILE
+ , b.username
+ , b.real_name
+ , b.MOBILE
FROM SYS_USER b
- WHERE del_flag = 0
- and user_id = #{userId}
+ WHERE is_delete = 0
+ and id = #{userId}
limit 1
</select>
@@ -206,7 +206,7 @@
, a.UPDATE_DATE = CURRENT_TIMESTAMP
WHERE a.IS_DELETE = 0
AND a.biz_id = #{bizId}
- AND a.receive_id = b.user_id and b.dept_id = #{receiveDeptId}
+ AND a.receive_id = b.id and b.dept_id = #{receiveDeptId}
AND a.status in (0,1)
</update>
--
Gitblit v1.9.1