From 6566e04fee5932942d44dfe17934807a076568ec Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 13 十二月 2023 09:10:44 +0800
Subject: [PATCH] 修改

---
 core/src/main/java/com/zt/life/export/service/WordFileService.java                                         |    9 ++++
 web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue                                        |   23 ++++++++---
 web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue                                    |    2 
 web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue                              |    4 +-
 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java |    4 +-
 modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml                  |   29 ++++++++------
 6 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/com/zt/life/export/service/WordFileService.java b/core/src/main/java/com/zt/life/export/service/WordFileService.java
index 3ef75f1..1d304c2 100644
--- a/core/src/main/java/com/zt/life/export/service/WordFileService.java
+++ b/core/src/main/java/com/zt/life/export/service/WordFileService.java
@@ -20,6 +20,7 @@
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
@@ -61,10 +62,14 @@
             Object staticFieldValue = ReflectUtil.getFieldValue(dataObj, field.getName()); // 灞炴�у搴旂殑鏁版嵁
             if (typeName.contains("com.zt.life.modules")) {
                 formatWordData(staticFieldValue, wordData, builder);
-            } else {
+            }else {
                 if (field.getType().getName().equals("java.util.List")) {
                     builder.bind(fieldName, new HackLoopTableRenderPolicy());
                 } else if (staticFieldValue != null) {
+                    if (typeName.contains("java.util.Date") && fieldName.contains("Date")) {
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        staticFieldValue=sdf.format(staticFieldValue);
+                    }
                     String valStr = staticFieldValue.toString();
                     if (valStr.contains("鏂囦欢鍥剧墖:")) {
                         valStr = localPath + valStr.replace("鏂囦欢鍥剧墖:", "");
@@ -88,6 +93,8 @@
                 if (wordData.get(fieldName) == null)
                     wordData.put(fieldName, staticFieldValue);
             }
+            if (wordData.get(fieldName) == null)
+                wordData.put(fieldName, staticFieldValue);
         }
     }
 }
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
index 2c1cd9a..74bd644 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
@@ -81,12 +81,12 @@
     public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
         List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams());
         if (list.size() > 0) {
-            workflowService.getRunFlow(list, "pzxrk");
+            workflowService.getRunFlow(list, "wplz");
         }
         return list;
     }
 
