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

blade-service/blade-business/src/main/java/org/springblade/business/controller/NeiYeController.java

@@ -339,7 +339,7 @@ public class NeiYeController {
                vo1.setPartName(wbsTreeContract.getNodeName());
            }
             //如果选择的节点正好是工序则直接将单元查出来
-            if(wbsTreeContract.getNodeType()==6){
+            if(wbsTreeContract.getNodeType()==6||(wbsTreeContract.getMajorDataType()!=null&&wbsTreeContract.getMajorDataType()==2)){
                 Integer unitNameNum=0;
                 if(wbsTreeContract!=null&&wbsTreeContract.getUnitName()!=null){
                     unitNameNum=wbsTreeContract.getUnitName();

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/EntrustInfoServiceImpl.java

@@ -124,7 +124,7 @@ public class EntrustInfoServiceImpl extends BaseServiceImpl<EntrustInfoMapper, E
 		String contractId = "";
         String sqlNodeName="select node_name from m_wbs_tree_private where p_key_id="+dataInfo.getString("nodeId");
         String nodeName = jdbcTemplate.queryForObject(sqlNodeName, new SingleColumnRowMapper<>(String.class));
-        if(!nodeName.equals("回弹法检测混凝土抗压强度")&&!nodeName.equals("路基压实度")&&!nodeName.equals("地基承载力")&&!nodeName.equals("路基路面弯沉")&&!nodeName.equals("锚杆")){
+        if(!nodeName.equals("回弹法检测混凝土抗压强度")&&!nodeName.equals("路基压实度")&&!nodeName.equals("地基承载力")&&!nodeName.equals("路基路面弯沉")&&!nodeName.equals("锚杆")&&!nodeName.equals("喷射混凝土厚度")){
             // 创建 委托单信息
             if(!dataInfo.containsKey("sampleId")){
                 return R.fail("取样信息为sampleId不存在");

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -1816,8 +1816,10 @@ public class ExcelTabController extends BladeController {
                     List<ContractRelationJlyz> ContractRelationJlyzs = jdbcTemplate.query(sqlForSG, new BeanPropertyRowMapper<>(ContractRelationJlyz.class));
                     if (ObjectUtil.isNotEmpty(ContractRelationJlyzs)) {
                         List<Long> contractsIds = ContractRelationJlyzs.stream().map(ContractRelationJlyz::getContractIdSg).collect(Collectors.toList());
-                        String contractsIdsStr = StringUtils.join(contractsIds, ",");
-                        String sql1 = "select pdf_url,e_visa_pdf_url,pdf_trial_url,pdf_trial_url_position,status from u_information_query where classify='" + classify + "' and wbs_id='" + nodeId + "' and contract_id in('" + contractsIdsStr + "')";
+                        String contractsIdsStr = contractsIds.stream()
+                            .map(id -> "'" + id + "'")
+                            .collect(Collectors.joining(", "));;
+                        String sql1 = "select pdf_url,e_visa_pdf_url,pdf_trial_url,pdf_trial_url_position,status from u_information_query where classify='" + classify + "' and wbs_id='" + nodeId + "' and contract_id in(" + contractsIdsStr + ")";
                         maps = jdbcTemplate.queryForList(sql1);
                     }
                 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -915,7 +915,7 @@
     </select>
 
     <select id="getNodeTyp6" resultType="org.springblade.manager.entity.WbsTreeContract">
-        select p_key_id,wbs_id,contract_id,unit_name from m_wbs_tree_contract where unit_name is not null and FIND_IN_SET(#{pKeyId},ancestors_p_id)>0 and node_type=6 and is_deleted=0
+        select p_key_id,wbs_id,contract_id,unit_name from m_wbs_tree_contract where unit_name is not null and FIND_IN_SET(#{pKeyId},ancestors_p_id)>0 and (node_type=6  or major_data_type=2) and is_deleted=0
     </select>
     <select id="getEKey" resultType="org.springblade.business.dto.EKeyDto">
         SELECT fe.e_key ,wtc.init_table_name,wtc.p_key_id

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

@@ -1446,10 +1446,14 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 Elements bhtitle3 = doc.select("el-input[placeholder~=^分项工程编号]");
                 Elements bhtitle4 = doc.select("el-input[placeholder~=^分部分项编号]");
                 Elements bhtitle5 = doc.select("el-input[placeholder~=^单元工程编码]");
+                Elements bhtitle6 = doc.select("el-input[placeholder~=^编 号]");
+                Elements bhtitle7 = doc.select("el-input[placeholder~=^分项工程编号：]");
                 bhtitle.addAll(bhtitle2);
                 bhtitle.addAll(bhtitle3);
                 bhtitle.addAll(bhtitle4);
                 bhtitle.addAll(bhtitle5);
+                bhtitle.addAll(bhtitle6);
+                bhtitle.addAll(bhtitle7);
             }
 
 

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

@@ -2827,7 +2827,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 WbsTreePrivate wbsPrivate = new WbsTreePrivate();
                 Long pKeyId1 = SnowFlakeUtil.getId();
                 wbsPrivate.setPKeyId(pKeyId1);
-                //查询wbs_tree_contract当前项目下是否已存在相同表
+                //查询wbs_tree_private当前项目下是否已存在相同表
                 WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.selectOne(new LambdaQueryWrapper<WbsTreePrivate>()
                         .eq(WbsTreePrivate::getProjectId, projectId)
                         .eq(WbsTreePrivate::getInitTableName, tableInfo.getTabEnName())

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FileUtils.java

@@ -544,11 +544,13 @@ public class FileUtils {
                 return fileUrl;
             }
         } else {
-            file_path = file_path2;
+            if("20".equals(sys_isonline)){
+                file_path2 = file_path;
+            }
         }
         String s1 = fileUrl.replaceAll("//", "/").replace("///","/");
-        file_path= file_path.replaceAll("//","/").replaceAll("///","/");
-        String s2= s1.replaceAll(file_path, "");
+        file_path2= file_path2.replaceAll("//","/").replaceAll("///","/");
+        String s2= s1.replaceAll(file_path2, "");
         String path = sys_file_net_url + s2;
         return path;
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/PdfAddContextUtils.java

@@ -24,15 +24,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class PdfAddContextUtils {
-    public static void main(String[] args) throws IOException, DocumentException {
-        String src = "C:\\Users\\泓创02\\Downloads\\抗弯拉检测报告.pdf"; // 输入PDF文件路径
-        String dest = "C:\\Users\\泓创02\\Downloads\\抗弯拉检测报告1.pdf"; // 输出PDF文件路径
-        String title = "水泥混凝土抗弯拉强度试验检测报告"; // 要查找的标题文本
-        String signature = "受控号：123456"; // 要添加的署名文本
-
-        addContextByTitle(src, dest, title, signature,  10);
-    }
-
     public static void addContextByTitle(String src, String dest, String title, String context,  int fontSize) throws IOException, DocumentException {
 
         File pdfFile = new File(src);