成果归档数据整理

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTechnicalController.java

@@ -84,11 +84,11 @@ public class CmcTechnicalController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcTechnical cmcTechnical)
     {
-        if (cmcTechnical.getTechnicalDocument() != null && cmcTechnical.getTechnicalComment() == null) {
+        if (cmcTechnical.getTechnicalDocument() != null && cmcTechnical.getTechnicalComment() == null && cmcTechnical.getModifyDocument() == null) {
             cmcTechnical.setTechnicalDesigner(getLoginUser().getUserId());
             cmcTechnical.setTechnicalUploadTime(new Date());
         }
-        if (cmcTechnical.getModifyDocument() != null && cmcTechnical.getManageComment() == null) {
+        if ((cmcTechnical.getModifyDocument() != null || cmcTechnical.getTechnicalComment() != null) && cmcTechnical.getManageComment() == null) {
             cmcTechnical.setTechnicalPlanner(getLoginUser().getUserId());
             cmcTechnical.setTechApprovalTime(new Date());
         }

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/domain/FilesAchievement.java

@@ -29,6 +29,10 @@ public class FilesAchievement extends BaseEntity
     @Excel(name = "项目编号")
     private String projectNumber;
 
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
     /** 数据年份 */
     @Excel(name = "数据年份")
     private String dataYear;
@@ -79,7 +83,7 @@ public class FilesAchievement extends BaseEntity
 
     /** 生产日期 */
     @Excel(name = "生产日期")
-    private String productionTime;
+    private Date productionTime;
 
     /** 存放地址id */
 //    @Excel(name = "存放地址id")
@@ -129,6 +133,16 @@ public class FilesAchievement extends BaseEntity
     {
         return projectNumber;
     }
+
+    public void setProjectName(String projectName)
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName()
+    {
+        return projectName;
+    }
     public void setAchiName(String achiName) 
     {
         this.achiName = achiName;
@@ -252,9 +266,9 @@ public class FilesAchievement extends BaseEntity
     {
         return submitDate;
     }
-    public void setProductionTime(String productionTime) { this.productionTime = productionTime; }
+    public void setProductionTime(Date productionTime) { this.productionTime = productionTime; }
 
-    public String getProductionTime()
+    public Date getProductionTime()
     {
         return productionTime;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/domain/FilesStorage.java

@@ -2,6 +2,7 @@ package com.ruoyi.file.domain;
 
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -26,6 +27,8 @@ public class FilesStorage extends BaseEntity
     @Excel(name = "管理人")
     private String administrator;
 
+    private SysUser user;
+
     public void setId(String id) 
     {
         this.id = id;
@@ -53,6 +56,15 @@ public class FilesStorage extends BaseEntity
     {
         return administrator;
     }
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/file/FilesAchievementMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="projectId"    column="project_id"    />
         <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
         <result property="achiName"    column="achi_name"    />
         <result property="dataYear"    column="data_year"    />
         <result property="scaleGrade"    column="scale_grade"    />
@@ -34,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="Base_Column_List" >
-        a.id, a.project_id, p.project_number, a.achi_name, a.data_year, a.scale_grade, a.result_type, a.file_type, a.kml_url, a.kml_lng, a.kml_lat, a.work_load, a.unit, a.data_source, a.data_type, a.storage_id, s.storage_address, a.remark, a.submit_date, a.production_time, a.resolution, a.geodetic_datum
+        a.id, a.project_id, p.project_number, p.project_name, a.achi_name, a.data_year, a.scale_grade, a.result_type, a.file_type, a.kml_url, a.kml_lng, a.kml_lat, a.work_load, a.unit, a.data_source, a.data_type, a.storage_id, s.storage_address, a.remark, a.submit_date, a.production_time, a.resolution, a.geodetic_datum
     </sql>
 
     <sql id="selectFilesAchievementAllVo">
@@ -46,25 +47,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFilesAchievementList" parameterType="FilesAchievement" resultMap="FilesAchievementResult">
         <include refid="selectFilesAchievementAllVo"/>
         <where>  
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="projectNumber != null  and projectNumber != ''"> and project_number like concat('%', #{projectNumber}, '%')</if>
-            <if test="achiName != null  and achiName != ''"> and achi_name like concat('%', #{achiName}, '%')</if>
-            <if test="dataYear != null  and dataYear != ''"> and data_year like concat('%', #{dataYear}, '%')</if>
-            <if test="scaleGrade != null  and scaleGrade != ''"> and scale_grade like concat('%', #{scaleGrade}, '%')</if>
-            <if test="resultType != null  and resultType != ''"> and result_type like concat('%', #{resultType}, '%')</if>
-            <if test="fileType != null  and fileType != ''"> and file_type like concat('%', #{fileType}, '%')</if>
-            <if test="kmlUrl != null  and kmlUrl != ''"> and kml_url like concat('%', #{kmlUrl}, '%')</if>
-            <if test="kmlLng != null  and kmlLng != ''"> and kml_lng like concat('%', #{kmlLng}, '%')</if>
-            <if test="kmlLat != null  and kmlLat != ''"> and kml_lat like concat('%', #{kmlLat}, '%')</if>
-            <if test="workLoad != null  and workLoad != ''"> and work_load = #{workLoad}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="dataSource != null  and dataSource != ''"> and data_source like concat('%', #{dataSource}, '%')</if>
-            <if test="dataType != null  and dataType != ''"> and data_type like concat('%', #{dataType}, '%')</if>
-            <if test="storageId != null  and storageId != ''"> and storage_id like concat('%', #{storageId}, '%')</if>
-            <if test="submitDate != null  and submitDate != ''"> and submit_date like concat('%', #{submitDate}, '%')</if>
-            <if test="productionTime != null  and productionTime != ''"> and production_time like concat('%', #{productionTime}, '%')</if>
-            <if test="resolution != null  and resolution != ''"> and resolution like concat('%', #{resolution}, '%')</if>
-            <if test="geodeticDatum != null  and geodeticDatum != ''"> and geodetic_datum like concat('%', #{geodeticDatum}, '%')</if>
+            <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="achiName != null  and achiName != ''"> and a.achi_name like concat('%', #{achiName}, '%')</if>
+            <if test="dataYear != null  and dataYear != ''"> and a.data_year like concat('%', #{dataYear}, '%')</if>
+            <if test="scaleGrade != null  and scaleGrade != ''"> and a.scale_grade like concat('%', #{scaleGrade}, '%')</if>
+            <if test="resultType != null  and resultType != ''"> and a.result_type like concat('%', #{resultType}, '%')</if>
+            <if test="fileType != null  and fileType != ''"> and a.file_type like concat('%', #{fileType}, '%')</if>
+            <if test="kmlUrl != null  and kmlUrl != ''"> and a.kml_url like concat('%', #{kmlUrl}, '%')</if>
+            <if test="kmlLng != null  and kmlLng != ''"> and a.kml_lng like concat('%', #{kmlLng}, '%')</if>
+            <if test="kmlLat != null  and kmlLat != ''"> and a.kml_lat like concat('%', #{kmlLat}, '%')</if>
+            <if test="workLoad != null  and workLoad != ''"> and a.work_load = #{workLoad}</if>
+            <if test="unit != null  and unit != ''"> and a.unit = #{unit}</if>
+            <if test="dataSource != null  and dataSource != ''"> and a.data_source like concat('%', #{dataSource}, '%')</if>
+            <if test="dataType != null  and dataType != ''"> and a.data_type like concat('%', #{dataType}, '%')</if>
+            <if test="storageId != null  and storageId != ''"> and a.storage_id like concat('%', #{storageId}, '%')</if>
+            <if test="submitDate != null  and submitDate != ''"> and a.submit_date like concat('%', #{submitDate}, '%')</if>
+            <if test="productionTime != null"> and a.production_time like concat('%', #{productionTime}, '%')</if>
+            <if test="resolution != null  and resolution != ''"> and a.resolution like concat('%', #{resolution}, '%')</if>
+            <if test="geodeticDatum != null  and geodeticDatum != ''"> and a.geodetic_datum like concat('%', #{geodeticDatum}, '%')</if>
         </where>
         order by p.project_number desc
     </select>

oa-back/ruoyi-system/src/main/resources/mapper/file/FilesStorageMapper.xml

@@ -9,31 +9,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="storageAddress"    column="storage_address"    />
         <result property="administrator"    column="administrator"    />
         <result property="remark"    column="remark"    />
+        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
     </resultMap>
 
     <sql id="selectFilesStorageVo">
-        select id, storage_address, administrator, remark from files_storage
+        select s.id, s.storage_address, s.administrator, u.nick_name, s.remark from files_storage as s
+        left join sys_user as u on u.user_id = s.administrator
     </sql>
 
     <select id="selectFilesStorageList" parameterType="FilesStorage" resultMap="FilesStorageResult">
         <include refid="selectFilesStorageVo"/>
         <where>  
-            <if test="storageAddress != null  and storageAddress != ''"> and storage_address like concat('%', #{storageAddress}, '%')</if>
-            <if test="administrator != null  and administrator != ''"> and administrator like concat('%', #{administrator}, '%')</if>
+            <if test="storageAddress != null  and storageAddress != ''"> and s.storage_address like concat('%', #{storageAddress}, '%')</if>
+            <if test="administrator != null  and administrator != ''"> and s.administrator like concat('%', #{administrator}, '%')</if>
         </where>
     </select>
 
     <select id="selectFilesStorageListE" parameterType="FilesStorage" resultMap="FilesStorageResult">
         <include refid="selectFilesStorageVo"/>
         <where>
-            <if test="storageAddress != null  and storageAddress != ''"> and storage_address = #{storageAddress}</if>
-            <if test="administrator != null  and administrator != ''"> and administrator = #{administrator}</if>
+            <if test="storageAddress != null  and storageAddress != ''"> and s.storage_address = #{storageAddress}</if>
+            <if test="administrator != null  and administrator != ''"> and s.administrator = #{administrator}</if>
         </where>
     </select>
 
     <select id="selectFilesStorageById" parameterType="String" resultMap="FilesStorageResult">
         <include refid="selectFilesStorageVo"/>
-        where id = #{id}
+        where s.id = #{id}
     </select>
         
     <insert id="insertFilesStorage" parameterType="FilesStorage">

oa-back/sql/sql.sql

@@ -1208,18 +1208,22 @@ insert into sys_dict_data values (408, 8, '报告', '8', 'cmc_achi_type', null,
 insert into sys_dict_data values (409, 9, '无人机航飞', '9', 'cmc_achi_type', null, 'default', 'N', '0', 'admin', '2023-04-18 09:10:38', '', null, null);
 insert into sys_dict_data values (410, 10, 'pdf', '10', 'cmc_achi_type', null, 'default', 'N', '0', '13880738350', '2023-04-19 16:57:43', '', null, null);
 insert into sys_dict_data values (411, 11, '原始数据', '11', 'cmc_achi_type', null, 'default', 'N', '0', '13880738350', '2023-04-20 15:57:24', '', null, null);
-insert into sys_dict_data values (412, 12, '其他', '12', 'cmc_achi_type', null, 'default', 'N', '0', 'admin', '2023-04-18 09:12:12', '', null, null);
+insert into sys_dict_data values (412, 12, '图片', '12', 'cmc_achi_type', null, 'default', 'N', '0', '13880738350', '2023-04-20 15:57:24', '', null, null);
+insert into sys_dict_data values (413, 13, '坐标转换', '13', 'cmc_achi_type', null, 'default', 'N', '0', '13880738350', '2023-04-20 15:57:24', '', null, null);
+insert into sys_dict_data values (414, 14, '断面', '14', 'cmc_achi_type', null, 'default', 'N', '0', '13880738350', '2023-04-20 15:57:24', '', null, null);
+insert into sys_dict_data values (415, 15, '视频', '15', 'cmc_achi_type', null, 'default', 'N', '0', '13880738350', '2023-04-20 15:57:24', '', null, null);
+insert into sys_dict_data values (416, 16, '其他', '16', 'cmc_achi_type', null, 'default', 'N', '0', 'admin', '2023-04-18 09:12:12', '', null, null);
 insert into sys_dict_data values (500, 0, '1:200', '0', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:30', '', null, null);
 insert into sys_dict_data values (501, 1, '1:500', '1', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:37', '', null, null);
 insert into sys_dict_data values (502, 2, '1:1000', '2', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:46', '', null, null);
 insert into sys_dict_data values (503, 3, '1:2000', '3', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:56', '', null, null);
 insert into sys_dict_data values (504, 4, '1:5000', '4', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:20:07', '', null, null);
 insert into sys_dict_data values (505, 5, '1:10000', '5', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:20:14', '', null, null);
-insert into sys_dict_data values (506, 6, '一', '6', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:30', '', null, null);
-insert into sys_dict_data values (507, 7, '二', '7', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:37', '', null, null);
-insert into sys_dict_data values (508, 8, '三', '8', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:46', '', null, null);
-insert into sys_dict_data values (509, 9, '四', '9', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:56', '', null, null);
-insert into sys_dict_data values (510, 10, '五', '10', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:20:07', '', null, null);
+insert into sys_dict_data values (506, 6, '一等', '6', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:30', '', null, null);
+insert into sys_dict_data values (507, 7, '二等', '7', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:37', '', null, null);
+insert into sys_dict_data values (508, 8, '三等', '8', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:46', '', null, null);
+insert into sys_dict_data values (509, 9, '四等', '9', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:19:56', '', null, null);
+insert into sys_dict_data values (510, 10, '五等', '10', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:20:07', '', null, null);
 insert into sys_dict_data values (511, 11, '无', '11', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:20:17', '', null, null);
 insert into sys_dict_data values (512, 12, '三、四等', '12', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:20:17', '', null, null);
 insert into sys_dict_data values (513, 13, '五等、一级', '13', 'cmc_scale_grade', null, 'default', 'N', '0', 'admin', '2022-10-14 11:20:17', '', null, null);
@@ -6875,6 +6879,195 @@ create table `cmc_technical`  (
 -- ----------------------------
 -- 初始化-技术交底表数据
 -- ----------------------------
+INSERT INTO `cmc_technical` VALUES ('1648881410480275457', '1648881410480275457', 61, 39, NULL, NULL, NULL, '59,38', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410555772930', '1648881410555772930', 61, 70, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410593521666', '1648881410593521666', 52, 123, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410631270401', '1648881410631270401', 61, 145, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410643853314', '1648881410643853314', 61, 75, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410660630529', '1648881410660630529', 61, 145, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410677407746', '1648881410677407746', 55, 38, NULL, NULL, NULL, '62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410694184962', '1648881410694184962', 52, 38, NULL, NULL, NULL, '60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410710962177', '1648881410710962177', 55, 84, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410727739393', '1648881410727739393', 61, 144, NULL, NULL, NULL, '60144', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410744516610', '1648881410744516610', 61, 145, NULL, NULL, NULL, '60144', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410761293825', '1648881410761293825', 52, 103, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410778071042', '1648881410778071042', 55, 45, NULL, NULL, NULL, '61,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410790653953', '1648881410790653953', 55, 45, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410815819777', '1648881410815819777', 55, 41, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410832596993', '1648881410832596993', 52, 39, NULL, NULL, NULL, '59,60,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410849374209', '1648881410849374209', 55, 38, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410866151425', '1648881410866151425', 55, 85, NULL, NULL, NULL, '60,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410878734337', '1648881410878734337', 61, 65, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410899705858', '1648881410899705858', 52, 65, NULL, NULL, NULL, '63,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410929065985', '1648881410929065985', 55, 85, NULL, NULL, NULL, '60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410945843202', '1648881410945843202', 55, 145, NULL, NULL, NULL, '60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410962620417', '1648881410962620417', 61, 41, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411000369153', '1648881411000369153', 52, 84, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411033923585', '1648881411033923585', 55, 146, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411050700802', '1648881411050700802', 61, 85, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411067478017', '1648881411067478017', 52, 65, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411105226753', '1648881411105226753', 61, 85, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411138781186', '1648881411138781186', 61, 85, NULL, NULL, NULL, '59,60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411201695745', '1648881411201695745', 55, 145, NULL, NULL, NULL, '60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411235250178', '1648881411235250178', 52, 84, NULL, NULL, NULL, '61,60,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411252027394', '1648881411252027394', 55, 38, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411268804610', '1648881411268804610', 54, 123, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411281387521', '1648881411281387521', 54, 121, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411298164738', '1648881411298164738', 54, 121, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411319136258', '1648881411319136258', 54, 103, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411331719170', '1648881411331719170', 54, 103, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411348496386', '1648881411348496386', 52, 122, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411373662209', '1648881411373662209', 52, 65, NULL, NULL, NULL, '63,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411419799553', '1648881411419799553', 52, 122, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411457548290', '1648881411457548290', 56, 75, NULL, NULL, NULL, '61,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411533045762', '1648881411533045762', 56, 84, NULL, NULL, NULL, '62,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411562405890', '1648881411562405890', 55, 149, NULL, NULL, NULL, '60150', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411587571714', '1648881411587571714', 61, 145, NULL, NULL, NULL, '144,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411612737537', '1648881411612737537', 61, 145, NULL, NULL, NULL, '144,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411650486273', '1648881411650486273', 54, 110, NULL, NULL, NULL, '52', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411688235010', '1648881411688235010', 52, 33, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411705012226', '1648881411705012226', 52, 33, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411730178050', '1648881411730178050', 61, 146, NULL, NULL, NULL, '144', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411751149569', '1648881411751149569', 61, 146, NULL, NULL, NULL, '144,60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411772121090', '1648881411772121090', 55, 95, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411809869825', '1648881411809869825', 61, 41, NULL, NULL, NULL, '60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411826647041', '1648881411826647041', 55, 39, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411847618561', '1648881411847618561', 56, 76, NULL, NULL, NULL, '62,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411868590081', '1648881411868590081', 52, 145, NULL, NULL, NULL, '117144', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411906338818', '1648881411906338818', 52, 117, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411944087553', '1648881411944087553', 145, 146, NULL, NULL, NULL, '144,60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411965059074', '1648881411965059074', 62, 75, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881411986030594', '1648881411986030594', 62, 38, NULL, NULL, NULL, '55,61,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412002807809', '1648881412002807809', 55, 56, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412074110977', '1648881412074110977', 55, 56, NULL, NULL, NULL, '60,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412090888194', '1648881412090888194', 54, 63, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412124442625', '1648881412124442625', 56, 65, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412141219841', '1648881412141219841', 56, 145, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412153802753', '1648881412153802753', 56, 84, NULL, NULL, NULL, '59,60,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412170579969', '1648881412170579969', 54, 102, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412204134402', '1648881412204134402', 56, 95, NULL, NULL, NULL, '61,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412220911618', '1648881412220911618', 56, 75, NULL, NULL, NULL, '62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412237688834', '1648881412237688834', 56, 75, NULL, NULL, NULL, '62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412254466049', '1648881412254466049', 56, 75, NULL, NULL, NULL, '62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412271243265', '1648881412271243265', 143, 149, NULL, NULL, NULL, '150,60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412296409090', '1648881412296409090', 56, 39, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412401266689', '1648881412401266689', 61, 39, NULL, NULL, NULL, '59,63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412422238210', '1648881412422238210', 52, 65, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412443209730', '1648881412443209730', 56, 96, NULL, NULL, NULL, '63,52', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412459986946', '1648881412459986946', 52, 103, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412476764161', '1648881412476764161', 15, 145, NULL, NULL, NULL, '144,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412493541377', '1648881412493541377', 52, 103, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412514512898', '1648881412514512898', 56, 84, NULL, NULL, NULL, '60,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412573233153', '1648881412573233153', 55, 39, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412594204674', '1648881412594204674', 56, 95, NULL, NULL, NULL, '62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412610981889', '1648881412610981889', 15, 145, NULL, NULL, NULL, '144,60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412631953410', '1648881412631953410', 55, 114, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412648730625', '1648881412648730625', 52, 85, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412665507842', '1648881412665507842', 52, 95, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412682285058', '1648881412682285058', 52, 84, NULL, NULL, NULL, '59,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412699062273', '1648881412699062273', 52, 15, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412736811010', '1648881412736811010', 55, 38, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412753588225', '1648881412753588225', 52, 67, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412774559745', '1648881412774559745', 56, 102, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412795531265', '1648881412795531265', 52, 39, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412812308481', '1648881412812308481', 52, 143, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412829085697', '1648881412829085697', 52, 143, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412845862913', '1648881412845862913', 52, 39, NULL, NULL, NULL, '60,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412875223041', '1648881412875223041', 52, 38, NULL, NULL, NULL, '60,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412892000257', '1648881412892000257', 52, 15, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412912971777', '1648881412912971777', 55, 114, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412929748993', '1648881412929748993', 15, 145, NULL, NULL, NULL, '144', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412946526209', '1648881412946526209', 52, 65, NULL, NULL, NULL, '59,60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881412963303425', '1648881412963303425', 52, 145, NULL, NULL, NULL, '61,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413093326850', '1648881413093326850', 52, 114, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413181407233', '1648881413181407233', 55, 38, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413210767362', '1648881413210767362', 15, 15, NULL, NULL, NULL, '144', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413227544578', '1648881413227544578', 15, 15, NULL, NULL, NULL, '144', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413244321794', '1648881413244321794', 52, 75, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413277876226', '1648881413277876226', 15, 145, NULL, NULL, NULL, '144', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413294653441', '1648881413294653441', 52, 114, NULL, NULL, NULL, '144', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413311430658', '1648881413311430658', 55, 38, NULL, NULL, NULL, '60,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413328207874', '1648881413328207874', 54, 110, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413344985090', '1648881413344985090', 54, 110, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413378539521', '1648881413378539521', 15, 15, NULL, NULL, NULL, '144', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413412093953', '1648881413412093953', 52, 65, NULL, NULL, NULL, '59,60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413441454081', '1648881413441454081', 52, 145, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413462425602', '1648881413462425602', 52, 38, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413483397121', '1648881413483397121', 52, 65, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413500174338', '1648881413500174338', 55, 38, NULL, NULL, NULL, '59,60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413512757249', '1648881413512757249', 56, 75, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413529534465', '1648881413529534465', 52, 114, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413550505985', '1648881413550505985', 52, 95, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413584060417', '1648881413584060417', 52, 84, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413684723714', '1648881413684723714', 52, 65, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413751832578', '1648881413751832578', 56, 114, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413911216130', '1648881413911216130', 52, 146, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881413948964865', '1648881413948964865', 52, 146, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414003490818', '1648881414003490818', 55, 114, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414037045250', '1648881414037045250', 52, 65, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414116737025', '1648881414116737025', 52, 143, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414234177537', '1648881414234177537', 52, 15, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414372589569', '1648881414372589569', 52, 146, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414389366785', '1648881414389366785', 52, 65, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414410338305', '1648881414410338305', 52, 15, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414456475649', '1648881414456475649', 55, 39, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414511001602', '1648881414511001602', 52, 39, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414527778817', '1648881414527778817', 56, 56, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414565527553', '1648881414565527553', 52, 149, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414582304770', '1648881414582304770', 52, 21, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414603276289', '1648881414603276289', 54, 103, NULL, NULL, NULL, '54,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414641025025', '1648881414641025025', 55, 84, NULL, NULL, NULL, '59,60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414695550978', '1648881414695550978', 52, 15, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414750076930', '1648881414750076930', 52, 84, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414812991489', '1648881414812991489', 61, 15, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414859128834', '1648881414859128834', 52, 96, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414880100353', '1648881414880100353', 52, 65, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414926237697', '1648881414926237697', 52, 38, NULL, NULL, NULL, '60,59,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414951403522', '1648881414951403522', 52, 84, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881414976569346', '1648881414976569346', 52, 65, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415219838978', '1648881415219838978', 56, 55, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415240810497', '1648881415240810497', 52, 95, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415333085186', '1648881415333085186', 61, 45, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415375028225', '1648881415375028225', 55, 84, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415395999745', '1648881415395999745', 52, 145, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415412776962', '1648881415412776962', 52, 84, NULL, NULL, NULL, '60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415458914305', '1648881415458914305', 52, 65, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415475691522', '1648881415475691522', 55, 38, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415492468738', '1648881415492468738', 56, 102, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415588937730', '1648881415588937730', 52, 65, NULL, NULL, NULL, '61,59,60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415647657985', '1648881415647657985', 55, 39, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415685406721', '1648881415685406721', 56, 39, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415798652929', '1648881415798652929', 52, 52, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415832207361', '1648881415832207361', 52, 84, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415979008002', '1648881415979008002', 56, 102, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881415991590913', '1648881415991590913', 45, 45, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416012562433', '1648881416012562433', 52, 84, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416046116866', '1648881416046116866', 55, 39, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416062894082', '1648881416062894082', 53, 53, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416100642818', '1648881416100642818', 52, 139, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416184528898', '1648881416184528898', 55, 139, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416197111809', '1648881416197111809', 52, 84, NULL, NULL, NULL, '60,59,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416213889025', '1648881416213889025', 52, 84, NULL, NULL, NULL, '59,60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416276803586', '1648881416276803586', 52, 102, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416377466882', '1648881416377466882', 52, 139, NULL, NULL, NULL, '58,59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416394244098', '1648881416394244098', 56, 122, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416465547266', '1648881416465547266', 52, 65, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416499101698', '1648881416499101698', 52, 52, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881416792702977', '1648881416792702977', 52, 52, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881417006612482', '1648881417006612482', 45, 45, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881417077915649', '1648881417077915649', 55, 61, NULL, NULL, NULL, '60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881417472180225', '1648881417472180225', 52, 65, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881417539289089', '1648881417539289089', 56, 52, NULL, NULL, NULL, '59,60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881417644146689', '1648881417644146689', 56, 123, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881417849667586', '1648881417849667586', 84, 56, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881417904193537', '1648881417904193537', 55, 55, NULL, NULL, NULL, '59,60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881417954525186', '1648881417954525186', 53, 52, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881417971302402', '1648881417971302402', 53, 53, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881418239737858', '1648881418239737858', 55, 61, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881419208622081', '1648881419208622081', 52, 146, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881420211060738', '1648881420211060738', 56, 56, NULL, NULL, NULL, '59', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881421368688642', '1648881421368688642', 52, 53, NULL, NULL, NULL, '56', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881421402243074', '1648881421402243074', 52, 52, NULL, NULL, NULL, '56', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 -- ----------------------------
 -- 47、cmc安全交底表

oa-ui/src/views/file/filesProject/achievement.vue

@@ -4,7 +4,7 @@
  * @Author: ysh
  * @Date: 2022-09-08 17:16:12
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-10 17:52:15
+ * @LastEditTime: 2024-05-30 16:31:54
 -->
 <template>
   <div>
@@ -67,7 +67,8 @@
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-hasPermi="['file:achievement:edit']">
+              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)"
+                v-hasPermi="['file:achievement:edit']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
@@ -84,21 +85,16 @@
     <!-- 新增成果表 -->
     <el-dialog :title="addTitle" :visible.sync="addOpen" width="50%">
       <el-form :model="form" ref="achiRef" label-width="110px" :rules="rules">
-        <el-row :gutter="20">
-          <el-col :span="7">
-            <el-form-item label="项目编号" prop="projectId">
-              <el-select v-model="form.projectId" placeholder="请选择" :style="{ width: '100%' }" clearable filterable
-                @change="selectNameByNumber">
-                <el-option v-for="item, index in projectList" :key="index" :label="item.projectNumber" :value="item.id" />
-              </el-select>
-            </el-form-item>
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-button type="primary" size="mini" @click="openProject = true">选择项目</el-button>
           </el-col>
-          <el-col :span="11">
-            <el-form-item label="项目名称" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+          <el-col :span="15">
+            <el-form-item label="项目名称" prop="projectNumber">
+              <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="数据年份" prop="dataYear">
               <el-input v-model="form.dataYear" placeholder="请输入数据年份" />
             </el-form-item>
@@ -132,7 +128,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="比例尺或等级" prop="scaleGrade">
-              <el-select v-model="form.scaleGrade" placeholder="请选择比例尺或等级" :style="{ width: '100%' }" clearable multiple>
+              <el-select v-model="form.scaleGrade" placeholder="请选择比例尺或等级" :style="{ width: '100%' }" clearable>
                 <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
                   :value="dict.value">
                 </el-option>
@@ -233,12 +229,8 @@
       <el-form :model="modifyForm" ref="achiModifyRef" label-width="110px" :rules="modifyRules">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="项目编号" prop="projectId">
-              <el-select allow-create v-model="modifyForm.projectId" placeholder="请选择" :style="{ width: '100%' }"
-                clearable filterable>
-                <el-option v-for="item, index in projectList" :key="index"
-                  :label="item.projectNumber + '-' + item.projectName" :value="item.projectId" />
-              </el-select>
+            <el-form-item label="项目编号">
+              <el-input :disabled="true" v-model="modifyForm.projectNumber" placeholder="请输入项目编号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -275,8 +267,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="比例尺或等级" prop="scaleGrade">
-              <el-select v-model="modifyForm.scaleGrade" placeholder="请选择比例尺或等级" :style="{ width: '100%' }" clearable
-                multiple>
+              <el-select v-model="modifyForm.scaleGrade" placeholder="请选择比例尺或等级" :style="{ width: '100%' }" clearable>
                 <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
                   :value="dict.value">
                 </el-option>
@@ -390,20 +381,28 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog title="选择项目" :visible.sync="openProject" width="70%" append-to-body>
+      <project-choose @chooseProject="confirmProject"></project-choose>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listAchievement, uploadAchievementSheet, addAchievement, updateAchievement, delAchievement } from "@/api/file/achievement";
-import { listProject, getProject, downloadTemplate } from "@/api/file/project";
+import { getProject, downloadTemplate } from "@/api/file/project";
 import { saveAs } from 'file-saver'
 import { getToken } from "@/utils/auth";
 import { listStorage } from "@/api/file/storage";
 import { cloneDeep } from "lodash";
 import { listType } from '@/api/system/dict/type'
+import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
 export default {
   name: "Achievement",
   dicts: ['cmc_achi_type', 'cmc_scale_grade'],
+  components: {
+    projectChoose,
+  },
   data() {
     return {
       achiTableData: [],
@@ -411,6 +410,8 @@ export default {
       total: 0,
       multiple: true,
       ids: [],
+      openProject: false,
+      chooseProject: {},
       addOpen: false,
       modifyOpen: false,
       addTitle: '成果增加',
@@ -461,11 +462,11 @@ export default {
         remark: undefined,
       },
       rules: {
-        projectNumber: [{ required: true, message: "项目编号不能为空", trigger: "change" }],
+        projectNumber: [{ required: true, message: "项目名称不能为空", trigger: "blur" }],
         achiName: [{ required: true, message: "成果名称不能为空", trigger: "blur" }],
         dataYear: [{ required: true, message: "数据年份不能为空", trigger: "blur" }],
-        resultType: [{ required: true, message: "数据类型不能为空", trigger: "change" }],
-        scaleGrade: [{ required: true, message: "比例尺或等级不能为空", trigger: "change" }],
+        resultType: [{ required: true, message: "数据类型不能为空", trigger: "blur" }],
+        scaleGrade: [{ required: true, message: "比例尺或等级不能为空", trigger: "blur" }],
       },
       modifyRules: {
         projectId: [{ required: true, message: "项目编号不能为空", trigger: "change" }],
@@ -480,7 +481,6 @@ export default {
   created() {
     this.getAchiList();
     this.getStorageList();
-    this.getProjectList();
   },
   /* ------------------------------------------------------------------------------------------------------------ */
   methods: {
@@ -496,13 +496,6 @@ export default {
         this.loading = false;
       })
     },
-    selectNameByNumber(val) {
-      getProject(val).then(res => {
-        let data = res.data;
-        this.form.projectName = data.projectName;
-        this.form.dataYear = data.projectNumber.substring(0, 4) + '年'
-      })
-    },
     /** 多选框选中数据 */
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id);
@@ -518,6 +511,7 @@ export default {
     /* 修改成果按钮 */
     handleUpdate(row) {
       this.modifyForm = cloneDeep(row);
+      this.modifyForm.projectNumber = this.modifyForm.projectNumber + '-' + this.modifyForm.projectName
       this.kmlFileName = "";
       this.kmlFileName = row.kmlUrl;
       if (typeof (this.modifyForm.resultType) == "string") {
@@ -527,13 +521,13 @@ export default {
           this.modifyForm.resultType = this.modifyForm.resultType.split();
         }
       }
-      if (typeof (this.modifyForm.scaleGrade) == "string") {
-        if (this.modifyForm.scaleGrade.indexOf(',') != -1) {
-          this.modifyForm.scaleGrade = this.modifyForm.scaleGrade.split(',');
-        } else {
-          this.modifyForm.scaleGrade = this.modifyForm.scaleGrade.split();
-        }
-      }
+      // if (typeof (this.modifyForm.scaleGrade) == "string") {
+      //   if (this.modifyForm.scaleGrade.indexOf(',') != -1) {
+      //     this.modifyForm.scaleGrade = this.modifyForm.scaleGrade.split(',');
+      //   } else {
+      //     this.modifyForm.scaleGrade = this.modifyForm.scaleGrade.split();
+      //   }
+      // }
       // let dates =  this.modifyForm.submitDate.slice(0,10)
       // this.modifyForm.submitDate = dates;
 
@@ -720,14 +714,7 @@ export default {
       this.queryParams.pageSize = 999999;
       listStorage(this.queryParams).then(response => {
         this.storageList = response.rows;
-      })
-    },
-    /* 获取项目列表 */
-    getProjectList() {
-      this.queryParams.pageNum = 1;
-      this.queryParams.pageSize = 999999;
-      listProject(this.queryParams).then(response => {
-        this.projectList = response.rows;
+        this.queryParams.pageSize = 10;
       })
     },
 
@@ -757,6 +744,18 @@ export default {
     getRowKeys(row) {
       return row.id;
     },
+    confirmProject(val) {
+      if (val.length > 1) {
+        this.$message.error('请选择一个项目');
+        return
+      } else if (val.length == 1) {
+        this.chooseProject = val[0]
+        this.chooseProject.projectNumber = this.chooseProject.projectNumber + '-' + this.chooseProject.projectName;
+        this.form.projectId = val[0].projectId
+        this.form.dataYear = val[0].projectNumber.substring(0, 4)
+      }
+      this.openProject = false
+    },
   }
 }
 </script>

oa-ui/src/views/file/filesProject/storage.vue

@@ -38,7 +38,7 @@
         <el-table-column type="index" label="序号" width="50px" align="center" />
         <el-table-column prop="id" label="存储编号" align="center" />
         <el-table-column prop="storageAddress" label="存储地址" align="center" />
-        <el-table-column prop="administrator" label="管理员" align="center" />
+        <el-table-column prop="user.nickName" label="管理员" align="center" />
         <el-table-column prop="remark" label="备注" align="center" />
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
           <template #default="scope">

oa-ui/src/views/flowable/form/archiveForm.vue

@@ -32,22 +32,29 @@
                 '' }}</el-descriptions-item>
               <el-descriptions-item label="质检审核员" label-class-name="my-label">{{
                 chooseProject.qualityInspectorUser ? chooseProject.qualityInspectorUser.nickName : ''
-              }}</el-descriptions-item>              
-              <el-descriptions-item label="坐标经度" label-class-name="my-label">{{ chooseProject.kmlLng }}</el-descriptions-item>              
-              <el-descriptions-item label="坐标纬度" label-class-name="my-label">{{ chooseProject.kmlLat }}</el-descriptions-item>  
+              }}</el-descriptions-item>
+              <el-descriptions-item label="坐标经度" label-class-name="my-label">{{ chooseProject.kmlLng
+              }}</el-descriptions-item>
+              <el-descriptions-item label="坐标纬度" label-class-name="my-label">{{ chooseProject.kmlLat
+              }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
+          <el-form-item label="归档状态">
+            <el-tag :type="typeStyle(hasArchievement)">{{ typeText(hasArchievement) }}</el-tag>
+          </el-form-item>
           <el-form-item label="成果提交日期" prop="submitTime">
             <el-date-picker clearable v-model="form.submitTime" type="date" value-format="yyyy-MM-dd"
               placeholder="请选择成果提交日期" :disabled="taskName != '成果上传'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="备注说明" prop="submitSituation">
-            <el-input type="textarea" v-model="form.submitSituation" placeholder="请输入备注说明" :disabled="taskName != '成果上传'" />
+            <el-input type="textarea" v-model="form.submitSituation" placeholder="请输入备注说明"
+              :disabled="taskName != '成果上传'" />
           </el-form-item>
           <el-divider></el-divider>
           <el-form-item label="部门检查员检查" prop="produceComment">
-            <el-input type="textarea" v-model="form.produceComment" placeholder="请输入部门检查员检查意见" :disabled="taskName != '部门检查'" />
+            <el-input type="textarea" v-model="form.produceComment" placeholder="请输入部门检查员检查意见"
+              :disabled="taskName != '部门检查'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -68,7 +75,8 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="质量检查员审核" prop="qualityComment">
-            <el-input type="textarea" v-model="form.qualityComment" placeholder="请输入质量检查员审核意见" :disabled="taskName != '质检审核'" />
+            <el-input type="textarea" v-model="form.qualityComment" placeholder="请输入质量检查员审核意见"
+              :disabled="taskName != '质检审核'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -84,7 +92,8 @@
             </el-col>
           </el-row>
           <el-form-item label="技术质量部负责人审核" prop="deptComment">
-            <el-input type="textarea" v-model="form.deptComment" placeholder="请输入技术质量部负责人审核意见" :disabled="taskName != '技术部审核'" />
+            <el-input type="textarea" v-model="form.deptComment" placeholder="请输入技术质量部负责人审核意见"
+              :disabled="taskName != '技术部审核'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -100,10 +109,11 @@
             </el-col>
           </el-row>
           <el-form-item label="资料管理">
-          <el-button type="success" size="mini" @click="gotoFile" :disabled="taskName != '成果归档'">前往资料管理系统</el-button>
-        </el-form-item>
+            <el-button type="success" size="mini" @click="gotoFile" :disabled="taskName != '成果归档'">前往资料管理系统</el-button>
+          </el-form-item>
           <el-form-item label="技术质量部归档" prop="archiveComment">
-            <el-input type="textarea" v-model="form.archiveComment" placeholder="请输入技术质量部归档意见" :disabled="taskName != '成果归档'" />
+            <el-input type="textarea" v-model="form.archiveComment" placeholder="请输入技术质量部归档意见"
+              :disabled="taskName != '成果归档'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -120,7 +130,8 @@
           </el-row>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" :disabled="taskName == '成果归档' && hasArchievement == false">确
+            定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </el-col>
@@ -163,6 +174,7 @@ import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { getUserByRole } from "@/api/system/role";
 import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
+import { listAchievement } from "@/api/file/achievement";
 
 export default {
   components: {
@@ -250,6 +262,7 @@ export default {
       completeOpen: false,
       completeTitle: '',
       checkType: 'single',
+      hasArchievement: false,
     };
   },
   mounted() {
@@ -291,6 +304,12 @@ export default {
           this.formTotal = 1;
           this.form = res.data;
           if (res.data.projectId) {
+            listAchievement({ projectId: res.data.projectId }).then(response => {
+              if (response.total > 0)
+                this.hasArchievement = true;
+              else
+                this.hasArchievement = false;
+            });
             getProject(res.data.projectId).then(response => {
               this.chooseProject = response.data;
               this.isSelect = true;
@@ -542,10 +561,28 @@ export default {
         this.isSelect = true
         this.form.projectId = val[0].projectId
       }
-      this.openProject = false
+      this.openProject = false;
+      listAchievement({ projectId: this.form.projectId }).then(response => {
+        if (response.total > 0)
+          this.hasArchievement = true;
+        else
+          this.hasArchievement = false;
+      });
+    },
+    gotoFile() {
+      this.$router.push({ path: '/file' })
+    },
+    typeText(flag) {
+      if (flag == true)
+        return '已归档'
+      else
+        return '未归档'
     },
-    gotoFile(){      
-      this.$router.push({path: '/file'})
+    typeStyle(flag) {
+      if (flag == true)
+        return 'success'
+      else
+        return 'warning'
     }
   }
 };