Commit f52d19d1 authored by fangxinjiang's avatar fangxinjiang

代码优化

parent fcc64871
...@@ -475,5 +475,5 @@ public interface CommonConstants { ...@@ -475,5 +475,5 @@ public interface CommonConstants {
public static final String PARAM_INFO_ERROR = "传参有误!"; public static final String PARAM_INFO_ERROR = "传参有误!";
public static final String XLSX = CommonConstants.XLSX; public static final String XLSX = ".xlsx";
} }
...@@ -23,10 +23,10 @@ import java.time.LocalDateTime; ...@@ -23,10 +23,10 @@ import java.time.LocalDateTime;
@Data @Data
public class TSalaryStandardExportVo implements Serializable { public class TSalaryStandardExportVo implements Serializable {
/** /**
* 状态(0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8:结算单调整待审核 9: 结算单调整待打印) * 状态0待提交 1待审核 2审核通过 3发送成功 5审核不通过 10 发送失败
*/ */
@ExcelAttribute(name = "状态", isDataId = true, readConverterExp = "0=待提交,1=待审核,2=待推送,3=已推送待发放,4=已发放,5=审核不通过,6=确认不通过,7=财务退回,8=结算单调整待审核,9=结算单调整待打印") @ExcelAttribute(name = "状态", isDataId = true, readConverterExp = "0=待提交,1=待审核,2=审核通过,3=发送成功,5=审核不通过,10=发送失败")
@NotBlank(message = "状态(0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8:结算单调整待审核 9: 结算单调整待打印)不能为空") @NotBlank(message = "状态(0待提交 1待审核 2审核通过 3发送成功 5审核不通过 10 发送失败)不能为空")
@ExcelProperty("薪酬状态") @ExcelProperty("薪酬状态")
private String status; private String status;
/** /**
......
...@@ -150,7 +150,6 @@ public class TSalaryStandardController { ...@@ -150,7 +150,6 @@ public class TSalaryStandardController {
@Operation(description = "简单分页查询") @Operation(description = "简单分页查询")
@GetMapping("/auditPage") @GetMapping("/auditPage")
public R<IPage<TSalaryStandard>> getTSalaryStandardAuditPage(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard) { public R<IPage<TSalaryStandard>> getTSalaryStandardAuditPage(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard) {
tSalaryStandard.setStatus(CommonConstants.ONE_INT);
return new R<>(tSalaryStandardService.getTSalaryStandardAuditPage(page, tSalaryStandard)); return new R<>(tSalaryStandardService.getTSalaryStandardAuditPage(page, tSalaryStandard));
} }
......
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