Changes

jinlin

2023-11-06 6e912707b2c73bb183563f197b92b08ac19790ff

Changes

 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/controller/ProjectController.java
@@ -1,4 +1,4 @@
package com.zt.life.modules.mainPart.project.controller;
package com.zt.life.modules.project.controller;


import com.zt.common.annotation.LogOperation;
@@ -12,8 +12,8 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.project.model.Project;
import com.zt.life.modules.mainPart.project.service.ProjectService;
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.service.ProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -93,10 +93,4 @@
        return Result.ok();
    }

    @GetMapping("check")
    @ApiOperation("查询所有项目字段")
    public Result<List<String>> checkProjects() {
        List<String> columnNames = projectService.checkProjects();
        return Result.ok(columnNames);
    }
}

 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/dao/ProjectDao.java
@@ -1,7 +1,7 @@
package com.zt.life.modules.mainPart.project.dao;
package com.zt.life.modules.project.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.mainPart.project.model.Project;
import com.zt.life.modules.project.model.Project;
import org.apache.ibatis.annotations.Mapper;


@@ -19,6 +19,5 @@
public interface ProjectDao extends BaseDao<Project> {

    List<Project> getList(Map<String, Object> params);
    List<String> checkList();

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/model/Project.java
@@ -1,4 +1,4 @@
package com.zt.life.modules.mainPart.project.model;
package com.zt.life.modules.project.model;

import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
@@ -21,6 +21,9 @@
public class Project extends BusiEntity {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "软件名称")
    private String softwarename;

    @ApiModelProperty(value = "项目编号")
    private String code;

@@ -37,7 +40,7 @@
    private String optEnviron;

    @ApiModelProperty(value = "编程语言")
    private String programlang;
    private String programLang;

    @ApiModelProperty(value = "软件类型")
    private Integer softwareType;

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/service/ProjectService.java
@@ -1,8 +1,8 @@
package com.zt.life.modules.mainPart.project.service;
package com.zt.life.modules.project.service;

import com.zt.common.service.BaseService;
import com.zt.life.modules.mainPart.project.dao.ProjectDao;
import com.zt.life.modules.mainPart.project.model.Project;
import com.zt.life.modules.project.dao.ProjectDao;
import com.zt.life.modules.project.model.Project;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
@@ -36,14 +36,5 @@
    public void delete(Long[] ids) {
        super.deleteLogic(ids);
    }
    /**
     * 获取所有项目字段
     *
     * @return 包含所有项目字段的列表
     */
    public List<String> checkProjects() {
        return baseDao.checkList();
    }


}

 modules/mainPart/src/main/resources/mapper/mainParts/ProjectDao.xml

File was deleted

 modules/mainPart/src/main/resources/mapper/mainParts/TaskCenterDao.xml

 modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml

New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.project.dao.ProjectDao">

    <select id="getList" resultType="com.zt.life.modules.project.model.Project">
        select a.*
        from project a
        <where>
            a.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            </if>
        </where>
        <if test="orderBySql!=null">
            ORDER BY ${orderBySql}
        </if>
    </select>

</mapper>

 web/src/views/modules/olderForm/SoftwareTestingOrderForm.vue

@@ -58,7 +58,7 @@
          </el-form-item>
          <!-- 联系人 -->
          <el-form-item label="软件标识" style="width: 49%">
            <el-input v-model="form.identification" placeholder="请输入软件标识"></el-input>
            <el-input v-model="form.identity" placeholder="请输入软件标识"></el-input>
          </el-form-item>
          <!-- 详细地址 -->
          <el-form-item label="密级" style="width: 49%">
