|
@@ -64,7 +64,7 @@ public class WorkHourStatistics {
|
|
|
|
|
|
@Scheduled(fixedDelay = 432000000L)
|
|
|
public void updateHour() {
|
|
|
- standardWorkHour();
|
|
|
+// standardWorkHour();
|
|
|
standardWeeklyWorkHour();
|
|
|
standardMonthlyWorkHour();
|
|
|
projectHour();
|
|
@@ -548,7 +548,9 @@ public class WorkHourStatistics {
|
|
|
list1.forEach(chuanyunProjectCostDO -> {
|
|
|
//更新数据库
|
|
|
BigDecimal standard = new BigDecimal(8);
|
|
|
- chuanyunProjectCostDO.setPersonDays(chuanyunProjectCostDO.getTotalHour().divide(standard,2,RoundingMode.HALF_UP));
|
|
|
+ if (chuanyunProjectCostDO.getTotalHour()!=null){
|
|
|
+ chuanyunProjectCostDO.setPersonDays(chuanyunProjectCostDO.getTotalHour().divide(standard,2,RoundingMode.HALF_UP));
|
|
|
+ }
|
|
|
ChuanyunProjectCostDO oldProjectDO = chuanyunProjectCostDao.findByProjectIdAndProjectTypeAndStatus(chuanyunProjectCostDO.getProjectId(),chuanyunProjectCostDO.getProjectType(),chuanyunProjectCostDO.getStatus());
|
|
|
if (oldProjectDO !=null) {
|
|
|
chuanyunProjectCostDao.delete(oldProjectDO);
|