内业台账-上报批次和搜索

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

@@ -103,6 +103,16 @@ public class NeiYeController {
                 if (queryDataResult.size() <= 0){
                     return R.data(300, null, "未查询到数据");
                 }
+                //审批状态
+                String taskStatus = queryVO.getTaskStatus();
+                if (!"".equals(taskStatus) && !"null".equals(taskStatus) && taskStatus != null) {
+                    Integer status = Integer.parseInt(taskStatus) - 1;
+                    queryDataResult = queryDataResult.stream()
+                            .filter(qdr->status.equals(qdr.getStatus())).collect(Collectors.toList());
+                }
+                if (queryDataResult.size() <= 0){
+                    return R.data(300, null, "未查询到数据");
+                }
                 //分组
                 List<List<QueryProcessDataVO>> groupList = CommonUtil.getBatchSize(queryDataResult, queryVO.getSize());
                 List<QueryProcessDataVO> groupQueryList = groupList.get(queryVO.getCurrent() == 0 ? 0 : queryVO.getCurrent() - 1);
@@ -138,22 +148,22 @@ public class NeiYeController {
                     }
                     //todo 当前缺少是否关联评定、是否关联试验 =================================
                     //过滤输入框条件
-                String queryStr = queryVO.getQueryStr();
-                if (!"".equals(queryStr) && !"null".equals(queryStr) && queryStr != null){
-                    if (!map.get("unitProject").toUpperCase().contains(queryStr.toUpperCase())){
-                        continue;
-                    }
-                }
-                    //审批状态
-                    String taskStatus = queryVO.getTaskStatus();
-                    if (!"".equals(taskStatus) && !"null".equals(taskStatus) && taskStatus != null) {
-                        String status = Integer.parseInt(taskStatus) - 1 + "";
-                        if (vo.getStatus() == null){
-                            vo.setStatus(0);
-                        }
-                        if (!status.equals(vo.getStatus()+"")){
+                    String queryStr = queryVO.getQueryStr();
+                    if (!"".equals(queryStr) && !"null".equals(queryStr) && queryStr != null){
+                        StringBuilder str = new StringBuilder();
+                        str.append(map.get("unitProject"));
+                        if (map.get("partProject") != null && map.get("partProject")!= "")
+                            str.append(map.get("partProject"));
+                        if (map.get("partChildProject") != null && map.get("partChildProject")!= "")
+                            str.append(map.get("partChildProject"));
+                        if (map.get("subentryProject") != null && map.get("subentryProject")!= "")
+                            str.append(map.get("subentryProject"));
+                        if (map.get("subentryChildProject") != null && map.get("subentryChildProject")!= "")
+                            str.append(map.get("subentryChildProject"));
+                        if (  vo.getTitle() != null &&   vo.getTitle()!= "")
+                            str.append(vo.getTitle());
+                        if (!str.toString().toUpperCase().contains(queryStr.toUpperCase()))
                             continue;
-                        }
                     }
                     //上报批次
                     if (vo.getInformationQueryId() != null){
@@ -161,7 +171,7 @@ public class NeiYeController {
                         Task task;
                         if (tasks == null || tasks.size() <= 0){
                             task = new Task();
-                            task.setBatch(-1);
+                            task.setBatch(0);
                         }else {
                             tasks = tasks.stream().sorted(Comparator.comparing(e -> e.getCreateTime())).collect(Collectors.toList());
                             task = tasks.get(tasks.size() - 1);
@@ -175,7 +185,7 @@ public class NeiYeController {
                             }
                         }
                     }else {
-                        map.put("reportNumber","-1");
+                        map.put("reportNumber","0");
                     }
                     //新增列表数据
                     neiYeLedgerVOList.add(new NeiYeLedgerVO(map.get("unitProject"),

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

@@ -332,6 +332,23 @@ public class TaskController extends BladeController {
 		return R.data(this.taskService.queryBatchList(projectId, contractId));
 	}
 
+	/**
+	 * 获取当前合同段有哪些上报批次
+	 * @param projectId 项目ID
+	 * @param contractId 合同段ID
+	 */
+	@GetMapping("/query-batch-list-two")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "获取当前合同段的上报批次")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "projectId", value = "项目ID", required = true),
+			@ApiImplicitParam(name = "contractId", value = "合同段ID", required = true)
+	})
+	public R<List<String>> queryBatchListTwo(String projectId, String contractId){
+		return R.data(this.taskService.queryBatchListTwo(projectId, contractId));
+	}
+
+
 	/**
 	 * 获取任务类型或任务状态
 	 */

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

@@ -34,4 +34,6 @@ public interface TaskMapper extends BaseMapper<Task> {
 
     List<Task> queryBatchList(@Param("projectId") String projectId, @Param("contractId") String contractId);
 
+    List<String> queryBatchListTwo(@Param("projectId") String projectId, @Param("contractId") String contractId);
+
 }

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

@@ -50,5 +50,12 @@
         </if>
         group by batch
     </select>
+    <select id="queryBatchListTwo" resultType="java.lang.String">
+        select DISTINCT batch from u_task where is_deleted = 0 and status in (1,2) and project_id = #{projectId}
+        <if test="contractId != null and contractId != ''">
+            and contract_id = #{contractId}
+        </if>
+        order by batch
+    </select>
 
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/ITaskService.java

@@ -67,4 +67,9 @@ public interface ITaskService extends BaseService<Task> {
      */
     Map<String,String> getTaskCount(String projectId, String contractId, String userId);
 
+    /**
+     * 获取当前合同段有哪些上报批次
+     */
+    List<String> queryBatchListTwo(String projectId, String contractId);
+
 }

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

@@ -332,6 +332,14 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         return map;
     }
 
+    /**
+     * 获取当前合同段有哪些上报批次
+     */
+    @Override
+    public List<String> queryBatchListTwo(String projectId, String contractId) {
+        return baseMapper.queryBatchListTwo(projectId,contractId);
+    }
+
     @Override
     public List<Task> queryBatchList(String projectId, String contract) {
         return this.baseMapper.queryBatchList(projectId, contract);