中期计量

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/InterimPayCertificate.java

@@ -16,16 +16,26 @@
  */
 package org.springblade.meter.entity;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang.StringUtils;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.core.tool.utils.Func;
 
 /**
  * 中期支付证书实体类
@@ -109,6 +119,34 @@ public class InterimPayCertificate extends BaseEntity {
     @ApiModelProperty(value = "审批状态,0未上报，1待审批，2已审批")
     private Integer approveStatus;
 
+    /**
+     * 原始PDF地址
+     */
+    @ApiModelProperty(value = "原始PDF地址")
+    private String rawUrl;
+
+    /**
+     * 每份表格独立的PDF地址
+     */
+    @ApiModelProperty(value = "每份表格独立的PDF地址")
+    private String fileUrlList;
 
+    @TableField(exist = false)
+    private List<Map<String,String>> urlListData = new ArrayList<>();
+    public List<Map<String,String>> getUrlListData() {
+        if(fileUrlList!=null && StringUtils.isNotEmpty(fileUrlList)){
+            JSONObject data = JSONObject.parseObject(this.fileUrlList);
+            for(String key:data.keySet()){
+                Map<String,String> dataV=new HashMap<String,String>();
+                dataV.put("title",key);
+                dataV.put("url",data.getString(key));
+                urlListData.add(dataV);
+            }
+        }
+        return urlListData;
+    }
 
+    public void setUrlListData(List<Map<String,String>> urlListData) {
+        this.urlListData = urlListData;
+    }
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -43,10 +43,12 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.feign.ArchiveFileTaskClient;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.ContractRelationJlyz;
+import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.feign.FormulaClient;
 import org.springblade.manager.vo.ReportResult;
 import org.springblade.meter.dto.*;
 import org.springblade.meter.entity.*;
+import org.springblade.meter.mapper.MaterialStartStatementMapper;
 import org.springblade.meter.mapper.MiddleMeterApplyMapper;
 import org.springblade.meter.service.IMaterialStartStatementService;
 import org.springblade.meter.service.impl.*;
@@ -2773,7 +2775,7 @@ public class TaskController extends BladeController {
                 }
             },(v1,v2)->v1,LinkedHashMap::new));
             String upSql = "update "+REPORT_TYPE[this.type]+" set raw_url=?,file_url_list=? where id="+this.id;
-            jdbcTemplate.update(upSql,this.pdfUrl ,JSON.toJSONString(fileListMap));
+            jdbcTemplate.update(upSql,this.pdfUrl , JSON.toJSONString(fileListMap));
             return  this.pdfUrl;
         }
 

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/InterimPayCertificateMapper.xml

@@ -23,6 +23,8 @@
         <result column="print_date" property="printDate"/>
         <result column="calculate_date" property="calculateDate"/>
         <result column="pay_money" property="payMoney"/>
+        <result column="raw_url" property="rawUrl"/>
+        <result column="file_url_list" property="fileUrlList" />
     </resultMap>
     <select id="getById" resultType="org.springblade.meter.vo.InterimPayCertificateVO">
         select * from s_interim_pay_certificate