计划退回

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -168,7 +168,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
                     lw.eq(PlanQuarter::getProjectStatus, vo.getProjectStatus());
                 } else {
-                    lw.in(PlanQuarter::getProjectStatus, "1,3");
+                    lw.in(PlanQuarter::getProjectStatus, "1,3,4");
                 }
                 if (!ObjectUtils.isEmpty(vo.getParams())) {
                     if (!ObjectUtils.isEmpty(vo.getParams().get("beginTime"))) {

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -168,7 +168,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
                     lw.eq(PlanYears::getProjectStatus, vo.getProjectStatus());
                 } else {
-                    lw.in(PlanYears::getProjectStatus, "1,3");
+                    lw.in(PlanYears::getProjectStatus, "1,3,4");
                 }
                 if (!ObjectUtils.isEmpty(vo.getParams())) {
                     if (!ObjectUtils.isEmpty(vo.getParams().get("beginTime"))) {

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -387,7 +387,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
                 lw.eq(ProvisionalPlan::getProjectStatus, vo.getProjectStatus());
             } else {
-                lw.apply("  project_status IN (1,3)", "");
+                lw.apply("  project_status IN (1,2,3)", "");
             }
             if (!ObjectUtils.isEmpty(vo.getParams())) {
                 if (!ObjectUtils.isEmpty(vo.getParams().get("beginTime"))) {

purchase-system/src/main/resources/mapper/plan/PlanQuarterMapper.xml

@@ -93,7 +93,7 @@
                 AND is_excess = #{isExcess}
             </if>
             <if test="projectStatus == null or projectStatus ==''">
-                AND project_status in (1,3)
+                AND project_status in (1,2,3)
             </if>
             <if test="projectStatus != null and projectStatus != ''">
                 AND project_status = #{projectStatus}
@@ -155,7 +155,7 @@
                 AND p.purchase_services = #{purchaseServices}
             </if>
             <if test="projectStatus == null or projectStatus ==''">
-                AND p.project_status in (1,3)
+                AND p.project_status in (1,2,3)
             </if>
             <if test="projectStatus != null and projectStatus != ''">
                 AND p.project_status = #{projectStatus}

purchase-system/src/main/resources/mapper/plan/PlanYearsMapper.xml

@@ -114,7 +114,7 @@
 				AND p.purchase_services = #{purchaseServices}
 			</if>
 			<if test="projectStatus == null or projectStatus ==''">
-				AND p.project_status in (1,3)
+				AND p.project_status in (1,2,3)
 			</if>
 			<if test="projectStatus != null and projectStatus != ''">
 				AND p.project_status = #{projectStatus}

purchase-system/src/main/resources/mapper/plan/ProvisionalPlanMapper.xml

@@ -167,7 +167,7 @@
                 and is_excess = #{isExcess}
             </if>
             <if test="projectStatus == null or projectStatus ==''">
-                and project_status in (1,3)
+                and project_status in (1,2,3)
             </if>
             <if test="projectStatus != null and projectStatus != ''">
                 and project_status = #{projectStatus}
@@ -221,7 +221,7 @@
                 AND p.is_excess = #{isExcess}
             </if>
             <if test="projectStatus == null or projectStatus ==''">
-                AND p.project_status in (1,3)
+                AND p.project_status in (1,2,3)
             </if>
             <if test="projectStatus != null and projectStatus != ''">
                 AND p.project_status = #{projectStatus}