|
|
@@ -397,6 +397,7 @@ public class WorkHourStatisticsRecently {
|
|
|
* @param chuanyunUserCompanyDO 员工信息
|
|
|
*/
|
|
|
private void standardMonthlyHour(ChuanyunUserCompanyDO chuanyunUserCompanyDO) {
|
|
|
+ log.info("开始月工时汇总");
|
|
|
//删除上一次状态为审核中，但本次已经审核通过的数据
|
|
|
chuanyunSelfCostDao.findAllByStatusAndUserId(ChuanYunConstant.IN_PROCESS,chuanyunUserCompanyDO.getUserId()).forEach(chuanyunSelfCostDO -> {
|
|
|
List<ChuanyunSelfWorkHourDO> chuanyunSelfWorkHourList=chuanyunSelfWorkHourDao.findAllByUserIdAndProjectIdAndProjectTypeAndStatusAndDayLogDateBetween(
|
|
|
@@ -453,6 +454,7 @@ public class WorkHourStatisticsRecently {
|
|
|
chuanyunSelfCostDO.setDayLogDate(projectMonth.getDayLogDate().withDayOfMonth(1));
|
|
|
chuanyunSelfCostDO.setTotalHour(projectMonth.getStandardWorkHour());
|
|
|
chuanyunSelfCostDO.setDepartmentId(chuanyunUserCompanyDO.getDepartmentId());
|
|
|
+ log.info(chuanyunSelfCostDO.getUserId()+"---"+chuanyunSelfCostDO.getProjectId()+"---"+chuanyunSelfCostDO.getProjectType()+"---"+df.format(chuanyunSelfCostDO.getDayLogDate()));
|
|
|
ChuanyunSelfCostDO oldSelfDO = chuanyunSelfCostDao.getOldSelfDO(chuanyunSelfCostDO.getUserId(),
|
|
|
chuanyunSelfCostDO.getProjectId(),
|
|
|
chuanyunSelfCostDO.getProjectType(),
|
WoNiu