Merge remote-tracking branch 'origin/master'

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

@@ -27,4 +27,6 @@ public class QueryProcessDataVO {
 
     private String firstId;
 
+    private String queryType;
+
 }

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

@@ -7,6 +7,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springblade.business.entity.ConstructionLedger;
 import org.springblade.business.service.IConstructionLedgerService;
 import org.springblade.business.service.IInformationQueryService;
@@ -82,6 +83,9 @@ public class NeiYeController {
             }
 
             if (queryDataResult != null && queryDataResult.size() > 0) {
+                //删除掉首件
+                queryDataResult.removeIf(query -> StringUtils.isNotEmpty(query.getQueryType()) && "3".equals(query.getQueryType()));
+
                 //分组
                 List<List<QueryProcessDataVO>> groupList = CommonUtil.getBatchSize(queryDataResult, queryVO.getSize());
                 List<QueryProcessDataVO> groupQueryList = groupList.get(queryVO.getCurrent() == 0 ? 0 : queryVO.getCurrent() - 1);

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

@@ -46,6 +46,7 @@
         <result column="firstId" property="firstId"/>
         <result column="nodeType" property="nodeType"/>
         <result column="evaluate" property="evaluate"/>
+        <result column="queryType" property="queryType"/>
     </resultMap>
 
     <resultMap id="queryContractTreeMap" type="org.springblade.manager.vo.WbsTreeContractTreeVOS">
@@ -75,6 +76,7 @@
 
     <select id="queryContractTreeSupervision" resultMap="queryContractTreeMap">
         SELECT
+            wtc.is_concealed_works_node AS "isConcealedWorksNode",
             wtc.p_key_id AS primaryKeyId,
             wtc.id,
             CASE wtc.parent_id
@@ -270,7 +272,8 @@
                 and tc.parent_id = wtc.parent_id
                 and tc.contract_id = wtc.contract_id
                 and NOT EXISTS (select 1 from u_information_query as q where iq.id = q.id and q.status > iq.status) LIMIT 1
-            ) AS evaluate
+            ) AS evaluate,
+            uiq.type AS queryType
         FROM
             m_wbs_tree_contract AS wtc
         LEFT JOIN u_information_query AS uiq ON wtc.p_key_id = uiq.wbs_id AND uiq.classify = #{classify} and uiq.is_deleted = 0
@@ -304,7 +307,8 @@
                 and tc.parent_id = wtc.parent_id
                 and tc.contract_id = wtc.contract_id
                 and NOT EXISTS (select 1 from u_information_query as q where iq.id = q.id and q.status > iq.status) LIMIT 1
-            ) AS evaluate
+            ) AS evaluate,
+            uiq.type AS queryType
         FROM
             m_wbs_tree_contract AS wtc
         LEFT JOIN u_information_query AS uiq ON wtc.p_key_id = uiq.wbs_id AND uiq.classify = #{classify} and uiq.is_deleted = 0