|
@@ -1888,7 +1888,7 @@ public class ExcelTabController extends BladeController {
|
|
|
}
|
|
|
|
|
|
//获取节点下的所有表单,和附件,如果表单全是隐藏的,并且没有附件,则提示暂无数据
|
|
|
- String sql = "select pdf_url,e_visa_pdf_url,pdf_trial_url,pdf_trial_url_position,status from u_information_query where classify='" + classify + "' and wbs_id='" + nodeId + "' and contract_id='" + contractId + "' and status<>3 ";
|
|
|
+ String sql = "select pdf_url,e_visa_pdf_url,pdf_trial_url,pdf_trial_url_position,status from u_information_query where classify='" + classify + "' and wbs_id='" + nodeId + "' and contract_id='" + contractId + "' and status<>3 and is_deleted=0";
|
|
|
List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
|
|
|
if (maps.size() < 1) {
|
|
|
//判断当前合同段的类型
|
|
@@ -1904,7 +1904,7 @@ public class ExcelTabController extends BladeController {
|
|
|
String contractsIdsStr = contractsIds.stream()
|
|
|
.map(id -> "'" + id + "'")
|
|
|
.collect(Collectors.joining(", "));;
|
|
|
- String sql1 = "select pdf_url,e_visa_pdf_url,pdf_trial_url,pdf_trial_url_position,status from u_information_query where classify='" + classify + "' and wbs_id='" + nodeId + "' and contract_id in(" + contractsIdsStr + ") and status in(0,1,2)";
|
|
|
+ String sql1 = "select pdf_url,e_visa_pdf_url,pdf_trial_url,pdf_trial_url_position,status from u_information_query where classify='" + classify + "' and wbs_id='" + nodeId + "' and contract_id in(" + contractsIdsStr + ") and status in(0,1,2) and is_deleted=0";
|
|
|
maps = jdbcTemplate.queryForList(sql1);
|
|
|
}
|
|
|
}
|