pdf预览修改

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/UserFilesInfoVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.control.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.springblade.control.entity.UserFilesInfo;
 import lombok.Data;
@@ -56,6 +57,7 @@ public class UserFilesInfoVO extends UserFilesInfo {
 	@ApiModelProperty(value = "身份证号码")
 	private String idNumber;
 
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
 	@ApiModelProperty(value = "出生日期")
 	private String birthday;
 

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -17,6 +17,7 @@
 package org.springblade.system.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -97,6 +98,7 @@ public class User extends TenantEntity {
      * 生日
      */
     @ApiModelProperty(value = "生日")
+    @JsonFormat
     private Date birthday;
     /**
      * 性别

blade-service/blade-control/src/main/java/org/springblade/control/controller/CorporationInfoController.java

@@ -166,6 +166,7 @@ public class CorporationInfoController extends BladeController {
             //获取PDF文件
             BladeFile bladeFile = this.newIOSSClient.updateFile(file.getBytes(), file.getOriginalFilename());
             BeanUtils.copyProperties(bladeFile, newBladeFile);
+            newBladeFile.setPdfUrl(bladeFile.getLink());
         }
         String fileExtension = FileUtil.getFileExtension(newBladeFile.getOriginalName());
         if (StringUtils.isNotEmpty(id)) {
@@ -188,7 +189,6 @@ public class CorporationInfoController extends BladeController {
             corporationInfo.setAttachSize(newBladeFile.getFileSize());
             corporationInfo.setExtension(fileExtension);
         }
-
         boolean b = corporationInfoService.saveOrUpdate(corporationInfo);
         if (b){
            return R.success("操作成功");
@@ -196,5 +196,4 @@ public class CorporationInfoController extends BladeController {
             return  R.fail("操作失败");
         }
     }
-
 }

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

@@ -40,33 +40,6 @@ public class WbsTreeContractController extends BladeController {
     @ApiOperation(value = "查询当前节点下所有元素表信息", notes = "传入节点primaryKeyId、type、合同段id、项目id")
     public R searchNodeAllTable(String primaryKeyId, String type, String contractId, String projectId) {
         List<AppWbsTreeContractVO> list = iWbsTreeContractService.searchNodeAllTable(primaryKeyId, type, contractId, projectId);
-        /*boolean flag = false;
-        Set<Long> l1 = new HashSet<>();
-        for (AppWbsTreeContractVO vo : list) {
-            if (vo.getNodeName().contains("_PL_")){
-                l1.add(vo.getId());
-                flag = true;
-            }
-        }
-        if (flag){
-            for (Long aLong : l1) {
-                List<AppWbsTreeContractVO> vos = new ArrayList<>();
-                for (AppWbsTreeContractVO vo : list) {
-                    if (aLong.equals(vo.getId())){
-                        vos.add(vo);
-                    }
-                }
-                list = list.stream().filter(l -> {
-                    if (l.getId().equals(aLong)){
-                        return false;
-                    }else {
-                        return true;
-                    }
-                }).collect(Collectors.toList());
-                vos = vos.stream().sorted(Comparator.comparing(AppWbsTreeContractVO::getPKeyId)).collect(Collectors.toList());
-                list.addAll(vos);
-            }
-        }*/
         if (list.size() > 0) {
             list.forEach(l -> {
                 if (StringUtils.isNotBlank(l.getHtmlUrl())) {
@@ -224,4 +197,20 @@ public class WbsTreeContractController extends BladeController {
         return R.status(iWbsTreeContractService.syncContractTabSort(projectId));
     }
 
+
+    /**
+     * 获取合同段详情id
+     */
+    @PostMapping("/getWbsContractById")
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "获取合同段详情", notes = "传入节点pKeyId")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "pKeyId", value = "节点pKeyId", required = true)
+    })
+    public R<WbsTreeContract> getWbsContractById(@RequestParam("pKeyId") String pKeyId){
+        WbsTreeContract wbsTreeContract = iWbsTreeContractService.getOne(Wrappers.<WbsTreeContract>query().lambda()
+                .eq(WbsTreeContract::getPKeyId, pKeyId).eq(WbsTreeContract::getIsDeleted, 0));
+        return R.data(wbsTreeContract);
+    }
+
 }

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

@@ -437,7 +437,7 @@
                 #{tableOwnerList}
             </foreach>
         </if>
-        ORDER BY sort,full_name
+        ORDER BY sort,full_name,create_time
     </select>
 
     <select id="selectRoleInfo" resultType="org.springblade.manager.entity.SaveUserInfoByProject">

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

@@ -298,7 +298,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         String lastStr = dataInfo2.getString(ziduan[0]) + "_^_" + ziduan[0].split("__")[1];
                         for (int i = 1; i < ziduan.length; i++) {
                             String keyData = dataInfo2.getString(ziduan[i]);
-                            if (!keyData.equals("")) {
+                            if (StringUtils.isNotEmpty(keyData)&&!keyData.equals("")) {
                                 lastStr += "☆" + dataInfo2.getString(ziduan[i]) + "_^_" + ziduan[i].split("__")[1];
                             }
 
@@ -1385,7 +1385,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                             if (ytzData != null) {
                                 Elements tdsx = ytzData.select("td");
                                 if (Integer.parseInt(xy[1]) < tdsx.size()) {
-                                    Element data = ytzData.select("td").get(Integer.parseInt(xy[1]));
+                                    Element data=  ytzData.getElementById(val);
+                                    //Element data = ytzData.select("td").get(Integer.parseInt(xy[1]));
                                     if (data != null) {
                                         if (data.html().indexOf("x1") >= 0 && data.html().indexOf("y1") >= 0) {
                                             int x1 = 0;