Merge remote-tracking branch 'origin/master' into master

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

@@ -1699,7 +1699,7 @@ public class InformationWriteQueryController extends BladeController {
 			parentId = primaryKeyId;
 		}
 		List<WbsTreeContractTreeVOS> rootTreeNode = this.queryContractTree(parentId, contractId, contractIdRelation);
-		rootTreeNode.removeIf(vos -> (vos.getMajorDataType() != null && Arrays.asList("1,2,3,111".split(",")).contains(vos.getMajorDataType().toString())) || (vos.getDeptCategory() != null && vos.getDeptCategory() == 111));
+		rootTreeNode.removeIf(vos -> (vos.getDeptCategory() != null && vos.getDeptCategory() == 111));
 
 		return R.data(rootTreeNode);
 	}

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

@@ -75,65 +75,61 @@ public class NeiYeController {
             }
 
             if (queryDataResult != null && queryDataResult.size() > 0) {
-                //删除非工序节点
-                queryDataResult.removeIf(vo -> !new Integer("4").equals(vo.getMajorDataType()));
-
-                if(queryDataResult.size() > 0){
-                    //分组
-                    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;
+                //分组
+                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()) ? "已审批" : "未上报",
-                                vo.getEvaluate(),
-                                "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 当前缺少是否关联评定、是否关联试验 =================================
+                    //新增列表数据
+                    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()) ? "已审批" : "未上报",
+                            vo.getEvaluate(),
+                            "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);
             }
         }
 

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

@@ -54,7 +54,7 @@
             wtc.p_key_id,
             wtc.ancestors,
             wtc.major_data_type,
-            wtc.dept_name AS title,
+            IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.dept_name),wtc.dept_name) AS title,
             wtc.parent_id AS parentId,
             uiq.id AS informationQueryId,
             uiq.status,
@@ -87,7 +87,7 @@
             wtc.ancestors,
             wtc.major_data_type,
             wtc.dept_category AS nodeType,
-            wtc.dept_name AS title,
+            IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.dept_name),wtc.dept_name) AS title,
             wtc.parent_id AS parentId,
             uiq.id AS informationQueryId,
             uiq.status,

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

@@ -10,7 +10,6 @@ import org.springblade.business.entity.Task;
 import org.springblade.business.entity.TaskParallel;
 import org.springblade.business.feign.TaskClient;
 import org.springblade.business.service.ITaskParallelService;
-import org.springblade.business.service.ITaskService;
 import org.springblade.business.vo.FileUserVO;
 import org.springblade.business.vo.InformationQueryVO;
 import org.springblade.business.mapper.InformationQueryMapper;
@@ -19,7 +18,6 @@ import org.springblade.business.vo.QueryProcessDataVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.feign.WbsTreeContractClient;
@@ -40,6 +38,7 @@ import java.util.*;
 @AllArgsConstructor
 public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQueryMapper, InformationQuery> implements IInformationQueryService {
 
+
 	private final WbsTreeContractClient wbsTreeContractClient;
 
 	private final IUserClient userClient;