甬台温材料预付款，小计合计位置混乱

blade-service/blade-archive/src/main/java/org/springblade/archive/config/sqliteConfig.java

@@ -1,6 +1,8 @@
 package org.springblade.archive.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
+import org.springblade.archive.utils.FileUtils;
 import org.springframework.stereotype.Component;
 
 import javax.sql.DataSource;
@@ -12,10 +14,17 @@ import javax.sql.DataSource;
  **/
 @Component
 public class sqliteConfig {
+    private final FileDescriptorMetrics fileDescriptorMetrics;
+
+    public sqliteConfig(FileDescriptorMetrics fileDescriptorMetrics) {
+        this.fileDescriptorMetrics = fileDescriptorMetrics;
+    }
+
     public DataSource dataSource() {
         DruidDataSource ds = new DruidDataSource();
 //        ds.setUrl("jdbc:sqlite:D:\\BaiduNetdiskDownload\\bladeX后端开发手册\\data");
-        ds.setUrl("jdbc:sqlite:/Users/hongchuangyanfa/Desktop/localArchive/data");
+        String fileUrl = FileUtils.getSysLocalFileUrl();
+        ds.setUrl("jdbc:sqlite:"+fileUrl+"/localArchive/data");
       //  ds.setUrl("jdbc:sqlite:/www/wwwroot/Users/hongchuangyanfa/Desktop/localArchive/localClient/data");
         ds.setDriverClassName("org.sqlite.JDBC");
         return ds;

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

@@ -31,7 +31,7 @@
     </update>
 
     <select id="selectFixedFlowLink" resultMap="fixedFlowLinkResultMap">
-        select id, fixed_flow_link_user, fixed_flow_link_user_name
+        select id, fixed_flow_link_user, fixed_flow_link_user_name,fixed_flow_link_type
         from u_fixed_flow_link
         where is_deleted = 0
           and fixed_flow_id = #{fixedFlowId}

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/FixedFlowServiceImpl.java

@@ -62,6 +62,7 @@ public class FixedFlowServiceImpl extends BaseServiceImpl<FixedFlowMapper, Fixed
                 links.forEach(link -> linkJoin.append(",").append(link.getFixedFlowLinkUserName()));
                 //去掉第一个逗号
                 vos.setLinkUserJoinString(linkJoin.substring(1));
+                vos.setFixedFlowLinkList(links);
             }
         });
         //设置总数

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

@@ -929,7 +929,14 @@ public class ExecutorMeter extends FormulaExecutor {
                    xj.setAmount(v.stream().map(e->BaseUtils.str2BigDecimal(e.getAmount())).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString());
                    xj.setTotal(v.stream().map(e->BaseUtils.str2BigDecimal(e.getTotal())).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString());
                    /*materialSum=StringUtils.number2String(xj.getTotal(),0);*/
-                   tmp.add(xj);
+                    AtomicBoolean flag=new AtomicBoolean(false);
+                    if(rowSize%tmp.size()==0){
+                        int num=isLast.get()?2:1;
+                        for (int i = 0; i < rowSize-num; i++) {
+                            tmp.add(new MaterialsArrival());
+                        }
+                    }
+                    tmp.add(xj);
                    dataList.addAll(tmp);
                    if(isLast.get()){
                        /*最后一条*/
@@ -939,6 +946,11 @@ public class ExecutorMeter extends FormulaExecutor {
                        hj.setAmount(list.stream().map(e->BaseUtils.str2BigDecimal(e.getAmount())).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString());
                        hj.setTotal(list.stream().map(e->BaseUtils.str2BigDecimal(e.getTotal())).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString());
                        materialSum=StringUtils.number2String(hj.getTotal(),0);
+                       if(capacity%tmp.size()==0){
+                           for (int i = 0; i < capacity-1; i++) {
+                               dataList.add(new MaterialsArrival());
+                           }
+                       }
                        dataList.add(hj);
                    }
                });