临时计划添加申请修改和申请撤销

purchase-system/src/main/java/com/ozs/plan/doman/ProvisionalPlan.java

@@ -85,6 +85,7 @@ public class ProvisionalPlan {
     private String budgetAccount;
     @TableField(exist = false)
     private String budgetAccountStr;
+
     @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）")
@@ -124,6 +125,30 @@ public class ProvisionalPlan {
     private String projectStatus;
     @TableField(exist = false)
     private String projectStatusStr;
+
+    /**
+     * 处理申请撤销
+     * 请求根据字段 appDelete 判断，值是true就是已申请
+     */
+    private String appDelete;
+    /**
+     * 是否可以申请撤销
+     * 请求根据字段 appDeleteDo 判断，值是true就是可以申请
+     */
+    @TableField(exist = false)
+    private String appDeleteDo;
+    /**
+     * 处理申请修改
+     * 请求根据字段 appUpdate 判断，值是true就是已申请
+     */
+    private String appUpdate;
+    /**
+     * 是否可以申请修改
+     * 请求根据字段 appDeleteDo 判断，值是true就是可以申请
+     */
+    @TableField(exist = false)
+    private String appUpdateDo;
+
     @ApiModelProperty(value = "退回原因")
     @TableField("refuse_reason")
     private String refuseReason;

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/ProvisionalPlanResVo.java

@@ -64,7 +64,28 @@ public class ProvisionalPlanResVo implements Serializable {
 
     private String projectAttr;
     @Excel(name = "项目属性")
+
     private String projectAttrName;
+    /**
+     * 处理申请撤销
+     * 请求根据字段 appDelete 判断，值是true就是已申请
+     */
+    private String appDelete;
+    /**
+     * 是否可以申请撤销
+     * 请求根据字段 appDeleteDo 判断，值是true就是可以申请
+     */
+    private String appDeleteDo;
+    /**
+     * 处理申请修改
+     * 请求根据字段 appUpdate 判断，值是true就是已申请
+     */
+    private String appUpdate;
+    /**
+     * 是否可以申请修改
+     * 请求根据字段 appDeleteDo 判断，值是true就是可以申请
+     */
+    private String appUpdateDo;
 
     @Excel(name = "计划调整情况及理由")
     private String adjustReason;

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

@@ -568,14 +568,14 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         planQuarter.setPlanPracticalId(vo.getPlanPracticalId());
         //同意修改申请
         if ("1".equals(vo.getProjectAttr())) {
+            //同意申请之后进行修改，提交后可再次申请
             planQuarter.setAppUpdate("");
             planQuarter.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
             planQuarterMapper.updateById(planQuarter);
-            //planQuarterMapper.review(vo);
-            planQuarterMapper.deletePlanQuarterById(vo.getPlanPracticalId());
             return AjaxResult.success("已同意该修改申请");
         }
-        planQuarter.setAppUpdate("false");
+        //拒绝后可以再次申请
+        planQuarter.setAppUpdate("");
         planQuarterMapper.updateById(planQuarter);
         return AjaxResult.success("已拒绝改申请");
     }
@@ -875,8 +875,8 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             responseVo.setPlanDemandSubTimeStr(sdf.format(responseVo.getPlanDemandSubTime()));
             responseVo.setPlanPurchaseFinishTimeStr(sdf.format(responseVo.getPlanPurchaseFinishTime()));
             responseVo.setPlanDeliverTimeStr(sdf.format(responseVo.getPlanDeliverTime()));
-            responseVo.setSendLetterDo("false");
             //状态在采购需求对接和流废标退回之间的项目可以进行催告---已发函不可再次发函
+            responseVo.setSendLetterDo("false");
             if (!ObjectUtils.isEmpty(demand)) {
                 if (sendLetterDo(demand.getProjectStatus()) && planQuarter.getSendLetter().equals("0")) {
                     responseVo.setSendLetterDo("true");

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,3)", "");
             }
             if (!ObjectUtils.isEmpty(vo.getParams())) {
                 if (!ObjectUtils.isEmpty(vo.getParams().get("beginTime"))) {
@@ -748,11 +748,39 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     }
                 }
             }
+            //是否可以申请撤销和申请修改
+            //需求待填制可以申请，需求建档就不能申请
+            PmDemand demand = demandService.selectByPlanId(provisionalPlan.getPlanPracticalId());
+            if (!ObjectUtils.isEmpty(demand) && !demand.getProjectStatus().equals(PmProjectStatus.DEMAND_WAIT_FILL.getCode())) {
+                provisionalPlan.setAppDeleteDo("false");
+                provisionalPlan.setAppUpdateDo("false");
+            } else {
+                //能否申请撤销
+                if (!ObjectUtils.isEmpty(provisionalPlan.getAppDelete()) && provisionalPlan.getAppDelete().equals("true")) {
+                    //申请过的不能再申请
+                    provisionalPlan.setAppDeleteDo("false");
+                } else if (provisionalPlan.getProjectStatus().equals("0")) {
+                    provisionalPlan.setAppDeleteDo("false");
+                } else {
+                    //提交后可以申请撤销
+                    provisionalPlan.setAppDeleteDo("true");
+                }
+                //能否申请修改
+                if (!ObjectUtils.isEmpty(provisionalPlan.getAppUpdate()) && provisionalPlan.getAppUpdate().equals("true")) {
+                    //申请过的不能再申请
+                    provisionalPlan.setAppUpdateDo("false");
+                } else if (provisionalPlan.getProjectStatus().equals("0")) {
+                    provisionalPlan.setAppUpdateDo("false");
+                } else {
+                    //提交后可以申请撤销
+                    provisionalPlan.setAppUpdateDo("true");
+                }
+
+            }
 
             BeanUtils.copyProperties(provisionalPlan, provisionalPlanResVo);
-            provisionalPlanResVo.setSendLetterDo("false");
             //状态在采购需求对接和流废标退回之间的项目可以进行催告---已发函不可再次发函
-            PmDemand demand = demandService.selectByPlanId(provisionalPlan.getPlanPracticalId());
+            provisionalPlanResVo.setSendLetterDo("false");
             if (!ObjectUtils.isEmpty(demand)) {
                 if (quarterService.sendLetterDo(demand.getProjectStatus()) && provisionalPlan.getSendLetter().equals("0")) {
                     provisionalPlanResVo.setSendLetterDo("true");