Merge remote-tracking branch 'origin/test-merge' into test-merge

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/InformationQueryClient.java

@@ -90,6 +90,9 @@ public interface InformationQueryClient {
     @PostMapping(API_PREFIX + "/getInformationByContractId")
     List<InformationQuery> getInformationByContractId(@RequestParam Long contractId,@RequestParam Integer classify);
 
+    @PostMapping(API_PREFIX + "/getInformationByContractIdAndApprovedStatus")
+    List<InformationQuery> getInformationByContractIdAndApprovedStatus(@RequestParam Long contractId,@RequestParam Integer classify);
+
     @PostMapping(API_PREFIX + "/getInformationByContractId1")
     void getInformationByContractId1(Long contractId);
 

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/InformationQueryClientImpl.java

@@ -116,6 +116,10 @@ public class InformationQueryClientImpl implements InformationQueryClient {
     public List<InformationQuery> getInformationByContractId(Long contractId, Integer classify) {
         return informationQueryMapper.getInformationByContractId(contractId,classify);
     }
+    @Override
+    public List<InformationQuery> getInformationByContractIdAndApprovedStatus(Long contractId, Integer classify) {
+        return informationQueryMapper.getInformationByContractIdAndApprovedStatus(contractId,classify);
+    }
 
     @Override
     public void getInformationByContractId1(Long contractId) {

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.java

@@ -142,6 +142,7 @@ public interface InformationQueryMapper extends BaseMapper<InformationQuery> {
     List<InformationQuery> selectChildrenNodeInfo(@Param("ids") List<Long> removeList);
 
     List<InformationQuery> getInformationByContractId(@Param("contractId") Long contractId, @Param("classify")Integer classify);
+    List<InformationQuery> getInformationByContractIdAndApprovedStatus(@Param("contractId") Long contractId, @Param("classify")Integer classify);
 
     List<TabBusstimeInfo> getTabussTimeInfo(@Param("tables") List<String> tables);
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -990,6 +990,18 @@
         where is_deleted = 0
           and contract_id = #{contractId} and classify = #{classify} and status in(0,1,2) and is_deleted = 0;
     </select>
+    <select id="getInformationByContractIdAndApprovedStatus" resultMap="informationQueryResultMap">
+        select id,
+               wbs_id,
+               name,
+               e_visa_pdf_url,
+               business_time,
+               classify,
+               e_visa_pdf_page,
+               e_visa_pdf_size,
+               node_pdf_url
+        from u_information_query where is_deleted = 0 and contract_id = #{contractId} and classify = #{classify} and status = 2 and is_deleted = 0;
+    </select>
 
     <select id="getTabussTimeInfo" resultMap="tabBusstimeInfoResultMap">
         select * from m_tab_busstime_info where is_deleted = 0

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

@@ -320,6 +320,10 @@ public class LinkdataInfoController extends BladeController {
                     element1.attr("placeholder", enName).attr("keyName", dataInfo2).attr("id", dataInfo2);
                     element1.attr("weighing", "100");
                     element1.attr("v-model", "formData." + dataInfo2);
+                    // 修正鼠标左键点击事件
+                    if ("el-input".equals(element1.tagName())) {
+                        element1.removeAttr("@mouseup.left").attr("@mouseup.left", "inputLeftClick($event,'" + dataInfo2 + "')");
+                    }
                     element.attr("@click", "getInformation('" + enName + "'," + linkdataInfo.getTrIndex() + "," + linkdataInfo.getTdIndex() + ")");
                 }
 

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

@@ -740,7 +740,7 @@ public class ArchiveTreeContractSyncImpl {
         //获取某个合同段所有的电签完成的文件题名，取 id wbsid name，eVisaPdfUrl
 //        List<InformationQuery> informationQueryList = new ArrayList<>();
       //  informationQueryClient.getInformationByContractId1(contractId);
-        List<InformationQuery> informationQueryList = informationQueryClient.getInformationByContractId(contractId,classify);
+        List<InformationQuery> informationQueryList = informationQueryClient.getInformationByContractIdAndApprovedStatus(contractId,classify);
         return informationQueryList;
 
         //互殴去
@@ -860,7 +860,7 @@ public class ArchiveTreeContractSyncImpl {
                 pdfSize = CommonUtil.getResourceLength(archiveFile.getPdfFileUrl());
                 archiveFile.setFileSize(pdfSize);
                 archiveFile.setFilePage(Integer.valueOf(pdfPage));
-            } catch (IOException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }

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

@@ -1200,7 +1200,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             map.put(pKeyId, nodeName);
             RandomNumberHolder.setRandomNumber(map);
         } catch (NumberFormatException e) {
-            throw new RuntimeException(e);
+            e.printStackTrace();
         }
 
         List<NodeTable> tableAll = createNodeTables(wbsTreeTable.getPId(), tableInfoList.get(0).getContractId(), tableInfoList.get(0).getProjectId(), ExecuteType.INSPECTION, tableInfoList.get(0).getClassify(), null);
@@ -1306,7 +1306,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     tableGroup.forEach((tableName, contracts) -> {
                         WbsTreeContract temp = null;
                         for (WbsTreeContract contract : contracts) {
-                            if (Objects.equals(contract.getPKeyId(), wbsTreeTable.getPId())) {
+                            if (Objects.equals(contract.getPKeyId(), wbsTreeTable.getPKeyId())) {
                                 temp = contract;
                                 break;
                             }
@@ -1378,7 +1378,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 if (dataMap != null && keys != null) {
                     for (String key : keys) {
                         String value = dataMap.get(key);
-                        if (value != null) {
+                        if (StringUtil.hasText(value)) {
                             data.append(value).append(",");
                         }
                     }
@@ -1430,6 +1430,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             if (split1.length > 1) {
                 String index = split1[1];
                 String[] split = resultData.split("☆");
+                if (split.length > 1) {
+                    resultData = "";
+                }
                 for (int i = 0; i < split.length; i++) {
                     String string = split[i];
                     if (string.contains(index)) {

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

@@ -6651,7 +6651,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             }
 
         }
-        return null;
+        return new HashMap<>();
     }
 
     @Override

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

@@ -790,7 +790,16 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                 if (obj != 1) {
                     throw new ServiceException(StringUtil.format("未获取到 {} 对应实体表信息，关联失败", wbsTree.getNodeName()));
                 }
-
+                //查询清表细信息
+                ExcelTab excelTab = excelTabMapper.selectById(formElementDTO.getExcelTabId());
+                if(StringUtils.isNotEmpty(excelTab.getTabId()) && !excelTab.getTabId().equals(wbsTree.getInitTableId().toString())){
+                    throw new ServiceException(StringUtil.format("当前清表与元素表不一致，无法关联"));
+                }
+                //如果没有 就设置清表的tab_id为选择元素表的tab_id
+                if(StringUtils.isEmpty(excelTab.getTabId())){
+                    excelTab.setTabId(wbsTree.getInitTableId().toString());
+                    excelTabMapper.updateById(excelTab);
+                }
                 //获取当前元素表与清表关系信息
                 List<WbsTabRelationExcelTab> list = baseMapper.selectWbsTabRelationExcelTab(String.valueOf(formElementDTO.getId()), String.valueOf(formElementDTO.getExcelTabId()));
                 if (list.size() <= 0) {
@@ -800,7 +809,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
                 //获取表单下的元素信息
                 List<WbsFormElement> wbsFormElements = baseMapper.selectList(Wrappers.<WbsFormElement>query().lambda()
-                        .eq(WbsFormElement::getFId, formElementDTO.getId()));
+                        .eq(WbsFormElement::getFId, wbsTree.getInitTableId()));
 
                 WbsFormElement firstWbsFormElement;
                 List<WbsFormElement> newList;
@@ -829,7 +838,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                     //新增元素到当前表中
                     wbsFormElementInfo.setEKey(key);
                     wbsFormElementInfo.setId(SnowFlakeUtil.getId());
-                    wbsFormElementInfo.setFId(String.valueOf(formElementDTO.getId()));
+                    wbsFormElementInfo.setFId(String.valueOf(wbsTree.getInitTableId()));
                     wbsFormElementInfo.setStatus(1);
                     wbsFormElementInfo.setELength(Integer.parseInt(WbsElementUtil.setDefaultElementLength(wbsFormElementInfo.getEType())));