提交

src/main/java/cn/timer/api/bean/xcgl/XcglAssoGztzt.java

@@ -66,5 +66,8 @@ public class XcglAssoGztzt extends Model<XcglAssoGztzt> {
 	@ApiModelProperty(value="实发工资",example="101")
 	@ApiModelProperty(value="实发工资",example="101")
 	private Double sfgz;
 	private Double sfgz;
 	
 	
+	@ApiModelProperty(value="薪资组id",example="101")
+	private Integer xzzid;
+    
 
 
 }
 }
\ No newline at end of file

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

@@ -95,6 +95,7 @@ import cn.timer.api.dao.xcgl.XcglSalaryItemMapper;
 import cn.timer.api.dao.yggl.YgglMainEmpMapper;
 import cn.timer.api.dao.yggl.YgglMainEmpMapper;
 import cn.timer.api.dto.kqmk.CalculatingCompensationDto;
 import cn.timer.api.dto.kqmk.CalculatingCompensationDto;
 import cn.timer.api.dto.sbgjj.InspersonnelDto;
 import cn.timer.api.dto.sbgjj.InspersonnelDto;
+import cn.timer.api.dto.xcgl.APPPayslipPeriodDto;
 import cn.timer.api.dto.xcgl.AdditionalDeductionDto;
 import cn.timer.api.dto.xcgl.AdditionalDeductionDto;
 import cn.timer.api.dto.xcgl.AppPaysSalaryOneDto;
 import cn.timer.api.dto.xcgl.AppPaysSalaryOneDto;
 import cn.timer.api.dto.xcgl.AppPaysSalaryTwoDto;
 import cn.timer.api.dto.xcgl.AppPaysSalaryTwoDto;
@@ -2013,6 +2014,7 @@ public class SalaryManagementController {
 			gzt.setYhqm(null);
 			gzt.setYhqm(null);
 			gzt.setSfgz(net_salary);
 			gzt.setSfgz(net_salary);
 			gzt.setQyid(orgcode);
 			gzt.setQyid(orgcode);
+			gzt.setXzzid(calcomtiondto.getPay_group_id());
 			gzt.insert();
 			gzt.insert();
 		}//薪资组内成员--结束
 		}//薪资组内成员--结束
 		
 		
@@ -3367,6 +3369,31 @@ public class SalaryManagementController {
 		return ResultUtil.success("成功");
 		return ResultUtil.success("成功");
 	}
 	}
 	
 	
+	
+	
+	
+	@PostMapping(value="/appacquisition")
+	@ApiOperation(value = "APP获取工资前期预备数据", httpMethod = "POST", notes = "接口发布说明")
+	public Result<Object> AppAcquisition(@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());
+		}else {
+			pays.setGztid(0);
+			pays.setXzzid(0);
+			pays.setUserid(0);
+			pays.setXzyf("");
+		}
+		
+		return ResultUtil.data(pays,"操作成功!");
+	}
+	
 	@Autowired
 	@Autowired
 	private KqglAssoRelationSummaryMapper kqglassorelationsummarymapper;
 	private KqglAssoRelationSummaryMapper kqglassorelationsummarymapper;
 	
 	
@@ -3382,7 +3409,7 @@ public class SalaryManagementController {
 		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) {
+		if(gzt != null && gzt.getFsType() == 1) {//已发送的工资条
 			top.setId(gzt.getId());
 			top.setId(gzt.getId());
 			top.setNetsalary(gzt.getSfgz());//实发工资
 			top.setNetsalary(gzt.getSfgz());//实发工资
 			top.setWagetime(gzt.getXzyf());//工资时间
 			top.setWagetime(gzt.getXzyf());//工资时间
@@ -3599,6 +3626,10 @@ public class SalaryManagementController {
 			
 			
 		}
 		}
 		
 		
+		
+		
+		
+		
 		return ResultUtil.data(top,"操作成功!");
 		return ResultUtil.data(top,"操作成功!");
 	}
 	}
 	
 	

src/main/java/cn/timer/api/dto/xcgl/APPPayslipPeriodDto.java

+package cn.timer.api.dto.xcgl;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class APPPayslipPeriodDto {
+	private Integer userid;
+	private String xzyf;
+}

src/main/resources/mapping/xcgl/XcglAssoGztztMapper.xml

@@ -15,6 +15,7 @@
                 <result column="qyid" property="qyid" />
                 <result column="qyid" property="qyid" />
                 <result column="gztszid" property="gztszid" />
                 <result column="gztszid" property="gztszid" />
 				<result column="sfgz" property="sfgz" />
 				<result column="sfgz" property="sfgz" />
+				<result column="xzzid" property="xzzid" />
     </resultMap>
     </resultMap>
     
     
     <resultMap id="PayslipDetailsMap" type="cn.timer.api.dto.xcgl.PayslipDetailsDto" >
     <resultMap id="PayslipDetailsMap" type="cn.timer.api.dto.xcgl.PayslipDetailsDto" >