修改工资结算

ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java

@@ -81,7 +81,7 @@ public interface IWgzPayCalculationService extends IServicePlus<WgzPayCalculatio
 	/**
 	 * 根据务工者id和招工id，得到最新的数据
 	 */
-	WgzPayCalculation findByUserIdRecruitIdNewestData(Long userId, Long recruitId);
+	List<WgzPayCalculation> findByUserIdRecruitIdNewestData(Long userId, Long recruitId);
 
 	/**
 	 * 查询列表

ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzUserService.java

@@ -92,4 +92,9 @@ public interface IWgzUserService extends IServicePlus<WgzUser> {
 	 * 务工者APP实名认证
 	 */
 	Boolean userRealNameAuthentication(@Validated @RequestBody WgzAppRealNameAuthenticationReq req);
+
+	/**
+	 * 根据务工者唯一标识获取数据
+	 */
+	WgzUser findByUserId(Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java

@@ -161,13 +161,12 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
 	}
 
 	@Override
-	public WgzPayCalculation findByUserIdRecruitIdNewestData(Long userId, Long recruitId) {
+	public List<WgzPayCalculation> findByUserIdRecruitIdNewestData(Long userId, Long recruitId) {
 		LambdaQueryWrapper<WgzPayCalculation> eq = new LambdaQueryWrapper<WgzPayCalculation>().
 			eq(WgzPayCalculation::getUserId, userId).
 			eq(WgzPayCalculation::getRecruitId, recruitId).
-			orderByDesc(WgzPayCalculation::getCreateTime).
-			last("limit 1");
-		return baseMapper.selectOne(eq);
+			eq(WgzPayCalculation::getAuditorType, "2");
+		return baseMapper.selectList(eq);
 	}
 
 	@Override

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java

@@ -190,4 +190,9 @@ public class WgzUserServiceImpl extends ServicePlusImpl<WgzUserMapper, WgzUser>
 		return true;
 	}
 
+	@Override
+	public WgzUser findByUserId(Long userId) {
+		return baseMapper.selectOne(new LambdaQueryWrapper<WgzUser>().eq(WgzUser::getUserId, userId));
+	}
+
 }