日报增加自定义字段4和5， 支持varchar类型。 针对泓浒的工单号和行号需求可进行配置。

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

@@ -1,8 +1,6 @@
 package com.management.platform.entity;
 
 import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDate;
@@ -26,7 +24,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2024-01-26
+ * @since 2025-04-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -430,6 +428,20 @@ public class Report extends Model<Report> {
     @TableField(exist = false)
     private String userReportDeptName;
 
+
+    /**
+     * 额外拓展字段，针对个性化定制的公司拓展的字段
+     */
+    @TableField("extra_field4")
+    private String extraField4;
+
+    /**
+     * 额外拓展字段，针对个性化定制的公司拓展的字段
+     */
+    @TableField("extra_field5")
+    private String extraField5;
+
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2025-03-11
+ * @since 2025-04-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -621,7 +621,7 @@ public class TimeType extends Model<TimeType> {
     private Integer forceRejectReason;
 
     /**
-     * 任务文件审核 0不启用 1启用且自动填充 2启用且下拉选择
+     * 任务文件审核 0不启用 1启用
      */
     @TableField("task_file_charge")
     private Integer taskFileCharge;
@@ -632,15 +632,21 @@ public class TimeType extends Model<TimeType> {
     @TableField("task_plan_cost")
     private Integer taskPlanCost;
 
-    /**项目进度判断依据，0-默认字段，1-根据任务工时*/
+    /**
+     * 项目进度判断依据，0-默认字段，1-根据任务工时
+     */
     @TableField("project_progress_check")
     private Integer projectProgressCheck;
 
-    /**按周审核日报过滤功能，0-不开启，1-开启*/
+    /**
+     * 按周审核日报过滤功能，0-不开启，1-开启
+     */
     @TableField("weekly_charge_filter")
     private Integer weeklyChargeFilter;
 
-    /**日报审核发送企微消息功能，0-不开启，1-开启*/
+    /**
+     * 对已通过的日报进行撤销操作时是否发送企微消息功能，0-不发送，1-发送
+     */
     @TableField("report_charge_msg")
     private Integer reportChargeMsg;
 
@@ -650,6 +656,19 @@ public class TimeType extends Model<TimeType> {
     @TableField("auto_project_approve")
     private Boolean autoProjectApprove;
 
+    /**
+     * 日报定制字段4名称
+     */
+    @TableField("report_extra_field4_name")
+    private String reportExtraField4Name;
+
+    /**
+     * 日报定制字段5名称
+     */
+    @TableField("report_extra_field5_name")
+    private String reportExtraField5Name;
+
+
     @TableField(exist = false)
     private List<User> userList;
     @TableField(exist = false)
@@ -657,7 +676,6 @@ public class TimeType extends Model<TimeType> {
     @TableField(exist = false)
     private Integer saasSyncContact;
 
-
     @Override
     protected Serializable pkVal() {
         return this.companyId;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CodeGenerator.java

@@ -92,7 +92,7 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://1.94.62.58:17089/man_mld?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://1.94.62.58:17089/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");