From d89ef43c4713adf26f74b796653d1dd15ff1f81a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 29 十一月 2023 16:37:47 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java | 9 ++++
zt/core/src/main/resources/mapper/workflowconfig/WfDefDao.xml | 11 ++---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java | 3 -
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java | 20 ++++++----
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java | 3 +
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue | 10 ++--
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 3 -
modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml | 2
8 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java
index ba35e36..3c06162 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java
@@ -14,6 +14,7 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.configItemWarehouse.dto.ConfigItemWarehouseDto;
import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse;
+import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
import com.zt.life.modules.configItemWarehouse.service.ConfigItemWarehouseService;
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
@@ -60,12 +61,12 @@
@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 = "projectCode", value = "椤圭洰缂栧彿", dataType = Constant.QT.STRING, format = "project_code^LK"),
- @ApiImplicitParam(name = "projectName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "project_name^LK"),
+ @ApiImplicitParam(name = "projectCode", value = "椤圭洰缂栧彿", dataType = Constant.QT.STRING, format = "code1^EQ"),
+ @ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^EQ"),
@ApiImplicitParam(name = "libraryType", value = "搴撶被鍨�", dataType = Constant.QT.STRING, format = "library_type^EQ") })
public PageResult<ConfigItemWarehouse> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
-
- return PageResult.ok(configItemWarehouseService.page(queryFilter));
+ List<ConfigItemWarehouse> configItemWarehouse=configItemWarehouseService.page(queryFilter);
+ return PageResult.ok(configItemWarehouse);
}
@GetMapping("getDto")
@@ -73,9 +74,12 @@
public Result<ConfigItemWarehouseDto> getDto(Long projectId, Long warehouseId) {
ConfigItemWarehouseDto data =configItemWarehouseService.getDto(projectId, warehouseId);
if (warehouseId!=null) {
- OssDto ossDto = sysOssConfigService.getOssByBusiType(warehouseId, "config_item_warehouse");
- if (ossDto != null) {
- data.setFiles(ossDto);
+ for (WarehouseConfigItem configItem : data.getConfigItemList()) {
+ Long configItemId = configItem.getId();
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
+ if (ossDto != null) {
+ configItem.setFiles(ossDto);
+ }
}
}
return Result.ok(data);
@@ -106,7 +110,7 @@
return Result.ok();
}
- @DeleteMapping
+ @DeleteMapping("deleteConfigItem")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids){
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 1c37670..13810f6 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
@@ -25,8 +25,7 @@
private Project project;
@ApiModelProperty(value = "閰嶇疆椤瑰叆搴�")
private ConfigItemWarehouse configItemWarehouse;
- @ApiModelProperty(value = "闄勪欢")
- private OssDto files;
+
@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 596f425..1e24a90 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
@@ -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.fasterxml.jackson.annotation.JsonFormat;
import com.zt.common.entity.BusiEntity;
@@ -84,4 +85,12 @@
@ApiModelProperty(value = "骞翠唤")
private String year;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ private String softwareName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "椤圭洰缂栧彿")
+ private String projectCode;
+
}
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 9a0c518..9460079 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
+import com.zt.life.sys.dto.OssDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -42,4 +43,6 @@
@ApiModelProperty(value = "瀵嗙骇")
private String secretClass;
+ @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 6d98b9e..862c230 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
@@ -100,6 +100,7 @@
configItem.setWarehouseId(warehouseId);
configItemService.insert(configItem);
}
+ sysOssConfigService.updateOss(configItem.getId(), configItem.getFiles());// 淇濆瓨闄勪欢
}
for (WarehouseCmAudit cmAudit : configItemDto.getCmAuditList()) {
@@ -121,8 +122,6 @@
qaAuditService.insert(qaAudit);
}
}
- sysOssConfigService.updateOss(configItemDto.getId(), configItemDto.getFiles());// 淇濆瓨闄勪欢
-
return true;
}
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
index 58e02bc..a39002e 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.zt.life.modules.configItemWarehouse.dao.ConfigItemWarehouseDao">
<select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse">
- select a.* ,p.*
+ select a.* ,p.*,p.CODE AS projectCode
from config_item_warehouse a
INNER JOIN project p ON p.id = a.project_id
<where>
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
index caae99e..1b75940 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
@@ -1,6 +1,6 @@
<template>
<div class="fa-card-a">
- <zt-table-wraper query-url="/configItemWarehouse/ConfigItemWarehouse/page" delete-url="/configItemWarehouse/ConfigItemWarehouse" v-slot="{ table }">
+ <zt-table-wraper query-url="/configItemWarehouse/ConfigItemWarehouse/page" delete-url="/configItemWarehouse/ConfigItemWarehouse/deleteConfigItem" v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.code" placeholder="璇疯緭鍏ラ厤缃」鍏ュ簱缂栧彿" clearable></el-input>
@@ -9,7 +9,7 @@
<el-input v-model="dataForm.projectCode" placeholder="璇疯緭鍏ラ」鐩紪鍙�" clearable></el-input>
</el-form-item>
<el-form-item>
- <el-input v-model="dataForm.projectName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable></el-input>
+ <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable></el-input>
</el-form-item>
<el-form-item>
<zt-dict v-model="dataForm.libraryType" dict="library_type" clearable></zt-dict>
@@ -24,7 +24,7 @@
<el-table-column align="center" type="selection" width="40"/>
<el-table-column prop="code" label="閰嶇疆椤瑰叆搴撶紪鍙�"/>
<el-table-column prop="projectCode" label="椤圭洰缂栧彿"/>
- <el-table-column prop="projectName" label="椤圭洰鍚嶇О"/>
+ <el-table-column prop="softwareName" label="椤圭洰鍚嶇О"/>
<zt-table-column-dict prop="libraryType" label="搴撶被鍨�" dict="library_type"/>
<zt-table-column-handle :table="table" edit-perm="configItemWarehouse:update" delete-perm="configItemWarehouse::delete"/>
</el-table>
@@ -47,8 +47,8 @@
dataForm: {
code: '',
projectCode: '',
- projectName: '',
- libraryType: '',
+ softwareName: '',
+ libraryType: ''
}
}
},
diff --git a/zt/core/src/main/resources/mapper/workflowconfig/WfDefDao.xml b/zt/core/src/main/resources/mapper/workflowconfig/WfDefDao.xml
index 48f8158..f1580fc 100644
--- a/zt/core/src/main/resources/mapper/workflowconfig/WfDefDao.xml
+++ b/zt/core/src/main/resources/mapper/workflowconfig/WfDefDao.xml
@@ -116,14 +116,11 @@
</select>
<select id="getStyleList" resultType="com.zt.modules.workflowconfig.model.WfDef">
- select Content as diagram
- from WX_NETWORK_DIAGRAM
+ select diagram
+ from wf_def
where is_delete = 0
- <if test="projectId!=null and projectId!=''">
- and PROJECT_ID = #{projectId}
- </if>
- <if test="diagramId!=null and diagramId!=''">
- and DIAGRAM_ID = #{diagramId}
+ <if test="flowCode!=null and flowCode!=''">
+ and CODE = #{flowCode}
</if>
</select>
--
Gitblit v1.9.1