Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

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

@@ -24,6 +24,7 @@ import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.feign.ContractClient;
 import org.springblade.manager.feign.WbsTreeContractClient;
 import org.springblade.manager.vo.WbsTreeContractTreeVOS;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springblade.core.mp.support.Query;
 
@@ -46,6 +47,8 @@ public class NeiYeController {
 
     private final TaskClient taskClient;
 
+    private final JdbcTemplate jdbcTemplate;
+
     /**
      * 获取内业台账列表
      * @return 内业台账列表
@@ -98,6 +101,16 @@ public class NeiYeController {
             if (queryDataResult != null && queryDataResult.size() > 0) {
                 //删除掉首件
                 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()+"";
                 if (!"".equals(isExperiment) && !"null".equals(isExperiment) && isExperiment != null) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -1590,7 +1590,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                     .last("limit 1"));
             //如果存在则复制最新表的配置,调整表单的值
             if (wbsTreePrivate != null) {
-                if (StringUtils.isNotEmpty(wbsTreePrivate.getExcelId().toString())) {
+                if (StringUtils.isNotEmpty(wbsTreePrivate.getExcelId()+"")) {
                     wbsPrivate.setExcelId(wbsTreePrivate.getExcelId());
                 }
                 if (StringUtils.isNotEmpty(wbsTreePrivate.getHtmlUrl())){