Skip to content

K
klck
Commit 2d51a4c2 authored by Fuzy's avatar Fuzy
Browse files
Options

重构计算方法

parent ea4baf83
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 117 deletions
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/WagesDetailsOriginalDataMapper.java
View file @ 2d51a4c2
......@@ -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
View file @ 2d51a4c2
......@@ -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
View file @ 2d51a4c2
......@@ -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/WagesDetailsOriginalDataMapper.xml
View file @ 2d51a4c2
......@@ -5,97 +5,144 @@
<mapper namespace="com.ruoyi.system.mapper.WagesDetailsOriginalDataMapper">
<resultMap type="com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO" id="WagesDetailsOriginalDataResult">
<result property="id" column="id" />
<result property="year" column="year" />
<result property="month" column="month" />
<result property="unitName" column="unit_name" />
<result property="peopleCount" column="people_count" />
<result property="totalWithholding" column="total_withholding" />
<result property="netSalary" column="net_salary" />
<result property="oneChildFee" column="one_child_fee" />
<result property="medicalSubsidy" column="medical_subsidy" />
<result property="healthCareFee" column="health_care_fee" />
<result property="classMealFee" column="class_meal_fee" />
<result property="soapFee" column="soap_fee" />
<result property="nursingFee" column="nursing_fee" />
<result property="heatstrokePreventionSubsidy" column="heatstroke_prevention_subsidy" />
<result property="heatingSubsidy" column="heating_subsidy" />
<result property="manuscriptFee" column="manuscript_fee" />
<result property="driverAllowance" column="driver_allowance" />
<result property="graduateSettlementFee" column="graduate_settlement_fee" />
<result property="oneTimeDisabilitySubsidy" column="one_time_disability_subsidy" />
<result property="lectureAndExamFee" column="lecture_and_exam_fee" />
<result property="otherSubsidies" column="other_subsidies" />
<result property="houseRent" column="house_rent" />
<result property="wagesPayable" column="Wages_payable" />
<result property="accommodation" column="accommodation" />
<result property="heatingFee" column="heating_fee" />
<result property="tradeUnionDues" column="trade_union_dues" />
<result property="compensationDeduction" column="compensation_deduction" />
<result property="otherDeductions" column="other_deductions" />
<result property="mutualMedicalAid" column="mutual_medical_aid" />
<result property="communicationFee" column="communication_fee" />
<result property="tax1" column="tax1" />
<result property="tax2" column="tax2" />
<result property="pensionInsurance" column="pension_insurance" />
<result property="unemploymentInsurance" column="unemployment_insurance" />
<result property="medicalInsurance" column="medical_insurance" />
<result property="annuity" column="annuity" />
<result property="housingProvidentFund" column="housing_provident_fund" />
<result property="enterpriseFund" column="enterprise_fund" />
<result property="annuityIncomeTax" column="annuity_income_tax" />
<result property="totalPayment" column="total_payment" />
<result property="totalSalaryDisbursement" column="total_salary_disbursement" />
<result property="id" column="id"/>
<result property="year" column="year"/>
<result property="month" column="month"/>
<result property="unitName" column="unit_name"/>
<result property="peopleCount" column="people_count"/>
<result property="totalWithholding" column="total_withholding"/>
<result property="netSalary" column="net_salary"/>
<result property="oneChildFee" column="one_child_fee"/>
<result property="medicalSubsidy" column="medical_subsidy"/>
<result property="healthCareFee" column="health_care_fee"/>
<result property="classMealFee" column="class_meal_fee"/>
<result property="soapFee" column="soap_fee"/>
<result property="nursingFee" column="nursing_fee"/>
<result property="heatstrokePreventionSubsidy" column="heatstroke_prevention_subsidy"/>
<result property="heatingSubsidy" column="heating_subsidy"/>
<result property="manuscriptFee" column="manuscript_fee"/>
<result property="driverAllowance" column="driver_allowance"/>
<result property="graduateSettlementFee" column="graduate_settlement_fee"/>
<result property="oneTimeDisabilitySubsidy" column="one_time_disability_subsidy"/>
<result property="lectureAndExamFee" column="lecture_and_exam_fee"/>
<result property="otherSubsidies" column="other_subsidies"/>
<result property="houseRent" column="house_rent"/>
<result property="wagesPayable" column="Wages_payable"/>
<result property="accommodation" column="accommodation"/>
<result property="heatingFee" column="heating_fee"/>
<result property="tradeUnionDues" column="trade_union_dues"/>
<result property="compensationDeduction" column="compensation_deduction"/>
<result property="otherDeductions" column="other_deductions"/>
<result property="mutualMedicalAid" column="mutual_medical_aid"/>
<result property="communicationFee" column="communication_fee"/>
<result property="tax1" column="tax1"/>
<result property="tax2" column="tax2"/>
<result property="pensionInsurance" column="pension_insurance"/>
<result property="unemploymentInsurance" column="unemployment_insurance"/>
<result property="medicalInsurance" column="medical_insurance"/>
<result property="annuity" column="annuity"/>
<result property="housingProvidentFund" column="housing_provident_fund"/>
<result property="enterpriseFund" column="enterprise_fund"/>
<result property="annuityIncomeTax" column="annuity_income_tax"/>
<result property="totalPayment" column="total_payment"/>
<result property="totalSalaryDisbursement" column="total_salary_disbursement"/>
</resultMap>
<sql id="selectWagesDetailsOriginalDataVo">
select id, ssk_id, year, month, unit_name, people_count, total_withholding, net_salary, one_child_fee, medical_subsidy, health_care_fee, class_meal_fee, soap_fee, nursing_fee, heatstroke_prevention_subsidy, heating_subsidy, manuscript_fee, driver_allowance, graduate_settlement_fee, one_time_disability_subsidy, lecture_and_exam_fee, other_subsidies, house_rent, Wages_payable, accommodation, heating_fee, trade_union_dues, compensation_deduction, other_deductions, mutual_medical_aid, communication_fee, tax1, tax2, pension_insurance, unemployment_insurance, medical_insurance, annuity, housing_provident_fund, enterprise_fund, annuity_income_tax, total_payment, total_salary_disbursement from wages_details_original_data
select id,
ssk_id,
year,
month,
unit_name,
people_count,
total_withholding,
net_salary,
one_child_fee,
medical_subsidy,
health_care_fee,
class_meal_fee,
soap_fee,
nursing_fee,
heatstroke_prevention_subsidy,
heating_subsidy,
manuscript_fee,
driver_allowance,
graduate_settlement_fee,
one_time_disability_subsidy,
lecture_and_exam_fee,
other_subsidies,
house_rent,
Wages_payable,
accommodation,
heating_fee,
trade_union_dues,
compensation_deduction,
other_deductions,
mutual_medical_aid,
communication_fee,
tax1,
tax2,
pension_insurance,
unemployment_insurance,
medical_insurance,
annuity,
housing_provident_fund,
enterprise_fund,
annuity_income_tax,
total_payment,
total_salary_disbursement
from wages_details_original_data
where import_time = #{date}
</sql>
<select id="selectAll" parameterType="com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO" resultMap="WagesDetailsOriginalDataResult">
<select id="selectAll" parameterType="com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO"
resultMap="WagesDetailsOriginalDataResult">
<include refid="selectWagesDetailsOriginalDataVo"/>
<where>
<if test="sskId != null and sskId != ''"> and ssk_id = #{sskId}</if>
<if test="year != null and year != ''"> and year = #{year}</if>
<if test="month != null and month != ''"> and month = #{month}</if>
<if test="unitName != null and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
<if test="peopleCount != null "> and people_count = #{peopleCount}</if>
<if test="totalWithholding != null "> and total_withholding = #{totalWithholding}</if>
<if test="netSalary != null "> and net_salary = #{netSalary}</if>
<if test="oneChildFee != null "> and one_child_fee = #{oneChildFee}</if>
<if test="medicalSubsidy != null "> and medical_subsidy = #{medicalSubsidy}</if>
<if test="healthCareFee != null "> and health_care_fee = #{healthCareFee}</if>
<if test="classMealFee != null "> and class_meal_fee = #{classMealFee}</if>
<if test="soapFee != null "> and soap_fee = #{soapFee}</if>
<if test="nursingFee != null "> and nursing_fee = #{nursingFee}</if>
<if test="heatstrokePreventionSubsidy != null "> and heatstroke_prevention_subsidy = #{heatstrokePreventionSubsidy}</if>
<if test="heatingSubsidy != null "> and heating_subsidy = #{heatingSubsidy}</if>
<if test="manuscriptFee != null "> and manuscript_fee = #{manuscriptFee}</if>
<if test="driverAllowance != null "> and driver_allowance = #{driverAllowance}</if>
<if test="graduateSettlementFee != null "> and graduate_settlement_fee = #{graduateSettlementFee}</if>
<if test="oneTimeDisabilitySubsidy != null "> and one_time_disability_subsidy = #{oneTimeDisabilitySubsidy}</if>
<if test="lectureAndExamFee != null "> and lecture_and_exam_fee = #{lectureAndExamFee}</if>
<if test="otherSubsidies != null "> and other_subsidies = #{otherSubsidies}</if>
<if test="houseRent != null "> and house_rent = #{houseRent}</if>
<if test="wagesPayable != null "> and Wages_payable = #{wagesPayable}</if>
<if test="accommodation != null "> and accommodation = #{accommodation}</if>
<if test="heatingFee != null "> and heating_fee = #{heatingFee}</if>
<if test="tradeUnionDues != null "> and trade_union_dues = #{tradeUnionDues}</if>
<if test="compensationDeduction != null "> and compensation_deduction = #{compensationDeduction}</if>
<if test="otherDeductions != null "> and other_deductions = #{otherDeductions}</if>
<if test="mutualMedicalAid != null "> and mutual_medical_aid = #{mutualMedicalAid}</if>
<if test="communicationFee != null "> and communication_fee = #{communicationFee}</if>
<if test="tax1 != null "> and tax1 = #{tax1}</if>
<if test="tax2 != null "> and tax2 = #{tax2}</if>
<if test="pensionInsurance != null "> and pension_insurance = #{pensionInsurance}</if>
<if test="unemploymentInsurance != null "> and unemployment_insurance = #{unemploymentInsurance}</if>
<if test="medicalInsurance != null "> and medical_insurance = #{medicalInsurance}</if>
<if test="annuity != null "> and annuity = #{annuity}</if>
<if test="housingProvidentFund != null "> and housing_provident_fund = #{housingProvidentFund}</if>
<if test="enterpriseFund != null "> and enterprise_fund = #{enterpriseFund}</if>
<if test="annuityIncomeTax != null "> and annuity_income_tax = #{annuityIncomeTax}</if>
<if test="totalPayment != null "> and total_payment = #{totalPayment}</if>
<if test="totalSalaryDisbursement != null "> and total_salary_disbursement = #{totalSalaryDisbursement}</if>
<if test="sskId != null and sskId != ''">and ssk_id = #{sskId}</if>
<if test="year != null and year != ''">and year = #{year}</if>
<if test="month != null and month != ''">and month = #{month}</if>
<if test="unitName != null and unitName != ''">and unit_name like concat('%', #{unitName}, '%')</if>
<if test="peopleCount != null ">and people_count = #{peopleCount}</if>
<if test="totalWithholding != null ">and total_withholding = #{totalWithholding}</if>
<if test="netSalary != null ">and net_salary = #{netSalary}</if>
<if test="oneChildFee != null ">and one_child_fee = #{oneChildFee}</if>
<if test="medicalSubsidy != null ">and medical_subsidy = #{medicalSubsidy}</if>
<if test="healthCareFee != null ">and health_care_fee = #{healthCareFee}</if>
<if test="classMealFee != null ">and class_meal_fee = #{classMealFee}</if>
<if test="soapFee != null ">and soap_fee = #{soapFee}</if>
<if test="nursingFee != null ">and nursing_fee = #{nursingFee}</if>
<if test="heatstrokePreventionSubsidy != null ">and heatstroke_prevention_subsidy =
#{heatstrokePreventionSubsidy}
</if>
<if test="heatingSubsidy != null ">and heating_subsidy = #{heatingSubsidy}</if>
<if test="manuscriptFee != null ">and manuscript_fee = #{manuscriptFee}</if>
<if test="driverAllowance != null ">and driver_allowance = #{driverAllowance}</if>
<if test="graduateSettlementFee != null ">and graduate_settlement_fee = #{graduateSettlementFee}</if>
<if test="oneTimeDisabilitySubsidy != null ">and one_time_disability_subsidy = #{oneTimeDisabilitySubsidy}
</if>
<if test="lectureAndExamFee != null ">and lecture_and_exam_fee = #{lectureAndExamFee}</if>
<if test="otherSubsidies != null ">and other_subsidies = #{otherSubsidies}</if>
<if test="houseRent != null ">and house_rent = #{houseRent}</if>
<if test="wagesPayable != null ">and Wages_payable = #{wagesPayable}</if>
<if test="accommodation != null ">and accommodation = #{accommodation}</if>
<if test="heatingFee != null ">and heating_fee = #{heatingFee}</if>
<if test="tradeUnionDues != null ">and trade_union_dues = #{tradeUnionDues}</if>
<if test="compensationDeduction != null ">and compensation_deduction = #{compensationDeduction}</if>
<if test="otherDeductions != null ">and other_deductions = #{otherDeductions}</if>
<if test="mutualMedicalAid != null ">and mutual_medical_aid = #{mutualMedicalAid}</if>
<if test="communicationFee != null ">and communication_fee = #{communicationFee}</if>
<if test="tax1 != null ">and tax1 = #{tax1}</if>
<if test="tax2 != null ">and tax2 = #{tax2}</if>
<if test="pensionInsurance != null ">and pension_insurance = #{pensionInsurance}</if>
<if test="unemploymentInsurance != null ">and unemployment_insurance = #{unemploymentInsurance}</if>
<if test="medicalInsurance != null ">and medical_insurance = #{medicalInsurance}</if>
<if test="annuity != null ">and annuity = #{annuity}</if>
<if test="housingProvidentFund != null ">and housing_provident_fund = #{housingProvidentFund}</if>
<if test="enterpriseFund != null ">and enterprise_fund = #{enterpriseFund}</if>
<if test="annuityIncomeTax != null ">and annuity_income_tax = #{annuityIncomeTax}</if>
<if test="totalPayment != null ">and total_payment = #{totalPayment}</if>
<if test="totalSalaryDisbursement != null ">and total_salary_disbursement = #{totalSalaryDisbursement}</if>
</where>
</select>
</mapper>
\ No newline at end of file
ruoyi-wages/src/main/resources/mapper/system/WagesOverviewOriginalDataMapper.xml
View file @ 2d51a4c2
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment