节点变色与节点资料计数

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

@@ -2471,6 +2471,11 @@ public class InformationWriteQueryController extends BladeController {
         } else {
             //施工合同段
             rootTreeNode = this.informationQueryService.queryContractTree(contractId, StringUtils.isNotEmpty(parentId) ? parentId : "0", 1);
+            rootTreeNode.stream().forEach(rtn->{
+                if (rtn.getSubmitCounts() > 0L){
+                    rtn.setColorStatus(2);
+                }
+            });
         }
 
         return rootTreeNode;

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

@@ -237,10 +237,10 @@
                     m_wbs_tree_contract AS wtc
                 <choose>
                     <when test="parentId == '0' || parentId == 0 || parentId == '' || parentId == null">
-                        LEFT JOIN m_wbs_tree_contract AS wtc1 ON wtc1.ancestors like concat('%', '0', '%') AND wtc1.is_deleted = 0 and wtc1.contract_id = wtc.contract_id AND wtc1.major_data_type IN(1,2,3,4)
+                        LEFT JOIN m_wbs_tree_contract AS wtc1 ON wtc1.ancestors like concat('%', '0', '%') AND wtc1.is_deleted = 0 and wtc1.contract_id = wtc.contract_id AND wtc1.major_data_type IN(0,1,2,3,4)
                     </when>
                     <otherwise>
-                        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 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(0,1,2,3,4)
                     </otherwise>
                 </choose>
                 LEFT JOIN u_information_query AS iq ON (iq.wbs_id = wtc1.p_key_id OR iq.wbs_id = wtc.p_key_id) AND iq.classify = #{classify} AND iq.type != 3
@@ -566,7 +566,7 @@
             LEFT JOIN u_information_query AS uiq ON wtc.p_key_id = uiq.wbs_id AND uiq.classify = #{classify} and uiq.is_deleted = 0
         WHERE
             wtc.type = 1
-          AND wtc.major_data_type in(1,2,3,4)
+          AND wtc.major_data_type in(0,1,2,3,4)
           AND wtc.ancestors like concat('%',#{parentId},'%')
           AND wtc.contract_id = #{contractId}
           AND wtc.is_deleted = 0