Merge remote-tracking branch 'origin/master' into master

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -1196,7 +1196,7 @@
         <result column="real_name" property="updateUserName"></result>
         <result column="update_time" property="updateUserTime"></result>
         <result column="auto_file_sort" property="autoFileSort"></result>
-        <result column="create__time" property="createUserTime"></result>
+        <result column="create_time" property="createUserTime"></result>
         <result column="file_n" property="fileN"></result>
         <result column="rollor" property="rollor"></result>
         <result column="node_id" property="nodeId"></result>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1339,7 +1339,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             Elements dwtitle = doc.select("el-input[placeholder~=.*承包单位]");
             Elements sgtitle = doc.select("el-input[placeholder~=^施工单位]");
             Elements sgtitle1 = doc.select("el-input[placeholder=安装单位]");
-            Elements sgtitle2= doc.select("el-input[placeholder=承建单位]");
+            Elements sgtitle2= doc.select("el-input[placeholder~=^承建单位]");
 
             Elements defText = doc.getElementsByAttribute("defText");
             sgtitle.addAll(sgtitle1);
@@ -1404,6 +1404,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     if ((trindex < 10 || placeholderxx.equals("施工单位")) && placeholderxx.indexOf("自评意见")<0) {
                         reData.put(element.attr("keyName"), contractInfo.getConstructionUnitName());
                     }
+                    if ((trindex < 10 || placeholderxx.equals("承建单位")) && placeholderxx.indexOf("自评意见")<0) {
+                        reData.put(element.attr("keyName"), contractInfo.getConstructionUnitName());
+                    }
                 }
             }