From 1058c119c4287d0ea42cd5804822a4a64201637c Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 27 十月 2026 09:43:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 /dev/null                                                                                      |  136 ---------------------------
 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java          |    4 
 inspect-server/src/main/java/com/ruoyi/inspect/util/ReportResultTableRenderPolicy.java         |   34 ++++++
 inspect-server/src/main/resources/mapper/InsOrderMapper.xml                                    |   70 ++++++++-----
 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java |    4 
 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java           |    2 
 inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java                         |    8 
 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java       |    3 
 8 files changed, 93 insertions(+), 168 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index dfd6e0d..bdcda5c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -169,9 +169,13 @@
     @GetMapping("/downFile")
     public Result<?> downFile(Integer id) {
         InsOrderFile insOrderFile = insOrderFileService.getById(id);
+        if (insOrderFile == null) {
+            return Result.fail("闄勪欢涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎");
+        }
         HashMap<String, Object> map = new HashMap<>();
         map.put("type", insOrderFile.getType());
         map.put("fileUrl", insOrderFile.getFileUrl());
+        map.put("fileName", insOrderFile.getFileName());
         return Result.success(map);
     }
 
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
index 53f57c3..0c36526 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
@@ -73,9 +73,13 @@
     @GetMapping("/downFile")
     public Result<?> oaDownFile(Integer id) {
         InsUnqualifiedHandlerFile insUnqualifiedHandlerFile = unqualifiedHandlerFileService.getById(id);
+        if (insUnqualifiedHandlerFile == null) {
+            return Result.fail("闄勪欢涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎");
+        }
         HashMap<String, Object> map = new HashMap<>();
         map.put("type", insUnqualifiedHandlerFile.getType());
         map.put("fileUrl", insUnqualifiedHandlerFile.getFileUrl());
+        map.put("fileName", insUnqualifiedHandlerFile.getFileName());
         return Result.success(map);
     }
 
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
index 246869d..a9fe4ec 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
@@ -84,11 +84,11 @@
     private String unqualifiedItem;
 
     /**
-     * (鎶ュ憡瀵煎嚭)涓嬪崟鏃堕棿
+     * (鎶ュ憡瀵煎嚭)閫佹牱鏃堕棿
      */
-    @ExcelProperty(index = 11, value = "涓嬪崟鏃堕棿")
-    @Schema(description = "涓嬪崟鏃堕棿")
-    private String createTimeString;
+    @ExcelProperty(index = 11, value = "閫佹牱鏃堕棿")
+    @Schema(description = "閫佹牱鏃堕棿")
+    private String sampleDateString;
 
     @Schema(description = "瀛愬疄楠屽")
     private String sonLaboratory;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 3dde4b3..39a0061 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -45,6 +45,7 @@
 import com.ruoyi.inspect.pojo.*;
 import com.ruoyi.inspect.service.*;
 import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.ReportResultTableRenderPolicy;
 import com.ruoyi.inspect.util.PreserveReportPicturePlaceholderHandler;
 import com.ruoyi.inspect.util.ReportSignaturePictureUtils;
 import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
@@ -3747,7 +3748,7 @@
         }
         Configure configure = Configure.builder()
                 .bind("deviceList", new HackLoopTableRenderPolicy())
-                .bind("r", new HackLoopTableRenderPolicy(true))
+                .bind("r", new ReportResultTableRenderPolicy())
                 .setValidErrorHandler(new PreserveReportPicturePlaceholderHandler())
                 .useSpringEL(true)
                 .build();
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index c8e2581..39843a4 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -1803,7 +1803,7 @@
                 List<String> unqualifiedList = insProductMapper.selectUnqualifiedList(orderDto.getId());
                 orderDto.setUnqualifiedItem(CollUtil.join(unqualifiedList, ","));
             }
-            orderDto.setCreateTimeString(orderDto.getCreateTime() == null ? "" : orderDto.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            orderDto.setSampleDateString(orderDto.getSampleDate() == null ? "" : orderDto.getSampleDate().toString());
 
         }
 
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/util/ReportResultTableRenderPolicy.java b/inspect-server/src/main/java/com/ruoyi/inspect/util/ReportResultTableRenderPolicy.java
new file mode 100644
index 0000000..3837527
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/util/ReportResultTableRenderPolicy.java
@@ -0,0 +1,34 @@
+package com.ruoyi.inspect.util;
+
+import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.poi.xwpf.usermodel.XWPFRun;
+import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.poi.xwpf.usermodel.XWPFTableCell;
+import org.apache.poi.xwpf.usermodel.XWPFTableRow;
+
+/** 鎶ュ憡缁撴灉琛ㄥ簭鍙蜂娇鐢ㄦ櫘閫氭枃瀛楋紝閬垮厤娓叉煋鏃朵骇鐢熼粯璁や笅鍒掔嚎銆� */
+public class ReportResultTableRenderPolicy extends HackLoopTableRenderPolicy {
+
+    public ReportResultTableRenderPolicy() {
+        super(true);
+    }
+
+    @Override
+    protected void afterloop(XWPFTable table, Object data) {
+        for (XWPFTableRow row : table.getRows()) {
+            XWPFTableCell cell = row.getCell(0);
+            if (cell == null || !cell.getText().trim().matches("\\d+")) {
+                continue;
+            }
+            for (XWPFParagraph paragraph : cell.getParagraphs()) {
+                for (XWPFRun run : paragraph.getRuns()) {
+                    if (run.getCTR().isSetRPr()) {
+                        while (run.getCTR().getRPr().sizeOfUArray() > 0) {
+                            run.getCTR().getRPr().removeU(0);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 8c68db8..dfa7c0d 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -66,6 +66,46 @@
         ip.cable_tag
     </sql>
 
+    <!-- 鐩寸粦璁㈠崟鎸夋ā鏉跨粨璁虹粺璁★紱浼犵粺璁㈠崟鎸夋湁鏁堜笖闈炵粦瀹氱殑妫�楠岄」鐩粺璁°�� -->
+    <sql id="inspectionProgressColumn">
+        CONCAT(COALESCE(ROUND(
+            CASE WHEN template_progress.total_count > 0
+                THEN template_progress.completed_count * 100.0 / template_progress.total_count
+                ELSE product_progress.completed_count * 100.0 / NULLIF(product_progress.total_count, 0)
+            END, 2), 0), '%') AS insProgress
+    </sql>
+
+    <sql id="inspectionProgressJoins">
+        LEFT JOIN (
+            SELECT s.ins_order_id, COUNT(*) AS total_count,
+                   SUM(CASE WHEN p.ins_result IN (0, 1, 3) THEN 1 ELSE 0 END) AS completed_count
+            FROM ins_product p
+            JOIN ins_sample s ON p.ins_sample_id = s.id
+            WHERE p.state = 1 AND (p.is_binding IS NULL OR p.is_binding != 1)
+            GROUP BY s.ins_order_id
+        ) product_progress ON io.id = product_progress.ins_order_id
+        LEFT JOIN (
+            SELECT t.ins_order_id, COUNT(*) AS total_count,
+                   SUM(CASE WHEN t.ins_result IN (0, 1) THEN 1 ELSE 0 END) AS completed_count
+            FROM ins_order_standard_template t
+            JOIN ins_order template_order ON template_order.id = t.ins_order_id
+            WHERE EXISTS (
+                SELECT 1
+                FROM ins_sample s
+                LEFT JOIN ins_product p ON p.ins_sample_id = s.id
+                WHERE s.ins_order_id = t.ins_order_id
+                  AND (p.template_row_index IS NOT NULL
+                       OR (s.standard_method_list_id IS NULL
+                           AND COALESCE(TRIM(s.factory), '') = ''
+                           AND COALESCE(TRIM(s.sample_type), '') = ''
+                           AND COALESCE(TRIM(s.model), '') = ''
+                           AND COALESCE(TRIM(template_order.factory), '') = ''
+                           AND COALESCE(TRIM(template_order.sample_type), '') = ''))
+            )
+            GROUP BY t.ins_order_id
+        ) template_progress ON io.id = template_progress.ins_order_id
+    </sql>
+
     <sql id="selectInsOrderExport">
         SELECT
             io.*,
@@ -74,7 +114,7 @@
             ir.url,
             ir.url_s,
             sample_counts.sample_num,
-            CONCAT(ROUND(approved_product_counts.approved_count / total_product_counts.total_count * 100, 2), '%') AS insProgress,
+            <include refid="inspectionProgressColumn"/>,
             io.sample_view AS sample_name,
             GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
             u.name,
@@ -101,18 +141,7 @@
              FROM ins_sample
              WHERE id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s )
              GROUP BY ins_order_id) sample_counts ON io.id = sample_counts.ins_order_id
-                LEFT JOIN
-            (SELECT ins_sample.ins_order_id, COUNT(*) AS total_count
-             FROM ins_product
-                      JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
-             WHERE ins_product.state = 1
-             GROUP BY ins_sample.ins_order_id) total_product_counts ON io.id = total_product_counts.ins_order_id
-                LEFT JOIN
-            (SELECT ins_sample.ins_order_id, COUNT(*) AS approved_count
-             FROM ins_product
-                      JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
-             WHERE ins_product.state = 1 AND ins_product.ins_result IS NOT NULL
-             GROUP BY ins_sample.ins_order_id) approved_product_counts ON io.id = approved_product_counts.ins_order_id
+            <include refid="inspectionProgressJoins"/>
                 LEFT JOIN (SELECT ins_sample_id, GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS testing_name
                            FROM ins_sample_user u
                                     LEFT JOIN user uu ON u.user_id = uu.id
@@ -131,7 +160,7 @@
         ir.url,
         ir.url_s,
         sample_counts.sample_num,
-        CONCAT(ROUND(approved_product_counts.approved_count / total_product_counts.total_count * 100, 2), '%') AS insProgress,
+        <include refid="inspectionProgressColumn"/>,
         io.sample_view AS sample_name,
         GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
         u.name,
@@ -155,18 +184,7 @@
         FROM ins_sample
         WHERE id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s )
         GROUP BY ins_order_id) sample_counts ON io.id = sample_counts.ins_order_id
-        LEFT JOIN
-        (SELECT ins_sample.ins_order_id, COUNT(*) AS total_count
-        FROM ins_product
-        JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
-        WHERE ins_product.state = 1 and is_binding !=1
-        GROUP BY ins_sample.ins_order_id) total_product_counts ON io.id = total_product_counts.ins_order_id
-        LEFT JOIN
-        (SELECT ins_sample.ins_order_id, COUNT(*) AS approved_count
-        FROM ins_product
-        JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
-        WHERE ins_product.state = 1 and is_binding !=1 AND ins_product.ins_result IS NOT NULL
-        GROUP BY ins_sample.ins_order_id) approved_product_counts ON io.id = approved_product_counts.ins_order_id
+        <include refid="inspectionProgressJoins"/>
         LEFT JOIN (SELECT ins_sample_id, GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS testing_name
         FROM ins_sample_user u
         LEFT JOIN user uu ON u.user_id = uu.id
diff --git a/sql/lims_delta.sql b/sql/lims_delta.sql
deleted file mode 100644
index bd6ee65..0000000
--- a/sql/lims_delta.sql
+++ /dev/null
@@ -1,136 +0,0 @@
--- LIMS 杩佺Щ澧為噺鑴氭湰
--- 鐩爣搴撶己灏戠殑 3.9.2 妗嗘灦琛紙鏃у簱 lims-ruoyi 宸蹭笉瀛樺湪锛屾敼鐢� zt_radio_requency锛�
--- 浠呮柊澧炶〃锛屼笉鍚� drop銆佷笉鍚紨绀烘暟鎹�
-
--- 15銆佸畾鏃朵换鍔¤皟搴﹁〃
-create table if not exists sys_job (
-  job_id              bigint(20)    not null auto_increment    comment '浠诲姟ID',
-  job_name            varchar(64)   default ''                 comment '浠诲姟鍚嶇О',
-  job_group           varchar(64)   default 'DEFAULT'          comment '浠诲姟缁勫悕',
-  invoke_target       varchar(500)  not null                   comment '璋冪敤鐩爣瀛楃涓�',
-  cron_expression     varchar(255)  default ''                 comment 'cron鎵ц琛ㄨ揪寮�',
-  misfire_policy      varchar(20)   default '3'                comment '璁″垝鎵ц閿欒绛栫暐锛�1绔嬪嵆鎵ц 2鎵ц涓�娆� 3鏀惧純鎵ц锛�',
-  concurrent          char(1)       default '1'                comment '鏄惁骞跺彂鎵ц锛�0鍏佽 1绂佹锛�',
-  status              char(1)       default '0'                comment '鐘舵�侊紙0姝e父 1鏆傚仠锛�',
-  create_by           varchar(64)   default ''                 comment '鍒涘缓鑰�',
-  create_time         datetime                                 comment '鍒涘缓鏃堕棿',
-  update_by           varchar(64)   default ''                 comment '鏇存柊鑰�',
-  update_time         datetime                                 comment '鏇存柊鏃堕棿',
-  remark              varchar(500)  default ''                 comment '澶囨敞淇℃伅',
-  primary key (job_id, job_name, job_group)
-) engine=innodb auto_increment=100 comment = '瀹氭椂浠诲姟璋冨害琛�';
-
--- 16銆佸畾鏃朵换鍔¤皟搴︽棩蹇楄〃
-create table if not exists sys_job_log (
-  job_log_id          bigint(20)     not null auto_increment    comment '浠诲姟鏃ュ織ID',
-  job_name            varchar(64)    not null                   comment '浠诲姟鍚嶇О',
-  job_group           varchar(64)    not null                   comment '浠诲姟缁勫悕',
-  invoke_target       varchar(500)   not null                   comment '璋冪敤鐩爣瀛楃涓�',
-  job_message         varchar(500)                              comment '鏃ュ織淇℃伅',
-  status              char(1)        default '0'                comment '鎵ц鐘舵�侊紙0姝e父 1澶辫触锛�',
-  exception_info      varchar(2000)  default ''                 comment '寮傚父淇℃伅',
-  start_time          datetime                                  comment '鎵ц寮�濮嬫椂闂�',
-  end_time            datetime                                  comment '鎵ц缁撴潫鏃堕棿',
-  create_time         datetime                                  comment '鍒涘缓鏃堕棿',
-  primary key (job_log_id)
-) engine=innodb comment = '瀹氭椂浠诲姟璋冨害鏃ュ織琛�';
-
--- 18銆佸叕鍛婂凡璇昏褰曡〃
-create table if not exists sys_notice_read (
-  read_id          bigint(20)       not null auto_increment    comment '宸茶涓婚敭',
-  notice_id        int(4)           not null                   comment '鍏憡id',
-  user_id          bigint(20)       not null                   comment '鐢ㄦ埛id',
-  read_time        datetime         not null                   comment '闃呰鏃堕棿',
-  primary key (read_id),
-  unique key uk_user_notice (user_id, notice_id)   comment '鍚屼竴鐢ㄦ埛鍚屼竴鍏憡鍙褰曚竴娆�'
-) engine=innodb auto_increment=1 comment='鍏憡宸茶璁板綍琛�';
-
--- 19銆佷唬鐮佺敓鎴愪笟鍔¤〃
-create table if not exists gen_table (
-  table_id          bigint(20)      not null auto_increment    comment '缂栧彿',
-  table_name        varchar(200)    default ''                 comment '琛ㄥ悕绉�',
-  table_comment     varchar(500)    default ''                 comment '琛ㄦ弿杩�',
-  sub_table_name    varchar(64)     default null               comment '鍏宠仈瀛愯〃鐨勮〃鍚�',
-  sub_table_fk_name varchar(64)     default null               comment '瀛愯〃鍏宠仈鐨勫閿悕',
-  class_name        varchar(100)    default ''                 comment '瀹炰綋绫诲悕绉�',
-  tpl_category      varchar(200)    default 'crud'             comment '浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔锛�',
-  tpl_web_type      varchar(30)     default ''                 comment '鍓嶇妯℃澘绫诲瀷锛坋lement-ui妯$増 element-plus妯$増锛�',
-  package_name      varchar(100)                               comment '鐢熸垚鍖呰矾寰�',
-  module_name       varchar(30)                                comment '鐢熸垚妯″潡鍚�',
-  business_name     varchar(30)                                comment '鐢熸垚涓氬姟鍚�',
-  function_name     varchar(50)                                comment '鐢熸垚鍔熻兘鍚�',
-  function_author   varchar(50)                                comment '鐢熸垚鍔熻兘浣滆��',
-  form_col_num      int(1)          default 1                  comment '琛ㄥ崟甯冨眬锛堝崟鍒� 鍙屽垪 涓夊垪锛�',
-  gen_type          char(1)         default '0'                comment '鐢熸垚浠g爜鏂瑰紡锛�0zip鍘嬬缉鍖� 1鑷畾涔夎矾寰勶級',
-  gen_path          varchar(200)    default '/'                comment '鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級',
-  options           varchar(1000)                              comment '鍏跺畠鐢熸垚閫夐」',
-  create_by         varchar(64)     default ''                 comment '鍒涘缓鑰�',
-  create_time       datetime                                   comment '鍒涘缓鏃堕棿',
-  update_by         varchar(64)     default ''                 comment '鏇存柊鑰�',
-  update_time       datetime                                   comment '鏇存柊鏃堕棿',
-  remark            varchar(500)    default null               comment '澶囨敞',
-  primary key (table_id)
-) engine=innodb auto_increment=1 comment = '浠g爜鐢熸垚涓氬姟琛�';
-
--- 20銆佷唬鐮佺敓鎴愪笟鍔¤〃瀛楁
-create table if not exists gen_table_column (
-  column_id         bigint(20)      not null auto_increment    comment '缂栧彿',
-  table_id          bigint(20)                                 comment '褰掑睘琛ㄧ紪鍙�',
-  column_name       varchar(200)                               comment '鍒楀悕绉�',
-  column_comment    varchar(500)                               comment '鍒楁弿杩�',
-  column_type       varchar(100)                               comment '鍒楃被鍨�',
-  java_type         varchar(500)                               comment 'JAVA绫诲瀷',
-  java_field        varchar(200)                               comment 'JAVA瀛楁鍚�',
-  is_pk             char(1)                                    comment '鏄惁涓婚敭锛�1鏄級',
-  is_increment      char(1)                                    comment '鏄惁鑷锛�1鏄級',
-  is_required       char(1)                                    comment '鏄惁蹇呭~锛�1鏄級',
-  is_insert         char(1)                                    comment '鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級',
-  is_edit           char(1)                                    comment '鏄惁缂栬緫瀛楁锛�1鏄級',
-  is_list           char(1)                                    comment '鏄惁鍒楄〃瀛楁锛�1鏄級',
-  is_query          char(1)                                    comment '鏄惁鏌ヨ瀛楁锛�1鏄級',
-  query_type        varchar(200)    default 'EQ'               comment '鏌ヨ鏂瑰紡锛堢瓑浜庛�佷笉绛変簬銆佸ぇ浜庛�佸皬浜庛�佽寖鍥达級',
-  html_type         varchar(200)                               comment '鏄剧ず绫诲瀷锛堟枃鏈銆佹枃鏈煙銆佷笅鎷夋銆佸閫夋銆佸崟閫夋銆佹棩鏈熸帶浠讹級',
-  dict_type         varchar(200)    default ''                 comment '瀛楀吀绫诲瀷',
-  sort              int                                        comment '鎺掑簭',
-  create_by         varchar(64)     default ''                 comment '鍒涘缓鑰�',
-  create_time       datetime                                   comment '鍒涘缓鏃堕棿',
-  update_by         varchar(64)     default ''                 comment '鏇存柊鑰�',
-  update_time       datetime                                   comment '鏇存柊鏃堕棿',
-  primary key (column_id)
-) engine=innodb auto_increment=1 comment = '浠g爜鐢熸垚涓氬姟琛ㄥ瓧娈�';
-
--- 21銆佹爣鍑嗘煡鏂拌〃澧炲姞鏌ユ柊鏃堕棿銆佹煡鏂扮粨鏋溿�佸叾浠栨潵婧愮綉鍧�
--- 浠呭湪鐩爣搴撶己灏戣繖浜涘垪鏃舵墽琛屼竴娆�
-alter table cnas_process_method_search_new
-  add column search_new_time    datetime     default null comment '鏌ユ柊鏃堕棿'                      after search_new_source,
-  add column search_new_result  varchar(500) default null comment '鏌ユ柊缁撴灉'                      after search_new_time,
-  add column search_new_website varchar(500) default null comment '鏉ユ簮涓哄叾浠栨椂鐨勫叿浣撶綉鍧�鎴栫綉绔欏悕绉�' after search_new_result;
-
--- 22銆佹楠岃鍗曡〃澧炲姞鏍囧噯搴撲簩绾ц妭鐐笽D锛堢洿缁戞ā鏉夸笅鍗曪級
--- 浠呭湪鐩爣搴撶己灏戣鍒楁椂鎵ц涓�娆�
-alter table ins_order
-  add column standard_tree_id int default null comment '鏂拌仛鐩寸粦妯℃澘涓嬪崟鏃堕�夋嫨鐨勬爣鍑嗗簱浜岀骇鑺傜偣ID' after quality_monitor_details_id;
-
--- 23銆佽祫璐ㄨ〃琛ラ綈棰佸彂鏃堕棿鍙婂垱寤轰汉濮撳悕
--- 浠呭湪鐩爣搴撶己灏戣繖浜涘垪鏃舵墽琛屼竴娆�
-alter table certification
-  add column create_user_name     varchar(255) default null comment '鍒涘缓浜哄鍚�'  after create_user,
-  add column first_issuance_date  datetime     default null comment '棣栨棰佸彂鏃堕棿' after date_of_issuance,
-  add column latest_issuance_date datetime     default null comment '鏈�杩戦鍙戞椂闂�' after first_issuance_date;
-
--- 24銆佸鎴锋弧鎰忓害琛ㄥ鍔犵‘璁ゅ瓧娈�
--- 浠呭湪鐩爣搴撶己灏戣繖浜涘垪鏃舵墽琛屼竴娆�
-alter table cnas_client_satisfaction
-  add column confirm_person    varchar(255) default null comment '纭浜�'                    after reasonable_fees_suggestion,
-  add column confirm_person_id int          default null comment '纭浜篿d'                  after confirm_person,
-  add column confirm_status    int          default null comment '纭鐘舵��, 0:鏈‘璁�, 1:纭' after confirm_person_id;
-
--- 25銆佷汉鍛樺煿璁槑缁嗚〃澧炲姞澶栬仒/闈炵郴缁熻甯堝鍚�
--- 浠呭湪鐩爣搴撶己灏戣鍒楁椂鎵ц涓�娆�
-alter table cnas_person_training_detailed
-  add column training_lecturer_name varchar(255) default null comment '澶栬仒/闈炵郴缁熻甯堝鍚嶏紱鍐呴儴璁插笀浠嶅瓨 training_lecturer_id' after training_lecturer_id;
-
--- 26銆佹楠岃鍗曟ā鏉垮揩鐓ц〃澧炲姞璁惧榛樿鍊煎垵濮嬪寲鏍囪
--- 浠呭湪鐩爣搴撶己灏戣鍒楁椂鎵ц涓�娆�
-alter table ins_order_standard_template
-  add column device_defaults_initialized int default null comment '榛樿璁惧鏄惁宸插湪棣栨杩涘叆妫�楠屼换鍔℃椂鍒濆鍖栵細0鍚︼紝1鏄�' after record_values;

--
Gitblit v1.9.3