日志电签相关

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/TaskClient.java

@@ -27,7 +27,7 @@ public interface TaskClient {
     String QUERY_FORM_DATA_ID = API_PREFIX + "/query-form-data-id";
     String QUERY_BUSINESS_DATA_TASK = API_PREFIX + "/query-business-data-task";
     String QUERY_APPROVAL_USER = API_PREFIX + "/query-approval-user";
-    String QUERY_BUSINESS_TABLE_E_VISA_CONFIG = API_PREFIX + "/query-business-table-E_VISA_CONFIG";
+    String QUERY_BUSINESS_TABLE_E_VISA_CONFIG = API_PREFIX + "/query-business-table-e-visa-config";
 
     /**
      * 获取当前任务绑定的表格

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/ImageClassificationConfigClient.java

@@ -22,7 +22,7 @@ public interface ImageClassificationConfigClient {
      * @return 结果集
      */
     @GetMapping(API_PREFIX + "/queryClassificationConfigList")
-    List<ImageClassificationConfig> queryClassificationConfigList();
+    List<ImageClassificationConfig> queryClassificationConfigList(@RequestParam Integer classify);
 
     /**
      * 根据ID集获取分类

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

@@ -72,8 +72,8 @@ public class ContractLogController extends BladeController {
 	/**
 	 * 单个废除（填报页）
 	 */
-	@PostMapping("/oneAbolish")
-	@ApiOperationSupport(order = 9)
+	@GetMapping("/oneAbolish")
+	@ApiOperationSupport(order = 11)
 	@ApiOperation(value = " 单个废除（填报页）")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "contractId", value = "合同段ID", required = true),
@@ -94,7 +94,7 @@ public class ContractLogController extends BladeController {
 	 * 获取当前资料的任务状态
 	 */
 	@GetMapping("/checkTheLogTaskStatus")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "获取当前资料的任务状态")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "contractId", value = "合同段ID", required = true),

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

@@ -31,9 +31,11 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.IoUtil;
+import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.ExcelTab;
 import org.springblade.manager.entity.ImageClassificationConfig;
 import org.springblade.manager.entity.WbsTreeContract;
+import org.springblade.manager.feign.ContractClient;
 import org.springblade.manager.feign.ExcelTabClient;
 import org.springblade.manager.feign.ImageClassificationConfigClient;
 import org.springblade.manager.feign.WbsTreeContractClient;
