|
@@ -234,6 +234,7 @@ public class PurcInquiryController {
|
|
|
if (StringUtils.isEmpty(keyword)) {
|
|
if (StringUtils.isEmpty(keyword)) {
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
|
|
+ pageInfo.filter("status", Status.NOT_REPLY.value());
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
SearchFilter distribute = userService.distribute();
|
|
SearchFilter distribute = userService.distribute();
|
|
|
if (distribute != null && distribute.getDistribute() == null) {
|
|
if (distribute != null && distribute.getDistribute() == null) {
|
|
@@ -305,6 +306,7 @@ public class PurcInquiryController {
|
|
|
pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
pageInfo.filter("status", Status.REPLIED.value());
|
|
pageInfo.filter("status", Status.REPLIED.value());
|
|
|
pageInfo.filter("invalid", Constant.NO);
|
|
pageInfo.filter("invalid", Constant.NO);
|
|
|
|
|
+ pageInfo.filter("overdue", Constant.NO);
|
|
|
pageInfo.filter("decideStatus", Status.UNAUDIT.value());
|
|
pageInfo.filter("decideStatus", Status.UNAUDIT.value());
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
SearchFilter distribute = userService.distribute();
|
|
SearchFilter distribute = userService.distribute();
|
|
@@ -343,7 +345,7 @@ public class PurcInquiryController {
|
|
|
pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
pageInfo.filter("agreed", Constant.YES);
|
|
pageInfo.filter("agreed", Constant.YES);
|
|
|
pageInfo.filter("status", Status.REPLIED.value());
|
|
pageInfo.filter("status", Status.REPLIED.value());
|
|
|
- pageInfo.filter("invalid", Constant.NO);
|
|
|
|
|
|
|
+ pageInfo.filter("overdue", Constant.NO);
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
SearchFilter distribute = userService.distribute();
|
|
SearchFilter distribute = userService.distribute();
|
|
|
if (distribute != null && distribute.getDistribute() == null) {
|
|
if (distribute != null && distribute.getDistribute() == null) {
|
|
@@ -380,7 +382,7 @@ public class PurcInquiryController {
|
|
|
pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
pageInfo.filter("agreed", Constant.NO);
|
|
pageInfo.filter("agreed", Constant.NO);
|
|
|
pageInfo.filter("status", Status.REPLIED.value());
|
|
pageInfo.filter("status", Status.REPLIED.value());
|
|
|
- pageInfo.filter("invalid", Constant.NO);
|
|
|
|
|
|
|
+ pageInfo.filter("overdue", Constant.NO);
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
SearchFilter distribute = userService.distribute();
|
|
SearchFilter distribute = userService.distribute();
|
|
|
if (distribute != null && distribute.getDistribute() == null) {
|
|
if (distribute != null && distribute.getDistribute() == null) {
|