From 3fa7fe0eb3934e2e550a70603be0e80375afa276 Mon Sep 17 00:00:00 2001
From: ilal <lalqqhy@163.com>
Date: Thu, 22 Oct 2020 09:39:24 +0800
Subject: [PATCH] 提交
---
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
index ad00fa2..a78af2c 100644
--- a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+++ b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
@@ -3402,13 +3402,26 @@ public class SalaryManagementController {
@PostMapping(value = "/pushpayslip")
@ApiOperation(value = "发送工资条", httpMethod = "POST", notes = "接口发布说明")
- public Result<Object> PushPayslip(@CurrentUser UserBean userBean,@RequestBody PushPayslipDto pays) {
+ public Result<Object> PushPayslip(@CurrentUser UserBean userBean,@RequestBody APPPayslipPeriodDto apppays) {
+
+ PushPayslipDto pays = new PushPayslipDto();
+
+ XcglAssoGztzt gzt = XcglAssoGztzt.builder().build().selectOne(new QueryWrapper<XcglAssoGztzt>().lambda().eq(XcglAssoGztzt::getUserid, apppays.getUserid())
+ .eq(XcglAssoGztzt::getXzyf, apppays.getXzyf()).eq(XcglAssoGztzt::getQyid, userBean.getOrgCode()));
+ if(gzt != null) {
+ pays.setGztid(gzt.getId());
+ pays.setXzzid(gzt.getXzzid());
+ pays.setUserid(gzt.getUserid());
+ pays.setXzyf(gzt.getXzyf());
+ }
+
+
String strY = new SimpleDateFormat("yyyy").format(new Date());
// double prescription = 8;
//顶层
AppPayslipDetailsDto top = new AppPayslipDetailsDto();
//工资条数据
- XcglAssoGztzt gzt = XcglAssoGztzt.builder().id(pays.getGztid()).build().selectById();
+// XcglAssoGztzt gzt = XcglAssoGztzt.builder().id(pays.getGztid()).build().selectById();
if(gzt != null && gzt.getFsType() == 1) {//已发送的工资条
top.setId(gzt.getId());
top.setNetsalary(gzt.getSfgz());//实发工资
--
libgit2 0.26.0