|
|
@@ -31,6 +31,8 @@ import org.springblade.resource.feign.NewIOSSClient;
|
|
|
import org.springblade.system.cache.ParamCache;
|
|
|
import org.springblade.system.user.entity.User;
|
|
|
import org.springblade.system.user.feign.IUserClient;
|
|
|
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
|
|
|
+import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
|
|
@@ -65,29 +67,43 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
|
|
|
|
|
|
private final ContractClient contractClient;
|
|
|
|
|
|
+ private final JdbcTemplate jdbcTemplate;
|
|
|
+
|
|
|
@Override
|
|
|
- public List<String> queryBusinessTableData(String formDataId) {
|
|
|
+ public List<String> queryBusinessTableData(String formDataId, Long trialSelfInspectionRecordId) {
|
|
|
//获取具体业务数据
|
|
|
InformationQuery query = this.getById(formDataId);
|
|
|
|
|
|
//查询这个业务数据绑定的表格，需要区分监理和施工
|
|
|
if (query != null) {
|
|
|
+ List<WbsTreeContract> tableList = new ArrayList<>();
|
|
|
+ if (query.getType() == 1) { //质检
|
|
|
// 获取wbs
|
|
|
WbsTreeContract tree = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(query.getWbsId());
|
|
|
- List<WbsTreeContract> tableList = new ArrayList<>();
|
|
|
- if(query.getType()==1){ //质检
|
|
|
- // 获取 合同端信息表
|
|
|
- tableList= this.wbsTreeContractClient.queryChildByParentId(tree, "queryTable", String.valueOf(query.getClassify()));
|
|
|
- }else if(query.getType()==3){ //首件数据
|
|
|
- // 获取首件 数据节点信息
|
|
|
- tableList = this.wbsTreeContractClient.queryContractFirstTab(tree.getContractId(), "111");
|
|
|
- }
|
|
|
- if (tableList != null && tableList.size() > 0) {
|
|
|
- //删除掉无法溯源的数据
|
|
|
- tableList.removeIf(node -> node.getIsTypePrivatePid() == null || node.getIsTypePrivatePid() <= 0 || StringUtils.isEmpty(node.getIsTypePrivatePid().toString()));
|
|
|
- List<Long> privatePIdList = tableList.stream().map(WbsTreeContract::getIsTypePrivatePid).distinct().collect(Collectors.toList());
|
|
|
- return JSONArray.parseArray(JSONObject.toJSONString(privatePIdList), String.class);
|
|
|
+ // 获取合同端信息表
|
|
|
+ tableList = this.wbsTreeContractClient.queryChildByParentId(tree, "queryTable", String.valueOf(query.getClassify()));
|
|
|
+ } else if (query.getType() == 3) { //首件数据
|
|
|
+ // 获取wbs
|
|
|
+ WbsTreeContract tree = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(query.getWbsId());
|
|
|
+ // 获取首件数据节点信息
|
|
|
+ tableList = this.wbsTreeContractClient.queryContractFirstTab(tree.getContractId(), "111");
|
|
|
+ }
|
|
|
+ if (tableList != null && tableList.size() > 0) {
|
|
|
+ //删除掉无法溯源的数据
|
|
|
+ tableList.removeIf(node -> node.getIsTypePrivatePid() == null || node.getIsTypePrivatePid() <= 0 || StringUtils.isEmpty(node.getIsTypePrivatePid().toString()));
|
|
|
+ List<Long> privatePIdList = tableList.stream().map(WbsTreeContract::getIsTypePrivatePid).distinct().collect(Collectors.toList());
|
|
|
+ return JSONArray.parseArray(JSONObject.toJSONString(privatePIdList), String.class);
|
|
|
+
|
|
|
+ //TODO ------试验 2023-03-14 liuYC------
|
|
|
+ } else if (query.getType() == 2) { //试验
|
|
|
+ // 获取试验对应表pKeyIds
|
|
|
+ String sql = "select table_ids from u_trial_self_inspection_record where is_deleted = 0 and id = " + trialSelfInspectionRecordId;
|
|
|
+ TrialSelfInspectionRecord obj = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TrialSelfInspectionRecord.class)).stream().findAny().orElse(null);
|
|
|
+ if (obj != null && StringUtils.isNotEmpty(obj.getTableIds())) {
|
|
|
+ return Func.toStrList(obj.getTableIds());
|
|
|
}
|
|
|
+ }
|
|
|
+
|
|
|
} else {
|
|
|
//那么就可能是日志，检查是不是日志
|
|
|
ContractLog log = this.contractLogService.getById(formDataId);
|
|
|
@@ -123,12 +139,14 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
|
+
|
|
|
//简化
|
|
|
@Override
|
|
|
public List<QueryProcessDataVO> queryProcessDataByParentIdAndContractIdTwo(String parentId, Integer classify, String contractId) {
|
|
|
List<QueryProcessDataVO> result = this.baseMapper.queryProcessDataByParentIdAndContractIdTwo(parentId, classify, contractId);
|
|
|
return result;
|
|
|
}
|
|
|
+
|
|
|
//资料进度统计使用
|
|
|
@Override
|
|
|
public List<QueryProcessDataVO> queryProcessDataByParentIdAndContractIdThree(String parentId, Integer classify, String contractId) {
|
|
|
@@ -554,33 +572,34 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
|
|
|
/**
|
|
|
* 获取当前合同所有填报表
|
|
|
*/
|
|
|
- public Map<String, Long> getTreeAllTable(String contractId){
|
|
|
+ public Map<String, Long> getTreeAllTable(String contractId) {
|
|
|
//总数据
|
|
|
List<WbsTreeContractTreeVOS> list = new ArrayList<>();
|
|
|
- this.getAllTable("",contractId,list);
|
|
|
- Map<String,Long> map = new HashMap<>();
|
|
|
- list.stream().forEach(li->map.put(li.getId()+"",li.getSubmitCounts()));
|
|
|
+ this.getAllTable("", contractId, list);
|
|
|
+ Map<String, Long> map = new HashMap<>();
|
|
|
+ list.stream().forEach(li -> map.put(li.getId() + "", li.getSubmitCounts()));
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public boolean copeNodeData(String nodeId, String vocationalId) {
|
|
|
- return baseMapper.copeNodeData(nodeId,vocationalId);
|
|
|
+ return baseMapper.copeNodeData(nodeId, vocationalId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 递归调用获取合同所有填报表
|
|
|
*/
|
|
|
- public void getAllTable(String parentId,String contractId, List<WbsTreeContractTreeVOS> list){
|
|
|
+ public void getAllTable(String parentId, String contractId, List<WbsTreeContractTreeVOS> list) {
|
|
|
List<WbsTreeContractTreeVOS> vos = this.queryContractTree(parentId, contractId, "", "1");
|
|
|
- if (vos != null && vos.size() > 0){
|
|
|
- vos = vos.stream().filter(vo->vo.getSubmitCounts()!=0).collect(Collectors.toList());
|
|
|
+ if (vos != null && vos.size() > 0) {
|
|
|
+ vos = vos.stream().filter(vo -> vo.getSubmitCounts() != 0).collect(Collectors.toList());
|
|
|
list.addAll(vos);
|
|
|
for (WbsTreeContractTreeVOS vo : vos) {
|
|
|
- this.getAllTable(vo.getId()+"",contractId,list);
|
|
|
+ this.getAllTable(vo.getId() + "", contractId, list);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 查询合同段划分树公共代码
|
|
|
*/
|
|
|
@@ -627,12 +646,12 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<WbsTreeContract> getNodeChildAllByNodeId(String nodeId,String contractId,String pKeyId) {
|
|
|
- return baseMapper.getNodeChildAllByNodeId(nodeId,contractId,pKeyId);
|
|
|
+ public List<WbsTreeContract> getNodeChildAllByNodeId(String nodeId, String contractId, String pKeyId) {
|
|
|
+ return baseMapper.getNodeChildAllByNodeId(nodeId, contractId, pKeyId);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public List<QueryProcessDataVO> getNodeChildTabColsAllByNodeId(String nodeId, String contractId) {
|
|
|
- return baseMapper.getNodeChildTabColsAllByNodeId(nodeId,contractId);
|
|
|
+ return baseMapper.getNodeChildTabColsAllByNodeId(nodeId, contractId);
|
|
|
}
|
|
|
}
|
liuyc