diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
index ce102caa..5e80e238 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@@ -1127,9 +1127,18 @@ public class EamServiceImpl implements EamService {
                                 calendar.clear();
                                 calendar.setTime(orderDate);
                                 if (calendar.get(Calendar.DAY_OF_MONTH) != 31){
-                                    calendar.add(Calendar.DATE,1);
-                                    orderDate = calendar.getTime();
+                                    calendar.set(Calendar.DATE,31);
+                                    try { // 判断该月31日是不是周末，如果为周末就取30日
+                                        if (!HolidayUtils.isWorkingDay(calendar.getTime().getTime())){
+                                            calendar.add(Calendar.DATE,-1);
+                                        }
+                                        orderDate = calendar.getTime();
+                                    }catch (IOException e){
+                                        e.printStackTrace();
+                                    }
                                 }
+                            } else if (month == 2) {
+                                orderDate.setDate(28);
                             }
                             planData.setOrderDate(orderDate);
                             // 是否选择了工单生成规则
@@ -1172,7 +1181,7 @@ public class EamServiceImpl implements EamService {
                         if (planData.getPlanCycle().equals("天")){
                             calendar.add(Calendar.DATE,planData.getPlanPeriod());
                         }else if (planData.getPlanCycle().equals("周")){
-                            calendar.add(Calendar.DATE,7);
+                            calendar.add(Calendar.DATE,7*planData.getPlanPeriod());
                         } else if (planData.getPlanCycle().equals("月")) {
                             calendar.add(Calendar.MONTH,planData.getPlanPeriod());
                         } else if (planData.getPlanCycle().equals("年")) {
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 4c14c58d..8d2a1162 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -363,7 +363,8 @@ b.MinValue,b.ItemRemark,b.ItemType
         a.properties_code,
         a.plan_period,
         d.code_desc,
-        a.work_order_rule
+        a.work_order_rule,
+        a.plan_cycle
         FROM eam_workPlan_overview a
         LEFT JOIN eam_properties_model_header d
         ON a.function_type = d.function_type and a.properties_code = d.code_no