bug

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

@@ -1873,12 +1873,12 @@ public class InformationWriteQueryController extends BladeController {
 		//其他参数
 		if(rootTreeNode != null && rootTreeNode.size() > 0){
 			//获取当前父节点下所有工序节点及填报资料
-			List<QueryProcessDataVO> queryDataResult;
-			if(new Integer("2").equals(contractInfo.getContractType())){
-				queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(parentId, 2, contractIdRelation);
-			} else {
-				queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(parentId, 1, contractId);
-			}
+//			List<QueryProcessDataVO> queryDataResult;
+//			if(new Integer("2").equals(contractInfo.getContractType())){
+//				queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(parentId, 2, contractIdRelation);
+//			} else {
+//				queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(parentId, 1, contractId);
+//			}
 
 			rootTreeNode.forEach(vo -> {
 				if(new Integer("1").equals(contractInfo.getContractType())){
@@ -1887,10 +1887,10 @@ public class InformationWriteQueryController extends BladeController {
 					}
 				}
 
-				//处理颜色
-				if(queryDataResult != null && queryDataResult.size() > 0){
-					this.setNodeColor(vo, queryDataResult, true);
-				}
+//				//处理颜色
+//				if(queryDataResult != null && queryDataResult.size() > 0){
+//					this.setNodeColor(vo, queryDataResult, true);
+//				}
 			});
 		}
 

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

@@ -95,7 +95,7 @@
         LEFT JOIN u_contract_tree_drawings AS ctd ON ctd.is_deleted = 0 and ctd.process_id = wtc.p_key_id
         LEFT JOIN (
             SELECT
-                #{parentId} AS parentId,
+                querys.pKeyId AS pKeyId,
                 CASE
                 WHEN querys.nodeStatus LIKE CONCAT('%',1,'%') AND (querys.nodeStatus NOT LIKE CONCAT('%',2,'%') AND querys.nodeStatus NOT LIKE CONCAT('%',3,'%') AND querys.nodeStatus NOT LIKE CONCAT('%',4,'%')) THEN 1
                 WHEN querys.nodeStatus LIKE CONCAT('%',1,'%') AND (querys.nodeStatus LIKE CONCAT('%',2,'%') OR querys.nodeStatus LIKE CONCAT('%',3,'%') OR querys.nodeStatus LIKE CONCAT('%',4,'%')) THEN 2
@@ -104,22 +104,25 @@
             FROM
             (
                 SELECT
+                    wtc.p_key_id AS pKeyId,
                     group_concat(
-                        CASE
-                        WHEN iq.status is null THEN 1
-                        WHEN iq.status = 1 THEN 3
-                        WHEN iq.status = 2 THEN 4
-                        ELSE 2 END
-                    ) AS nodeStatus
+                                CASE
+                                WHEN iq.status is null THEN 1
+                                WHEN iq.status = 1 THEN 3
+                                WHEN iq.status = 2 THEN 4
+                                ELSE 2 END
+                            ) AS nodeStatus
                 FROM
-                    m_wbs_tree_contract AS tc
-                LEFT JOIN u_information_query AS iq ON tc.p_key_id = iq.wbs_id
+                    m_wbs_tree_contract AS wtc
+                LEFT JOIN m_wbs_tree_contract AS wtc1 ON wtc1.ancestors like concat('%', wtc.id, '%') AND wtc1.is_deleted = 0 and wtc1.contract_id = wtc.contract_id AND wtc1.major_data_type IN(1,2,3,4)
+                LEFT JOIN u_information_query AS iq ON (iq.wbs_id = wtc1.p_key_id OR iq.wbs_id = wtc.p_key_id)
                 WHERE
-                    tc.major_data_type in(1,2,3,4)
-                AND tc.ancestors LIKE concat('%', #{parentId}, '%')
-                AND tc.contract_id = #{contractId}
+                    wtc.contract_id = #{contractId}
+                and wtc.parent_id = #{parentId}
+                and wtc.is_deleted= '0'
+                group by wtc.p_key_id
             ) AS querys
-        ) AS querys ON wtc.parent_id = querys.parentId
+        ) AS querys ON wtc.p_key_id = querys.pKeyId
         WHERE
             wtc.contract_id = #{contractId}
         AND wtc.type = #{classify}