diff --git a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java index a7030757..80053613 100644 --- a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java +++ b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java @@ -396,6 +396,8 @@ public class evaluateTask { } } + //若在工程施工合同签订之日起30日后未开设 + //年度度汛方案未备案 @Scheduled(cron="0 0 0 15 4 ?") //每年4月15日秒执行一次 diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiChange.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiChange.java index 167b242e..4a159eb4 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiChange.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiChange.java @@ -94,4 +94,6 @@ public class BsSgcJsjdBuiChange extends BaseEntity @ApiModelProperty("数源部门") private String owerDept; + private String sectionName; + } diff --git a/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiNmgStatisticsController.java b/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiNmgStatisticsController.java index fca3b044..9d319006 100644 --- a/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiNmgStatisticsController.java +++ b/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiNmgStatisticsController.java @@ -9,6 +9,7 @@ import com.kms.statistics.domain.BsSgcJsjdNmgStatisticVo; import com.kms.statistics.service.BsSgcJsjdBuiNmgStatisticsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -18,7 +19,7 @@ public class BsSgcJsjdBuiNmgStatisticsController { @Autowired BsSgcJsjdBuiNmgStatisticsService bsSgcJsjdBuiNmgStatisticsService; - @GetMapping + @PostMapping("/getNum") public IPageselectPage(SearchParamsp){ return bsSgcJsjdBuiNmgStatisticsService.selectPage(sp); } diff --git a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java index 5c734558..7c01d724 100644 --- a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java +++ b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java @@ -10,7 +10,7 @@ import java.util.List; public class BsSgcJsjdNmgStatisticVo { private String projectName; - private Date currentTime; + private String currentTime; //总多少农民工数量 private String totalNum;