From c8c4bd334a753f587cc80f0af3c1f80ce3094b7a Mon Sep 17 00:00:00 2001 From: haha Date: Fri, 8 Sep 2023 23:42:40 +0800 Subject: [PATCH] update code --- ruoyi-ui/src/api/project/projectPlan.js | 8 + .../src/views/project/projectPlan/index.vue | 418 +++++------------- .../controller/SurProjectPlanController.java | 2 +- .../jh/project/domain/SurProjectPlan.java | 22 +- .../jh/project/domain/vo/MajorPlanExport.java | 12 +- .../jh/project/domain/vo/UrbanPlanExport.java | 12 +- .../project/mapper/SurProjectPlanMapper.java | 2 +- .../mapper/project/SurProjectPlanMapper.xml | 4 +- 8 files changed, 148 insertions(+), 332 deletions(-) diff --git a/ruoyi-ui/src/api/project/projectPlan.js b/ruoyi-ui/src/api/project/projectPlan.js index ed832a04..73e780da 100644 --- a/ruoyi-ui/src/api/project/projectPlan.js +++ b/ruoyi-ui/src/api/project/projectPlan.js @@ -42,3 +42,11 @@ export function delProjectPlan(id) { method: 'delete' }) } + + +export function listAll(type) { + return request({ + url: '/project/projectPlan/listAll/' + type, + method: 'get' + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/projectPlan/index.vue b/ruoyi-ui/src/views/project/projectPlan/index.vue index 295eb1ff..2482f43c 100644 --- a/ruoyi-ui/src/views/project/projectPlan/index.vue +++ b/ruoyi-ui/src/views/project/projectPlan/index.vue @@ -1,360 +1,172 @@ + diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectPlanController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectPlanController.java index fca6162f..934fd852 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectPlanController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectPlanController.java @@ -67,7 +67,7 @@ public class SurProjectPlanController extends BaseController */ @PreAuthorize("@ss.hasPermi('project:projectPlan:export')") @Log(title = "项目跟进计划", businessType = BusinessType.EXPORT) - @GetMapping("/export/{type}") + @PostMapping("/export/{type}") public void export(HttpServletResponse response,@PathVariable("type") Long type) { SurProjectPlan where=new SurProjectPlan(); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectPlan.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectPlan.java index d137082d..03cb843a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectPlan.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectPlan.java @@ -1,7 +1,5 @@ package com.yanzhu.jh.project.domain; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity; * 项目跟进计划对象 sur_project_plan * * @author ruoyi - * @date 2023-09-07 + * @date 2023-09-08 */ public class SurProjectPlan extends BaseEntity { @@ -37,14 +35,12 @@ public class SurProjectPlan extends BaseEntity private String dept; /** 开工日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开工日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date startDate; + @Excel(name = "开工日期") + private String startDate; /** 完工日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "完工日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date endDate; + @Excel(name = "完工日期") + private String endDate; /** 总投资（万元） */ @Excel(name = "总投资", readConverterExp = "万=元") @@ -107,21 +103,21 @@ public class SurProjectPlan extends BaseEntity { return dept; } - public void setStartDate(Date startDate) + public void setStartDate(String startDate) { this.startDate = startDate; } - public Date getStartDate() + public String getStartDate() { return startDate; } - public void setEndDate(Date endDate) + public void setEndDate(String endDate) { this.endDate = endDate; } - public Date getEndDate() + public String getEndDate() { return endDate; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/MajorPlanExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/MajorPlanExport.java index 133c1c8f..e48bb3cd 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/MajorPlanExport.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/MajorPlanExport.java @@ -70,19 +70,19 @@ public class MajorPlanExport this.dept = dept; } - public Date getStartDate() { + public String getStartDate() { return startDate; } - public void setStartDate(Date startDate) { + public void setStartDate(String startDate) { this.startDate = startDate; } - public Date getEndDate() { + public String getEndDate() { return endDate; } - public void setEndDate(Date endDate) { + public void setEndDate(String endDate) { this.endDate = endDate; } @@ -121,12 +121,12 @@ public class MajorPlanExport /** 开工日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "开工日期", dateFormat = "yyyy.MM") - private Date startDate; + private String startDate; /** 完工日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "完工日期", dateFormat = "yyyy.MM") - private Date endDate; + private String endDate; /** 总投资（万元） */ @Excel(name = "总投资（万元）") diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/UrbanPlanExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/UrbanPlanExport.java index 5393e17b..ae6fac56 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/UrbanPlanExport.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/UrbanPlanExport.java @@ -33,12 +33,12 @@ public class UrbanPlanExport { /** 开工日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "开工时限", dateFormat = "yyyy.MM") - private Date startDate; + private String startDate; /** 完工日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "建成时限", dateFormat = "yyyy.MM") - private Date endDate; + private String endDate; /** 总投资（万元） */ @Excel(name = "总投资（万元）") @@ -102,19 +102,19 @@ public class UrbanPlanExport { this.dept = dept; } - public Date getStartDate() { + public String getStartDate() { return startDate; } - public void setStartDate(Date startDate) { + public void setStartDate(String startDate) { this.startDate = startDate; } - public Date getEndDate() { + public String getEndDate() { return endDate; } - public void setEndDate(Date endDate) { + public void setEndDate(String endDate) { this.endDate = endDate; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java index 3b75d45c..f23f6d89 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java @@ -7,7 +7,7 @@ import com.yanzhu.jh.project.domain.SurProjectPlan; * 项目跟进计划Mapper接口 * * @author ruoyi - * @date 2023-09-07 + * @date 2023-09-08 */ public interface SurProjectPlanMapper { diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectPlanMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectPlanMapper.xml index 263d70d3..b474e418 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectPlanMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectPlanMapper.xml @@ -34,8 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and content = #{content} and build_type = #{buildType} and dept = #{dept} - and start_date = #{startDate} - and end_date = #{endDate} + and start_date = #{startDate} + and end_date = #{endDate} and total_investment = #{totalInvestment} and year_investment = #{yearInvestment} and plan_type = #{planType}