|
|
@@ -300,7 +300,7 @@ public class MaterialProgressController extends BladeController {
|
|
|
}
|
|
|
if (countList.size() > 0) {
|
|
|
//设置参数
|
|
|
- this.setTaskParameter(reVO, countList, classifyType);
|
|
|
+ this.setTaskParameter(reVO, countList, classifyType,contractId);
|
|
|
filtetDataByRole(contract, reVO,2);
|
|
|
return R.data(reVO);
|
|
|
}
|
|
|
@@ -309,7 +309,7 @@ public class MaterialProgressController extends BladeController {
|
|
|
//找到可填写的
|
|
|
List<WbsTreeContract> submitNodeList = this.wbsTreeContractClient.queryContractSubmitWbsTreeByContractId(contractId);
|
|
|
if (submitNodeList != null && submitNodeList.size() > 0) {
|
|
|
- this.setTaskParameter(reVO, submitNodeList, classifyType);
|
|
|
+ this.setTaskParameter(reVO, submitNodeList, classifyType,contractId);
|
|
|
filtetDataByRole(contract, reVO,2);
|
|
|
return R.data(reVO);
|
|
|
}
|
|
|
@@ -407,7 +407,7 @@ public class MaterialProgressController extends BladeController {
|
|
|
}*/
|
|
|
}
|
|
|
|
|
|
- private void setTaskParameter(MaterialProgressVO reVO, List<WbsTreeContract> submitNodeList, String classifyType) {
|
|
|
+ private void setTaskParameter(MaterialProgressVO reVO, List<WbsTreeContract> submitNodeList, String classifyType,String contractId) {
|
|
|
classifyType = StringUtils.isEmpty(classifyType) ? "1" : classifyType;
|
|
|
|
|
|
//汇总四个填报类型的总数
|
|
|
@@ -435,7 +435,6 @@ public class MaterialProgressController extends BladeController {
|
|
|
if (completion.size() > 0) {
|
|
|
completionSubmitList = this.informationQueryService.list(Wrappers.<InformationQuery>lambdaQuery().in(InformationQuery::getWbsId, completion).eq(InformationQuery::getClassify, classifyType));
|
|
|
}
|
|
|
-
|
|
|
//处理工序资料
|
|
|
if (processSubmitList != null && processSubmitList.size() > 0) {
|
|
|
this.setParameter("工序资料", reVO, processSubmitList);
|
|
|
@@ -463,6 +462,27 @@ public class MaterialProgressController extends BladeController {
|
|
|
} else {
|
|
|
reVO.setProcessMaterialStatusList("中间交工", 0, 0, 0);
|
|
|
}
|
|
|
+
|
|
|
+ String sql="select * from m_hide_process where contract_id= "+contractId+" and classify_type= "+classifyType;
|
|
|
+ List<HideProcess> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(HideProcess.class));
|
|
|
+ String hideTypes="";
|
|
|
+ if(!list.isEmpty()){
|
|
|
+ hideTypes= list.stream().map(HideProcess::getHideType).map(String::valueOf).collect(Collectors.joining(","));
|
|
|
+ }
|
|
|
+ for (MaterialProgressVO.ProcessMaterialStatus status : reVO.getProcessMaterialStatusList()) {
|
|
|
+ if("开工报告".equals(status.getTitle())){
|
|
|
+ status.setIsHide(hideTypes.contains("1")?1:0);
|
|
|
+ }
|
|
|
+ if("工序资料".equals(status.getTitle())){
|
|
|
+ status.setIsHide(hideTypes.contains("2")?1:0);
|
|
|
+ }
|
|
|
+ if ("评定资料".equals(status.getTitle())){
|
|
|
+ status.setIsHide(hideTypes.contains("3")?1:0);
|
|
|
+ }
|
|
|
+ if ("中间交工".equals(status.getTitle())){
|
|
|
+ status.setIsHide(hideTypes.contains("4")?1:0);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|