查询销售计划状态错误

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesPlanDao.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.UUID;
 
 import com.beecode.amino.core.Amino;
+import com.beecode.bap.workflow.core.BizProcessState;
 import com.beecode.bcp.type.KClass;
 import com.beecode.inz.common.BaseConstants;
 import com.beecode.inz.common.util.DateTimeUtils;
@@ -246,9 +247,9 @@ public class SalesPlanDao {
         detachedCriteria.createAlias("planningCycle", "planningCycle");
         detachedCriteria.createAlias("contract", "contract");
         //获取本周和下周时间段内的临时销售计划
-        detachedCriteria.add(Restrictions.le("planningCycle.startTime", DateTimeUtils.getWeekStart(date,0)));
-        detachedCriteria.add(Restrictions.gt("planningCycle.endTime", DateTimeUtils.getWeekEnd(date,1)));
-        detachedCriteria.add(Restrictions.eq(SalesPlanConstant.APPROVE_STATE, 1));
+        detachedCriteria.add(Restrictions.ge("planningCycle.startTime", DateTimeUtils.getWeekStart(date,0)));
+        detachedCriteria.add(Restrictions.lt("planningCycle.endTime", DateTimeUtils.getWeekEnd(date,1)));
+        detachedCriteria.add(Restrictions.eq(SalesPlanConstant.APPROVE_STATE, BizProcessState.DONE_WITH_AGREE.getValue()));
         detachedCriteria.add(Restrictions.eq("transportMode", TransportModeEnum.DELIVERY.name()));
         detachedCriteria.setProjection(Projections.distinct(Projections.property("contract.purchaseSandUnit")));
         return (List<KObject>) template.findByCriteria(detachedCriteria);
@@ -260,9 +261,9 @@ public class SalesPlanDao {
         dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
         detachedCriteria.createAlias("planningCycle", "planningCycle");
         detachedCriteria.createAlias("contract", "contract");
-        detachedCriteria.add(Restrictions.le("planningCycle.startTime", date));
-        detachedCriteria.add(Restrictions.gt("planningCycle.endTime", date));
-        detachedCriteria.add(Restrictions.eq(SalesPlanConstant.APPROVE_STATE, 1));
+        detachedCriteria.add(Restrictions.ge("planningCycle.startTime", DateTimeUtils.getWeekStart(date,0)));
+        detachedCriteria.add(Restrictions.lt("planningCycle.endTime", DateTimeUtils.getWeekEnd(date,1)));
+        detachedCriteria.add(Restrictions.eq(SalesPlanConstant.APPROVE_STATE, BizProcessState.DONE_WITH_AGREE.getValue()));
         detachedCriteria.add(Restrictions.eq("transportMode", TransportModeEnum.DELIVERY.name()));
         detachedCriteria.add(Restrictions.eq("contract.purchaseSandUnit.id", purchaseSandUnitId));
         detachedCriteria.setProjection(Projections.distinct(Projections.property("planningCycle")));
@@ -275,7 +276,7 @@ public class SalesPlanDao {
         dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
         detachedCriteria.createAlias("planningCycle", "planningCycle");
         detachedCriteria.createAlias("contract", "contract");
-        detachedCriteria.add(Restrictions.eq(SalesPlanConstant.APPROVE_STATE, 1));
+        detachedCriteria.add(Restrictions.eq(SalesPlanConstant.APPROVE_STATE, BizProcessState.DONE_WITH_AGREE.getValue()));
         detachedCriteria.add(Restrictions.eq("transportMode", TransportModeEnum.DELIVERY.name()));
         detachedCriteria.add(Restrictions.eq("contract.purchaseSandUnit.id", purchaseSandUnitId));
         detachedCriteria.add(Restrictions.eq("planningCycle.id", planningCycleId));
@@ -295,6 +296,8 @@ public class SalesPlanDao {
         detachedCriteria.add(Restrictions.eq("contract.purchaseSandUnit.id", purchaseSandUnitId));
         detachedCriteria.add(Restrictions.eq("planningCycle.id", planningCycleId));
         detachedCriteria.add(Restrictions.eq("project.id", projectId));
+        detachedCriteria.add(Restrictions.eq(SalesPlanConstant.APPROVE_STATE, BizProcessState.DONE_WITH_AGREE.getValue()));
+        detachedCriteria.add(Restrictions.eq("transportMode", TransportModeEnum.DELIVERY.name()));
         List<KObject> byCriteria = (List<KObject>) template.findByCriteria(detachedCriteria);
         for (KObject byCriterion : byCriteria) {
             KObject salesPlanTempDetails = byCriterion.get("SalesPlanTempDetails");