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

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java

@@ -16,17 +16,10 @@
  */
 package org.springblade.resource.endpoint;
 
-import com.aspose.cells.SaveFormat;
-import com.aspose.words.DocumentBuilder;
-import com.itextpdf.text.Image;
-import com.itextpdf.text.Rectangle;
-import com.itextpdf.text.pdf.PdfWriter;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.oss.model.OssFile;
 import org.springblade.core.secure.annotation.PreAuth;
@@ -40,11 +33,10 @@ import org.springblade.resource.entity.Attach;
 import org.springblade.resource.feign.CommonFileClient;
 import org.springblade.resource.service.IAttachService;
 import org.springblade.resource.vo.NewBladeFile;
-import org.springblade.resource.vo.ToPdfVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import java.io.*;
+
 import java.util.Objects;
 
 /**

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractTreeAllVO.java

@@ -1,6 +1,7 @@
 package org.springblade.manager.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.core.tool.node.INode;
 
@@ -28,6 +29,9 @@ public class WbsTreeContractTreeAllVO implements INode<WbsTreeContractTreeAllVO>
 
     private Long submitCounts;
 
+    @ApiModelProperty("未填报1 、已填报-未上报2 、已填报-待审批3 、已审批4")
+    private Integer colorStatus;
+
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<WbsTreeContractTreeAllVO> children;
 

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

@@ -210,10 +210,10 @@ public class ImageClassificationFileController extends BladeController {
                                                 float reduceMultiple = 0.5f;
                                                 bytes = FileUtils.resizeImage(bytes, reduceMultiple);
                                             }*/
-                                            bytes = FileUtils.resizeImage(bytes, 0f);
+                                            byte[] bytesNew = FileUtils.resizeImage(bytes, 0f);
 
                                             //创建图片
-                                            drawing.createPicture(anchor, workbook.addPicture(bytes, Workbook.PICTURE_TYPE_JPEG));
+                                            drawing.createPicture(anchor, workbook.addPicture(bytesNew, Workbook.PICTURE_TYPE_JPEG));
                                             //图片定位
                                             FileUtils.imageOrientation(sheet, anchor, i == 1 ? new DataVO(1, 28) : new DataVO(0, 0));
 

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

@@ -106,8 +106,8 @@ public class FileUtils {
         BufferedImage bi = ImageIO.read(new ByteArrayInputStream(srcImgData));
         /*int width = (int) (bi.getWidth() * reduceMultiple);
         int height = (int) (bi.getHeight() * reduceMultiple);*/
-        int width = 768;
-        int height = 1024;
+        int width = 600;
+        int height = 800;
         Image image = bi.getScaledInstance(width, height, Image.SCALE_SMOOTH);
         BufferedImage tag = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
         Graphics g = tag.getGraphics();

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

@@ -1720,10 +1720,10 @@ public class ExcelTabController extends BladeController {
                                 if (val.indexOf("__") >= 0) {
                                     String[] DataVal = val.split("__");
                                     String[] xy = DataVal[1].split("_");
-                                    if (trs.size() > (Integer.parseInt(xy[0])-1)) {
+                                    if (trs.size() > Integer.parseInt(xy[0])) {
                                         Element trData = trs.get(Integer.parseInt(xy[0]));
                                         Elements tdDatas = trData.select("td");
-                                        if (tdDatas.size() > (Integer.parseInt(xy[0]) - 1)) {
+                                        if (tdDatas.size() > Integer.parseInt(xy[1])) {
                                             Element data = tdDatas.get(Integer.parseInt(xy[1]));
 
                                             if (data.html().indexOf("x1") >= 0 && data.html().indexOf("y1") >= 0) {
@@ -1800,7 +1800,7 @@ public class ExcelTabController extends BladeController {
                                 if ( trs.size() > (Integer.parseInt(trtd[0]))) {
                                     Element trData = trs.get(Integer.parseInt(trtd[0]));
                                     Elements tdDatas = trData.select("td");
-                                    if (tdDatas.size() > (Integer.parseInt(trtd[0]) - 1)) {
+                                    if (tdDatas.size() > Integer.parseInt(trtd[1])) {
                                         Element data = tdDatas.get(Integer.parseInt(trtd[1]));
 //                                Element data = trs.get(Integer.parseInt(trtd[0])).select("td").get(Integer.parseInt(trtd[1]));
 
@@ -2407,9 +2407,11 @@ public class ExcelTabController extends BladeController {
         } else { // 单个保存
             dataArray.add(dataInfo);
         }
+        JSONObject tableInfo1 = dataArray.getJSONObject(0);
+        String nodeid = tableInfo1.getString("nodeId");
         List<TableInfo> tableInfoList = this.excelTabService.getTableInfoList(dataArray);
         try {
-            this.excelTabService.formulaFillData(tableInfoList, null);
+            this.excelTabService.formulaFillData(tableInfoList, Long.parseLong(nodeid));
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -143,6 +143,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
                 for (WbsTreeContractTreeAllVO vo : wbsTreeContractVOS) {
                     if (key.equals(vo.getId() + "")) {
                         vo.setSubmitCounts(allTable.get(key));
+                        vo.setColorStatus(2);
                     }
                 }
             }

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

@@ -922,7 +922,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 for (Element element : htdtitle) {
                     int trindex = Integer.parseInt(element.attr("trindex"));
                     if (trindex <= 8) {
-                        reData.put(element.attr("keyName"), contractInfo.getContractName());
+                        reData.put(element.attr("keyName"), contractInfo.getContractNumber());
                     }
                 }
             }
@@ -936,12 +936,16 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     }
                 }
             }
+            //获取父节点划分编号
+            WbsTreeContract node = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
+                    .eq(WbsTreeContract::getId, wbsTreeContract.getParentId())
+                    .eq(WbsTreeContract::getContractId, wbsTreeContract.getContractId()));
             // 编号
             if (bhtitle.size() >= 1 && contractInfo.getIsReferenceNumber() == 1) {
                 for (Element element : bhtitle) {
                     int trindex = Integer.parseInt(element.attr("trindex"));
                     if (trindex <= 10) {
-                        reData.put(element.attr("keyName"), contractInfo.getContractNumber());
+                        reData.put(element.attr("keyName"), node.getPartitionCode()==null?"":node.getPartitionCode());
                     }
                 }
             }