修改

jinlin

2024-02-04 4b04e7fd4fcad9af480a003509288aa6070b137e

修改

 modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java

@@ -164,8 +164,11 @@
            }
        }

        int i=0;
        for (ConfigAuditReportProblem problem : configAuditDto.getProblemList()) {
            i++;
            problem.setReportId(reportId);
            problem.setNo(i);
            if (problem.getId() != null) {
                problemService.update(problem);
            } else {

 modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml

@@ -71,5 +71,6 @@
        from config_item_warehouse_detail
        where project_id =${projectId} and is_delete =0 and src_id =${srcId}
        ORDER BY UPDATE_DATE DESC
        LIMIT 1
    </select>
</mapper>

 web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue

@@ -20,7 +20,7 @@
          <div>
            <div style="text-align: center;font-weight: 600;border-bottom:1px solid rgba(0,0,0,.2);height: 40px;line-height: 40px;font-size: 18px">审核内容</div>
            <el-form-item label="状态标记" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
              √合格         ×不合格       NA不适用
              √合格&nbsp&nbsp&nbsp×不合格&nbsp&nbsp&nbspNA不适用
            </el-form-item>
            <div class="table-container">
              <el-table ref="tableConfigAuditList" class="el-software el-margin-top-bot" border
@@ -36,10 +36,9 @@
                    <el-input v-model="row.auditContent" placeholder="审核内容"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="auditResult" align="center" width="150" label="审核结果">
                <el-table-column prop="auditResult" align="center" width="200" label="审核结果">
                  <template v-slot="{ row }">
                    <zt-dict v-model="row.auditResult" placeholder="审核结果" dict="status_tag"
                             clearable></zt-dict>
                    <zt-dict v-model="row.auditResult" placeholder="审核结果" dict="status_tag" :radio="true"></zt-dict>
                  </template>
                </el-table-column>
                <el-table-column prop="remark" label="备注" width="100" align="center">
@@ -180,7 +179,7 @@
          ...res.data
        }
        if(this.dataForm.configAuditReport === null){
          this.dataForm.contractReview={}
          this.dataForm.configAuditReport={}
        }
        console.log(this.dataForm, "getInfo this.dataForm")
      },

 web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue

@@ -424,26 +424,27 @@
          return
        }
        if (submitType === 'tj' || submitType === 'bl') {
          console.log(this.stepMarker, "this.stepMarker")
          if (this.stepMarker === 'wplz_wpjs') {
            if (this.dataForm.circulatOrder.acceptSituation == null || this.dataForm.circulatOrder.virusLibraryVersion == null) {
            if (!this.dataForm.circulatOrder.acceptSituation || !this.dataForm.circulatOrder.virusLibraryVersion) {
              this.$alert("当前有未填写的情况说明")
              return
            }
          }
          if (this.stepMarker === 'wplz_jcjs') {
            if (this.dataForm.circulatOrder.detectAcceptSituation == null) {
            if (!this.dataForm.circulatOrder.detectAcceptSituation) {
              this.$alert("当前有未填写的情况说明")
              return
            }
          }
          if (this.stepMarker === 'wplz_xzjc') {
            if (this.dataForm.circulatOrder.detectSituation == null) {
            if (!this.dataForm.circulatOrder.detectSituation) {
              this.$alert("当前有未填写的情况说明")
              return
            }
          }
          if (this.stepMarker === 'wplz_wprk') {
            if (this.dataForm.circulatOrder.depositSituation == null) {
            if (!this.dataForm.circulatOrder.depositSituation) {
              this.$alert("当前有未填写的情况说明")
              return
            }

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

@@ -419,7 +419,7 @@
              <div class="" style="width: 100%;">
                <div class="el-flex" style="height: 40px">
                  <div style="width: 60%">
                    <zt-select v-model="dataForm.softwareTestOrder.contractSign" url="/sys/userEx/getUsersList"
                    <zt-select v-model="dataForm.softwareTestOrder.contractSign" :datas="usersList"
                               placeholder="承托方人员"/>
                    <!--                    <span>{{ dataForm.contractSign }}</span>-->
                  </div>
@@ -542,17 +542,11 @@
          },
          deliverableList: [],
          measuredList: [],
        }
        },
        usersList:[]
      }
    },
    methods: {
      // getDictLabel(event,name){
      //   if(name.indexOf("其他")!=-1){
      //     console.log(name,'字典名字q34567')
      //     this.eventIndex = event
      //     this.inputName='q14eeff'
      //   }
      // },
      getChangeInputData(data, ogn) {
        // console.log(ogn)
        this.$set(this.dataForm.softwareTestOrder, ogn, data);
@@ -609,6 +603,7 @@
            this.dataForm.testAgencyInfo = {}
          }
        }
        await this.getusersList()
        // console.log(this.dataForm, "this.dataForm")
        console.log(this.dataForm, "getInfo this.dataForm")
      },
@@ -622,6 +617,12 @@
          tableBody.scrollTop = tableBody.scrollHeight
        })
      },
      async getusersList() {
        let res = await this.$http.get(`/sys/userEx/getUsersList`)
        if (res.success) {
          this.usersList = res.data;
        }
      },
      async deleteDeliverableRow(index,id) {
          if (await this.$tip.confirm(this.$t('prompt.info', {'handle': this.$t('delete')}))) {
            if (id != null) {

 zt/core/src/main/java/com/zt/modules/oss/cloud/LocalStorageService.java

@@ -8,6 +8,8 @@

package com.zt.modules.oss.cloud;

import com.aspose.words.Document;
import com.aspose.words.SaveFormat;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.spire.xls.Workbook;
import com.zt.common.exception.ErrorCode;
@@ -27,6 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;

/**
 * 本地上传
@@ -151,7 +154,18 @@
                        documentBytes = outputStream.toByteArray();
                        headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
                    }
                    if (filename.endsWith(".doc") || filename.endsWith(".docx") ||  filename.endsWith(".xlsx")) {

                    if (filename.endsWith(".doc")) {
                        // 使用 Aspose.Words 进行文档转换
                        Document doc = new Document(in);
                        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                        doc.save(outputStream, SaveFormat.DOCX);

                        documentBytes = outputStream.toByteArray();
                        headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
                        headers.setContentDispositionFormData("attachment", filename.replace(".doc", ".docx"));

                    } else if (filename.endsWith(".docx") || filename.endsWith(".xlsx")) {
                        documentBytes = FileCopyUtils.copyToByteArray(in);
                        headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
                        headers.setContentDispositionFormData("attachment", filename);