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

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

@@ -1165,7 +1165,7 @@ public class InformationWriteQueryController extends BladeController {
                                 }
                             }
 
-                            iTaskService.delArchiveFileBusinessData(query.getProjectId(),query.getWbsId());
+                            iTaskService.delArchiveFileBusinessData(query.getProjectId(), query.getWbsId());
                         }
 
                         //更新Redis缓存
@@ -1480,6 +1480,9 @@ public class InformationWriteQueryController extends BladeController {
                     if (nodeOld.getType() == 2 && StringUtils.isNotEmpty(newData.getInitTableName()) && tabOwner.contains(nodeOld.getTableOwner()) && vo.getIsCopyData() == 1) {
                         String tableName = newData.getInitTableName();
                         String col = nodeTabColsMap.get(tableName);
+                        if (ObjectUtil.isEmpty(col)) { //如果没获取到字段，那么跳过
+                            continue;
+                        }
                         List<String> filteredList = Arrays.stream(col.split(","))
                                 .filter(value -> !value.equals("id") && !value.equals("p_key_id") && !value.equals("group_id"))
                                 .collect(Collectors.toList());
@@ -1866,11 +1869,11 @@ public class InformationWriteQueryController extends BladeController {
                             List<String> result = new ArrayList<>();
                             for (String[] a : la) {
                                 String v = a[0];
-                                String sv ;
-                                if(v.contains("、")){
-                                  sv= Arrays.stream(v.split("[、]")).map(e->imitate(e,rjs)).collect(Collectors.joining("、"));
-                                }else{
-                                  sv=imitate(v,rjs);
+                                String sv;
+                                if (v.contains("、")) {
+                                    sv = Arrays.stream(v.split("[、]")).map(e -> imitate(e, rjs)).collect(Collectors.joining("、"));
+                                } else {
+                                    sv = imitate(v, rjs);
                                 }
                                 result.add(sv + "_^_" + a[1]);
                             }
@@ -1884,7 +1887,8 @@ public class InformationWriteQueryController extends BladeController {
         }
         return value;
     }
-    public String imitate(String v,List<RangeJson> rjs){
+
+    public String imitate(String v, List<RangeJson> rjs) {
         RangeJson best = rjs.stream().min(Comparator.comparingDouble(j -> Double.parseDouble(v) - Double.parseDouble(j.getDesign()))).orElse(rjs.get(0));
         int scale = Math.max(new StringBuilder(v).reverse().indexOf("."), 0);
         return BaseUtils.rangeList(1, best.getDesign(), best.getDev(), 1, scale, 1).get(0).toString();

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

@@ -14,6 +14,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springblade.business.entity.DefaultProject;
 import org.springblade.business.service.IDefaultProjectService;
 import org.springblade.business.vo.UserVO;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -166,6 +167,19 @@ public class UserViewProjectContractController {
             //获取当前所有合同段
             List<ContractInfo> contractInfos = this.contractClient.queryContractListByIds(longProjectIds);
 
+            /*//如果没有设置默认项目合同段，那么选择一个设置固定的
+            if (ObjectUtil.isEmpty(defaultProject) || ObjectUtil.isEmpty(defaultContract)) {
+                ProjectInfo projectInfo = projectInfos.get(0); //默认选第一个
+                ContractInfo contractInfo = contractInfos.stream().filter(f -> f.getPId().contains(projectInfo.getId().toString()) && f.getContractType() == 1).findAny().orElse(null);
+                if (projectInfo != null && contractInfo != null) {
+                    defaultProject = projectInfo.getId().toString();
+                    defaultContract = contractInfo.getId().toString();
+                }
+            }
+            if (StringUtils.isEmpty(defaultProject) || StringUtils.isEmpty(defaultContract)) {
+                throw new ServiceException("获取默认项目合同段信息失败，请联系管理员");
+            }*/
+
             //如果是监理，那么移除施工合同段信息
             if (var) {
                 contractInfos.removeIf(next -> next.getContractType() == 1);
@@ -181,7 +195,6 @@ public class UserViewProjectContractController {
                 //用户默认的项目及合同段
                 String finalDefaultProject = defaultProject;
                 String finalDefaultContract = defaultContract;
-
                 projectInfoVOS.forEach(vo -> {
                     //统一返回格式
                     vo.setName(vo.getProjectName());

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

@@ -480,7 +480,7 @@ public class TextdictInfoController extends BladeController {
 
                 } else if (textdictInfo.getTextId().equals("img")) { //图片
                     element.empty().append("<hc-table-form-upload @keydown.shift.up='keyupShiftUp' @keydown.shift.down='keyupShiftDown' @keydown.shift.left='keyupShiftLeft' @keydown.shift.right='keyupShiftRight'  :src='" + vmode + "' placeholder=" + placeholder + "  @mouseup.right='RightClick(" + parm + ")' v-model=" + vmode + "  keyName=" + keyname + " weighing=" + weighing + "  @success='formUploadSuccess' @del='delTableFormFile' trIndex=" + trindex + " tdIndex=" + tdindex + "  x1=" + x1 + " x2=" + x2 + " y1=" + y1 + " y2=" + y2 + "></hc-table-form-upload> ");
-                    element.removeAttr("style");
+//                  element.removeAttr("style");
                 } else if (textdictInfo.getTextId().equals("searchSelect")) { //搜索框
                     element.empty().append("<hc-form-select-search id=" + keyname + " @keydown.shift.up='keyupShiftUp' @keydown.shift.down='keyupShiftDown' @keydown.shift.left='keyupShiftLeft' @keydown.shift.right='keyupShiftRight'  @mouseup.right='RightClick(" + parm + ")' type='dap_site_data' :val=" + vmode + " contractId=''  pkeyId='' @change='formRemoteChange' v-model=" + vmode + " placeholder=" + placeholder + " keyname=" + keyname + " weighing=" + weighing + "  @contextmenu.prevent.native='contextmenuClick(" + parm + ")'  @mouseup.right='RightClick(" + parm + ")' trIndex=" + trindex + " tdIndex=" + tdindex + "  x1=" + x1 + " x2=" + x2 + " y1=" + y1 + " y2=" + y2 + " style='width:100%;height:100%' > </hc-form-select-search>");
                 } else if (textdictInfo.getTextId().equals("strengthSearch")) { //强度搜索框

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

@@ -439,6 +439,7 @@ public class ArTreeContractInitServiceImpl {
             archiveTree.setTenantId(tenantId);
             archiveTree.setProjectId(projectId);
             archiveTree.setContractId(contractId);
+            archiveTree.setTreeCode(contractId.toString());
             archiveTree.setId(oldNewMap.get(wbsTreeVO2.getId()));
             if (wbsTreeVO2.getParentId().equals(rootId)) {
                 archiveTree.setParentId(subTree.getId());

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

@@ -1696,14 +1696,16 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         if (tabPdf2.exists()) {
             tabPdf2.delete();
         }
-
-        FileUtils.mergePdfPublicMethods(dataListPdf, pdfPath2);
-
-        BladeFile bladeFile2 = newIOSSClient.uploadFile(pkeyId + "2.pdf", pdfPath2);
+        String fileUrl ="";
+        if (dataListPdf.size() > 0) {
+            FileUtils.mergePdfPublicMethods(dataListPdf, pdfPath2);
+            BladeFile bladeFile2 = newIOSSClient.uploadFile(pkeyId + "2.pdf", pdfPath2);
+            fileUrl = bladeFile2.getLink();
+        }
 
         UpdateWrapper<WbsTreeContract> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("p_key_id", pkeyId + "");
-        updateWrapper.set("pdf_url", bladeFile2.getLink());
+        updateWrapper.set("pdf_url", fileUrl);
         wbsTreeContractService.update(updateWrapper);
 
         if (outputStream != null) {
@@ -1712,7 +1714,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         if (exceInp != null) {
             IoUtil.closeQuietly(exceInp);
         }
-        return R.data(bladeFile2.getLink());
+        return R.data(fileUrl);
 
     }