任务表修改1

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Task.java

@@ -82,6 +82,12 @@ public class Task extends Model<Task> {
     @TableField("order_id")
     private Integer orderId;
 
+    /**
+     * 产品id
+     */
+    @TableField("product_id")
+    private Integer productId;
+
     /**
      * 状态 0-启动 1-进行中 2-完成 3-推迟
      */
@@ -100,6 +106,36 @@ public class Task extends Model<Task> {
     @TableField("repeat")
     private Integer repeat;
 
+    /**
+     * 重复类型 :每天:0、每周:1、每月:2、自定义周期:4、自定义日期:4五种
+     */
+    @TableField("repeat_type")
+    private Integer repeatType;
+
+    /**
+     * 重复永不结束   1:勾选  
+     */
+    @TableField("repeat_end_never")
+    private Integer repeatEndNever;
+
+    /**
+     * 重复结束 在  ? 次之后
+     */
+    @TableField("repeat_end_count")
+    private Integer repeatEndCount;
+
+    /**
+     * 重复结束 在  ? 日期YYYY-MM-DD之后
+     */
+    @TableField("repeat_end_date")
+    private LocalDate repeatEndDate;
+
+    /**
+     * 自定义周期: 每 ? 天一次
+     */
+    @TableField("repeat_design_day")
+    private Integer repeatDesignDay;
+
     /**
      * 任务描述
      */

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/TaskMapper.xml

@@ -14,9 +14,15 @@
         <result column="custom_id" property="customId" />
         <result column="business_opportunity_id" property="businessOpportunityId" />
         <result column="order_id" property="orderId" />
+        <result column="product_id" property="productId" />
         <result column="status" property="status" />
         <result column="priority" property="priority" />
         <result column="repeat" property="repeat" />
+        <result column="repeat_type" property="repeatType" />
+        <result column="repeat_end_never" property="repeatEndNever" />
+        <result column="repeat_end_count" property="repeatEndCount" />
+        <result column="repeat_end_date" property="repeatEndDate" />
+        <result column="repeat_design_day" property="repeatDesignDay" />
         <result column="task_desc" property="taskDesc" />
         <result column="creater_id" property="createrId" />
         <result column="creater_name" property="createrName" />
@@ -33,7 +39,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, company_id, owner_id, contacts_id, executor_id, clue_id, custom_id, business_opportunity_id, order_id, status, priority, repeat, task_desc, creater_id, creater_name, create_date, end_date, start_date, finish_date, plate1, plate2, plate3, plate4, plate5
+        id, name, company_id, owner_id, contacts_id, executor_id, clue_id, custom_id, business_opportunity_id, order_id, product_id, status, priority, repeat, repeat_type, repeat_end_never, repeat_end_count, repeat_end_date, repeat_design_day, task_desc, creater_id, creater_name, create_date, end_date, start_date, finish_date, plate1, plate2, plate3, plate4, plate5
     </sql>
 
 </mapper>