Changes

jinlin

2023-11-15 a4928bd09a4b5034290985ce21304e9fed56732c

Changes

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

@@ -95,7 +95,7 @@
        return Result.ok();
    }

    @DeleteMapping
    @DeleteMapping("deleteProject")
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids) {

 web/src/views/modules/project/Project-AddOrUpdate.vue

@@ -95,19 +95,19 @@
              项目责任人
            </div>
            <div class="DSTOld-1-Form">
              <!-- 单位名称 -->
              <!-- 项目负责人 -->
              <zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="项目负责人" prop="projectLeader" style="width: 48%" rules="required">
                <el-input v-model="dataForm.projectLeader" placeholder="请输入单位名称"></el-input>
                <el-input v-model="dataForm.projectLeader" placeholder="请输入项目负责人"></el-input>
              </zt-form-item>
              <!-- 联系人 -->
              <!-- 项目测试人员 -->
              <zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="项目测试人员" prop="projectTesters" style="width: 48%" rules="required">
                <el-input v-model="dataForm.projectTesters" placeholder="请输入联系人"></el-input>
                <el-input v-model="dataForm.projectTesters" placeholder="请输入项目测试人员"></el-input>
              </zt-form-item>
              <!-- 详细地址 -->
              <!-- 项目审核人 -->
              <zt-form-item label-width="120px" label="项目审核人" prop="projectReviewer" style="width: 48%" rules="required">
                <el-input v-model="dataForm.projectReviewer" placeholder="请输入详细地址"></el-input>
                <el-input v-model="dataForm.projectReviewer" placeholder="请输入项目审核人"></el-input>
              </zt-form-item>
              <!-- 联系方式 -->
              <!-- 是否签署合同 -->
              <zt-form-item label-width="120px" label="是否签署合同" prop="isContract" style="width: 48%" rules="required">
                <zt-dict v-model="dataForm.isContract" dict="is_or_not"></zt-dict>
              </zt-form-item>

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

@@ -1,7 +1,7 @@
<template>
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-project-project}">
      <zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project" v-slot="{ table }">
      <zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project/deleteProject" v-slot="{ table }">
        <el-form :inline="true" class="form-input-width-1"  :model="dataForm" @keyup.enter.native="table.query()">
          <el-form-item>
            <el-input v-model="dataForm.softwareName" placeholder="请输入软件名称" clearable></el-input>

 web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue

@@ -4,7 +4,7 @@
             class="weiTuoDanAuto">
      <div class="DManageForm">
        <el-form-item readonly label-width="60px" label="编号:" style="width: 99% ;margin-bottom:-5px">
          <span>{{ dataForm.project.code }}</span>
          <span>{{ dataForm.softwareTestOrder.code}}</span>
        </el-form-item>
      </div>
      <div style="border: 1px solid rgba(0,0,0,.2)">
@@ -231,7 +231,7 @@
                  <div class="el-border-left" style="width: 98%;">
                    <el-form-item label="是否盖CNAS章" label-width="130px" style="padding-left:5%;margin-bottom:0">
                      <zt-dict v-model="dataForm.softwareTestOrder.otherRequire" :radio="true"
                               dict="is_or_not"></zt-dict>
                               dict="is_stamp"></zt-dict>
                    </el-form-item>
                  </div>
                </div>
@@ -413,6 +413,7 @@
        id: null,
        projectId: null,
        softwareTestOrder: {
          code:'',
          optEnviron:'',
          programLang:'',
          testBasis:'',

 zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java

@@ -54,15 +54,16 @@
        String year = sdf.format(new Date());
        newCodeTemplet = newCodeTemplet.replace("[年份]",year);

        String xhTemplet = StringUtils.substring("__________",0,codeRule.getNoByteNum()-1);
        String xhTemplet = StringUtils.substring("__________",0,codeRule.getNoByteNum());
        newCodeTemplet = newCodeTemplet.replace("[序号]",xhTemplet);
        int xhStartPosition = newCodeTemplet.indexOf(xhTemplet);

        String maxCode = baseDao.getMaxCode(codeRule.getTableName(),newCodeTemplet);
        String maxCodeXh = "0";
        if (StringUtils.isNotBlank(maxCode))
            maxCodeXh = StringUtils.substring(maxCode,xhStartPosition,xhStartPosition+codeRule.getNoByteNum()-1);
        String newCodeXh = String.format("%0"+codeRule.getNoByteNum()+"d", Convert.toInt(maxCodeXh)+1);
            maxCodeXh = StringUtils.substring(maxCode,xhStartPosition,xhStartPosition+codeRule.getNoByteNum());
        Integer a = Convert.toInt(maxCodeXh)+1;
        String newCodeXh = String.format("%0"+codeRule.getNoByteNum()+"d", a);
        String newCode = newCodeTemplet.replace(xhTemplet,newCodeXh);
        return newCode;
    }