提交

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -3402,13 +3402,26 @@ public class SalaryManagementController {
 	
 	
 	@PostMapping(value = "/pushpayslip")
 	@PostMapping(value = "/pushpayslip")
 	@ApiOperation(value = "发送工资条", httpMethod = "POST", notes = "接口发布说明")
 	@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());
 		String strY = new SimpleDateFormat("yyyy").format(new Date());
 //		double prescription = 8;
 //		double prescription = 8;
 		//顶层
 		//顶层
 		AppPayslipDetailsDto top = new AppPayslipDetailsDto();
 		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) {//已发送的工资条
 		if(gzt != null && gzt.getFsType() == 1) {//已发送的工资条
 			top.setId(gzt.getId());
 			top.setId(gzt.getId());
 			top.setNetsalary(gzt.getSfgz());//实发工资
 			top.setNetsalary(gzt.getSfgz());//实发工资