@@ -76,32 +76,11 @@
            </el-radio-group>
          </el-form-item>
          <el-form-item label="运行环境" style="width: 49%">
            <el-input v-model="form.runtimeEnvironment" placeholder="请输入运行环境"></el-input>
            <el-input v-model="form.optEnviron" placeholder="请输入运行环境"></el-input>
          </el-form-item>
          <el-form-item label="编程语言" style="width: 49%">
            <el-input v-model="form.programmingLanguage" placeholder="请输入编程语言"></el-input>
            <el-input v-model="form.programlang" placeholder="请输入编程语言"></el-input>
          </el-form-item>
          <div class="el-flex">
            <div class="DWidth DAlign DHold">
              被测件及其他相关物品清单
            </div>
            <div style="width: calc(100% - 120px)">
              <el-table class="el-software" height="230" border :data="form.tableData"
                        stripe>
                <el-table-column prop="code" align="center" width="80" label="序号"></el-table-column>
                <el-table-column prop="name" min-width="300" label="名称"></el-table-column>
                <el-table-column prop="identification" align="center" width="180" label="标识/版本"></el-table-column>
                <el-table-column label="是否被测件" width="180" align="center">
                  <template slot-scope="scope">
                    <el-radio-group v-model="scope.row.isTested">
                      <el-radio :label="1">是</el-radio>
                      <el-radio :label="0">否</el-radio>
                    </el-radio-group>
                  </template>
                </el-table-column>
              </el-table>
            </div>
          </div>
          <div class="el-flex" style="height: 40px;">
            <div class="DWidth DAlign DHold">
              软件类型
@@ -123,19 +102,19 @@
        <div class="DOldForm">
          <!-- 单位名称 -->
          <el-form-item label="项目负责人" style="width: 99%">
            <el-input v-model="form.delegateUnitName" placeholder="请输入单位名称"></el-input>
            <el-input v-model="form.projectLeader" placeholder="请输入单位名称"></el-input>
          </el-form-item>
          <!-- 联系人 -->
          <el-form-item label="项目测试人员" style="width: 99%">
            <el-input v-model="form.delegateUnitContactPerson" placeholder="请输入联系人"></el-input>
            <el-input v-model="form.projectTesters" placeholder="请输入联系人"></el-input>
          </el-form-item>
          <!-- 详细地址 -->
          <el-form-item label="项目审核人" style="width: 99%">
            <el-input v-model="form.delegateUnitAddress" placeholder="请输入详细地址"></el-input>
            <el-input v-model="form.projectReviewer" placeholder="请输入详细地址"></el-input>
          </el-form-item>
          <!-- 联系方式 -->
          <el-form-item label="是否签署合同" style="width: 99%">
            <el-input v-model="form.delegateUnitContact" placeholder="请输入联系方式"></el-input>
            <el-input v-model="form.isContract" placeholder="请输入联系方式"></el-input>
          </el-form-item>
        </div>
      </div>
@@ -158,37 +137,33 @@
          developmentAddress: '',
          developmentContact: '',
          softwareName: '',
          identification: '',
          identity: '',
          secretClass: '',
          criticalLevel: 0,
          runtimeEnvironment: '',
          programmingLanguage: '',
          checkList: [1, 0],
          tableData: [
            {code: 1, name: '小鹌鹑', identification: '3/121', isTested: 1},
            {code: 2, name: '小鹌鹑', identification: '3/122', isTested: 0},
            {code: 3, name: '小鹌鹑', identification: '3/111', isTested: 0},
            {code: 4, name: '小鹌鹑', identification: '36/121', isTested: 1},
            {code: 5, name: '小鹌鹑', identification: '3/121a', isTested: 0},
            {code: 6, name: '小鹌鹑', identification: '3c/121', isTested: 0},
            {code: 7, name: '小鹌鹑', identification: '3ac/12ac1', isTested: 0},
            {code: 8, name: '小鹌鹑', identification: '3aca/ac121', isTested: 1},
            {code: 9, name: '小鹌鹑', identification: '3ww/ca121', isTested: 1},
            {code: 10, name: '小鹌鹑', identification: '3aw/12wd1', isTested: 1},
            {code: 1, name: '小鹌鹑', identification: '3/121', isTested: 1},
            {code: 2, name: '小鹌鹑', identification: '3/122', isTested: 0},
            {code: 3, name: '小鹌鹑', identification: '3/111', isTested: 0},
            {code: 4, name: '小鹌鹑', identification: '36/121', isTested: 1},
            {code: 5, name: '小鹌鹑', identification: '3/121a', isTested: 1},
            {code: 6, name: '小鹌鹑', identification: '3c/121', isTested: 0},
            {code: 7, name: '小鹌鹑', identification: '3ac/12ac1', isTested: 0},
            {code: 8, name: '小鹌鹑', identification: '3aca/ac121', isTested: 1},
            {code: 9, name: '小鹌鹑', identification: '3ww/ca121', isTested: 1},
            {code: 10, name: '小鹌鹑', identification: '3aw/12wd1', isTested: 1}
          ],
          optEnviron: '',
          programlang: '',
          softwareType: [1, 0],
          id: '',
          code: '',
          projectLeader: '',
          projectTesters: '',
          projectReviewer: '',
          isContract: ''
        },
      }
    },
    methods: {
      // 获取信息
      async getInfo() {
        let res = await this.$http.get(`/modules/check/`)
        console.log(res.data);
        console.log(res);
      /*  this.dataForm = {
          ...this.dataForm,
          ...res.data
        }*/
      },
    }
  }
