新增车间计算记录与数据看板

ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.ruoyi.oa.mapper.OaReportSummaryMapper">
 
     <resultMap type="com.ruoyi.oa.domain.OaReportSummary" id="OaReportSummaryResult">
-        <result property="id" column="id"/>
+        <result property="summaryId" column="summary_id"/>
         <result property="reportTitle" column="report_title"/>
         <result property="reportDate" column="report_date"/>
         <result property="reporter" column="reporter"/>
@@ -16,11 +16,12 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
+        <result property="type" column="type"/>
     </resultMap>
 
     <select id="selectVoPageWithProject" resultType="com.ruoyi.oa.domain.vo.OaReportSummaryVo">
         SELECT
-        s.id,
+        s.summary_id as summaryId,
         s.report_title AS reportTitle,
         s.report_date AS reportDate,
         s.reporter,