diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/AnticorrosionEntrustController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/AnticorrosionEntrustController.java
index f4882a857..c1994fff0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/AnticorrosionEntrustController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/AnticorrosionEntrustController.java
@@ -1,5 +1,8 @@
 package com.zhgd.xmgl.modules.baotou.controller;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
@@ -37,6 +40,473 @@ public class AnticorrosionEntrustController {
     @Autowired
     private IAnticorrosionEntrustService anticorrosionEntrustService;
 
+    public static void main(String[] args) {
+        String s = "1.0米\n" +
+                "1.2米\n" +
+                "1.5米\n" +
+                "1.8米\n" +
+                "年限\n" +
+                "安全\n" +
+                "使用\n" +
+                "性能\n" +
+                "安全第一、预防为主、综合治理\n" +
+                "安全第一、预防为主\n" +
+                "安全第一、安全发展\n" +
+                "安全发展、预防为主\n" +
+                "加班\n" +
+                "连续\n" +
+                "疲劳\n" +
+                "冒险\n" +
+                "2002.11.1\n" +
+                "2003.11.1\n" +
+                "2004.11.1\n" +
+                "2005.11.1\n" +
+                "安全第一、预防为主\n" +
+                "安全第一、预防为主、综合治理\n" +
+                "安全第一、预防为辅\n" +
+                "安全第一、预防为主、群防群治\n" +
+                "安全帽、安全带、安全网\n" +
+                "安全帽、安全带、安全鞋\n" +
+                "安全帽、安全带、安全手套\n" +
+                "安全帽、安全网、安全服\n" +
+                "人民群众生命和财产安全\n" +
+                "社会安定、财产安全\n" +
+                "项目部、设备安全\n" +
+                "施工人员、管理人员安全\n" +
+                "劳动、管理\n" +
+                "安全生产保障、安全生产\n" +
+                "安全知识、劳动\n" +
+                "教育、安全检查\n" +
+                "安全生产教育和培训\n" +
+                "登记、教育\n" +
+                "管理、建档\n" +
+                "专业知识教育、考试\n" +
+                "管理、合格证书\n" +
+                "特种作业操作资格证书\n" +
+                "考试、操作资格证书\n" +
+                "教育、认可\n" +
+                "施工工具、使用、保管\n" +
+                "劳动保护用品、佩戴\n" +
+                "安全防护用品、保管、使用\n" +
+                "建筑材料、保管、使用\n" +
+                "作业场所、工作岗位\n" +
+                "施工现场、作业场所\n" +
+                "项目部、施工现场\n" +
+                "上班路上、工作岗位\n" +
+                "安全问题\n" +
+                "危险因素、处理\n" +
+                "危险因素\n" +
+                "危险种类、防范措施\n" +
+                "冒险作业\n" +
+                "作业\n" +
+                "要求、批评、操作\n" +
+                "建议、上报、工作\n" +
+                "安全规章制度、操作规程\n" +
+                "管理制度、管理规定\n" +
+                "上班纪律、劳动纪律\n" +
+                "各项规章制度、人事管理规定\n" +
+                "奖励 责任\n" +
+                "批评教育\n" +
+                "罚款\n" +
+                "教育\n" +
+                "违章作业、违章指挥、违反劳动纪律\n" +
+                "违法作业 违法施工、违法操作\n" +
+                "违章堆放、违章张贴、违章抛洒\n" +
+                "违章停放、违章指挥、违章作业\n" +
+                "工伤社会保险\n" +
+                "养老保险\n" +
+                "社会福利\n" +
+                "就业保险\n" +
+                "2米\n" +
+                "3米\n" +
+                "4米\n" +
+                "5米\n" +
+                "2—5米、5—15米 、15—30米、30米以上\n" +
+                "5米、20米、25米30米\n" +
+                "10米、20米、30米、40米\n" +
+                "15米、20米、25米、30米\n" +
+                "高血压、心脏病、精神病\n" +
+                "精神病、肝病、传染病\n" +
+                "高血压、痨病、肺结核\n" +
+                "职业病、传染病、癌症\n" +
+                "安全带\n" +
+                "安全帽\n" +
+                "安全手套\n" +
+                "安全网\n" +
+                "4\n" +
+                "5\n" +
+                "6\n" +
+                "7\n" +
+                "公司级、项目部级、班组级\n" +
+                "建设单位级、项目部级、班组级\n" +
+                "建设单位级、监理单位级、施工单位级\n" +
+                "监理单位级、项目部级、班组级\n" +
+                "三级\n" +
+                "公司级\n" +
+                "学校级\n" +
+                "项目部级\n" +
+                "管理\n" +
+                "教育\n" +
+                "领导\n" +
+                "调动\n" +
+                "安全帽\n" +
+                "安全带\n" +
+                "施工用具\n" +
+                "安全手套\n" +
+                "触电、高空坠落\n" +
+                "跌伤、车辆伤害\n" +
+                "突发疾病、火灾伤害\n" +
+                "中毒、职业病\n" +
+                "15\n" +
+                "16\n" +
+                "17\n" +
+                "18\n" +
+                "14、16\n" +
+                "16、18\n" +
+                "18、19\n" +
+                "19、20\n" +
+                "冒险、违章\n" +
+                "加班、班长\n" +
+                "串岗、正确\n" +
+                "冒险、正确\n" +
+                "劳保鞋\n" +
+                "拖鞋\n" +
+                "布鞋\n" +
+                "凉鞋\n" +
+                "报告现场负责人\n" +
+                "隐瞒现场负责人\n" +
+                "通知其他人\n" +
+                "告诉有关人员\n" +
+                "安全防护设施\n" +
+                "安全标志\n" +
+                "施工机具\n" +
+                "安全标语\n" +
+                "安全帽、安全带、安全网\n" +
+                "安全手套、安全网、安全鞋\n" +
+                "安全服、安全镜、安全带\n" +
+                "安全门、安全通道、安全装置\n" +
+                "纸张、物件\n" +
+                "垃圾、杂物\n" +
+                "工具、材料\n" +
+                "标语、标志\n" +
+                "安全带\n" +
+                "安全帽\n" +
+                "安全服\n" +
+                "安全鞋\n" +
+                "正常人\n" +
+                "任何人\n" +
+                "专人\n" +
+                "残疾人\n" +
+                "动火报告制度\n" +
+                "动火监督制度\n" +
+                "动火审批制度\n" +
+                "动火请示制度\n" +
+                "操作资格证\n" +
+                "毕业证\n" +
+                "合格证\n" +
+                "使用证\n" +
+                "瓦工\n" +
+                "木工\n" +
+                "钢筋工\n" +
+                "专业电工\n" +
+                "抢救人员\n" +
+                "切断电源\n" +
+                "迅速逃避\n" +
+                "观看\n" +
+                "禁止、指示、注意、安全\n" +
+                "警告、安全、注意、严禁\n" +
+                "安全、指示、注意、禁止\n" +
+                "指示、注意、安全、警告\n" +
+                "经济建设\n" +
+                "法律\n" +
+                "生产\n" +
+                "安全保证生产\n" +
+                "安全第一、质量第一\n" +
+                "安全第一、预防为主、综合治理\n" +
+                "安全提小标志\n" +
+                "安全宣传标志\n" +
+                "安全警小标志\n" +
+                "权利和义务\n" +
+                "权利和责任\n" +
+                "义务和责任\n" +
+                "技术教育\n" +
+                "专业教育\n" +
+                "项目部教育\n" +
+                "办完入场手续\n" +
+                "被本单位录用\n" +
+                "接受过安全教育并且考试合格\n" +
+                "身体检查\n" +
+                "重新登记\n" +
+                "专门培训\n" +
+                "造成的。\n" +
+                "违反操作规程\n" +
+                "违反有关规定\n" +
+                "违反劳动纪律\n" +
+                "应把安全帽戴正\n" +
+                "必须系紧下颗带\n" +
+                "不能坐在安全帽上\n" +
+                "高挂低用\n" +
+                "低挂高用\n" +
+                "挂在与腰部同高处\n" +
+                "戴护目镜或面罩\n" +
+                "穿绝缘鞋，戴护目镜或面罩\n" +
+                "戴电焊专用手套穿绝缘鞋和戴护目镜或面罩\n" +
+                "使用干粉灭火器\n" +
+                "使用泡沫灭火器\n" +
+                "使用任何灭火器到可以\n" +
+                "对机械设备进行检查\n" +
+                "拉闸断电\n" +
+                "注意防雨措施\n" +
+                "有电\n" +
+                "无电\n" +
+                "可能有电\n" +
+                "也可能无电\n" +
+                "同时设计、同时施工、同时投入生产和使用\n" +
+                "同时安装、同时验收、同时投入使用\n" +
+                "同时设计、同时验收、同时投入使用\n" +
+                "同时安装、同时施工、同时验收\n" +
+                "超额累退\n" +
+                "超额累进\n" +
+                "减额累退\n" +
+                "减额累进\n" +
+                "注意安全”\n" +
+                "有电，危险”\n" +
+                "宥人工作，严禁合闸”\n" +
+                "正在维修，小心危险”\n" +
+                "指令及必须遵守的规定\n" +
+                "警告、注意\n" +
+                "禁止、停止\n" +
+                "安全网\n" +
+                "防护栏\n" +
+                "安全带\n" +
+                "1\n" +
+                "2\n" +
+                "3\n" +
+                "20\n" +
+                "5\n" +
+                "30\n" +
+                "1天\n" +
+                "2天\n" +
+                "3天\n" +
+                "应系好下颌带\n" +
+                "不能坐在安全帽上\n" +
+                "应把安全帽戴正\n" +
+                "低挂高用\n" +
+                "水平挂用\n" +
+                "高挂低用\n" +
+                "电工\n" +
+                "铆工\n" +
+                "喷砂工\n" +
+                "6V\n" +
+                "12V\n" +
+                "24V\n" +
+                "1.5米\n" +
+                "2米\n" +
+                "2.5米\n" +
+                "5米、10米\n" +
+                "10米、5米\n" +
+                "2米 、5米\n" +
+                "半小时\n" +
+                "1小时\n" +
+                "1.5小时\n" +
+                "2～5m\n" +
+                "5～15m\n" +
+                "15～30m\n" +
+                "30m以上\n" +
+                "一级高空作业\n" +
+                "二级高空作业\n" +
+                "三级高空作业\n" +
+                "雪天高空作业\n" +
+                "1处\n" +
+                "2处\n" +
+                "3处\n" +
+                "4处\n" +
+                "4级\n" +
+                "5级\n" +
+                "6级\n" +
+                "7级\n" +
+                "2m\n" +
+                "2.5m\n" +
+                "3m\n" +
+                "4m\n" +
+                "1.5-2m\n" +
+                "2-2.5m\n" +
+                "2.5-3m\n" +
+                "3-3.5m\n" +
+                "5\n" +
+                "6\n" +
+                "7\n" +
+                "8\n" +
+                "  每半年\n" +
+                "每年\n" +
+                "每2年\n" +
+                "每3年\n" +
+                "15米\n" +
+                "20米\n" +
+                "25米\n" +
+                "30米\n" +
+                "300mm\n" +
+                "350mm\n" +
+                "400mm\n" +
+                "450mm\n" +
+                "公司、项目部、班组\n" +
+                "公司、分公司、项目部\n" +
+                "公司、安全部门、班组\n" +
+                "公司、监理公司、项目部　\n" +
+                "可以\n" +
+                "应当\n" +
+                "不得\n" +
+                "一机、一闸、一漏、一箱\n" +
+                "一闸、一箱、一漏、一保护　　\n" +
+                "一机、一闸、一漏、一保护\n" +
+                "一机、一箱、一保险\n" +
+                "安全帽、绝缘鞋、漏电开关\n" +
+                "安全网、绝缘鞋、电焊面罩\n" +
+                "安全网、安全带、软底鞋\n" +
+                "安全帽、安全网、安全带\n" +
+                "文明施工\n" +
+                "全方位管理\n" +
+                "安全管理\n" +
+                "封闭围挡\n" +
+                "下风\n" +
+                "上风\n" +
+                "原地\n" +
+                "顺风\n" +
+                "机械工\n" +
+                "安全员\n" +
+                "电工\n" +
+                "违反操作规程\n" +
+                "违反有关规定\n" +
+                "违反劳动纪律\n" +
+                "穿胶鞋（靴）和戴绝缘橡胶手套\n" +
+                "穿胶靴\n" +
+                "戴绝缘手套\n" +
+                "对机械设备进行检查\n" +
+                "拉闸断电\n" +
+                "注意防雨措施\n" +
+                "5\n" +
+                "6\n" +
+                "7\n" +
+                "8\n" +
+                "5\n" +
+                "8\n" +
+                "10\n" +
+                "15\n" +
+                "1\n" +
+                "3\n" +
+                "5\n" +
+                "10\n" +
+                "高挂抵用\n" +
+                "低挂高用\n" +
+                "更换新的\n" +
+                "继续使用\n" +
+                "自己维修\n" +
+                "工作服口袋里\n" +
+                "手中\n" +
+                "工具袋\n" +
+                "圆钢\n" +
+                "角钢\n" +
+                "螺纹钢\n" +
+                "钢管\n" +
+                "2\n" +
+                "3\n" +
+                "5\n" +
+                "28.5-32.5%\n" +
+                "19.5-23.5%\n" +
+                "12.5-28.5%\n" +
+                "13.5-29.5%\n" +
+                "白蓝红黄\n" +
+                "红黄蓝绿\n" +
+                "红黄绿白\n" +
+                "红黄蓝白\n" +
+                "高处坠落\n" +
+                "起重伤害\n" +
+                "坍塌\n" +
+                "触 电\n" +
+                "防护眼镜\n" +
+                "安全帽\n" +
+                "劳保鞋\n" +
+                "安全带\n" +
+                "黄色\n" +
+                "红色\n" +
+                "绿色\n" +
+                "可以站人\n" +
+                "严禁站人\n" +
+                "十不吊\n" +
+                "十大禁令\n" +
+                "四不伤害\n" +
+                "380V\n" +
+                "220V\n" +
+                "24V\n" +
+                "手套\n" +
+                "安全帽\n" +
+                "防护眼镜\n" +
+                "项目经理\n" +
+                "技术人员\n" +
+                "安全管理人员\n" +
+                "警告\n" +
+                "指令\n" +
+                "通行\n" +
+                "禁止\n" +
+                "上部\n" +
+                "根部\n" +
+                "四周\n" +
+                "焊工\n" +
+                "电工\n" +
+                "架子工\n" +
+                "木工\n" +
+                "人的不安全行为\n" +
+                "物的不安全状态\n" +
+                "管理缺陷\n" +
+                "环境缺陷\n" +
+                "气体检测\n" +
+                "设监护人\n" +
+                "受限作业票\n" +
+                "健康体检\n" +
+                "阻火器\n" +
+                "倒车蜂鸣器\n" +
+                "放大号\n" +
+                "施工废弃物在现场进行集中焚烧处理\n" +
+                "危险废弃物不准随便处置\n" +
+                "不准向地下管道或地面排放污水、泥浆、化学品残液、残渣\n" +
+                "作业层的垃圾应及时清理，送达指定地点，垃圾不得从高处向下抛洒\n" +
+                "预防为主\n" +
+                "四不放过\n" +
+                "三同时\n" +
+                "四不伤害\n" +
+                "110\n" +
+                "120\n" +
+                "119\n" +
+                "8600119\n" +
+                "电源线可以拖地敷设\n" +
+                "过路电源线不设防护，过往车辆或人员随意通行\n" +
+                "电源线应架空、埋地、挂设使用，严禁随地拖拽\n" +
+                "现场电源线与焊把线、地线等缠绕使用\n" +
+                "自下而上\n" +
+                "自左向右\n" +
+                "自右向右\n" +
+                "自上而下\n" +
+                "1\n" +
+                "1.5\n" +
+                "2\n" +
+                "3\n" +
+                "经过登记手续\n" +
+                "重新经过安全生产教育\n" +
+                "经过领导同意\n" +
+                "低挂高用\n" +
+                "高挂低用\n" +
+                "水平挂用\n" +
+                "钩挂牢靠，挂位不受限制\n";
+        String[] split = s.split("\n");
+        for (int i = 0; i < split.length; i++) {
+            String s1 = split[i];
+            if (i % 4 == 0) {
+                System.out.println("\n");
+            }
+            System.out.println(s1);
+        }
+    }
+
     /**
      * 分页列表查询
      *
@@ -155,4 +625,5 @@ public class AnticorrosionEntrustController {
     public Result<CountAnticorrosionEntrust> countInfoNum(@RequestParam HashMap<String, Object> param) {
         return Result.success(anticorrosionEntrustService.countInfoNum(param));
     }
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/CivilizeConstructionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/CivilizeConstructionMapper.xml
index cea67e177..e7cce4c45 100644
--- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/CivilizeConstructionMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/CivilizeConstructionMapper.xml
@@ -3,17 +3,17 @@
 <mapper namespace="com.zhgd.xmgl.modules.baotou.mapper.CivilizeConstructionMapper">
     <select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.CivilizeConstruction">
         select * from (
-        select t.*,
-        ei6.enterprise_name as responsible_party_name,
-        pg.project_group_name,
-        ei1.enterprise_name as supervising_unit_name,
-        ei2.enterprise_name as epc_contractor_name,
-        ei3.enterprise_name as construction_unit_name
+        select t.*
+        ,ei6.enterprise_name as responsible_party_name
+        ,pg.project_group_name
+        ,ei1.enterprise_name as supervising_unit_name
+        ,ei2.enterprise_name as epc_contractor_name
+        ,ei3.enterprise_name as construction_unit_name
         ,du.device_unit_name as device_name
-        ,du.device_unit_name as enterprise_name
-        ,du.device_unit_name as issuing_department_name
-        ,du.device_unit_name as issuer_name
-        ,du.device_unit_name as inspect_man_name
+        ,ei7.enterprise_name as enterprise_name
+        ,po.dept_name as issuing_department_name
+        ,su1.real_name as issuer_name
+        ,su2.real_name as inspect_man_name
         from civilize_construction t
         left join project_group pg on t.project_group_id = pg.id
         left join enterprise_info ei1 on ei1.id = t.supervising_unit_id
@@ -38,17 +38,17 @@
     </select>
     <select id="queryById" resultType="com.zhgd.xmgl.modules.baotou.entity.CivilizeConstruction">
         select * from (
-        select t.*,
-        ei6.enterprise_name as responsible_party_name,
-        pg.project_group_name,
-        ei1.enterprise_name as supervising_unit_name,
-        ei2.enterprise_name as epc_contractor_name,
-        ei3.enterprise_name as construction_unit_name
+        select t.*
+        ,ei6.enterprise_name as responsible_party_name
+        ,pg.project_group_name
+        ,ei1.enterprise_name as supervising_unit_name
+        ,ei2.enterprise_name as epc_contractor_name
+        ,ei3.enterprise_name as construction_unit_name
         ,du.device_unit_name as device_name
-        ,du.device_unit_name as enterprise_name
-        ,du.device_unit_name as issuing_department_name
-        ,du.device_unit_name as issuer_name
-        ,du.device_unit_name as inspect_man_name
+        ,ei7.enterprise_name as enterprise_name
+        ,po.dept_name as issuing_department_name
+        ,su1.real_name as issuer_name
+        ,su2.real_name as inspect_man_name
         from civilize_construction t
         left join project_group pg on t.project_group_id = pg.id
         left join enterprise_info ei1 on ei1.id = t.supervising_unit_id
diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java
index ed2cfb50c..7923d3197 100644
--- a/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java
@@ -982,7 +982,6 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl<Xz
         String notifyPerson = FlowUtil.getString(formData, "notifyPerson");
         String createTime = FlowUtil.getString(formData, "createTime");
         String changeLimitTime = FlowUtil.getString(formData, "field8075015540558");
-        String inspectTime = FlowUtil.getString(formData, "field1920515528681");
         String enterpriseSn = FlowUtil.getString(formData, "enterpriseSn");
         String imageUrl = FlowUtil.getJSONString(formData, "field9169215564432");
         String fileUrl = FlowUtil.getJSONString(formData, "field4400374080533");
@@ -1020,7 +1019,7 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl<Xz
 //        record.setReviewId(reviewId);
 //        record.setVerifyManId(verifyManId);
         record.setInspectManId(inspectManId);
-        record.setInspectTime(inspectTime);
+        record.setInspectTime(DateUtil.formatDateTime(FlowUtil.getDate(formData, "field1920515528681")));
         record.setRecordType(recordType);
         record.setEnterpriseSn(enterpriseSn);
         record.setImageUrl(imageUrl);
diff --git a/src/main/resources/excel/题库导入模版.xlsx b/src/main/resources/excel/题库导入模版.xlsx
index bd81d62b6..db6fdb291 100644
Binary files a/src/main/resources/excel/题库导入模版.xlsx and b/src/main/resources/excel/题库导入模版.xlsx differ