修改

jinlin

2023-12-19 b5d05005ead969319589c2d5e2bb44d95c9b6783

修改

 modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java

@@ -54,11 +54,14 @@
        @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")    })
            @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){
        return PageResult.ok(baselineReleaseService.page(queryFilter));
        List<BaselineRelease> baselineRelease = baselineReleaseService.page(queryFilter);
        return PageResult.ok(baselineRelease);
    }

    @GetMapping("getDto")

 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;

 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 = "配置项明细ID")
    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;


 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;


 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);

 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')

 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
        }
      }

 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){

 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")