Merge branch 'zhuwei' into test-merge

blade-common/pom.xml

@@ -77,11 +77,11 @@
         </dependency>
 
         <!-- 使用OkHttp -->
-        <dependency>
+   <!--     <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
             <version>4.9.3</version>
-        </dependency>
+        </dependency>-->
 
         <!-- 使用Gson进行JSON处理 -->
         <dependency>

blade-common/src/main/java/org/springblade/common/utils/DeepSeekClient.java

@@ -1,3 +1,4 @@
+/*
 
 package org.springblade.common.utils;
 import com.google.gson.Gson;
@@ -33,9 +34,11 @@ public class DeepSeekClient {
                 .build();
     }
 
+*/
 /**
      * 请求 DeepSeek API
-     */
+     *//*
+
 
     public String callDeepSeek(String prompt) throws IOException {
         DeepSeekRequest request = new DeepSeekRequest(prompt, "deepseek-chat");
@@ -62,9 +65,11 @@ public class DeepSeekClient {
     }
 
 
+*/
 /**
      * 解析响应获取结果
-     */
+     *//*
+
 
     public String analysisResponse(String responseJson) {
         try {
@@ -92,9 +97,11 @@ public class DeepSeekClient {
     }
 
 
+*/
 /**
      * 直接获取精简后的内容
-     */
+     *//*
+
 
     public String getSimplifiedContent(String prompt) {
         try {
@@ -242,3 +249,4 @@ public class DeepSeekClient {
         }
     }
 }
+*/

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/TaskSplit.java

@@ -71,4 +71,10 @@ public class TaskSplit extends BaseEntity {
 
 	@ApiModelProperty("分解任务名称")
 	private String taskName;
+
+	/**
+	 * 分解类型
+	 */
+	@ApiModelProperty("1:案卷分解 2 :仓库扫描 ")
+	private Integer dataType;
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/TaskSplitMapper.java

@@ -46,6 +46,8 @@ public interface TaskSplitMapper extends BaseMapper<TaskSplit> {
 	// 获取分解任务是否存在
 	Integer getSpliteTaskCount(String contractId);
 
+	Integer getSpliteTaskCountByScan(String contractId);
+
 	Integer updateArchiveByContratId(String contractId);
 
 	Integer updateArchiveByIds(@Param("split") List<String> split);

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/TaskSplitMapper.xml

@@ -33,6 +33,11 @@
     <select id="getSpliteTaskCount" resultType="java.lang.Integer">
         select count(1) from u_task_split where contract_id = #{contractId} and type=2
     </select>
+
+    <select id="getSpliteTaskCountByScan" resultType="java.lang.Integer">
+        select count(1) from scan_file where contract_id = #{contractId}
+    </select>
+
     <update id="updateArchiveByContratId" >
         update u_archives_auto set split_status = 0 where contract_id = #{contractId} and is_deleted = 0
     </update>

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/TaskSplitServiceImpl.java

@@ -62,6 +62,12 @@ public class TaskSplitServiceImpl extends BaseServiceImpl<TaskSplitMapper, TaskS
 		Map<String,Object> data = new HashMap<>();
 		String contractId = taskSplit.getContractId();
 		String splitIds = taskSplit.getIds();
+		int dataType = taskSplit.getDataType();
+
+		if(dataType!=2){
+			taskSplit.setDataType(1);
+		}
+
 		if (contractId=="" || contractId==null || contractId.length()==0 || Func.isEmpty(contractId)){
 			return R.fail("合同段Id为空");
 		}
@@ -69,7 +75,16 @@ public class TaskSplitServiceImpl extends BaseServiceImpl<TaskSplitMapper, TaskS
 		if (splitIds=="" || splitIds==null || splitIds.length()==0 || Func.isEmpty(splitIds)){ // 代表整个合同解析
 			taskSplit.setType(2);
 			// 查询整个合同段下的所有文件
-			Integer spliteTaskCount =baseMapper.getSpliteTaskCount(contractId);
+
+			Integer spliteTaskCount = 0;
+			if(dataType==2){ //
+				spliteTaskCount = baseMapper.getSpliteTaskCountByScan(contractId);
+			}else {
+				spliteTaskCount = baseMapper.getSpliteTaskCount(contractId);
+			}
+
+
+
 			if(spliteTaskCount>=1){
 				return R.fail("该合同已经添加任务，无需重复操作");
 			}

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

@@ -1347,6 +1347,7 @@ public class ExecutorMeter extends FormulaExecutor {
                                      if(preSubTotal!=null) {
                                          rebateIncentiveAdvPay.setCurrentPay(subtractFc.apply(dyTotalAmount, preSubTotal.getCurrentPeriodEndPay()));
                                      }
+                                     // 计量支付扣回开工预付款
                                      rebateIncentiveAdvPay.setRetained(rebateIncentiveAdvPay.getCurrentPay());
                                  } else {
                                      rebateIncentiveAdvPay.calc(baseInfo.getContractAmount().toPlainString(), dyTotalAmount,preSubTotal.getCurrentPeriodEndPay());

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

@@ -39,7 +39,10 @@ import org.springblade.meter.entity.InterimPayCertificate;
 import org.springblade.meter.service.IInterimPayCertificateService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 中期支付证书 控制器
@@ -226,4 +229,29 @@ public class InterimPayCertificateController extends BladeController {
 	}
 
 
+	@GetMapping("/getbigDataInfo")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "查看报表", notes = "传入计量期id，返回报表URL")
+	public R getbigDataInfo(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
+
+		if(id!=null&&!id.equals("")){
+			InterimPayCertificate payCertificate = interimPayCertificateService.getById(id);
+			if(payCertificate!=null && payCertificate.getPagePdfUrl()!=null){
+				String dataUrl = payCertificate.getPagePdfUrl();
+				List<String> strList = Func.toStrList(dataUrl);
+				List<Map<String,String>> data = new ArrayList<>();
+				for (int i=0;i<strList.size();i++) {
+					Map<String,String> map = new HashMap<>();
+					map.put("title","第"+(i+1)+"页");
+					map.put("url",strList.get(i));
+					data.add(map);
+				}
+				return R.data(data);
+			}else{
+				return R.fail("没有查到任何数据");
+			}
+		}else {
+			return R.fail("id不能为空");
+		}
+	}
 }