@@ -96,6 +98,8 @@ public class ImageClassificationFileController extends BladeController {
 
 	private final RecycleBinClient recycleBinClient;
 
+	private final ContractClient contractClient;
+
 	/**
 	 * 批量下载
 	 */
@@ -347,7 +351,7 @@ public class ImageClassificationFileController extends BladeController {
 		//首先获取显隐
 		List<ImageClassificationShow> showClassifyIdList = this.imageClassificationShowService.queryShowClassify(projectId, contractId, null);
 		//获取当前系统配置的所有有效分类
-		List<ImageClassificationConfig> sysClassifyConfigList = this.imageClassificationConfigClient.queryClassificationConfigList();
+		List<ImageClassificationConfig> sysClassifyConfigList = this.imageClassificationConfigClient.queryClassificationConfigList(this.contractClient.getContractById(Long.parseLong(contractId)).getContractType());
 
 		if(sysClassifyConfigList == null || sysClassifyConfigList.size() == 0){
 			return R.data(-1, null, "不存在数据，请联系管理员或维护人员");
@@ -401,6 +405,7 @@ public class ImageClassificationFileController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "获取类型列表(类型主页)")
 	public R<List<ImageClassificationConfigVO>> getClassIfyList(@RequestParam String projectId, @RequestParam String contractId){
+
 		//获取当前项目下的类型显隐情况
 		List<ImageClassificationShow> allShowClassifyIdList = this.imageClassificationShowService.queryShowClassify(projectId, contractId, null);
 
@@ -408,7 +413,7 @@ public class ImageClassificationFileController extends BladeController {
 		List<ImageClassificationConfig> configList = new ArrayList<>();
 		if(allShowClassifyIdList == null || allShowClassifyIdList.size() == 0){
 			//说明没有控制显隐,全查
-			configList = this.imageClassificationConfigClient.queryClassificationConfigList();
+			configList = this.imageClassificationConfigClient.queryClassificationConfigList(this.contractClient.getContractById(Long.parseLong(contractId)).getContractType());
 		} else {
 			//获取分类ID集合
 			List<Long> classifyIds = new ArrayList<>();

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ContractLogClientImpl.java

@@ -12,12 +12,15 @@ import org.springblade.business.vo.SaveContractLogVO;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.manager.entity.WbsTreePrivate;
+import org.springblade.manager.feign.WbsTreeContractClient;
+import org.springblade.manager.feign.WbsTreePrivateClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
 @RestController
@@ -29,6 +32,8 @@ public class ContractLogClientImpl implements ContractLogClient {
 
     private final IContractLogWbsService contractLogWbsService;
 
+    private final WbsTreePrivateClient wbsTreePrivateClient;
+
     @Override
     public void removeContractLogWbsByTheLogId(String theLogId) {
         try{
@@ -104,12 +109,16 @@ public class ContractLogClientImpl implements ContractLogClient {
             this.contractLogService.update(Wrappers.<ContractLog>lambdaUpdate().set(ContractLog::getDataId, contractLog.getDataId()).eq(ContractLog::getId, logJson.getString("id")));
 
         } else {
+            //获取节点信息
+            WbsTreePrivate node =  this.wbsTreePrivateClient.queryByPKeyIds(Func.toStrList(saveContractLogVO.getWbsNodeId().toString())).get(0);
+
             //新增
             contractLog.setId(SnowFlakeUtil.getId());
             contractLog.setCreateTime(new Date());
             contractLog.setCreateUser(AuthUtil.getUserId());
             contractLog.setCreateUserName(AuthUtil.getUserName());
             contractLog.setStatus(0);
+            contractLog.setFileName(saveContractLogVO.getRecordTime() + " " + node.getNodeName());
 
             if(saveContractLogVO.getCorrelationIds() != null && saveContractLogVO.getCorrelationIds().size() > 0){
                 List<JSONObject> list = saveContractLogVO.getCorrelationIds();

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

@@ -8,14 +8,11 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.http.client.utils.DateUtils;
 import org.springblade.business.entity.*;
 import org.springblade.business.feign.TaskClient;
-import org.springblade.business.service.IFirstInformationService;
-import org.springblade.business.service.IInformationQueryFileService;
-import org.springblade.business.service.ITaskParallelService;
+import org.springblade.business.service.*;
 import org.springblade.business.utils.FileUtils;
 import org.springblade.business.vo.FileUserVO;
 import org.springblade.business.vo.InformationQueryVO;
 import org.springblade.business.mapper.InformationQueryMapper;
-import org.springblade.business.service.IInformationQueryService;
 import org.springblade.business.vo.QueryProcessDataVO;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.utils.SnowFlakeUtil;
@@ -24,6 +21,7 @@ import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.feign.WbsTreeContractClient;
 import org.springblade.manager.vo.WbsTreeContractTreeVOS;
@@ -61,21 +59,32 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
 
 	private final IInformationQueryFileService informationQueryFileService;
 
+	private final IContractLogService contractLogService;
+
 	@Override
 	public List<String> queryBusinessTableData(String formDataId) {
 		//获取具体业务数据
 		InformationQuery query = this.getById(formDataId);
 
 		//查询这个业务数据绑定的表格，需要区分监理和施工
-		WbsTreeContract tree = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(query.getWbsId());
-		List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(tree, "queryTable", String.valueOf(query.getClassify()));
-		if(tableList != null && tableList.size() > 0){
-			//删除掉无法溯源的数据
-			tableList.removeIf(node -> node.getIsTypePrivatePid() == null || node.getIsTypePrivatePid() <= 0 || StringUtils.isEmpty(node.getIsTypePrivatePid().toString()));
+		if(query != null){
+			WbsTreeContract tree = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(query.getWbsId());
+			List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(tree, "queryTable", String.valueOf(query.getClassify()));
+			if(tableList != null && tableList.size() > 0){
+				//删除掉无法溯源的数据
+				tableList.removeIf(node -> node.getIsTypePrivatePid() == null || node.getIsTypePrivatePid() <= 0 || StringUtils.isEmpty(node.getIsTypePrivatePid().toString()));
 
-			List<Long> privatePIdList = tableList.stream().map(WbsTreeContract::getIsTypePrivatePid).distinct().collect(Collectors.toList());
+				List<Long> privatePIdList = tableList.stream().map(WbsTreeContract::getIsTypePrivatePid).distinct().collect(Collectors.toList());
 
-			return JSONArray.parseArray(JSONObject.toJSONString(privatePIdList), String.class);
+				return JSONArray.parseArray(JSONObject.toJSONString(privatePIdList), String.class);
+			}
+		} else {
+			//那么就可能是日志，检查是不是日志
+			ContractLog log = this.contractLogService.getById(formDataId);
+			if(log != null){
+				//说明是日志，日志的绑定节点在wbs_tree_private表中，所以这个节点ID就是要找的ID
+				return Func.toStrList(String.valueOf(log.getWbsNodeId()));
+			}
 		}
 
 		return null;

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/ImageClassificationConfigClientImpl.java

@@ -1,5 +1,6 @@
 package org.springblade.manager.feign;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.manager.entity.ImageClassificationConfig;
 import org.springblade.manager.service.IImageClassificationConfigService;
@@ -19,7 +20,21 @@ public class ImageClassificationConfigClientImpl implements ImageClassificationC
     }
 
     @Override
-    public List<ImageClassificationConfig> queryClassificationConfigList() {
-        return this.imageClassificationConfigService.list();
+    public List<ImageClassificationConfig> queryClassificationConfigList(Integer classify) {
+        switch (classify){
+            case 1:
+                classify = 3;
+                break;
+            case 2:
+                classify = 2;
+                break;
+            case 3:
+                classify = 1;
+                break;
+            default:
+                break;
+        }
+
+        return this.imageClassificationConfigService.list(Wrappers.<ImageClassificationConfig>lambdaQuery().eq(ImageClassificationConfig::getAffiliatedParty, classify));
     }
 }