</script>


 web/src/views/modules/project/project-add-or-update.vue

New file
@@ -0,0 +1,85 @@
<template>
  <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
    <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
      <zt-form-item label="软件名称" prop="softwarename" rules="required">
        <el-input v-model="dataForm.softwarename"></el-input>
      </zt-form-item>
      <zt-form-item label="项目编号" prop="code" rules="required">
        <el-input v-model="dataForm.code"></el-input>
      </zt-form-item>
      <zt-form-item label="项目标识" prop="identity" rules="required">
        <el-input v-model="dataForm.identity"></el-input>
      </zt-form-item>
      <zt-form-item label="密级" prop="secretClass" rules="required">
        <el-input v-model="dataForm.secretClass"></el-input>
      </zt-form-item>
      <zt-form-item label="关键等级" prop="criticalLevel" rules="required">
        <el-input v-model="dataForm.criticalLevel"></el-input>
      </zt-form-item>
      <zt-form-item label="运行环境" prop="optEnviron" rules="required">
        <el-input v-model="dataForm.optEnviron"></el-input>
      </zt-form-item>
      <zt-form-item label="编程语言" prop="programLang" rules="required">
        <el-input v-model="dataForm.programLang"></el-input>
      </zt-form-item>
      <zt-form-item label="软件类型" prop="softwareType" rules="required">
        <el-input v-model="dataForm.softwareType"></el-input>
      </zt-form-item>
      <zt-form-item label="项目负责人" prop="projectLeader" rules="required">
        <el-input v-model="dataForm.projectLeader"></el-input>
      </zt-form-item>
      <zt-form-item label="项目测试人员" prop="projectTesters" rules="required">
        <el-input v-model="dataForm.projectTesters"></el-input>
      </zt-form-item>
      <zt-form-item label="项目审核人员" prop="projectReviewer" rules="required">
        <el-input v-model="dataForm.projectReviewer"></el-input>
      </zt-form-item>
      <zt-form-item label="是否签署合同" prop="isContract" rules="required">
        <el-input v-model="dataForm.isContract"></el-input>
      </zt-form-item>
    </el-form>
  </zt-dialog>
</template>

<script>
  export default {
    data() {
      return {
        dataForm: {
          id: '',
          softwarename: '',
          code: '',
          identity: '',
          secretClass: '',
          criticalLevel: '',
          optEnviron: '',
          programLang: '',
          softwareType: '',
          projectLeader: '',
          projectTesters: '',
          projectReviewer: '',
          isContract: ''
        }
      }
    },
    methods: {
      // 获取信息
      async getInfo() {
        let res = await this.$http.get(`/project//${this.dataForm.id}`)
        this.dataForm = {
          ...this.dataForm,
          ...res.data
        }
      },
      // 表单提交
      async formSubmit() {
        let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project//', this.dataForm)
        if (res.success) {
          await this.$tip.success()
          this.$refs.dialog.close()
          this.$emit('refreshDataList')
        }
      }
    }
  }
</script>

 web/src/views/modules/project/project.vue

