Browse Source

台账管理-业内台账
1、工序节点筛选和非工序筛选

LHB 1 month ago
parent
commit
49b4518a71

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

@@ -44,6 +44,9 @@ public class NeiYeQueryVO {
     @ApiModelProperty(value = "日期是否填报,与质检树类型一致")
     private Integer dateIsComplete;
 
+    @ApiModelProperty(value = "查询类型:1-工序,2-节点")
+    private Integer selectType = 1;
+
     private List<String> wbsIds;
 
 }

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

@@ -125,9 +125,12 @@ public class NeiYeController {
             }
             //不是工序,则查询当前节点下的所有填报节点
             List<QueryProcessDataVO> queryDataResult;
+            //本身就是工序节点就查本节点
+            if(node.getNodeType() == 6){
+                queryVO.setSelectType(2);
+            }
             //有些填报节点的MajorDataType为0
-            if (!new Integer("6").equals(node.getNodeType()) && (ObjectUtil.isEmpty(node.getMajorDataType()) || !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString()))
-                    && !node.getNodeName().contains("开工报告") && !node.getNodeName().contains("质量检验评定表")) {
+            if (queryVO.getSelectType() == 1) {
                 //非填报节点
                 if (node.getParentId() == 0) {
                     queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo("", contractType, contractId, queryVO.getDateIsComplete());