boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (farm): 生产计划

Browse Source 
- 计算逾期天数
This commit is contained in:
达富斌
2025-08-30 11:54:38 +08:00
parent 9ac8f177e6
commit 517e709661
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/CropFarmingCenterController.java
View File

@@ -92,6 +92,7 @@ public class CropFarmingCenterController {
cropFarmingCenterService.restartProductionPlan(updateReqVO);
return success(true);
}
@Operation(summary = "生产计划-开始按钮")
@PutMapping("/production-plan/start")
public CommonResult<Boolean> startPlanning(@RequestBody ProductionPlanUpdateReqVO updateReqVO) {

3
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanUpdateReqVO.java
View File

@@ -43,7 +43,10 @@ public class ProductionPlanUpdateReqVO {
@Schema(description = "计划执行状态 (1：未开始；2：进行中；3：已完成；4：逾期)")
private Integer planStatus;
@Schema(description = "计划执行状态 (5: 逾期未开始; 6:逾期未结束)")
private Integer planSubStatus;
@Schema(description = "逾期天数")
private Integer overdueDays;
@Schema(description = "租户ID")

24
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java
View File

@@ -28,6 +28,7 @@ import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.Period;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.List;
@@ -226,7 +227,8 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService {
PageResult<ProductionPlanRespVO> resultData = BeanUtils.toBean(productionPlanDOPageResult, ProductionPlanRespVO.class);
resultData.getList().forEach(e -> {
// 逾期天数
int overdueDays = this.countOverdueDays(e);
e.setOverdueDays(overdueDays);
// 计划状态-名称
e.setPlanStatusName(PLAN_MAP.get(e.getPlanStatus()));
// 模型
@@ -258,6 +260,26 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService {
}
private int countOverdueDays(ProductionPlanRespVO vo) {
Integer planStatus = vo.getPlanStatus();
Integer planSubStatus = vo.getPlanSubStatus();
if (!ObjectUtils.notEqual(planStatus, PLAN_STATUS_4)) {
LocalDate today = LocalDate.now(ZoneId.of("Asia/Shanghai"));
if (!ObjectUtils.notEqual(planSubStatus, PLAN_STATUS_5)) {
LocalDate productionStartDate = vo.getProductionStartDate();
Period period = Period.between(today, productionStartDate);
return period.getDays();
}
if (!ObjectUtils.notEqual(planSubStatus, PLAN_STATUS_5)) {
LocalDate productionEndDate = vo.getProductionEndDate();
Period period = Period.between(today, productionEndDate);
return period.getDays();
}
}
return 0;
}
@Override
public int getCropCount(Long tenantId) {
return productionPlanMapper.getCropCount(tenantId);