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"); for (WarehouseConfigItem configItem : data.getConfigItemList()) { Long configItemId = configItem.getId(); OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse"); if (ossDto != null) { data.setFiles(ossDto); 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){ 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<>(); 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; } 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; } 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; }
@@ -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> 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: '' } } }, 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>
