qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug

This commit is contained in:
钱涛 2022-03-12 14:20:39 +08:00
parent 3abcf90ee2
commit 4e9d103021
7 changed files with 13 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java
View File

@ -143,10 +143,10 @@ public class AddUpSituationGetDetailListCmd extends AbstractCommonCommand<Map<St
List<String> taxYearMonth = queryParam.getTaxYearMonth();
if (CollectionUtils.isNotEmpty(taxYearMonth)) {
if (taxYearMonth.size() == 1) {
sqlWhere += " AND t1.declare_month = '" + taxYearMonth.get(0) + "'";
sqlWhere += " AND t1.tax_year_month = '" + taxYearMonth.get(0) + "'";
}
if (taxYearMonth.size() == 2) {
sqlWhere += " AND (t1.declare_month BETWEEN '" + taxYearMonth.get(0) + "' AND '" + taxYearMonth.get(1) + "')";
sqlWhere += " AND (t1.tax_year_month BETWEEN '" + taxYearMonth.get(0) + "' AND '" + taxYearMonth.get(1) + "')";
}
}
//姓名

6
src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java
View File

@ -33,7 +33,7 @@ public class AddUpSituationListCmd extends AbstractCommonCommand<Map<String, Obj
public Map<String, Object> execute(CommandContext commandContext) {
String fields = " t1.id," +
" t1.tax_year_month," +
" t1.tax_year_month as taxYearMonth," +
" t1.employee_id as employeeId," +
" e.lastname as username," +
" d.departmentName AS departmentName," +
@ -115,10 +115,10 @@ public class AddUpSituationListCmd extends AbstractCommonCommand<Map<String, Obj
List<String> taxYearMonth = queryParam.getTaxYearMonth();
if (CollectionUtils.isNotEmpty(taxYearMonth)) {
if (taxYearMonth.size() == 1) {
sqlWhere += " AND t1.declare_month = '" + taxYearMonth.get(0) + "'";
sqlWhere += " AND t1.tax_year_month = '" + taxYearMonth.get(0) + "'";
}
if (taxYearMonth.size() == 2) {
sqlWhere += " AND (t1.declare_month BETWEEN '" + taxYearMonth.get(0) + "' AND '" + taxYearMonth.get(1) + "')";
sqlWhere += " AND (t1.tax_year_month BETWEEN '" + taxYearMonth.get(0) + "' AND '" + taxYearMonth.get(1) + "')";
}
}
//姓名

2
src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
View File

@ -89,7 +89,7 @@ public class AddUpDeductionDTO {
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(index = 6)
@SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate", transmethod = "com.engine.salary.transmethod.TransMethod.timeToDate")
@SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate")
private Date hiredate;
/**

109
src/com/engine/salary/entity/datacollection/dto/AddUpDeductionListDTO.java
View File

@ -1,109 +0,0 @@
package com.engine.salary.entity.datacollection.dto;
import com.engine.salary.util.excel.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.Date;
/**
* 数据采集-累计专项附加扣除
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AddUpDeductionListDTO {
/**
* 主键id
*/
private Long id;
/**
* 员工id
*/
private Long employeeId;
/**
* 姓名
*/
@ExcelProperty(index = 0)
private String username;
/**
* 个税扣缴义务人
*/
@ExcelProperty(index = 1)
private String taxAgentName;
/**
* 部门
*/
@ExcelProperty(index = 2)
private String departmentName;
/**
* 手机号
*/
@ExcelProperty(index = 3)
private String mobile;
/**
* 工号
*/
@ExcelProperty(index = 4)
private String jobNum;
/**
* 证件号码
*/
@ExcelProperty(index = 5)
private String idNo;
/**
* 入职日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(index = 6)
private Date hiredate;
/**
* 累计子女教育
*/
@ExcelProperty(index = 7)
private BigDecimal addUpChildEducation;
/**
* 累计继续教育
*/
@ExcelProperty(index = 8)
private BigDecimal addUpContinuingEducation;
/**
* 累计住房贷款利息
*/
@ExcelProperty(index = 9)
private BigDecimal addUpHousingLoanInterest;
/**
* 累计住房租金
*/
@ExcelProperty(index = 10)
private BigDecimal addUpHousingRent;
/**
* 累计赡养老人
*/
@ExcelProperty(index = 11)
private BigDecimal addUpSupportElderly;
}

2
src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
View File

@ -70,7 +70,7 @@ public class AddUpSituationDTO {
private String idNo;
//入职日期
@SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate", transmethod = "com.engine.salary.transmethod.TransMethod.timeToDate")
@SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate")
@ExcelProperty(index = 6)
private Date hiredate;

3
src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
View File

@ -38,7 +38,6 @@ public class OtherDeductionListDTO {
private Long employeeId;
//姓名
@SalaryTableColumn(text = "姓名", width = "10%", column = "username")
@ExcelProperty(index = 0)
private String username;
@ -70,7 +69,7 @@ public class OtherDeductionListDTO {
//入职日期
@ExcelProperty(index = 6)
@SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate", transmethod = "com.engine.salary.transmethod.TransMethod.timeToDate")
@SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate")
private Date hiredate;
//商业健康保险

5
src/com/engine/salary/transmethod/TransMethod.java
View File

@ -31,4 +31,9 @@ public class TransMethod {
}
return format;
}
public static String dateToString(String date) {
return date;
}
}