增加日报自定义数值

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

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2022-02-24
+ * @since 2022-03-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -132,6 +132,18 @@ public class TimeType extends Model<TimeType> {
     @TableField("report_workflow")
     private Integer reportWorkflow;
 
+    /**
+     * 工时填报数值收集开关
+     */
+    @TableField("custom_data_active")
+    private Integer customDataActive;
+
+    /**
+     * 工时填报数值收集字段名称
+     */
+    @TableField("custom_data_name")
+    private String customDataName;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -78,7 +78,7 @@
     </select>
     <!--获取查询者所在公司每个项目的工时成本-->
     <select id="getParticipatedProject" resultType="java.util.Map">
-        SELECT id, project_name AS projectName
+        SELECT id, project_name AS projectName, status
         FROM project
         WHERE id IN (
             SELECT project_id

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TimeTypeMapper.xml

@@ -22,11 +22,13 @@
         <result column="sync_corpwx_time" property="syncCorpwxTime" />
         <result column="need_dept_audit" property="needDeptAudit" />
         <result column="report_workflow" property="reportWorkflow" />
+        <result column="custom_data_active" property="customDataActive" />
+        <result column="custom_data_name" property="customDataName" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        company_id, allday, am, pm, month_days, hour_cost_input_type, type, pay_overtime, alert_time, multi_worktime, fix_monthcost, fill_months, custom_degree_active, custom_degree_name, alert_msg, sync_corpwx_time, need_dept_audit, report_workflow
+        company_id, allday, am, pm, month_days, hour_cost_input_type, type, pay_overtime, alert_time, multi_worktime, fix_monthcost, fill_months, custom_degree_active, custom_degree_name, alert_msg, sync_corpwx_time, need_dept_audit, report_workflow, custom_data_active, custom_data_name
     </sql>
 
 </mapper>