New file
@@ -0,0 +1,49 @@
<template>
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-project-project}">
      <zt-table-wraper query-url="/project//page" delete-url="/project/" v-slot="{ table }">
        <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
          <el-form-item>
            <zt-button type="query" @click="table.query()"/>
            <zt-button type="add" perm="project::add" @click="table.editHandle()"/>
            <zt-button type="delete" perm="project::delete" @click="table.deleteHandle()"/>
          </el-form-item>
        </el-form>
        <el-table v-loading="table.dataLoading" :data="table.dataList" border @selection-change="table.selectionChangeHandle">
          <el-table-column type="selection" width="40"/>
          <el-table-column prop="softwarename" label="软件名称"/>
          <el-table-column prop="code" label="项目编号"/>
          <el-table-column prop="identity" label="项目标识"/>
          <el-table-column prop="secretClass" label="密级"/>
          <el-table-column prop="criticalLevel" label="关键等级"/>
          <el-table-column prop="optEnviron" label="运行环境"/>
          <el-table-column prop="programLang" label="编程语言"/>
          <el-table-column prop="softwareType" label="软件类型"/>
          <el-table-column prop="projectLeader" label="项目负责人"/>
          <el-table-column prop="projectTesters" label="项目测试人员"/>
          <el-table-column prop="projectReviewer" label="项目审核人员"/>
          <el-table-column prop="isContract" label="是否签署合同"/>

          <zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
        </el-table>
        <!-- 弹窗, 新增 / 修改 -->
        <add-or-update @refreshDataList="table.query"/>
      </zt-table-wraper>
    </div>
  </el-card>
</template>

<script>
  import AddOrUpdate from './project-add-or-update'
  export default {
    data() {
      return {
        dataForm: {
        }
      }
    },
    components: {
      AddOrUpdate
    }
  }
</script>

 zt/core/src/main/resources/template/add-or-update.vue.vm

@@ -26,7 +26,7 @@
    methods: {
      // 获取信息
      async getInfo() {
        let res = await #[[this.$http.get(]]#`/${moduleName}/${pathName}/#[[${]]#this.dataForm.${pk.attrName}}`)
        let res = await #[[this.$http.get(]]#`/${moduleName}/${pathName}/#[[${]]#this.dataForm.id}`)
        this.dataForm = {
          ...this.dataForm,
          ...res.data
@@ -34,7 +34,7 @@
      },
      // 表单提交
      async formSubmit() {
        let res = await #[[this.$http]]#[!this.dataForm.${pk.attrName} ? 'post' : 'put']('/${moduleName}/${pathName}/', this.dataForm)
        let res = await #[[this.$http]]#[!this.dataForm.id ? 'post' : 'put']('/${moduleName}/${pathName}/', this.dataForm)
        if (res.success) {
          await this.$tip.success()
          this.$refs.dialog.close()

 zt/core/src/main/resources/template/index.vue.vm

@@ -12,8 +12,8 @@
#end
          <el-form-item>
            <zt-button type="query" @click="table.query()"/>
            <zt-button type="add" perm="${moduleName}:${permName}:add" @click="table.editHandle()"/>
            <zt-button type="delete" perm="${moduleName}:${permName}:delete" @click="table.deleteHandle()"/>
            <zt-button type="add" perm="${moduleName}::add" @click="table.editHandle()"/>
            <zt-button type="delete" perm="${moduleName}::delete" @click="table.deleteHandle()"/>
          </el-form-item>
        </el-form>
        <el-table v-loading="table.dataLoading" :data="table.dataList" border @selection-change="table.selectionChangeHandle">
@@ -24,7 +24,7 @@
#end
#end

          <zt-table-column-handle :table="table" edit-perm="${moduleName}:${permName}:update" delete-perm="${moduleName}:${permName}:delete"/>
          <zt-table-column-handle :table="table" edit-perm="${moduleName}:update" delete-perm="${moduleName}::delete"/>
        </el-table>
        <!-- 弹窗, 新增 / 修改 -->
        <add-or-update @refreshDataList="table.query"/>
@@ -34,7 +34,7 @@
</template>

<script>
  import AddOrUpdate from './${pathName}-add-or-update'
  import AddOrUpdate from './${tableName}-add-or-update'
  export default {
    data() {
      return {