重构计算方法

ruoyi-wages/src/main/java/com/ruoyi/system/mapper/WagesDetailsOriginalDataMapper.java

@@ -2,10 +2,11 @@ package com.ruoyi.system.mapper;
 
 
 import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface WagesDetailsOriginalDataMapper {
 
-    List<WagesDetailsOriginalExcelDAO> selectAll();
+    List<WagesDetailsOriginalExcelDAO> selectAll(@Param("date") String date);
 }
\ No newline at end of file

ruoyi-wages/src/main/java/com/ruoyi/system/mapper/WagesOverviewOriginalDateMapper.java

@@ -2,10 +2,11 @@ package com.ruoyi.system.mapper;
 
 
 import com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface WagesOverviewOriginalDateMapper {
 
-    List<WagesOverviewOriginalExcelDAO> selectAll();
+    List<WagesOverviewOriginalExcelDAO> selectAll(@Param("date") String date);
 }
\ No newline at end of file

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesCalculateConversionServiceImpl.java

@@ -78,16 +78,11 @@ public class WagesCalculateConversionServiceImpl implements WagesCalculateConver
 
         //定义一个集合用来，存储返回的字段
         List<WagesFormulaVo> voList = new ArrayList<>();
-        // 从数据库中获取数据
-        String date = wagesFormulaListDto.getDate();
-        String[] parts = date.split("-");
-        String year = parts[0];
-        String month = parts[1];
         // 获取前端传过来的集合（label, c, value）
         //详细表
-        List<WagesDetailsOriginalExcelDAO> wagesDetails = detailsOriginalDataMapper.selectAll();
+        List<WagesDetailsOriginalExcelDAO> wagesDetails = detailsOriginalDataMapper.selectAll(wagesFormulaListDto.getDate());
         //略表
-        List<WagesOverviewOriginalExcelDAO> wagesList = originalDateMapper.selectAll();
+        List<WagesOverviewOriginalExcelDAO> wagesList = originalDateMapper.selectAll(wagesFormulaListDto.getDate());
         List<String> unitList = wagesList.parallelStream().map(WagesOverviewOriginalExcelDAO::getUnitName).collect(Collectors.toList());
 
         if (wagesList.size() == 0) {
@@ -250,7 +245,7 @@ public class WagesCalculateConversionServiceImpl implements WagesCalculateConver
         int accordPositionTwo = value.length();
         for (int i = 0; i < value.length(); i++) {
             char charAt = value.charAt(i);
-            if (FH.contains(charAt) && !ifAccordOne && ifAccordTwo) {
+            if (FH.contains(charAt) && !ifAccordOne) {
                 ifAccordTwo = false;
                 accordPositionTwo = i;
                 break;

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

@@ -4,36 +4,50 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.WagesOverviewOriginalDateMapper">
 
-    <resultMap type="com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO" id="WagesOverviewOriginalDataResult">
-        <result property="year"    column="year"    />
-        <result property="month"    column="month"    />
-        <result property="unitCode"    column="unit_code"    />
-        <result property="unitName"    column="unit_name"    />
-        <result property="workerCount"    column="worker_count"    />
-        <result property="workerWagesPayable"    column="worker_wages_payable"    />
-        <result property="cadreCount"    column="cadre_count"    />
-        <result property="cadreWagesPayable"    column="cadre_wages_payable"    />
-        <result property="totalCount"    column="total_count"    />
-        <result property="totalWagesPayable"    column="total_wages_payable"    />
+    <resultMap type="com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO"
+               id="WagesOverviewOriginalDataResult">
+        <result property="year" column="year"/>
+        <result property="month" column="month"/>
+        <result property="unitCode" column="unit_code"/>
+        <result property="unitName" column="unit_name"/>
+        <result property="workerCount" column="worker_count"/>
+        <result property="workerWagesPayable" column="worker_wages_payable"/>
+        <result property="cadreCount" column="cadre_count"/>
+        <result property="cadreWagesPayable" column="cadre_wages_payable"/>
+        <result property="totalCount" column="total_count"/>
+        <result property="totalWagesPayable" column="total_wages_payable"/>
     </resultMap>
 
     <sql id="selectWagesOverviewOriginalDataVo">
-        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
+        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}
     </sql>
 
-    <select id="selectAll" parameterType="com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO" resultMap="WagesOverviewOriginalDataResult">
+    <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>
+            <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