重构计算方法

ruoyi-wages/src/main/resources/mapper/system/WagesOverviewOriginalDataMapper.xml

@@ -33,21 +33,36 @@
         from wages_overview_original_data
 where import_time = #{date}
     </sql>
-
-    <select id="selectAll" parameterType="com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO"
-            resultMap="WagesOverviewOriginalDataResult">
-        <include refid="selectWagesOverviewOriginalDataVo"/>
-        <where>
-            <if test="year != null  and year != ''">and year = #{year}</if>
-            <if test="month != null  and month != ''">and month = #{month}</if>
-            <if test="unitCode != null  and unitCode != ''">and unit_code = #{unitCode}</if>
-            <if test="unitName != null  and unitName != ''">and unit_name like concat('%', #{unitName}, '%')</if>
-            <if test="workerCount != null ">and worker_count = #{workerCount}</if>
-            <if test="workerWagesPayable != null ">and worker_wages_payable = #{workerWagesPayable}</if>
-            <if test="cadreCount != null ">and cadre_count = #{cadreCount}</if>
-            <if test="cadreWagesPayable != null ">and cadre_wages_payable = #{cadreWagesPayable}</if>
-            <if test="totalCount != null ">and total_count = #{totalCount}</if>
-            <if test="totalWagesPayable != null ">and total_wages_payable = #{totalWagesPayable}</if>
-        </where>
+    <select id="selectAll" resultMap="WagesOverviewOriginalDataResult">
+        select id,
+               year,
+               month,
+               unit_code,
+               unit_name,
+               worker_count,
+               worker_wages_payable,
+               cadre_count,
+               cadre_wages_payable,
+               total_count,
+               total_wages_payable
+        from wages_overview_original_data
+        where import_time = #{date}
     </select>
+
+    <!--    <select id="selectAll" parameterType="com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO"-->
+<!--            resultMap="WagesOverviewOriginalDataResult">-->
+<!--        <include refid="selectWagesOverviewOriginalDataVo"/>-->
+<!--        <where>-->
+<!--            <if test="year != null  and year != ''">and year = #{year}</if>-->
+<!--            <if test="month != null  and month != ''">and month = #{month}</if>-->
+<!--            <if test="unitCode != null  and unitCode != ''">and unit_code = #{unitCode}</if>-->
+<!--            <if test="unitName != null  and unitName != ''">and unit_name like concat('%', #{unitName}, '%')</if>-->
+<!--            <if test="workerCount != null ">and worker_count = #{workerCount}</if>-->
+<!--            <if test="workerWagesPayable != null ">and worker_wages_payable = #{workerWagesPayable}</if>-->
+<!--            <if test="cadreCount != null ">and cadre_count = #{cadreCount}</if>-->
+<!--            <if test="cadreWagesPayable != null ">and cadre_wages_payable = #{cadreWagesPayable}</if>-->
+<!--            <if test="totalCount != null ">and total_count = #{totalCount}</if>-->
+<!--            <if test="totalWagesPayable != null ">and total_wages_payable = #{totalWagesPayable}</if>-->
+<!--        </where>-->
+<!--    </select>-->
 </mapper>
\ No newline at end of file