From b5d05005ead969319589c2d5e2bb44d95c9b6783 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 19 十二月 2023 14:40:25 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue | 17 ++++----
modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/model/BaselineReleaseRemark.java | 8 +++-
modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java | 29 ++++++++------
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java | 3 +
web/src/views/modules/sys/task/already-task.vue | 11 ++++-
web/src/views/modules/sys/task/stay-task.vue | 7 +++
web/src/views/modules/baselineRelease/BaselineRelease.vue | 5 +-
modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/model/BaselineRelease.java | 9 +++-
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 6 ++
9 files changed, 63 insertions(+), 32 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java
index bf75f90..52c043c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java
@@ -34,12 +34,12 @@
/**
* baseline_release
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-12-18
*/
@RestController
@RequestMapping("/baselineRelease/BaselineRelease/")
-@Api(tags="baseline_release")
+@Api(tags = "baseline_release")
public class BaselineReleaseController {
@Autowired
private BaselineReleaseService baselineReleaseService;
@@ -50,15 +50,18 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "code", value = "鍩虹嚎鍙戝竷缂栧彿", dataType = Constant.QT.STRING, format = "code^LK"),
- @ApiImplicitParam(name = "baselineType", value = "鍩虹嚎绫诲瀷", dataType = Constant.QT.STRING, format = "baseline_type^EQ"),
- @ApiImplicitParam(name = "baselineName", value = "鍩虹嚎鍚嶇О", dataType = Constant.QT.STRING, format = "baseline_name^LK") })
- public PageResult<BaselineRelease> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
- return PageResult.ok(baselineReleaseService.page(queryFilter));
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "code", value = "鍩虹嚎鍙戝竷缂栧彿", dataType = Constant.QT.STRING, format = "a.code^LK"),
+ @ApiImplicitParam(name = "baselineType", value = "鍩虹嚎绫诲瀷", dataType = Constant.QT.STRING, format = "a.baseline_type^EQ"),
+ @ApiImplicitParam(name = "baselineName", value = "鍩虹嚎鍚嶇О", dataType = Constant.QT.STRING, format = "a.baseline_name^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^LK"),
+ @ApiImplicitParam(name = "pageCode", value = "閰嶇疆椤规爣璇�", dataType = Constant.QT.STRING, format = "a.page_code^LK")})
+ public PageResult<BaselineRelease> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
+ List<BaselineRelease> baselineRelease = baselineReleaseService.page(queryFilter);
+ return PageResult.ok(baselineRelease);
}
@GetMapping("getDto")
@@ -92,7 +95,7 @@
@DeleteMapping("deleteBaseline")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
baselineReleaseService.delete(ids);
@@ -109,7 +112,7 @@
@GetMapping("getItemList")
@ApiOperation("鑾峰彇鍏ュ簱閰嶇疆椤瑰垪琛�")
public PageResult<WarehouseConfigItem> getItemList(Long projectId, String ids) {
- List<WarehouseConfigItem> resultList = configItemService.warehouseConfigList(projectId,ids);
+ List<WarehouseConfigItem> resultList = configItemService.warehouseConfigList(projectId, ids);
return PageResult.ok(resultList);
}
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/model/BaselineRelease.java b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/model/BaselineRelease.java
index d4c2d15..e93ccb1 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/model/BaselineRelease.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/model/BaselineRelease.java
@@ -1,5 +1,6 @@
package com.zt.life.modules.baselineRelease.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zt.common.entity.BusiEntity;
@@ -31,12 +32,16 @@
@ApiModelProperty(value = "椤甸潰鏍囪瘑")
private String pageCode;
+
@ApiModelProperty(value = "鍩虹嚎绫诲瀷")
private String baselineType;
@ApiModelProperty(value = "鍩虹嚎鍚嶇О")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date baselineName;
+ private String baselineName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ private String softwareName;
@ApiModelProperty(value = "鍩虹嚎鐗堟湰")
private String baselineVersion;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/model/BaselineReleaseRemark.java b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/model/BaselineReleaseRemark.java
index cceb9fd..c0a5477 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/model/BaselineReleaseRemark.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/model/BaselineReleaseRemark.java
@@ -24,8 +24,9 @@
@ApiModelProperty(value = "椤圭洰ID")
private Long projectId;
- @ApiModelProperty(value = "鍏ュ簱ID")
- private Long warehouseId;
+ @ApiModelProperty(value = "閰嶇疆椤规槑缁咺D")
+ private Long warehouseDetailId;
+
@ApiModelProperty(value = "鍩虹嚎ID")
private Long baselineId;
@@ -33,6 +34,9 @@
@ApiModelProperty(value = "鏄庣粏鍒嗙被")
private String pageCode;
+ @ApiModelProperty(value = "搴撶被鍨�")
+ private String libraryType;
+
@ApiModelProperty(value = "搴忓彿")
private Integer no;
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 3b17c6b..43e3a00 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
@@ -41,6 +41,9 @@
@ApiModelProperty(value = "鍏ュ簱鐘舵��")
private Integer status;
+ @ApiModelProperty(value = "搴撶被鍨�")
+ private String libraryType;
+
@ApiModelProperty(value = "閰嶇疆椤瑰悕绉�")
private String itemName;
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 f07f6d4..f435d76 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
@@ -131,14 +131,18 @@
if (CommonUtils.isActureChangeData(configItem,configItem2)) {
configItemService.update(configItem);
}
+ if(CommonUtils.isActureChangeData(configItemDto.getConfigItemWarehouse().getLibraryType(),configItem.getLibraryType())){
+ configItem.setLibraryType(configItemDto.getConfigItemWarehouse().getLibraryType());
+ configItemService.update(configItem);
+ }
} else {
Map<String, String> map = new HashMap<>();
String pageCode = configItem.getPageCode();
if (StringUtils.isNotBlank(pageCode) && "plan,explain,record,report".contains(pageCode)) {
map.put("funCode", "test_" + pageCode);
- //map.put("projectId",configItemDto.getProjectId().toString());
configItem.setItemIdentify(sysCodeRuleService.getNewCode(map));
}
+ configItem.setLibraryType(configItemDto.getConfigItemWarehouse().getLibraryType());
configItem.setWarehouseId(warehouseId);
configItem.setProjectId(configItemDto.getConfigItemWarehouse().getProjectId());
configItemService.insert(configItem);
diff --git a/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue b/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue
index 6b5cf18..d033107 100644
--- a/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue
+++ b/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue
@@ -58,7 +58,7 @@
</div>
<div class="el-border-left acceptDate1" style="width: calc(100% - 120px)">
<el-form-item style="width: 100%;margin-bottom:0">
- <el-input v-model="dataForm.baseline.baselineName" placeholder="鍩虹嚎鍚嶇О"></el-input>
+ <span>{{dataForm.baseline.baselineName}}</span>
</el-form-item>
</div>
</div>
@@ -107,7 +107,7 @@
</template>
</el-table-column>
</el-table>
- <div v-if="!dataForm.disabled" class="icon-container" @click="handleCommand">
+ <div :disabled="stepMarker!=='jxfb_first'" v-if="!dataForm.disabled" class="icon-container" @click="handleCommand">
<!-- 鏀剧疆鍥哄畾鐨勫浘鏍� -->
<i class="el-icon-plus"></i>
</div>
@@ -139,7 +139,7 @@
</div>
<div style="width: calc(100% - 120px)" class="el-border-left">
<el-form-item class="wt-form-item" label-width="20px" style="width: 100%;padding: 5px">
- <el-input type="textarea" :rows="2" :disabled="stepMarker!=='pzxbg_bmsh'" v-model="dataForm.baseline.departOpinion"></el-input>
+ <el-input type="textarea" :rows="2" :disabled="stepMarker!=='jxfb_bmsp'" v-model="dataForm.baseline.departOpinion"></el-input>
</el-form-item>
<el-form-item label-width="275px" label="绛惧瓧锛�" style="width: 45%">
<span>{{dataForm.baseline.departSign}}</span>
@@ -172,11 +172,11 @@
data() {
return {
ids:'',
+ stepMarker: '',
dataForm: {
id: '',
pageCode: '',
projectId:'',
- stepMarker: '',
remarkList:[],
pageName: {
demand: '闇�姹傚熀绾�', product:'浜у搧鍩虹嚎'
@@ -215,16 +215,15 @@
if (row.projectId) {
this.dataForm.projectId = row.projectId
}
- /* if (this.configDetailRow) {
+ if (!this.dataForm.disabled) {
if (!row.stepMarker) {
- this.stepMarker = 'csjcd_first'
- this.title = '鍙戣捣娴嬭瘯妫�鏌ュ崟'
+ this.stepMarker = 'jxfb_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')
diff --git a/web/src/views/modules/baselineRelease/BaselineRelease.vue b/web/src/views/modules/baselineRelease/BaselineRelease.vue
index 93308d5..4c349a0 100644
--- a/web/src/views/modules/baselineRelease/BaselineRelease.vue
+++ b/web/src/views/modules/baselineRelease/BaselineRelease.vue
@@ -17,7 +17,7 @@
<el-form-item>
<zt-button type="query" @click="table.query()"/>
<zt-button type="add" @click="add()"/>
- <zt-button type="delete" perm="baselineRelease:delete" @click="table.deleteHandle()"/>
+ <zt-button type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList"
@@ -26,7 +26,7 @@
border @selection-change="table.selectionChangeHandle">
<el-table-column align="center" type="selection" width="40"/>
<el-table-column prop="code" label="鍩虹嚎鍙戝竷缂栧彿"/>
- <el-table-column prop="softwareIdentity" label="椤圭洰鍚嶇О"/>
+ <el-table-column prop="softwareName" label="椤圭洰鍚嶇О"/>
<zt-table-column-dict prop="baselineType" label="鍩虹嚎绫诲瀷" dict="baseline_type"/>
<el-table-column prop="baselineName" label="鍩虹嚎鍚嶇О"/>
<el-table-column prop="baselineVersion" label="鍩虹嚎鐗堟湰"/>
@@ -59,6 +59,7 @@
code: '',
baselineType: '',
baselineName: '',
+ softwareName:'',
pageCode:this.$route.query.pageCode
}
}
diff --git a/web/src/views/modules/sys/task/already-task.vue b/web/src/views/modules/sys/task/already-task.vue
index f78d7a7..f969f62 100644
--- a/web/src/views/modules/sys/task/already-task.vue
+++ b/web/src/views/modules/sys/task/already-task.vue
@@ -52,7 +52,8 @@
<ConfigItemWarehouse ref="configItemWarehouse" @refreshDataList="getQuery()"></ConfigItemWarehouse>
<ConfigItemChange ref="configItemChange" @refreshDataList="getQuery()"></ConfigItemChange>
<ConfigItemOutbound ref="configItemOutbound" @refreshDataList="getQuery()"></ConfigItemOutbound>
- <TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder><TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
+ <TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
+ <BaselineRelease ref="baselineRelease" @refreshDataList="getQuery()"></BaselineRelease>
<!-- </zt-table-wraper>-->
</div>
</template>
@@ -66,6 +67,7 @@
import TestCheckOrder from "@/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue";
import ConfigItemChange from "@/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue";
import ConfigItemOutbound from "@/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue";
+ import BaselineRelease from "@/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue";
export default {
data() {
@@ -94,7 +96,8 @@
ItemCirculatOrder,
ConfigItemWarehouse,
ConfigItemChange,
- ConfigItemOutbound
+ ConfigItemOutbound,
+ BaselineRelease
},
watch:{
},
@@ -215,6 +218,10 @@
this.$nextTick(()=>{
this.$refs.configItemChange.$refs.dialog.init(row.bizId,row, true)
})
+ }else if (row.flowCode === 'jxfb') {
+ this.$nextTick(()=>{
+ this.$refs.baselineRelease.$refs.dialog.init(row.bizId,row, true)
+ })
}
else {
if (row.stepReadRouterId === null){
diff --git a/web/src/views/modules/sys/task/stay-task.vue b/web/src/views/modules/sys/task/stay-task.vue
index 1e67235..8765baf 100644
--- a/web/src/views/modules/sys/task/stay-task.vue
+++ b/web/src/views/modules/sys/task/stay-task.vue
@@ -60,6 +60,7 @@
<ConfigItemChange ref="configItemChange" @refreshDataList="getQuery()"></ConfigItemChange>
<ConfigItemOutbound ref="configItemOutbound" @refreshDataList="getQuery()"></ConfigItemOutbound>
<TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
+ <BaselineRelease ref="baselineRelease" @refreshDataList="getQuery()"></BaselineRelease>
<!-- </zt-table-wraper>-->
</div>
</template>
@@ -72,6 +73,7 @@
import TestCheckOrder from '@/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate'
import ConfigItemChange from '@/views/modules/configItemChange/ConfigItemChange-AddOrUpdate'
import ConfigItemOutbound from '@/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate'
+ import BaselineRelease from '@/views/modules/baselineRelease/BaselineRelease-AddOrUpdate'
export default {
data() {
@@ -114,7 +116,8 @@
ConfigItemWarehouse,
TestCheckOrder,
ConfigItemChange,
- ConfigItemOutbound
+ ConfigItemOutbound,
+ BaselineRelease,
},
created() {
if (this.$route.path.indexOf('taskCenter') > 0 || this.system == 'smj') {
@@ -232,6 +235,8 @@
this.$refs.configItemChange.$refs.dialog.init(row.bizId, row)
}else if (row.flowCode === 'pzxck') {
this.$refs.configItemOutbound.$refs.dialog.init(row.bizId, row)
+ }else if (row.flowCode === 'jxfb') {
+ this.$refs.baselineRelease.$refs.dialog.init(row.bizId, row)
}else {
if (row.stepRouterId === null) {
this.$tip.alert("娌℃湁閰嶇疆鑿滃崟id")
--
Gitblit v1.9.1