diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java index 7976eba9..19c1edd8 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java @@ -1,13 +1,22 @@ package com.kms.build.controller; +import java.time.LocalDate; +import java.time.Month; +import java.time.ZoneId; import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; import java.util.List; +import cn.hutool.core.date.DateUtil; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.DateUtils; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.build.domain.BsSgcJsjdBuiProgressInfo; +import com.kms.build.domain.BsSgcJsjdBuiProgressPlan; import com.kms.build.service.BsSgcJsjdBuiProgressInfoService; +import com.kms.build.service.BsSgcJsjdBuiProgressPlanService; import com.kms.common.utils.BaseEntityUtils; @@ -47,6 +56,9 @@ public class BsSgcJsjdBuiProgressInfoController extends BaseController @Autowired private BsSgcJsjdBuiProgressInfoService bsSgcJsjdBuiProgressInfoService; + @Autowired + private BsSgcJsjdBuiProgressPlanService bsSgcJsjdBuiProgressPlanService; + /** * 查询进度填报详情列表 */ @@ -90,7 +102,22 @@ public class BsSgcJsjdBuiProgressInfoController extends BaseController public AjaxResult add(@RequestBody BsSgcJsjdBuiProgressInfo bsSgcJsjdBuiProgressInfo) { BaseEntityUtils.preInsert(bsSgcJsjdBuiProgressInfo); - return toAjax(bsSgcJsjdBuiProgressInfoService.save(bsSgcJsjdBuiProgressInfo)); + if(bsSgcJsjdBuiProgressInfoService.save(bsSgcJsjdBuiProgressInfo)){ + Date stageTime = bsSgcJsjdBuiProgressInfo.getStageTime(); + Calendar instance = Calendar.getInstance(); + instance.setTime(stageTime); + int year = instance.get(Calendar.YEAR); + int month = instance.get(Calendar.MONTH); + + + } + return toAjax(true); + } + + public static void main(String[] args) { + Date date = new Date(); + + } /** diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java index 0dc6554b..b239ddb7 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java @@ -56,12 +56,20 @@ public class BsSgcJsjdBuiProgressPlan extends BaseEntity /** 类型 */ @Excel(name = "类型") @ApiModelProperty("类型") - private String planName; + private String planType; /** 1-3月计划投资 */ @Excel(name = "1-3月计划投资") @ApiModelProperty("1-3月计划投资") - private BigDecimal p1To3; + private BigDecimal p1; + + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p2; + + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p3; /** $column.columnComment */ @Excel(name = "1-3月计划投资") @@ -122,7 +130,15 @@ public class BsSgcJsjdBuiProgressPlan extends BaseEntity /** 1-3月实际投资 */ @Excel(name = "1-3月实际投资") @ApiModelProperty("1-3月实际投资") - private BigDecimal v1To3; + private BigDecimal v1; + + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v2; + + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v3; /** $column.columnComment */ @Excel(name = "1-3月实际投资")