Merge remote-tracking branch 'origin/master'

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandResVo.java

@@ -247,6 +247,10 @@ public class PmDemandResVo extends BaseEntity
      * 项目是否滞后 1为滞后
      */
     private String isExceedProject;
+    /**
+     * 首页是否显示填写滞后原因
+     */
+    private String isWriteExceed;
     /**
      * 详情类型(1项目计划，2需求建档，3任务下达,4中标信息，5合同信息，6建设情况)
      */

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -3112,6 +3112,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 vo.setTipsMessage(pmDemandGetTips(vo.getPlanDeliverTime()));
                 if (vo.getTipsMessage().contains("超过")) {
                     vo.setIsExceedProject("1");
+                    if (ObjectUtils.isEmpty(pmDemand1.getDelayReason())) {
+                       //没有原因就可以填写滞后原因
+                        vo.setIsWriteExceed("1");
+                    }
                 }
             } catch (ParseException e) {
                 e.printStackTrace();