From fbdc3cb5768e3484648edf3ff96df03c881e78fa Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期四, 16 十一月 2023 09:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/Project-AddOrUpdate.vue | 14 +++++++-------
web/src/views/modules/project/Project.vue | 2 +-
zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java | 7 ++++---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 2 +-
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 5 +++--
5 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
index 68a39b7..28049a7 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
@@ -95,7 +95,7 @@
return Result.ok();
}
- @DeleteMapping
+ @DeleteMapping("deleteProject")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids) {
diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index ef6e6ce..939e641 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -95,19 +95,19 @@
椤圭洰璐ｄ换浜�
</div>
<div class="DSTOld-1-Form">
- <!-- 鍗曚綅鍚嶇О -->
+ <!-- 椤圭洰璐熻矗浜� -->
<zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="椤圭洰璐熻矗浜�" prop="projectLeader" style="width: 48%" rules="required">
- <el-input v-model="dataForm.projectLeader" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ <el-input v-model="dataForm.projectLeader" placeholder="璇疯緭鍏ラ」鐩礋璐ｄ汉"></el-input>
</zt-form-item>
- <!-- 鑱旂郴浜� -->
+ <!-- 椤圭洰娴嬭瘯浜哄憳 -->
<zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="椤圭洰娴嬭瘯浜哄憳" prop="projectTesters" style="width: 48%" rules="required">
- <el-input v-model="dataForm.projectTesters" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ <el-input v-model="dataForm.projectTesters" placeholder="璇疯緭鍏ラ」鐩祴璇曚汉鍛�"></el-input>
</zt-form-item>
- <!-- 璇︾粏鍦板潃 -->
+ <!-- 椤圭洰瀹℃牳浜� -->
<zt-form-item label-width="120px" label="椤圭洰瀹℃牳浜�" prop="projectReviewer" style="width: 48%" rules="required">
- <el-input v-model="dataForm.projectReviewer" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ <el-input v-model="dataForm.projectReviewer" placeholder="璇疯緭鍏ラ」鐩鏍镐汉"></el-input>
</zt-form-item>
- <!-- 鑱旂郴鏂瑰紡 -->
+ <!-- 鏄惁绛剧讲鍚堝悓 -->
<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>
diff --git a/web/src/views/modules/project/Project.vue b/web/src/views/modules/project/Project.vue
index 6f90a3b..ffc4e4c 100644
--- a/web/src/views/modules/project/Project.vue
+++ b/web/src/views/modules/project/Project.vue
@@ -1,7 +1,7 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-project-project}">
- <zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project" v-slot="{ table }">
+ <zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project/deleteProject" v-slot="{ table }">
<el-form :inline="true" class="form-input-width-1" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�" clearable></el-input>
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 9687ce7..f7b563f 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -4,7 +4,7 @@
class="weiTuoDanAuto">
<div class="DManageForm">
<el-form-item readonly label-width="60px" label="缂栧彿:" style="width: 99% ;margin-bottom:-5px">
- <span>{{ dataForm.project.code }}</span>
+ <span>{{ dataForm.softwareTestOrder.code}}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2)">
@@ -231,7 +231,7 @@
<div class="el-border-left" style="width: 98%;">
<el-form-item label="鏄惁鐩朇NAS绔�" label-width="130px" style="padding-left:5%;margin-bottom:0">
<zt-dict v-model="dataForm.softwareTestOrder.otherRequire" :radio="true"
- dict="is_or_not"></zt-dict>
+ dict="is_stamp"></zt-dict>
</el-form-item>
</div>
</div>
@@ -413,6 +413,7 @@
id: null,
projectId: null,
softwareTestOrder: {
+ code:'',
optEnviron:'',
programLang:'',
testBasis:'',
diff --git a/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java b/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java
index 12ff294..2234b69 100644
--- a/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java
+++ b/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java
@@ -54,15 +54,16 @@
String year = sdf.format(new Date());
newCodeTemplet = newCodeTemplet.replace("[骞翠唤]",year);
- String xhTemplet = StringUtils.substring("__________",0,codeRule.getNoByteNum()-1);
+ String xhTemplet = StringUtils.substring("__________",0,codeRule.getNoByteNum());
newCodeTemplet = newCodeTemplet.replace("[搴忓彿]",xhTemplet);
int xhStartPosition = newCodeTemplet.indexOf(xhTemplet);
String maxCode = baseDao.getMaxCode(codeRule.getTableName(),newCodeTemplet);
String maxCodeXh = "0";
if (StringUtils.isNotBlank(maxCode))
- maxCodeXh = StringUtils.substring(maxCode,xhStartPosition,xhStartPosition+codeRule.getNoByteNum()-1);
- String newCodeXh = String.format("%0"+codeRule.getNoByteNum()+"d", Convert.toInt(maxCodeXh)+1);
+ maxCodeXh = StringUtils.substring(maxCode,xhStartPosition,xhStartPosition+codeRule.getNoByteNum());
+ Integer a = Convert.toInt(maxCodeXh)+1;
+ String newCodeXh = String.format("%0"+codeRule.getNoByteNum()+"d", a);
String newCode = newCodeTemplet.replace(xhTemplet,newCodeXh);
return newCode;
}
--
Gitblit v1.9.1