优化
This commit is contained in:
@ -24,4 +24,8 @@ public class SnowflakeIdUtil {
|
||||
public static long generateId() {
|
||||
return snowflake.nextId();
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(generateId());
|
||||
}
|
||||
}
|
||||
|
@ -11,6 +11,7 @@ import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes;
|
||||
import com.ruoyi.wgz.domain.WgzPayCalculation;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
@ -97,4 +98,9 @@ public interface IWgzPayCalculationService extends IServicePlus<WgzPayCalculatio
|
||||
*/
|
||||
Boolean appUpdate(BgtPayCalculationUpdateDTO dto);
|
||||
|
||||
/**
|
||||
* 根据任务和包工头查询已同意的工资
|
||||
*/
|
||||
BigDecimal getPayByTaskAndBgt(Long taskId, Long auditorUserId);
|
||||
|
||||
}
|
||||
|
@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -193,4 +194,12 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
|
||||
payCalculation.setAuditorTime(LocalDateTime.now());
|
||||
return updateById(payCalculation);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BigDecimal getPayByTaskAndBgt(Long taskId,Long auditorUserId) {
|
||||
|
||||
List<WgzPayCalculation> list = list(Wrappers.<WgzPayCalculation>lambdaQuery().eq(WgzPayCalculation::getTaskId, taskId)
|
||||
.eq(WgzPayCalculation::getAuditorUserId, auditorUserId));
|
||||
return list.stream().map(WgzPayCalculation::getRecruitAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user