ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
@@ -400,6 +400,15 @@ samplingRecordOperation.setReceiptsTime(LocalDateTime.now()); } samplingRecordOperationService.updateBatchById(samplingRecordOperations); // 判断是否所有取样记录都收样了 List<TSamplingRecordOperation> allRecordOperations = samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class) .eq(TSamplingRecordOperation::getSamplingId, samplingRecordOperations.get(0).getSamplingId())); if(allRecordOperations.stream().allMatch(e -> e.getStatus() == 3)){ samplingRecordService.update(Wrappers.lambdaUpdate(TSamplingRecord.class) .set(TSamplingRecord::getStatus, 4) .eq(TSamplingRecord::getId, samplingRecordOperations.get(0).getSamplingId())); } return R.ok(); }
@@ -228,6 +228,9 @@ .eq(TExperimentDispatchParticipants::getDispatchId, dto.getDispatchId()) .eq(TExperimentDispatchParticipants::getRoleType,3) .last("LIMIT 1")); if(Objects.isNull(experimentDispatchParticipant)){ return R.fail("项目组工艺工程师未参与该调度"); } // 查询工艺工程师所在的项目组 TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class) .eq(TProjectTeamStaff::getUserId, experimentDispatchParticipant.getUserId()) ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSamplingRecordMapper.java
@@ -25,6 +25,6 @@ * @param pageInfo * @return */ List<TSamplingRecordVO> pageList(@Param("query") TSamplingRecordQuery query); List<TSamplingRecordVO> pageList(@Param("query") TSamplingRecordQuery query, @Param("pageInfo") PageInfo<TSamplingRecordVO> pageInfo); } ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java
@@ -44,7 +44,7 @@ @TableField("remark") private String remark; @ApiModelProperty(value = "状态 -1=草稿箱 1=已发送待提交 2=已提交 3=已封存") @ApiModelProperty(value = "状态 -1=草稿箱 1=已发送待提交 2=已提交 3=已封存 4=已完成") @TableField("status") private Integer status;
@@ -47,24 +47,23 @@ if(CollectionUtils.isEmpty(query.getDispatchIds())){ return pageInfo; } List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationMapper.selectList(null); List<TSamplingRecordVO> list = this.baseMapper.pageList(query); List<TSamplingRecordVO> list = this.baseMapper.pageList(query,pageInfo); if(CollectionUtils.isEmpty(list)){ return pageInfo; } for (TSamplingRecordVO tSamplingRecordVO : list) { if (query.getRoleType()==5){ if (tSamplingRecordVO.getStatus()==2){ List<TSamplingRecordOperation> samplingRecordOperationsIds = samplingRecordOperations.stream().filter(e -> e.getSamplingId().equals(tSamplingRecordVO.getId())).collect(Collectors.toList()); // 如果samplingRecordOperationsIds的状态全部都为3 if(!samplingRecordOperationsIds.stream().allMatch(e -> e.getStatus() == 3)){ res.add(tSamplingRecordVO); } } }else{ res.add(tSamplingRecordVO); } } // for (TSamplingRecordVO tSamplingRecordVO : list) { // if (query.getRoleType()==5){ // if (tSamplingRecordVO.getStatus()==1){ // List<TSamplingRecordOperation> samplingRecordOperationsIds = samplingRecordOperations.stream().filter(e -> e.getSamplingId().equals(tSamplingRecordVO.getId())).collect(Collectors.toList()); // // 如果samplingRecordOperationsIds的状态全部都为3 // if(!samplingRecordOperationsIds.stream().allMatch(e -> e.getStatus() == 3)){ // res.add(tSamplingRecordVO); // } // } // }else{ // res.add(tSamplingRecordVO); // } // } List<String> recordIds = list.stream().map(TSamplingRecordVO::getId).collect(Collectors.toList()); List<TSamplingRecordOperation> recordOperationList = samplingRecordOperationMapper.selectList(Wrappers.lambdaQuery(TSamplingRecordOperation.class) .in(TSamplingRecordOperation::getSamplingId, recordIds)); @@ -95,9 +94,9 @@ } } // 手动对res进行分页 res = res.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList()); pageInfo.setTotal(res.size()); pageInfo.setRecords(res); // res = res.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList()); // pageInfo.setTotal(res.size()); pageInfo.setRecords(list); return pageInfo; } } ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
@@ -154,6 +154,9 @@ <if test="query.userId != null"> and tedp.user_id = #{query.userId} </if> <if test="query.userId != null"> and trwe.user_id = #{query.userId} </if> <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''"> AND trwe.evaluate_time BETWEEN #{query.startTime} AND #{query.endTime} </if> @@ -187,6 +190,9 @@ <if test="query.userId != null"> and tedp.user_id = #{query.userId} </if> <if test="query.userId != null"> and trwe.user_id = #{query.userId} </if> <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''"> AND trwe.evaluate_time BETWEEN #{query.startTime} AND #{query.endTime} </if> ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
@@ -56,7 +56,9 @@ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)"> AND tsr.status != 3 </if> <if test="query.roleType != null and (query.roleType == 5 or query.roleType == 4)"> AND tsr.status != 4 </if> <if test="query.status == null"> and tsr.status != -1 </if>
