From 1a7af6fff5185bb257c16b0445140c93263a3331 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 15 一月 2024 11:18:17 +0800
Subject: [PATCH] 修改
---
starter/src/main/resources/application.yml | 11 ++++++-----
web/src/views/modules/project/Project-AddOrUpdate.vue | 17 ++++++-----------
modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java | 10 ++++++++++
web/packages/views/modules/sys/role-user.vue | 1 +
zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java | 10 +++++-----
modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml | 1 -
6 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java b/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java
index f7fe2cb..7229593 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java
@@ -24,6 +24,7 @@
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.sys.service.SysUserService;
import com.zt.modules.workflow.dto.FlowInfoDto;
import com.zt.modules.workflow.service.WorkflowService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +74,9 @@
@Autowired
private WorkflowService workflowService;
+
+ @Autowired
+ private SysUserService sysUserService;
/**
* 鍒嗛〉鏌ヨ
*
@@ -177,6 +181,12 @@
try {
QaAuditReportDto dataObj = this.getDto(null, id);
+ String projectLeaderId=dataObj.getProject().getProjectLeader();
+ String projectConfigerId=dataObj.getProject().getProjectTesters();
+ String projectTestersId=dataObj.getProject().getProjectConfiger();
+ dataObj.getProject().setProjectLeader(sysUserService.getNames(projectLeaderId));
+ dataObj.getProject().setProjectTesters(sysUserService.getNames(projectTestersId));
+ dataObj.getProject().setProjectConfiger(sysUserService.getNames(projectConfigerId));
String CheckerPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getAuditReport().getCheckerId()));
dataObj.getAuditReport().setChecker(CheckerPath);
String SupervisorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getAuditReport().getSupervisorId()));
diff --git a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml
index 39734b0..c71c936 100644
--- a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml
@@ -20,7 +20,6 @@
SELECT m.*, p.secret_class
FROM software_test_order_measured m
JOIN software_test_order s ON s.id = m.order_id
- JOIN software_test_order_deliverable d ON d.ord_id = m.order_id
JOIN project p ON p.id = ${projectId}
<where>
s.is_delete = 0 and m.is_delete = 0
diff --git a/starter/src/main/resources/application.yml b/starter/src/main/resources/application.yml
index 8ce2b02..f5f5013 100644
--- a/starter/src/main/resources/application.yml
+++ b/starter/src/main/resources/application.yml
@@ -4,7 +4,7 @@
uri-encoding: UTF-8
max-threads: 1000
min-spare-threads: 30
- port: 8058
+ port: 8050
servlet:
context-path: /life-protection
session:
@@ -17,12 +17,13 @@
datasource:
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://127.0.0.1:3306/csiczb?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
+ #url: jdbc:mysql://127.0.0.1:3306/csiczb?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
#url: jdbc:mysql://127.0.0.1:3306/test_project?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
url: jdbc:mysql://192.168.31.25:3306/test_project?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
-# url: jdbc:mysql://127.0.0.1:3306/zhpt_djxl?serverTimezone=GMT&allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
+ #url: jdbc:mysql://127.0.0.1:3306/zhpt_djxl?serverTimezone=GMT&allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
username: root
password: root
+ #password: 123456
# driver-class-name: com.kingbase8.Driver
# url: jdbc:kingbase8://192.168.0.25:54321/ZHPT?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
# username: SYSTEM
@@ -113,13 +114,13 @@
# initFromJson: true
server-url-prefix: http://localhost:8100/cas
server-login-url: http://localhost:8100/cas/login
- client-host-url: http://localhost:8058
+ client-host-url: http://localhost:8050
validation-type: cas
zt:
oss:
type: local
- local-domain: http://127.0.0.1:8058/life-protection/
+ local-domain: http://127.0.0.1:8050/life-protection/
local-path: D:/TestProjectFiles/ #闄勪欢瀛樺偍鐩綍
local-qd-path: D:/TestProjectFiles/ #闄勪欢瀛樺偍鐩綍
local-prefix: accessories #闄勪欢瀛樺偍瀛愮洰褰�
diff --git a/web/packages/views/modules/sys/role-user.vue b/web/packages/views/modules/sys/role-user.vue
index c56015a..2639514 100644
--- a/web/packages/views/modules/sys/role-user.vue
+++ b/web/packages/views/modules/sys/role-user.vue
@@ -58,6 +58,7 @@
await this.$tip.success()
this.$refs.examineObj.query()
this.$refs.dialog.close()
+ this.$emit('refreshDataList')
}
}
},
diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index 557d240..61d7963 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -103,32 +103,32 @@
</div>
<div class="DSTOld-1-Form">
<zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="鎵�灞為儴闂�" prop="bizDeptId"
- style="width: 48%">
+ style="width: 48%" rules="required">
<zt-select @input="changeDept" v-model="dataForm.bizDeptId" :datas="bizDeptList" placeholder="鎵�灞為儴闂�"/>
</zt-form-item>
<!-- 鏄惁绛剧讲鍚堝悓 -->
- <zt-form-item label-width="120px" label="鏄惁绛剧讲鍚堝悓" prop="isContract" style="width: 48%">
+ <zt-form-item label-width="120px" label="鏄惁绛剧讲鍚堝悓" prop="isContract" style="width: 48%" rules="required">
<zt-dict v-model="dataForm.isContract" dict="is_or_not"></zt-dict>
</zt-form-item>
<!-- 椤圭洰璐熻矗浜� -->
<zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="椤圭洰璐熻矗浜�" prop="projectLeader"
- style="width: 48%">
+ style="width: 48%" rules="required">
<zt-select v-model="dataForm.projectLeader" :datas="projectLeaderList" placeholder="椤圭洰璐熻矗浜�"/>
</zt-form-item>
<!-- 椤圭洰娴嬭瘯浜哄憳 -->
<zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="椤圭洰娴嬭瘯浜哄憳" prop="projectTesters"
- style="width: 48%">
+ style="width: 48%" rules="required">
<!-- <el-input v-model="dataForm.projectTesters" placeholder="璇疯緭鍏ラ」鐩祴璇曚汉鍛�"></el-input>-->
<zt-select v-model="dataForm.projectTesters" :datas="projectTestersList" :multiple="true"
:clearable="true" placeholder="椤圭洰娴嬭瘯浜哄憳"/>
</zt-form-item>
<!-- 椤圭洰瀹℃牳浜� -->
- <zt-form-item label-width="120px" label="椤圭洰瀹℃牳浜�" prop="projectReviewer" style="width: 48%">
+ <zt-form-item label-width="120px" label="椤圭洰瀹℃牳浜�" prop="projectReviewer" style="width: 48%" rules="required">
<!-- <el-input v-model="dataForm.projectReviewer" placeholder="璇疯緭鍏ラ」鐩鏍镐汉"></el-input>-->
<zt-select v-model="dataForm.projectReviewer" :datas="projectReviewerList" :multiple="true"
:clearable="true" placeholder="椤圭洰瀹℃牳浜�"/>
</zt-form-item>
- <zt-form-item label-width="120px" label="椤圭洰閰嶇疆浜�" prop="projectConfiger" style="width: 48%">
+ <zt-form-item label-width="120px" label="椤圭洰閰嶇疆浜�" prop="projectConfiger" style="width: 48%" rules="required">
<!-- <el-input v-model="dataForm.projectReviewer" placeholder="璇疯緭鍏ラ」鐩鏍镐汉"></el-input>-->
<zt-select v-model="dataForm.projectConfiger" :datas="projectConfigerList" :multiple="true"
:clearable="true" placeholder="椤圭洰閰嶇疆浜�"/>
@@ -176,11 +176,6 @@
bizDeptIdList: [],
}
},
- // watch: {
- // "dataForm.bizDeptId"(){
- // this.getUserList()
- // }
- // },
methods: {
init() {
this.getInfo()
diff --git a/zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java b/zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java
index 852f7ef..3f75961 100644
--- a/zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java
+++ b/zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java
@@ -317,19 +317,19 @@
}
else if (currentStep.getTaskGroup() !=null && "pall,zrr,csr,shr,pzr".contains(currentStep.getTaskGroup())) {
String userList = null;
- if ("zrr".equals(currentStep.getTaskGroup())){
+ if ("zrr".equals(currentStep.getTaskGroup())) {
userList = bizInfoDto.getZrr();
}
- if ("csr".equals(currentStep.getTaskGroup())){
+ if ("csr".equals(currentStep.getTaskGroup())) {
userList = bizInfoDto.getCsr();
}
- if ("shr".equals(currentStep.getTaskGroup())){
+ if ("shr".equals(currentStep.getTaskGroup())) {
userList = bizInfoDto.getShr();
}
- if ("pzr".equals(currentStep.getTaskGroup())){
+ if ("pzr".equals(currentStep.getTaskGroup())) {
userList = bizInfoDto.getPzr();
}
- if ("pall".equals(currentStep.getTaskGroup())){
+ if ("pall".equals(currentStep.getTaskGroup())) {
userList = bizInfoDto.getPall();
}
if (userList != null) {
--
Gitblit v1.9.1