内业台账调整、BUG

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/NeiYeLedgerVO.java

@@ -18,12 +18,24 @@ public class NeiYeLedgerVO {
     @ApiModelProperty(value = "分部工程")
     private String partProject;
 
+    /**
+     * 子分部工程
+     */
+    @ApiModelProperty(value = "子分部工程")
+    private String partChildProject;
+
     /**
      * 分项工程
      */
     @ApiModelProperty(value = "分项工程")
     private String subentryProject;
 
+    /**
+     * 子分项工程
+     */
+    @ApiModelProperty(value = "子分项工程")
+    private String subentryChildProject;
+
     /**
      * 工序
      */
@@ -71,13 +83,15 @@ public class NeiYeLedgerVO {
     public NeiYeLedgerVO(String... values){
         this.unitProject = values[0];
         this.partProject = values[1];
-        this.subentryProject = values[2];
-        this.process = values[3];
-        this.siteStartToEndTime = values[4];
-        this.detectionStartToEndTime = values[5];
-        this.taskStatus = values[6];
-        this.isEvaluate = Boolean.parseBoolean(values[7]);
-        this.isExperiment = Boolean.parseBoolean(values[8]);
+        this.partChildProject = values[2];
+        this.subentryProject = values[3];
+        this.subentryChildProject = values[4];
+        this.process = values[5];
+        this.siteStartToEndTime = values[6];
+        this.detectionStartToEndTime = values[7];
+        this.taskStatus = values[8];
+        this.isEvaluate = Boolean.parseBoolean(values[9]);
+        this.isExperiment = Boolean.parseBoolean(values[10]);
     }
 
     public NeiYeLedgerVO(){}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/NeiYeQueryVO.java

@@ -3,6 +3,8 @@ package org.springblade.business.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class NeiYeQueryVO {
 
@@ -33,4 +35,6 @@ public class NeiYeQueryVO {
     @ApiModelProperty(value = "项目ID")
     private String contractId;
 
+    private List<String> wbsIds;
+
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/QueryProcessDataVO.java

@@ -7,8 +7,12 @@ public class QueryProcessDataVO {
 
     private String ancestors;
 
+    private String parentId;
+
     private String primaryKeyId;
 
+    private String title;
+
     private String treeId;
 
     private String informationQueryId;

blade-service-api/blade-e-visa-api/src/main/java/org/springblade/evisa/feign/EVisaClient.java

@@ -1,6 +1,7 @@
 package org.springblade.evisa.feign;
 
 import org.springblade.common.constant.EVisaConstant;
+import org.springblade.evisa.vo.CertBeanVO;
 import org.springblade.evisa.vo.EVisaMakeSealVO;
 import org.springblade.evisa.vo.EVisaTaskApprovalVO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -8,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @FeignClient(value = EVisaConstant.APPLICATION_WEATHER_NAME)
 public interface EVisaClient {
 
@@ -38,6 +41,6 @@ public interface EVisaClient {
      * 在线验签
      */
     @PostMapping(API_PREFIX + "/onlineCheckSeal")
-    String onlineCheckSeal(@RequestParam String pdfUrl);
+    CertBeanVO onlineCheckSeal(@RequestParam String pdfUrl);
 
 }

blade-service-api/blade-e-visa-api/src/main/java/org/springblade/evisa/vo/CertBeanVO.java

@@ -0,0 +1,19 @@
+package org.springblade.evisa.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CertBeanVO {
+    private String serialNo = "";
+    private String dn = "";
+    private String issuerDn = "";
+    private String notBefore = "";
+    private String notAfter = "";
+
+    private String pdfUrl;
+
+    private List<CertBeanVO> certBeanVOList;
+
+}

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

@@ -46,9 +46,19 @@ public class TreeNodeVO extends BaseNode<TreeNode> {
 
     private String oldId;
 
+    private Integer majorDataType;
+
     public TreeNodeVO() {
     }
 
+    public Integer getMajorDataType() {
+        return majorDataType;
+    }
+
+    public void setMajorDataType(Integer majorDataType) {
+        this.majorDataType = majorDataType;
+    }
+
     public String getAncestors() {
         return ancestors;
     }

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

@@ -38,7 +38,7 @@ public class WbsTreeContractTreeVOS {
     private Boolean leaf;
 
     @ApiModelProperty("是否有下级")
-    private Boolean exsitChild;
+    private Boolean notExsitChild;
 
     @ApiModelProperty("节点类型")
     private Integer deptCategory;
@@ -70,4 +70,6 @@ public class WbsTreeContractTreeVOS {
     @ApiModelProperty("未填报1 、已填报-未上报2 、已填报-待审批3 、已审批4")
     private Integer colorStatus;
 
+    private Integer majorDataType;
+
 }

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

@@ -48,6 +48,16 @@ public class ContractLogController extends BladeController {
 
 	private final OperationLogClient operationLogClient;
 
+	/**
+	 * 获取合同段当前日志节点下的填报日期记录
+	 */
+	@PostMapping("/getSubmitLogDateList")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "获取合同段当前日志节点下的填报日期记录")
+	public R<List<String>> getSubmitLogDateList(@RequestParam String contractId, @RequestParam String primaryKeyId){
+		return R.data(this.contractLogService.getSubmitLogDateList(contractId, primaryKeyId));
+	}
+
 	/**
 	 * 批量废除
 	 */

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

@@ -18,6 +18,7 @@ package org.springblade.business.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.*;
@@ -36,6 +37,7 @@ import org.springblade.business.feignClient.ClientTreePublicCodeClientImpl;
 import org.springblade.business.service.IConstructionLedgerService;
 import org.springblade.business.service.IContractTreeDrawingsService;
 import org.springblade.business.service.ITreeContractFirstService;
+import org.springblade.business.utils.FileUtils;
 import org.springblade.business.vo.*;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.mp.support.Condition;
@@ -43,6 +45,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.evisa.feign.EVisaClient;
+import org.springblade.evisa.vo.CertBeanVO;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.entity.WbsTreePrivate;
@@ -95,6 +99,8 @@ public class InformationWriteQueryController extends BladeController {
 
 	private final OperationLogClient operationLogClient;
 
+	private final EVisaClient eVisaClient;
+
 	/**
 	 * 单个废除
 	 */
@@ -137,18 +143,20 @@ public class InformationWriteQueryController extends BladeController {
 				default:
 					//如果不匹配，默认为未填报
 					status = "1";
+					//查询表格
+					List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId), "queryTable");
+					if(tableList != null && tableList.size() > 0){
+						for(WbsTreeContract table : tableList){
+							if(new Integer("2").equals(table.getIsTabPdf())){
+								//这些表格中，但凡有一个能够预览，就开放预览
+								status = "2";
+								break;
+							}
+						}
+					}
 					break;
 			}
 		}
-		//查询表格
-		List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId), "queryTable");
-		if(tableList != null && tableList.size() > 0 && "1".equals(status)){
-			for(WbsTreeContract table : tableList){
-//				if(table){
-//
-//				}
-			}
-		}
 
 		return R.data(status);
 	}
@@ -168,7 +176,6 @@ public class InformationWriteQueryController extends BladeController {
 			startTaskVO.setIds(businessData.getId().toString());
 			return this.batchTask(startTaskVO);
 		}
-
 		return R.data(300,false,"上报失败");
 	}
 
@@ -188,8 +195,16 @@ public class InformationWriteQueryController extends BladeController {
     @PostMapping("/onlineVerify")
     @ApiOperationSupport(order = 21)
     @ApiOperation(value = "在线验签")
-    public R<Boolean> onlineVerify(@RequestParam String ids) {
-        return R.data(false);
+    public R<CertBeanVO> onlineVerify(@RequestParam String ids) {
+    	//查询业务数据
+		InformationQuery query = this.informationQueryService.getById(ids);
+    	if(query != null && (StringUtils.isNotEmpty(query.getEVisaPdfUrl()) || StringUtils.isNotEmpty(query.getPdfUrl()))){
+			CertBeanVO reVO = this.eVisaClient.onlineCheckSeal(StringUtils.isNotEmpty(query.getEVisaPdfUrl()) ? query.getEVisaPdfUrl() : query.getPdfUrl());
+			if(reVO != null){
+				return R.data(reVO, reVO.getCertBeanVOList().size() > 0 ? "校验成功" : "未找到签字信息");
+			}
+		}
+        return R.data(300, null, "校验失败");
     }
 
     /**
@@ -209,7 +224,18 @@ public class InformationWriteQueryController extends BladeController {
     @ApiOperationSupport(order = 19)
     @ApiOperation(value = "批量下载")
     public void batchDownloadFileToZip(String ids, HttpServletResponse response) {
-
+    	if(StringUtils.isNotEmpty(ids)){
+    		//获取文件
+			List<InformationQuery> result = this.informationQueryService.list(Wrappers.<InformationQuery>lambdaQuery().in(InformationQuery::getId, Arrays.asList(ids.split(","))));
+			if(result != null && result.size() > 0){
+				List<String> urls = new ArrayList<>();
+				result.forEach(query -> urls.add(StringUtils.isNotEmpty(query.getEVisaPdfUrl()) ? query.getEVisaPdfUrl() : query.getPdfUrl()));
+				//删除空数据
+				urls.removeIf(StringUtils::isNotEmpty);
+				//打包下载
+				FileUtils.batchDownloadFileToZip(urls, response);
+			}
+		}
 	}
 
 	/**
@@ -230,19 +256,24 @@ public class InformationWriteQueryController extends BladeController {
 						this.taskClient.abolishTask(task);
 					} else if(new Integer("2").equals(task.getStatus())) {
 						//已审批的任务，修改业务数据的审批状态为未上报并撤签即可
-						this.informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getStatus, 0).in(InformationQuery::getId, Arrays.asList(task.getFormDataId().split(","))));
-						// todo ================== 调用撤签
-						// todo ================== 调用撤签
+						LambdaUpdateWrapper<InformationQuery> wrapper = Wrappers.lambdaUpdate();
+						//更改状态为未上报
+						wrapper.set(InformationQuery::getStatus, 0);
+						//将电签的pdf路径置空
+						wrapper.set(InformationQuery::getEVisaPdfUrl, null);
+
+						this.informationQueryService.update(wrapper.in(InformationQuery::getId, Arrays.asList(task.getFormDataId().split(","))));
 					}
 					//保存操作记录
 					this.operationLogClient.saveUserOperationLog(6, "资料管理", "工序资料", task.getFormDataId());
 				}
+				return R.data(true, "废除成功");
 			}catch (Exception e){
 				e.printStackTrace();
 				return R.data(300, false, "废除失败");
 			}
 		}
-		return R.data(true, "废除成功");
+		return R.data(300, false, "废除失败");
 	}
 
 	/**
@@ -1020,6 +1051,22 @@ public class InformationWriteQueryController extends BladeController {
 		ContractInfo contract = this.contractClient.getContractById(vo.getContractId());
 		vo.setClassify(contract.getContractType() == null ? 1 : contract.getContractType());
 
+		//获取所有
+		List<String> submitNodeKeyIds = new ArrayList<>();
+		//防止遗漏，将当前节点设置进集合中
+		submitNodeKeyIds.add(vo.getWbsId().toString());
+		//查询当前节点下的所有填报节点
+		WbsTreeContract node = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(vo.getWbsId());
+		if(!new Integer("6").equals(node.getDeptCategory()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
+			//不是工序，则查询当前节点下的所有填报节点
+			List<QueryProcessDataVO> queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(node.getId().toString(), 1, vo.getContractId().toString());
+			if(queryDataResult != null && queryDataResult.size() > 0){
+				submitNodeKeyIds.addAll(queryDataResult.stream().map(QueryProcessDataVO::getPrimaryKeyId).distinct().collect(Collectors.toList()));
+			}
+		}
+		//设置进集合中
+		vo.setWbsIds(submitNodeKeyIds);
+
 		return R.data(this.informationQueryService.selectInformationQueryPage(Condition.getPage(query), vo));
 	}
 

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

@@ -3,6 +3,7 @@ package org.springblade.business.controller;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -12,17 +13,22 @@ import lombok.AllArgsConstructor;
 import org.springblade.business.entity.ConstructionLedger;
 import org.springblade.business.feignClient.ClientTreePublicCodeClientImpl;
 import org.springblade.business.service.IConstructionLedgerService;
+import org.springblade.business.service.IInformationQueryService;
 import org.springblade.business.vo.NeiYeLedgerVO;
 import org.springblade.business.vo.NeiYeQueryVO;
+import org.springblade.business.vo.QueryProcessDataVO;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
+import org.springblade.manager.entity.WbsTreeContract;
+import org.springblade.manager.feign.ContractClient;
 import org.springblade.manager.feign.WbsTreeContractClient;
 import org.springblade.manager.vo.WbsTreeContractTreeVOS;
 import org.springframework.web.bind.annotation.*;
 import org.springblade.core.mp.support.Query;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @AllArgsConstructor
@@ -36,6 +42,10 @@ public class NeiYeController {
 
     private final ClientTreePublicCodeClientImpl clientTreePublicCodeClient;
 
+    private final IInformationQueryService informationQueryService;
+
+    private final ContractClient contractClient;
+
     /**
      * 获取内业台账列表
      * @return 内业台账列表
@@ -44,104 +54,85 @@ public class NeiYeController {
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取内业台账列表")
     public R<IPage<NeiYeLedgerVO>> queryCurrentNodeNeiYeLedger(@RequestBody NeiYeQueryVO queryVO){
-        //获取当前合同段所有划分情况
-        List<WbsTreeContractTreeVOS> contractNodeLIst = this.wbsTreeContractClient.queryContractWbsTreeAll(queryVO.getContractId(), 1, "");
-        //形成Map
-        Map<String,WbsTreeContractTreeVOS> vosMap = new HashMap<>();
-        Map<String,String> vosParentMap = new HashMap<>();
-        contractNodeLIst.forEach(vo -> {
-            vosMap.put(vo.getId(), vo);
-            if(vosParentMap.containsKey(vo.getParentId())){
-                //存在，获取拼接
-                vosParentMap.put(vo.getParentId(), vosParentMap.get(vo.getParentId()) + "," + vo.getId());
-            } else {
-                //不存在，新建
-                vosParentMap.put(vo.getParentId(), vo.getId());
-            }
-        });
-
-        //根据parentId获取其下所有子节点
-        String clientId = queryVO.getParentId();
-        clientId = this.getAllClientId(queryVO.getParentId(), clientId, vosParentMap);
-
-        //结果数据
-        List<NeiYeLedgerVO> result = new ArrayList<>();
-        //循环节点集合,找到工序节点
-        for(WbsTreeContractTreeVOS vos : contractNodeLIst){
-            if(new Integer("6").equals(vos.getType())){
-                if(clientId != null && !clientId.contains(vos.getId())){
-                    continue;
-                }
-
-                //工序节点,递归获取父节点信息
-                Map<String,String> map = new HashMap<>();
-                this.foreachGetParent(map, vosMap, vos.getParentId());
-
-                //目前先查询名称(暂时这么处理)
-                if(StringUtils.isNotEmpty(queryVO.getQueryStr()) && !(map.get("unitProject").contains(queryVO.getQueryStr()) || map.get("partProject").contains(queryVO.getQueryStr()) || map.get("subentryProject").contains(queryVO.getQueryStr()) || vos.getTitle().contains(queryVO.getQueryStr()))){
-                    //不符合查询条件，跳过
-                    continue;
-                }
-
-                //获取当前工序的施工台账信息
-                Map<String,Object> queryMap = new HashMap<>();
-                queryMap.put("wbs_id",vos.getPrimaryKeyId());
-                List<ConstructionLedger> ledgers = this.constructionLedgerService.listByMap(queryMap);
-                if(ledgers != null && ledgers.size() > 0){
-                    ConstructionLedger ledger = ledgers.get(0);
-                    if(ledger.getSiteStartTime() != null && ledger.getSiteEndTime() != null){
-                        //获取施工起止时间
-                        map.put("siteStartToEndTime", DateUtil.format(ledger.getSiteStartTime(), "yyyy-MM-dd") + " ~ " + DateUtil.format(ledger.getSiteEndTime(), "yyyy-MM-dd"));
-                    }
-                    if(ledger.getDetectionStartTime() != null && ledger.getDetectionEndTime() != null){
-                        //获取检测起止时间
-                        map.put("detectionStartToEndTime", DateUtil.format(ledger.getDetectionStartTime(), "yyyy-MM-dd") + " ~ " + DateUtil.format(ledger.getDetectionEndTime(), "yyyy-MM-dd"));
+        if(queryVO.getWbsIds() != null && queryVO.getWbsIds().size() > 0){
+            //生成列表
+            List<NeiYeLedgerVO> neiYeLedgerVOList = new ArrayList<>();
+
+            //获取当前合同段所有划分情况
+            List<WbsTreeContractTreeVOS> contractNodeLIst = this.wbsTreeContractClient.queryContractWbsTreeAll(queryVO.getContractId(), 1, "");
+            //设置map
+            Map<String, WbsTreeContractTreeVOS> idToNodeMap = new HashMap<>();
+            contractNodeLIst.forEach(vos -> idToNodeMap.put(vos.getId(), vos));
+
+            //根据点击的节点获取这个节点下所有填报节点
+            WbsTreeContract node = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(queryVO.getWbsIds().get(0));
+
+            if(!new Integer("6").equals(node.getDeptCategory()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
+                //不是工序，则查询当前节点下的所有填报节点
+                List<QueryProcessDataVO> queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(node.getId().toString(), 1, queryVO.getContractId());
+                if(queryDataResult != null && queryDataResult.size() > 0){
+                    //删除非工序节点
+                    queryDataResult.removeIf(vo -> !new Integer("4").equals(vo.getMajorDataType()));
+
+                    //分组
+                    List<List<QueryProcessDataVO>> groupList = CommonUtil.getBatchSize(queryDataResult, queryVO.getSize());
+                    List<QueryProcessDataVO> groupQueryList = groupList.get(queryVO.getCurrent() == 0 ? 0 : queryVO.getCurrent() - 1);
+
+                    //获取所有施工日志记录
+                    List<String> primaryKeyIds = groupQueryList.stream().map(QueryProcessDataVO::getPrimaryKeyId).distinct().collect(Collectors.toList());
+                    List<ConstructionLedger> ledgers = this.constructionLedgerService.list(Wrappers.<ConstructionLedger>lambdaQuery().in(ConstructionLedger::getWbsId, primaryKeyIds));
+
+                    for(QueryProcessDataVO vo : groupQueryList){
+                        //处理父节点信息
+                        Map<String, String> map = new HashMap<>();
+                        this.foreachGetParent(map, idToNodeMap, vo.getParentId(), queryVO.getContractId());
+
+                        //获取当前工序的施工台账信息
+                        if(ledgers != null && ledgers.size() > 0){
+                            Iterator<ConstructionLedger> iterator = ledgers.iterator();
+                            while (iterator.hasNext()){
+                                ConstructionLedger ledger = iterator.next();
+                                if(vo.getPrimaryKeyId().equals(ledger.getWbsId().toString())){
+                                    if(ledger.getSiteStartTime() != null && ledger.getSiteEndTime() != null){
+                                        //获取施工起止时间
+                                        map.put("siteStartToEndTime", DateUtil.format(ledger.getSiteStartTime(), "yyyy-MM-dd") + " ~ " + DateUtil.format(ledger.getSiteEndTime(), "yyyy-MM-dd"));
+                                    }
+                                    if(ledger.getDetectionStartTime() != null && ledger.getDetectionEndTime() != null){
+                                        //获取检测起止时间
+                                        map.put("detectionStartToEndTime", DateUtil.format(ledger.getDetectionStartTime(), "yyyy-MM-dd") + " ~ " + DateUtil.format(ledger.getDetectionEndTime(), "yyyy-MM-dd"));
+                                    }
+                                    iterator.remove();
+                                    break;
+                                }
+                            }
+                        }
+                        //todo 当前缺少流程状态、是否关联评定、是否关联试验 =================================
+                        //新增列表数据
+                        neiYeLedgerVOList.add(new NeiYeLedgerVO(map.get("unitProject"),
+                                map.get("partProject"),
+                                map.get("partChildProject"),
+                                map.get("subentryProject"),
+                                map.get("subentryChildProject"),
+                                vo.getTitle(),
+                                map.get("siteStartToEndTime"),
+                                map.get("detectionStartToEndTime"),
+                                new Integer("1").equals(vo.getStatus()) ? "待审批" : new Integer("2").equals(vo.getStatus()) ? "已审批" : "未上报",
+                                "false",
+                                "false"));
                     }
+                    //转换为page信息
+                    Query query = new Query();
+                    query.setCurrent(queryVO.getCurrent());
+                    query.setSize(queryVO.getSize());
+                    IPage<NeiYeLedgerVO> page = Condition.getPage(query);
+                    page.setTotal(queryDataResult.size());
+                    page.setRecords(neiYeLedgerVOList);
+                    return R.data(page);
                 }
-                //todo 当前缺少流程状态、是否关联评定、是否关联试验 =================================
-                //新增列表数据
-                result.add(new NeiYeLedgerVO(map.get("unitProject"), map.get("partProject"), map.get("subentryProject"), vos.getTitle(), map.get("siteStartToEndTime"), map.get("detectionStartToEndTime"), "1", "false", "false"));
             }
         }
-        //根据query的分页信息分组
-        if(result.size() != 0){
-            List<List<NeiYeLedgerVO>> groupList = CommonUtil.getBatchSize(result, queryVO.getSize());
-
-            //转换为page信息
-            Query query = new Query();
-            query.setCurrent(queryVO.getCurrent());
-            query.setSize(queryVO.getSize());
-            IPage<NeiYeLedgerVO> page = Condition.getPage(query);
-            page.setTotal(result.size());
-            page.setRecords(groupList.get(queryVO.getCurrent() == 0 ? 0 : queryVO.getCurrent() - 1));
-            return R.data(page);
-        }
 
-        return R.data(null);
-    }
-
-
-
-    /**
-     * 获取指定节点下的所有子节点
-     * @param parentId 父节点
-     * @param clientId 子节点ID串
-     * @param vosParentMap 数据map
-     * @return clientId
-     */
-    private String getAllClientId(String parentId, String clientId, Map<String,String> vosParentMap){
-        if(vosParentMap.containsKey(parentId)){
-            //获取其下所有子节点
-            String clientIds = vosParentMap.get(parentId);
-            if(StringUtils.isNotEmpty(clientIds)){
-                String[] clientIdArray = clientIds.split(",");
-                for(String id : clientIdArray){
-                    clientId = this.getAllClientId(id, clientId, vosParentMap);
-                }
-                clientId += "," + clientIds;
-            }
-        }
-        return clientId;
+        return R.data(300, null, "未查询到数据");
     }
 
     /**
@@ -150,33 +141,32 @@ public class NeiYeController {
      * @param vosMap 所有节点信息
      * @param parentId 父节点
      */
-    private void foreachGetParent(Map<String,String> resultMap, Map<String,WbsTreeContractTreeVOS> vosMap, String parentId){
+    private void foreachGetParent(Map<String,String> resultMap, Map<String,WbsTreeContractTreeVOS> vosMap, String parentId, String contractId){
         if(vosMap.containsKey(parentId) || !"0".equals(parentId.trim())){
             //存在父节点信息，获取
             WbsTreeContractTreeVOS vos = vosMap.get(parentId);
-            if(new Integer("1").equals(vos.getType())){
+            if(new Integer("1").equals(vos.getDeptCategory())){
                 //类型属于1则为单位工程
-                resultMap.put("unitProject", vos.getTitle());
-            } else if(Arrays.asList("2,3".split(",")).contains(String.valueOf(vos.getType()))){
-                //类型属于2和3则为分部工程和子分部工程
-                if(resultMap.containsKey("partProject")){
-                    //存在
-                    resultMap.put("partProject", vos.getTitle() + "/" + resultMap.get("partProject"));
-                } else {
-                    //不存在
-                    resultMap.put("partProject", vos.getTitle());
-                }
-            } else if(Arrays.asList("4,5".split(",")).contains(String.valueOf(vos.getType()))){
-                //类型属于2和3则为分项工程和子分项工程
-                if(resultMap.containsKey("subentryProject")){
-                    //存在
-                    resultMap.put("subentryProject", vos.getTitle() + "/" + resultMap.get("subentryProject"));
-                } else {
-                    //不存在
-                    resultMap.put("subentryProject", vos.getTitle());
-                }
+                resultMap.put("unitProject", this.contractClient.getContractById(Long.parseLong(contractId)).getContractName());
+
+            } else if(new Integer("2").equals(vos.getDeptCategory())){
+                //类型属于2则为分部工程
+                resultMap.put("partProject", vos.getTitle());
+
+            } else if(new Integer("3").equals(vos.getDeptCategory())){
+                //类型属于3则为子分部工程
+                resultMap.put("partChildProject", vos.getTitle());
+
+            } else if(new Integer("4").equals(vos.getDeptCategory())){
+                //类型属于4则为分项工程
+                resultMap.put("subentryProject", vos.getTitle());
+
+            } else if(new Integer("5").equals(vos.getDeptCategory())){
+                //类型属于5则为子分项工程
+                resultMap.put("subentryChildProject", vos.getTitle());
+
             }
-            this.foreachGetParent(resultMap, vosMap, vos.getParentId());
+            this.foreachGetParent(resultMap, vosMap, vos.getParentId(), contractId);
         }
     }
 
@@ -199,10 +189,15 @@ public class NeiYeController {
             //为空，说明初始化
             //获取根节点
             rootTreeNode = this.clientTreePublicCodeClient.queryContractWbsTreeByContractIdAndType(contractId, 1, "0");
+            //设置名称
+            rootTreeNode.get(0).setTitle(this.contractClient.getContractById(Long.parseLong(contractId)).getContractName());
         } else {
             //不为空，获取其下子节点
             rootTreeNode = this.wbsTreeContractClient.queryContractWbsTreeByContractIdAndType(contractId, 1, parentId);
         }
+
+        rootTreeNode.removeIf(vos -> Arrays.asList("1,2,3".split(",")).contains(vos.getMajorDataType().toString()));
+
         return R.data(rootTreeNode);
     }
 

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

@@ -31,6 +31,8 @@ import java.util.List;
  */
 public interface ContractLogMapper extends BaseMapper<ContractLog> {
 
+	List<String> getSubmitLogDateList(@Param("contractId") String contractId, @Param("primaryKeyId") String primaryKeyId);
+
 	List<ContractLog> queryFillUser(@Param("vo") ContractLogVO vo);
 
 	List<ContractLog> constructionLogPage(@Param("current") Integer current, @Param("size") Integer size, @Param("vo") ContractLogVO vo);

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

@@ -25,6 +25,10 @@
         <result column="file_name" property="fileName"/>
     </resultMap>
 
+    <select id="getSubmitLogDateList" resultType="java.lang.String">
+        select record_time from u_contract_log where is_deleted = 0 and wbs_node_id = #{primaryKeyId} and contract_id = #{contractId} group by record_time order by record_time DESC
+    </select>
+
     <select id="queryFillUser" resultMap="contractLogResultMap">
       select create_user, create_user_name from u_contract_log where is_deleted = 0 and wbs_node_id = #{vo.wbsNodeId}
     </select>
@@ -45,6 +49,7 @@
         where
         is_deleted = 0
         and wbs_node_id = #{vo.wbsNodeId}
+        and contract_id = #{vo.contractId}
         <if test="vo.queryValue != null and vo.queryValue != ''">
             and
             (
@@ -69,6 +74,7 @@
         where
           is_deleted = 0
         and wbs_node_id = #{vo.wbsNodeId}
+        and contract_id = #{vo.contractId}
         <if test="vo.queryValue != null and vo.queryValue != ''">
           and
             (

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

@@ -39,6 +39,8 @@
         <result column="informationQueryId" property="informationQueryId"/>
         <result column="status" property="status"/>
         <result column="major_data_type" property="majorDataType"/>
+        <result column="parentId" property="parentId"/>
+        <result column="title" property="title"/>
     </resultMap>
 
     <resultMap id="intResultMap" type="java.lang.Integer"/>
@@ -49,6 +51,8 @@
             wtc.p_key_id,
             wtc.ancestors,
             wtc.major_data_type,
+            wtc.dept_name AS title,
+            wtc.parent_id AS parentId,
             uiq.id AS informationQueryId,
             uiq.status
         FROM
@@ -57,7 +61,7 @@
         WHERE
             wtc.wbs_type = 1
         AND wtc.type = 1
-        AND (wtc.dept_category = 6 or wtc.major_data_type in(1,2,3,4))
+        AND (wtc.dept_category in(1,2,3,4,5,6) and wtc.major_data_type in(1,2,3,4))
         AND wtc.major_data_type != 5
         AND wtc.ancestors like concat('%',#{parentId},'%')
         AND wtc.contract_id = #{contractId}

blade-service/blade-business/src/main/java/org/springblade/business/service/IContractLogService.java

@@ -34,6 +34,8 @@ public interface IContractLogService extends BaseService<ContractLog> {
 
 	List<FileUserVO> queryFillUser(ContractLogVO logVO);
 
+	List<String> getSubmitLogDateList(String contractId, String primaryKeyId);
+
 	/**
 	 * 施工日志分页
 	 * @param logVO 查询条件

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

@@ -41,6 +41,11 @@ import java.util.List;
 @Service
 public class ContractLogServiceImpl extends BaseServiceImpl<ContractLogMapper, ContractLog> implements IContractLogService {
 
+	@Override
+	public List<String> getSubmitLogDateList(String contractId, String primaryKeyId) {
+		return this.baseMapper.getSubmitLogDateList(contractId, primaryKeyId);
+	}
+
 	@Override
 	public List<FileUserVO> queryFillUser(ContractLogVO logVO) {
 		List<FileUserVO> result = new ArrayList<>();

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

@@ -147,9 +147,9 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
 		//获取总量
 		Integer count = this.baseMapper.countInformationQuery(vo);
 		//多节点查询
-		if(vo.getWbsId() != null){
-			vo.setWbsIds(JSONArray.parseArray(JSONObject.toJSONString(Arrays.asList(String.valueOf(vo.getWbsId()).split(","))), String.class));
-		}
+//		if(vo.getWbsId() != null){
+//			vo.setWbsIds(JSONArray.parseArray(JSONObject.toJSONString(Arrays.asList(String.valueOf(vo.getWbsId()).split(","))), String.class));
+//		}
 
 		if(StringUtils.isNotEmpty(vo.getBetweenTime())){
 			String[] betweenTime;

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

@@ -183,12 +183,13 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         if(StringUtils.isNotEmpty(masterTaskId)){
             //结束主流程
             this.newFlowClient.completeApprovalTask(masterTaskId, task.getProcessInstanceId(), "上报人主动废除");
-            //修改主流程状态为3
-            this.update(Wrappers.<Task>lambdaUpdate().set(Task::getStatus, 3).eq(Task::getId, task.getId()));
-            //修改业务数据状态为未上报
-            this.updateBusinessDataByFormDataId(task, 0, null);
         }
 
+        //修改主流程状态为3
+        this.update(Wrappers.<Task>lambdaUpdate().set(Task::getStatus, 3).eq(Task::getId, task.getId()));
+        //修改业务数据状态为未上报
+        this.updateBusinessDataByFormDataId(task, 0, null);
+
         return true;
     }
 
@@ -266,12 +267,6 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             if(otherLink != null && otherLink.size() > 0){
                 masterProcessInstanceId = otherLink.get(0).getProcessInstanceId();
                 for(TaskParallel parallel : otherLink){
-                    if(parallel.getEVisaStatus() != null && parallel.getEVisaStatus() != -1){
-                        //不为空说明已经执行电签，需要撤签
-                        // todo =================== 撤签调用 ===================
-                        System.out.println("循环调用撤签");
-                        // todo =================== 撤签调用 ===================
-                    }
                     if(!new Integer("2").equals(parallel.getStatus())){
                         //修改所有状态为已废除
                         this.taskParallelService.update(Wrappers.<TaskParallel>lambdaUpdate().set(TaskParallel::getInitiative, 2).set(TaskParallel::getUpdateUser, AuthUtil.getUserId()).set(TaskParallel::getUpdateTime, new Date()).eq(TaskParallel::getId, parallel.getId()));
@@ -426,7 +421,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
      * 资料填报
      */
     private void updateWriteBusinessDataStatus(String formDataId, Integer status, String newFileUrl){
-        this.informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getStatus, status).eq(InformationQuery::getEVisaPdfUrl, newFileUrl).in(InformationQuery::getId, Arrays.asList(formDataId.split(","))));
+        this.informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getStatus, status).set(InformationQuery::getEVisaPdfUrl, newFileUrl).in(InformationQuery::getId, Arrays.asList(formDataId.split(","))));
     }
 
     /**

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/feign/EVisaClientImpl.java

@@ -1,8 +1,11 @@
 package org.springblade.evisa.feign;
 
 import cfca.paperless.dto.bean.CertBean;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import org.springblade.evisa.service.EVisaService;
+import org.springblade.evisa.vo.CertBeanVO;
 import org.springblade.evisa.vo.EVisaMakeSealVO;
 import org.springblade.evisa.vo.EVisaTaskApprovalVO;
 import org.springframework.web.bind.annotation.RestController;
@@ -15,9 +18,15 @@ public class EVisaClientImpl implements EVisaClient {
     private final EVisaService eVisaService;
 
     @Override
-    public String onlineCheckSeal(String pdfUrl) {
+    public CertBeanVO onlineCheckSeal(String pdfUrl) {
         List<CertBean> beans = this.eVisaService.onlineCheckSeal(pdfUrl);
-
+        if(beans != null && beans.size() > 0){
+            //设置返回参数
+            CertBeanVO reVO = new CertBeanVO();
+            reVO.setPdfUrl(pdfUrl);
+            reVO.setCertBeanVOList(JSONArray.parseArray(JSONObject.toJSONString(beans), CertBeanVO.class));
+            return reVO;
+        }
         return null;
     }
 

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

@@ -9,6 +9,7 @@ import com.mixsmart.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.service.IContractInfoService;
 import org.springblade.manager.service.IWbsTreeContractService;
@@ -34,7 +35,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
     @Override
     public List<WbsTreeContract> queryProcessSubmitBusinessDataByPrimaKeyIdAndClassify(String primaKeyId, String classify) {
         WbsTreeContract keyNode = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId, primaKeyId));
-        return this.wbsTreeContractService.list(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getContractId, keyNode.getContractId()).eq(WbsTreeContract::getParentId, keyNode.getId()).eq(WbsTreeContract::getType, 2)
+        return this.wbsTreeContractService.list(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getContractId, keyNode.getContractId()).eq(WbsTreeContract::getIsBussShow, "1").eq(WbsTreeContract::getParentId, keyNode.getId()).eq(WbsTreeContract::getType, 2)
                 .in(WbsTreeContract::getTableType, "1".equals(classify) ? Arrays.asList("1,2,3".split(",")) : Arrays.asList("4,5,6".split(","))));
     }
 
@@ -68,7 +69,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
             voData.setLeaf(new Integer("6").equals(voData.getDeptCategory()));
             //检查是否有下级
             long count = this.wbsTreeContractService.count(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, voData.getPrimaryKeyId()).eq(WbsTreeContract::getContractId, voData.getContractIdRelation()).eq(WbsTreeContract::getWbsType, 1));
-            voData.setExsitChild(count == 0);
+            voData.setNotExsitChild(count == 0);
         });
 
         return vos;
@@ -125,8 +126,8 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         vos.forEach(voData -> {
             voData.setLeaf(new Integer("6").equals(voData.getDeptCategory()));
             //检查是否有下级
-            long count = this.wbsTreeContractService.count(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, voData.getId()).eq(WbsTreeContract::getContractId, contractId).eq(WbsTreeContract::getWbsType, 1));
-            voData.setExsitChild(count == 0);
+            long count = this.wbsTreeContractService.count(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, voData.getId()).eq(WbsTreeContract::getContractId, contractId).eq(WbsTreeContract::getType, 1));
+            voData.setNotExsitChild(count == 0);
         });
         return vos;
     }
@@ -143,17 +144,28 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
 
     @Override
     public List<WbsTreeContractTreeVOS> queryCurrentContractLogList(String contractId) {
-        List<WbsTreeContract> result = this.wbsTreeContractService.queryCurrentContractLogList(contractId);
+        ContractInfo contract = this.contractInfoService.getById(contractId);
+        List<WbsTreeContract> result = this.wbsTreeContractService.queryCurrentContractLogList(contract.getPId());
         if (result != null && result.size() != 0) {
             List<WbsTreeContractTreeVOS> vosResult = new ArrayList<>();
             result.forEach(node -> {
-                //转换
-                WbsTreeContractTreeVOS vos = new WbsTreeContractTreeVOS();
-                vos.setDeptCategory(node.getDeptCategory());
-                vos.setPrimaryKeyId(String.valueOf(node.getPKeyId()));
-                vos.setTitle(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getDeptName());
-                //最终返回集合
-                vosResult.add(vos);
+               if(new Integer("2").equals(contract.getContractType()) && Arrays.asList("8,10,11,12".split(",")).contains(node.getDeptCategory().toString())){
+                   //转换
+                   WbsTreeContractTreeVOS vos = new WbsTreeContractTreeVOS();
+                   vos.setDeptCategory(node.getDeptCategory());
+                   vos.setPrimaryKeyId(String.valueOf(node.getPKeyId()));
+                   vos.setTitle(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getDeptName());
+                   //最终返回集合
+                   vosResult.add(vos);
+               } else if(new Integer("1").equals(contract.getContractType()) && Arrays.asList("7,9,13".split(",")).contains(node.getDeptCategory().toString())){
+                   //转换
+                   WbsTreeContractTreeVOS vos = new WbsTreeContractTreeVOS();
+                   vos.setDeptCategory(node.getDeptCategory());
+                   vos.setPrimaryKeyId(String.valueOf(node.getPKeyId()));
+                   vos.setTitle(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getDeptName());
+                   //最终返回集合
+                   vosResult.add(vos);
+               }
             });
 
             List<WbsTreeContractTreeVOS> finalResult = new ArrayList<>();

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

@@ -46,7 +46,7 @@ public class WbsTreePrivateClientImpl implements WbsTreePrivateClient {
                 vos.setType(wbsTreePrivate.getType());
                 vos.setWbsType(Integer.parseInt(wbsTreePrivate.getWbsType()));
                 long count = this.wbsTreePrivateService.count(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getProjectId, projectId).eq(WbsTreePrivate::getParentId, wbsTreePrivate.getId()));
-                vos.setExsitChild(count == 0);
+                vos.setNotExsitChild(count == 0);
 
                 vosResult.add(vos);
             });

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ContractInfoMapper.xml

@@ -62,6 +62,7 @@
         <result column="partition_code" property="partitionCode"/>
         <result column="old_id" property="oldId"/>
         <result column="contractIdRelation" property="contractIdRelation"/>
+        <result column="major_data_type" property="majorDataType"/>
     </resultMap>
 
     <resultMap id="treeNodeResultMap2" type="org.springblade.manager.vo.WbsTreeContractVO">
@@ -225,7 +226,8 @@
         id AS "value",
         id AS "key",
         partition_code,
-        old_id
+        old_id,
+        major_data_type
 <!--        contract_id AS contractIdRelation-->
         FROM
         m_wbs_tree_contract

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.java

@@ -14,7 +14,7 @@ public interface WbsTreeContractMapper extends BaseMapper<WbsTreeContract> {
 
     List<WbsTreeContract> queryContractSubmitWbsTreeByContractId(@Param("contractId")String contractId);
 
-    List<WbsTreeContract> queryCurrentContractLogList(@Param("contractId") String contractId);
+    List<WbsTreeContract> queryCurrentContractLogList(@Param("projectId") String projectId);
 
     List<WbsTreeContractVO> selectAll();
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -315,10 +315,10 @@
                dept_name,
                full_name,
                dept_category
-        from m_wbs_tree_contract
+        from m_wbs_tree_private
         where is_deleted = 0
           and major_data_type = 5
-          and contract_id = #{contractId}
+          and project_id = #{projectId}
     </select>
 
     <select id="selectListByCondition" resultType="org.springblade.manager.vo.WbsTreeContractVO2">

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeContractService.java

@@ -21,7 +21,7 @@ public interface IWbsTreeContractService extends BaseService<WbsTreeContract> {
 
     List<WbsTreeContract> findWbsTreeContract(String ids);
 
-    List<WbsTreeContract> queryCurrentContractLogList(String contractId);
+    List<WbsTreeContract> queryCurrentContractLogList(String projectId);
 
     List<WbsTreeContractTreeVO> lazyTreeTwo(String contractIdRelation, Long parentId, Integer contractType, String contractId);
 

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

@@ -467,8 +467,8 @@ public class WbsTreeContractServiceImpl
     }
 
     @Override
-    public List<WbsTreeContract> queryCurrentContractLogList(String contractId) {
-        return this.baseMapper.queryCurrentContractLogList(contractId);
+    public List<WbsTreeContract> queryCurrentContractLogList(String projectId) {
+        return this.baseMapper.queryCurrentContractLogList(projectId);
     }
 
     @Override