1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/Plan.java

@@ -22,7 +22,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-07-29
+ * @since 2023-07-31
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -215,6 +215,12 @@ public class Plan extends Model<Plan> {
     @TableField("create_id")
     private String createId;
 
+    /**
+     * 0-待下发 1-已下发
+     */
+    @TableField("status")
+    private Integer status;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -212,9 +212,15 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             switch (plan.getPlanType()){
                 case 0:
                     plan.setStartDate(LocalDate.now());
+                    if(plan.getEndDate().isBefore(plan.getStartDate())){
+                        plan.setEndDate(LocalDate.now());
+                    }
                     break;
                 case 1:
                     plan.setStartDate(LocalDate.now().plusDays(1));
+                    if(plan.getEndDate().isBefore(plan.getStartDate())){
+                        plan.setEndDate(LocalDate.now().plusDays(1));
+                    }
                     break;
             }
             if(plan.getPlanType()!=2){
@@ -297,6 +303,8 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     stringBuilder.append((planType==0?"今日计划":planType==1?"明日计划":"插单计划")+"\n");
                     stringBuilder.append(planType==2?"任务名称: "+plan.getTaskName()+"\n"+"任务变更通知号: "+plan.getTaskChangeNoticeNum():"产品名称: "+plan.getProductName()+"\n"+"排产工单号: "+plan.getProductSchedulingNum());
                     wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,first.get().getCorpwxRealUserid(),stringBuilder.toString(),planType==0?"plan/today":planType==1?"plan/tomorrow":"plan/orderInsert",null);
+                    /*修改下发状态为已下发*/
+                    plan.setStatus(1);
                 }else msg.setError("验证失败");
             }
         }

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/PlanMapper.xml

@@ -33,11 +33,12 @@
         <result column="version_number" property="versionNumber" />
         <result column="create_time" property="createTime" />
         <result column="create_id" property="createId" />
+        <result column="status" property="status" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, product_scheduling_num, product_id, product_name, project_code, company_id, steel_stamp_number_start, steel_stamp_number_end, num, main_process, station_id, station_name, foreman_id, foreman_name, plan_type, start_date, end_date, task_name, task_type_id, task_type_name, check_type, task_change_notice_num, plan_man_num, plan_work_hour, money_of_job, describtion, version_number, create_time, create_id
+        id, product_scheduling_num, product_id, product_name, project_code, company_id, steel_stamp_number_start, steel_stamp_number_end, num, main_process, station_id, station_name, foreman_id, foreman_name, plan_type, start_date, end_date, task_name, task_type_id, task_type_name, check_type, task_change_notice_num, plan_man_num, plan_work_hour, money_of_job, describtion, version_number, create_time, create_id, status
     </sql>
 
 </mapper>