计量相关/资料填报

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

@@ -0,0 +1,57 @@
+package org.springblade.manager.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+/**
+ * @author yangyj
+ * @Date 2024/4/18 15:22
+ * @description 扣回材料垫付款
+ */
+@Data
+public class MaterialWithheld {
+    public static final String ID="20300000000";
+    public static final String TBN="MtWi";
+    public static final String TBN_CH="扣回材料垫付款";
+    @JSONField(name = "key_1",label="年",ordinal = 1)
+    private String year;
+    @JSONField(name = "key_2",label="月",ordinal = 1)
+    private String month;
+    @JSONField(name = "key_3",label="到本期末累计预付合计",ordinal = 1)
+    private String curPeriodEndPaySum;
+    @JSONField(name = "key_4",label="到本期末累计预付材料款",ordinal = 1)
+    private String curPeriodEndPayMt;
+    @JSONField(name = "key_5",label="到本期末累计预付设备款",ordinal = 1)
+    private String curPeriodEndPayEi;
+
+    @JSONField(name = "key_6",label="本期预付合计",ordinal = 1)
+    private String curPeriodPaySum;
+    @JSONField(name = "key_7",label="本期预付材料款",ordinal = 1)
+    private String curPeriodPayMt;
+    @JSONField(name = "key_8",label="本期预付设备款",ordinal = 1)
+    private String curPeriodPayEi;
+
+    @JSONField(name = "key_6",label="到本期末回扣款合计",ordinal = 1)
+    private String curPeriodEndBackSum;
+    @JSONField(name = "key_7",label="到本期末回扣材料款",ordinal = 1)
+    private String curPeriodEndBackMt;
+    @JSONField(name = "key_8",label="到本期末回扣设备款",ordinal = 1)
+    private String curPeriodEndBackEi;
+
+    @JSONField(name = "key_9",label="到上期末回扣款合计",ordinal = 1)
+    private String prePeriodEndBackSum;
+    @JSONField(name = "key_10",label="到上期末回扣材料款",ordinal = 1)
+    private String prePeriodEndBackMt;
+    @JSONField(name = "key_11",label="到上期末回扣设备款",ordinal = 1)
+    private String prePeriodEndBackEi;
+
+    @JSONField(name = "key_12",label="本期回扣款合计",ordinal = 1)
+    private String curPeriodBackSum;
+    @JSONField(name = "key_13",label="本期回扣材料款",ordinal = 1)
+    private String curPeriodBackMt;
+    @JSONField(name = "key_14",label="本期期回扣设备款",ordinal = 1)
+    private String curPeriodBackEi;
+    @JSONField(name = "key_15",label="页码",ordinal = 101)
+    /**第n页 共m页*/
+    private String pageCount;
+}

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

@@ -0,0 +1,12 @@
+package org.springblade.manager.vo;
+
+import lombok.Data;
+
+/**
+ * @author yangyj
+ * @Date 2024/4/18 16:26
+ * @description 计量期关联材料预付款信息表
+ */
+@Data
+public class PeriodMaterial {
+}

blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

@@ -297,7 +297,7 @@ public class FormulaUtils {
                                      }
                                  });
                             }else{
-                                fd.getValues().get(0).setValue(values.stream().map(StringUtils::handleNull).collect(Collectors.joining("、")));
+                                fd.getValues().get(0).setValue(values.stream().filter(StringUtils::isNotEmpty).map(StringUtils::handleNull).collect(Collectors.joining("、")));
                             }
                         }
                     }else{

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

@@ -78,7 +78,6 @@ public class ExecutorInit extends FormulaExecutor {
         LinkedHashMap<String, FormData> periodMap=  FormulaUtils.toFormDataMap(tec.periodInfo);
         tec.getRepeatKeys().addAll(periodMap.keySet());
         tec.formDataMap.putAll(periodMap);
-
     }
 
     /*预处理计量单元树*/

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

@@ -428,6 +428,24 @@ public class ExecutorMeter extends FormulaExecutor {
 
     }
 
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public  class MaterialWithheldSp extends   BaseSpecial<MaterialWithheld> implements Special{
+
+        @Override
+        public boolean ready() {
+            return true;
+        }
+
+        @Override
+        public void parse() {
+            builderFormDatas(MaterialWithheld.class);
+            if(dataList.size()>0){
+                putOut();
+            }
+        }
+    }
+
 
     @Data
     @EqualsAndHashCode(callSuper = true)

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

@@ -10,26 +10,13 @@ import com.itextpdf.text.pdf.PdfCopy;
 import com.itextpdf.text.pdf.PdfReader;
 import com.spire.xls.*;
 import com.spire.xls.CellRange;
-import com.spire.xls.collections.CommentsCollection;
-import com.spire.xls.core.INamedRange;
 import com.spire.xls.core.spreadsheet.HTMLOptions;
 import com.sun.image.codec.jpeg.JPEGCodec;
 import com.sun.image.codec.jpeg.JPEGImageEncoder;
 import org.apache.commons.lang.StringUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.apache.pdfbox.text.PDFTextStripperByArea;
-import org.apache.pdfbox.text.TextPosition;
 import org.apache.poi.hssf.usermodel.HSSFPrintSetup;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.IOUtils;
 import org.apache.poi.util.Units;
 import org.apache.poi.xssf.usermodel.XSSFPrintSetup;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -42,19 +29,13 @@ import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.common.utils.SystemUtils;
 import org.springblade.common.vo.DataVO;
-import org.springblade.core.tool.api.ResultCode;
 import org.springblade.core.tool.utils.*;
 import org.springblade.system.cache.ParamCache;
-
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
-import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.*;
-import java.net.URL;
 import java.net.URLEncoder;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.zip.ZipEntry;