平台变更条件更改

src/main/java/com/uas/platform/b2b/controller/PurcOrderChangeController.java

@@ -30,7 +30,9 @@ import org.springframework.web.servlet.ModelAndView;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 采购变更单
@@ -70,13 +72,16 @@ public class PurcOrderChangeController {
         if (!StringUtils.isEmpty(filter.getKeyword())) {
             params.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
             params.getFilters().put("pu_source", "B2B");
+            Map<String,Object> map = new HashMap<>();
+            map.put("pu_status", Status.UNAUDIT.value());
+            params.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
             params.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.findEnableToChange(filter.getKeyword(), params);
         } else {
             pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-            params.getFilters().put("pu_source", "B2B");
+            pageInfo.filter("source","B2B");
             return orderChangeService.findEnableToChange(pageInfo, filter);
         }
 
@@ -162,6 +167,7 @@ public class PurcOrderChangeController {
         if (!StringUtils.isEmpty(filter.getKeyword())) {
             pageParams.getFilters().put("pc_enuu", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("pc_status", Status.REPLIED.value());
+            pageParams.getFilters().put("pc_unneedreply", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -170,6 +176,7 @@ public class PurcOrderChangeController {
             PageInfo pageInfo = new PageInfo(params);
             pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
             pageInfo.filter("status",Status.REPLIED.value());
+            pageInfo.filter("unNeedReply",Constant.NO);
             return SPageUtils.covertSPage(orderChangeService.findByPageInfo(pageInfo, filter));
         }
     }

src/main/java/com/uas/platform/b2b/service/impl/PurcOrderChangeServiceImpl.java

@@ -85,6 +85,7 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
             }
         }
         pageInfo.expression(PredicateUtils.isNull("erpId"));
+        pageInfo.expression(PredicateUtils.ne("status",Status.UNAUDIT.value(),false));
         Page<PurchaseOrderAll> pageOrders = purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
             @Override
             public Predicate toPredicate(Root<PurchaseOrderAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {