|
@@ -312,6 +312,8 @@ public class StatementCompanyComprehensiveController extends BaseController {
|
|
|
model.addAttribute("field3",statementCompanyComprehensiveInfo.getField3());
|
|
|
model.addAttribute("field4",statementCompanyComprehensiveInfo.getField4());
|
|
|
|
|
|
+ statementCompanyComprehensiveInfo.setField3("0");
|
|
|
+
|
|
|
//进行查询之后进行任何操作,返回还是查询之后的数据页面
|
|
|
if (StringUtils.isNotBlank(workContractInfo.getToflag())){
|
|
|
if (workContractInfo.getToflag().equals("1")){
|
|
@@ -329,7 +331,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
|
|
|
|
|
|
//查询信息
|
|
|
Page<WorkContractInfo> page = new Page<WorkContractInfo>();
|
|
|
- if(StringUtils.isNotBlank(statementCompanyComprehensiveInfo.getField3()) || StringUtils.isNotBlank(statementCompanyComprehensiveInfo.getField4())) {
|
|
|
+ if(!statementCompanyComprehensiveInfo.getField3().equals("0") && !statementCompanyComprehensiveInfo.getField4().equals("0")) {
|
|
|
statementCompanyComprehensiveInfo.setType("4");
|
|
|
page = workContractInfoService.findContractStatementPageOverdue(new Page<WorkContractInfo>(request, response), workContractInfo, statementCompanyComprehensiveInfo, bigDateType, smallDateType, year);
|
|
|
}else {
|
|
@@ -747,7 +749,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
|
|
|
|
|
|
//查询信息
|
|
|
Page<WorkContractInfo> page = new Page<WorkContractInfo>();
|
|
|
- if(StringUtils.isNotBlank(statementCompanyComprehensiveInfo.getField3()) || StringUtils.isNotBlank(statementCompanyComprehensiveInfo.getField4())) {
|
|
|
+ if(!statementCompanyComprehensiveInfo.getField3().equals("0") && !statementCompanyComprehensiveInfo.getField4().equals("0")) {
|
|
|
//超期未超期信息
|
|
|
page = workContractInfoService.findContractStatementPageOverdue(new Page<WorkContractInfo>(request, response), workContractInfo, statementCompanyComprehensiveInfo,officeIdd);
|
|
|
}else {
|