|
@@ -24,6 +24,7 @@ import org.springblade.manager.entity.WbsTreeContract;
|
|
import org.springblade.manager.feign.ContractClient;
|
|
import org.springblade.manager.feign.ContractClient;
|
|
import org.springblade.manager.feign.WbsTreeContractClient;
|
|
import org.springblade.manager.feign.WbsTreeContractClient;
|
|
import org.springblade.manager.vo.WbsTreeContractTreeVOS;
|
|
import org.springblade.manager.vo.WbsTreeContractTreeVOS;
|
|
|
|
+import org.springframework.jdbc.core.JdbcTemplate;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springblade.core.mp.support.Query;
|
|
import org.springblade.core.mp.support.Query;
|
|
|
|
|
|
@@ -46,6 +47,8 @@ public class NeiYeController {
|
|
|
|
|
|
private final TaskClient taskClient;
|
|
private final TaskClient taskClient;
|
|
|
|
|
|
|
|
+ private final JdbcTemplate jdbcTemplate;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 获取内业台账列表
|
|
* 获取内业台账列表
|
|
* @return 内业台账列表
|
|
* @return 内业台账列表
|
|
@@ -98,6 +101,16 @@ public class NeiYeController {
|
|
if (queryDataResult != null && queryDataResult.size() > 0) {
|
|
if (queryDataResult != null && queryDataResult.size() > 0) {
|
|
//删除掉首件
|
|
//删除掉首件
|
|
queryDataResult.removeIf(query -> StringUtils.isNotEmpty(query.getQueryType()) && "3".equals(query.getQueryType()));
|
|
queryDataResult.removeIf(query -> StringUtils.isNotEmpty(query.getQueryType()) && "3".equals(query.getQueryType()));
|
|
|
|
+ //判断是否关联工程部位
|
|
|
|
+ String sql = "select quality_node_id from u_trial_self_quality_project";
|
|
|
|
+ List<String> stringList = jdbcTemplate.queryForList(sql, String.class);
|
|
|
|
+ if (stringList != null && stringList.size() > 0){
|
|
|
|
+ queryDataResult.stream().forEach(qdr->{
|
|
|
|
+ if (stringList.contains(qdr.getPrimaryKeyId())){
|
|
|
|
+ qdr.setIsExperiment("true");
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ }
|
|
//过滤试验
|
|
//过滤试验
|
|
String isExperiment = queryVO.getIsExperiment()+"";
|
|
String isExperiment = queryVO.getIsExperiment()+"";
|
|
if (!"".equals(isExperiment) && !"null".equals(isExperiment) && isExperiment != null) {
|
|
if (!"".equals(isExperiment) && !"null".equals(isExperiment) && isExperiment != null) {
|