-    /**
+    /**yi
      * 鍒犻櫎
      *
      * @param ids
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index 0af6c8b..859808c 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -18,7 +18,7 @@
     </select>
     <select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
         SET @row_number = 0;
-        SELECT (@row_number := @row_number + 1) AS no,
+        SELECT (@row_number := @row_number + 1)                        AS no,
                p.secret_class,
                SUBSTRING(m.name, LOCATE('杞欢', m.name), LENGTH(m.name)) AS itemName,
                m.identify                                              AS version,
@@ -30,32 +30,35 @@
           AND s.id = m.order_id
         UNION
         SELECT (@row_number := @row_number + 1) AS no,
-               NULL      AS secretClass,
-               '杞欢娴嬭瘯濮旀墭鍗�' AS itemName,
-               NULL      AS version,
-               s.code    AS itemIdentify
+               NULL                             AS secretClass,
+               '杞欢娴嬭瘯濮旀墭鍗�'                        AS itemName,
+               NULL                             AS version,
+               s.code                           AS itemIdentify
         FROM software_test_order s
         WHERE s.is_delete = 0
           AND s.project_id = ${projectId}
         UNION
         SELECT (@row_number := @row_number + 1) AS no,
-               NULL    AS secretClass,
-               '鐗╁搧娴佽浆鍗�' AS itemName,
-               NULL    AS version,
-               i.code  AS itemIdentify
+               NULL                             AS secretClass,
+               '鐗╁搧娴佽浆鍗�'                          AS itemName,
+               NULL                             AS version,
+               i.code                           AS itemIdentify
         FROM item_circulat_order i
         WHERE i.is_delete = 0
           AND i.project_id = ${projectId}
     </select>
     <select id="warehouseList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
-        select a.item_name,a.item_identify,a.version as retrospect_version,a.secret_class,a.project_id,a.id as select_id
+        SET @row_number = 0;
+        SELECT (@row_number := @row_number + 1) AS no,
+               a.item_name,a.item_identify,a.version as retrospect_version,a.secret_class,a.project_id,a.id as select_id
         from config_item_warehouse_detail a
         WHERE a.is_delete = 0
-          and a.project_id = ${projectId}
-          and a.id NOT IN (SELECT select_id FROM config_item_warehouse_detail)
+        and a.project_id = ${projectId}
         <if test="ids!=null and ids!=''">
-            AND id not in  (${ids})
+            AND id not in (${ids})
         </if>
+        and a.id NOT IN (SELECT select_id FROM config_item_warehouse_detail WHERE (SELECT count(*) FROM
+        config_item_warehouse_detail WHERE id = select_id) > 0)
     </select>
 
 </mapper>
diff --git a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
index 9239b8f..fd37e36 100644
--- a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
@@ -28,7 +28,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item class="marginTopAndMarginBottom2" label="搴撶被鍨�" style="width: 99%">
-            <zt-dict v-model="dataForm.configItemChange.libraryType" :radio="true" dict="library_type"></zt-dict>
+            <zt-dict :disabled="stepMarker!=='pzxbg_first'" v-model="dataForm.configItemChange.libraryType" :radio="true" dict="library_type"></zt-dict>
           </el-form-item>
         </div>
         <div class="el-configChangeDialog el-border-bottom">
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index 01ae420..f6bc816 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -28,7 +28,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item class="marginTopAndMarginBottom2" label="搴撶被鍨�" style="width: 99%">
-            <zt-dict v-model="dataForm.configItemWarehouse.libraryType" :radio="true" dict="library_type"></zt-dict>
+            <zt-dict :disabled="stepMarker!=='pzxrk_first'" v-model="dataForm.configItemWarehouse.libraryType" :radio="true" dict="library_type"></zt-dict>
           </el-form-item>
         </div>
         <div class="el-flexManageDialog el-border-bottom">
@@ -88,7 +88,7 @@
                 <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="240" align="center">
                   <template v-slot="{ row }">
                     <!--                    <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>-->
-                    <table-uploader busi-type="config_item_warehouse" model-name="row" :dataForm="row"
+                    <table-uploader :disabled="!showAddAndEdit" busi-type="config_item_warehouse" model-name="row" :dataForm="row"
                                     v-model="row.files"/>
                   </template>
                 </el-table-column>
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index 0ba54c4..b9f2344 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -16,16 +16,18 @@
             <el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鍚嶇О"></el-input>
           </el-form-item>
           <el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ヤ汉" style="width: 49%">
-            <el-input :disabled="stepMarker!=='csjcd_first'" v-model="dataForm.checkOrder.examiner"
+            <el-input v-if="stepMarker=='csjcd_first'" v-model="dataForm.checkOrder.examiner"
                       placeholder="妫�鏌ヤ汉"></el-input>
+            <span v-else>{{dataForm.checkOrder.examiner}}</span>
           </el-form-item>
           <el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ユ椂闂�" style="width: 49%">
             <el-date-picker
-              :disabled="stepMarker!=='csjcd_first'"
+              v-if="stepMarker=='csjcd_first'"
               v-model="dataForm.checkOrder.examDate"
               type="date"
               placeholder="璇烽�夋嫨妫�鏌ユ椂闂�">
             </el-date-picker>
+            <span v-else>{{dataForm.checkOrder.examDate}}</span>
           </el-form-item>
         </div>
         <div style="border-bottom: 1px solid rgba(0,0,0,.2);">
@@ -47,12 +49,13 @@
                 </el-table-column>
                 <el-table-column prop="checkResult" align="center" width="180" label="妫�鏌ョ粨鏋�">
                   <template v-slot="{ row }">
-                    <zt-dict v-model="row.checkResult" dict="tristate1" :radio="true"></zt-dict>
+                    <zt-dict :disabled="stepMarker!=='csjcd_first'" v-model="row.checkResult" dict="tristate1" :radio="true"></zt-dict>
                   </template>
                 </el-table-column>
                 <el-table-column prop="remark" label="澶囨敞" width="100" align="center">
                   <template v-slot="{ row }">
-                    <el-input v-model="row.remark" placeholder="澶囨敞"></el-input>
+                    <el-input v-if="stepMarker=='csjcd_first'" v-model="row.remark" placeholder="澶囨敞"></el-input>
+                    <span v-else>{{row.remark}}</span>
                   </template>
                 </el-table-column>
                 <!--                <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
@@ -76,8 +79,9 @@
           </div>
           <div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
             <el-form-item style="width: 100%;padding-left:20px;margin:0;">
-              <el-input type="textarea"
+              <el-input v-if="stepMarker=='csjcd_first'" type="textarea"
                         :rows="3" v-model="dataForm.checkOrder.problemDescription" placeholder="闂鎻忚堪..."></el-input>
+              <span v-else>{{dataForm.checkOrder.problemDescription}}</span>
             </el-form-item>
           </div>
         </div>
@@ -87,8 +91,9 @@
           </div>
           <div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
             <el-form-item style="width: 100%;padding-left:20px;margin:0;">
-              <el-input type="textarea"
+              <el-input v-if="stepMarker=='csjcd_wtcl'" type="textarea"
                         :rows="3" v-model="dataForm.checkOrder.problemProcess" placeholder="闂澶勭悊..."></el-input>
+              <span v-else>{{dataForm.checkOrder.problemProcess}}</span>
             </el-form-item>
           </div>
         </div>
@@ -233,7 +238,10 @@
             submitType == ''
           }
         }
-        if (submitType == 'tj' || submitType == 'bl') {
+        if (submitType == 'bl') {
+          isFlow = true
+        }
+        if (submitType == 'tj' && isFlow || submitType == 'bl' && isFlow) {
           let flowInfo = {
             flowCode: 'csjcd',
             stepIdMark: this.stepMarker,
@@ -247,6 +255,7 @@
           await this.$tip.success()
           this.$refs.dialog.close()
           this.$emit('recall', res.data, this.configDetailRow)
+          this.$emit('refreshDataList')
         }
       }
     }

--
Gitblit v1.9.1