Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -2,6 +2,7 @@ package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
@@ -15,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2024-02-28
+ * @since 2024-03-06
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,6 +28,15 @@ public class Task extends Model<Task> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    /**
+     * 任务名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 公司id
+     */
     @TableField("company_id")
     private Integer companyId;
 
@@ -42,6 +52,12 @@ public class Task extends Model<Task> {
     @TableField("contacts_id")
     private Integer contactsId;
 
+    /**
+     * 执行人id，多个
+     */
+    @TableField("executor_id")
+    private String executorId;
+
     /**
      * 线索id
      */
@@ -66,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-推迟
      */
@@ -84,6 +106,78 @@ 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;
+
+    /**
+     * 任务描述
+     */
+    @TableField("task_desc")
+    private String taskDesc;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creater_id")
+    private String createrId;
+
+    /**
+     * 创建人姓名
+     */
+    @TableField("creater_name")
+    private String createrName;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_date")
+    private LocalDate createDate;
+
+    /**
+     * 截止时间
+     */
+    @TableField("end_date")
+    private LocalDate endDate;
+
+    /**
+     * 开始日期
+     */
+    @TableField("start_date")
+    private LocalDate startDate;
+
+    /**
+     * 完成日期
+     */
+    @TableField("finish_date")
+    private LocalDate finishDate;
+
     /**
      * 自定义字段存值
      */

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

@@ -5,16 +5,31 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.Task">
         <id column="id" property="id" />
+        <result column="name" property="name" />
         <result column="company_id" property="companyId" />
         <result column="owner_id" property="ownerId" />
         <result column="contacts_id" property="contactsId" />
+        <result column="executor_id" property="executorId" />
         <result column="clue_id" property="clueId" />
         <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" />
+        <result column="create_date" property="createDate" />
+        <result column="end_date" property="endDate" />
+        <result column="start_date" property="startDate" />
+        <result column="finish_date" property="finishDate" />
         <result column="plate1" property="plate1" />
         <result column="plate2" property="plate2" />
         <result column="plate3" property="plate3" />
@@ -24,7 +39,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, owner_id, contacts_id, clue_id, custom_id, business_opportunity_id, order_id, status, priority, repeat, 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>

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

@@ -11957,7 +11957,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 LocalDate createTimeLocalDate = createTime.toLocalDate();
                 boolean b1 = WorkDayCalculateUtils.sameMonth(createDate, createTimeLocalDate);
                 boolean b2 = WorkDayCalculateUtils.sameWeek(createDate, createTimeLocalDate);
-                if (b1&&b2){
+                if (b1||b2){
                     reports.add(report);
                 }
             }