From 75179b48af9e22774b055d75ac7f0f9c4893f476 Mon Sep 17 00:00:00 2001
From: wxj334 <2241669945@qq.com>
Date: Tue, 31 May 2022 17:31:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/IPredictionController.java | 10 ++-
.../seasky/projectplan/api/IProjectPlan.java | 12 ++++
.../projectplan/ExportProjectPlanBookOut.java | 67 +++++++++++++++++++
.../query/prediction/QueryYBInfoService.java | 8 +++
.../projectplan/ProjectPlanQueryService.java | 10 +++
.../prediction/QueryYBInfoServiceImpl.java | 33 +++++++++
.../ProjectPlanQueryServiceImpl.java | 57 ++++++++++++++++
.../controller/PredictionController.java | 12 ++++
.../controller/ProjectPlanController.java | 13 ++++
9 files changed, 220 insertions(+), 2 deletions(-)
create mode 100644 ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ExportProjectPlanBookOut.java
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPredictionController.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPredictionController.java
index 09b3da07..bf06f49f 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPredictionController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPredictionController.java
@@ -129,8 +129,14 @@ public interface IPredictionController {
@PostMapping("/deleteHistoryYB")
Result<Object> deleteHistoryYB(Long id);
-
-
+ /**
+ * 鍒ゆ柇鏄惁绔嬮」
+ *
+ * @param projectNo 椤圭洰娌℃湁
+ * @return {@link Result}<{@link Object}>
+ */
+ @PostMapping("/judge")
+ Result<Object> judge(String projectNo);
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java
index 393ee1a6..1eba9595 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java
@@ -1,5 +1,6 @@
package com.seasky.projectplan.api;
+import com.baomidou.mybatisplus.extension.api.R;
import com.seasky.core.common.Result;
import com.seasky.projectplan.dto.projectlibrary.ProjectLibraryOut;
import com.seasky.projectplan.dto.projectlibrary.ProjectLibraryQry;
@@ -360,4 +361,15 @@ public interface IProjectPlan {
*/
@PostMapping(path = "/initQuotaInfo")
Result<Integer> initQuotaInfo();
+
+
+ /**
+ * 鍑哄彛
+ *
+ * @param request 璇锋眰
+ * @param response 鍝嶅簲
+ * @param projectPlanBooksCmd 椤圭洰瑙勫垝涔md
+ */
+ @PostMapping(path = "/export")
+ void export(HttpServletRequest request, HttpServletResponse response, ProjectPlanBooksCmd projectPlanBooksCmd);
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ExportProjectPlanBookOut.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ExportProjectPlanBookOut.java
new file mode 100644
index 00000000..0b47b11a
--- /dev/null
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ExportProjectPlanBookOut.java
@@ -0,0 +1,67 @@
+package com.seasky.projectplan.dto.projectplan;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author wangxingjun
+ * @Data 2022/5/31 16:34
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ExportProjectPlanBookOut {
+
+
+ @ApiModelProperty(value = "骞翠唤",example = "")
+ @ExcelProperty(value = "骞翠唤",index = 0)
+ private Integer year;
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О",example = "")
+ @ExcelProperty(value = "椤圭洰鍚嶇О",index = 1)
+ private String projectName;
+
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О",example = "")
+ @ExcelProperty(value = "閮ㄩ棬鍚嶇О",index = 2)
+ private String departmentName;
+
+ @ApiModelProperty(value = "閮ㄩ棬缂栧彿",example = "")
+ @ExcelProperty(value = "閮ㄩ棬缂栧彿",index = 3)
+ private String departmentCode;
+
+ @ApiModelProperty(value = "瀹℃牳鐘舵€�",example = "")
+ @ExcelProperty(value = "瀹℃牳鐘舵€�",index = 4)
+ private String state;
+
+ @ApiModelProperty(value = "绫诲瀷",example = "")
+ @ExcelProperty(value = "绫诲瀷",index = 5)
+ private String planType;
+
+ @ApiModelProperty(value = "椤圭洰绫诲瀷",example = "")
+ @ExcelProperty(value = "椤圭洰绫诲瀷",index = 6)
+ private String projectType;
+
+ @ApiModelProperty(value = "鐢虫姤涔︾被鍨�",example = "")
+ @ExcelProperty(value = "鐢虫姤涔︾被鍨�",index = 7)
+ private String planBookType;
+
+ @ApiModelProperty(value = "椤圭洰绫诲瀷缂栧彿",example = "")
+ @ExcelProperty(value = "椤圭洰绫诲瀷缂栧彿",index = 8)
+ private String projectTypeId;
+
+ @ApiModelProperty(value = "閲戦",example = "")
+ @ExcelProperty(value = "閲戦",index = 9)
+ private BigDecimal totalMoney;
+
+ @ApiModelProperty(value = "椤圭洰缂栧彿",example = "")
+ @ExcelProperty(value = "椤圭洰缂栧彿",index = 10)
+ private String number;
+
+ @ExcelProperty(value = "缁忚垂鍗″彿",index = 11)
+ private String funCode;
+}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/query/prediction/QueryYBInfoService.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/query/prediction/QueryYBInfoService.java
index 5e7b49ce..15964014 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/application/query/prediction/QueryYBInfoService.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/query/prediction/QueryYBInfoService.java
@@ -65,4 +65,12 @@ public interface QueryYBInfoService extends BaseService<ProjectPlanBookPo> {
*/
ProjectOut getBYById(Long id);
+ /**
+ * 鍒ゆ柇鏄惁绔嬮」
+ *
+ * @param projectNo 椤圭洰娌℃湁
+ * @return {@link Boolean}
+ */
+ Boolean judge(String projectNo);
+
}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/query/projectplan/ProjectPlanQueryService.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/query/projectplan/ProjectPlanQueryService.java
index a778bf69..225c3b25 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/application/query/projectplan/ProjectPlanQueryService.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/query/projectplan/ProjectPlanQueryService.java
@@ -241,4 +241,14 @@ public interface ProjectPlanQueryService extends BaseService<ProjectPlanBookPo>
void recallTarget(Long id);
+ /**
+ * 瀵煎嚭
+ *
+ * @param request 璇锋眰
+ * @param response 鍝嶅簲
+ * @param projectPlanBooksCmd 椤圭洰瑙勫垝涔md
+ */
+ void export(HttpServletRequest request, HttpServletResponse response, ProjectPlanBooksCmd projectPlanBooksCmd);
+
+
}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
index f366c4d3..5d361d89 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.seasky.projectplan.infrastructure.reader.prediction;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.seasky.core.base.AbstractService;
@@ -16,11 +17,14 @@ import com.seasky.microflowapi.dto.FlowCanShowOut;
import com.seasky.projectplan.application.query.prediction.QueryYBInfoService;
import com.seasky.projectplan.dto.incomeplan.InComePlanOut;
import com.seasky.projectplan.dto.projectplan.quotadeclaration.*;
+import com.seasky.projectplan.dto.projectplan.rpc.PageSelectModel;
import com.seasky.projectplan.infrastructure.dataobject.co.YBExamineDo;
import com.seasky.projectplan.infrastructure.dataobject.co.YBHisInfoDo;
import com.seasky.projectplan.infrastructure.dataobject.po.*;
import com.seasky.projectplan.infrastructure.db.mapper.table.*;
import com.seasky.projectplan.infrastructure.rpc.FlowRpc;
+import com.seasky.projectplan.infrastructure.rpc.TripartiteRPC;
+import net.sf.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -56,6 +60,9 @@ public class QueryYBInfoServiceImpl extends AbstractService<ProjectPlanBookPo, P
@Resource
ProjectMapper projectMapper;
+ @Resource
+ TripartiteRPC tripartiteRPC;
+
@Resource
IUser iUser;
@@ -378,6 +385,32 @@ public class QueryYBInfoServiceImpl extends AbstractService<ProjectPlanBookPo, P
return projectOut;
}
+ /**
+ * 鍒ゆ柇鏄惁绔嬮」
+ *
+ * @param projectNo 椤圭洰娌℃湁
+ * @return {@link Boolean}
+ */
+ @Override
+ public Boolean judge(String projectNo) {
+ PageSelectModel pageSelectModel = new PageSelectModel();
+ pageSelectModel.setKeyWord(projectNo);
+ pageSelectModel.setPageSize(1);
+ pageSelectModel.setPageNO(1);
+ String s = JSONObject.toJSONString(pageSelectModel);
+ String info = tripartiteRPC.GetPojectBudgetData_arrival(s);
+ JSONArray jsonArray = JSONArray.fromObject(info);
+ boolean flag = false;
+ for (int i = 0; i < jsonArray.size(); i++) {
+ String s1 = jsonArray.getJSONObject(i).get("projectCode").toString();
+ if (projectNo.equals(s1)) {
+ flag = true;
+ break;
+ }
+ }
+ return flag;
+ }
+
/**
* 鑾峰彇褰撳墠鐧诲綍浜烘墍灞為儴闂ㄧ紪鍙烽泦鍚�
*
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java
index 36cd63c7..a761ec7c 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java
@@ -30,7 +30,9 @@ import com.seasky.projectplan.domain.aggregate.common.PlanTypeEnum;
import com.seasky.projectplan.dto.FacultyStaff.FacultyStaffOut;
import com.seasky.projectplan.dto.attachment.AttachmentInfoOut;
import com.seasky.projectplan.dto.attachment.AttachmentQry;
+import com.seasky.projectplan.dto.budgetinfo.BudgetInfoOut;
import com.seasky.projectplan.dto.budgetinfo.BudgetInfoQry;
+import com.seasky.projectplan.dto.budgetinfo.ExportBudgetInfoOut;
import com.seasky.projectplan.dto.collegeclasses.CollegeClassesOut;
import com.seasky.projectplan.dto.projectplan.*;
import com.seasky.projectplan.dto.schoolStudentInformation.SchoolStudentInformationOut;
@@ -43,6 +45,7 @@ import com.seasky.projectplan.infrastructure.dataobject.co.ProjectPersonPlanDo;
import com.seasky.projectplan.infrastructure.dataobject.po.*;
import com.seasky.projectplan.infrastructure.db.mapper.table.*;
import com.seasky.projectplan.infrastructure.reader.attachment.AttachmentQueryConvert;
+import com.seasky.projectplan.infrastructure.reader.budgetinfo.BudgetInfoConvert;
import com.seasky.projectplan.infrastructure.rpc.FlowRpc;
import dm.jdbc.util.StringUtil;
import org.apache.commons.io.IOUtils;
@@ -1264,6 +1267,60 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook
}
+ /**
+ * 瀵煎嚭
+ *
+ * @param request 璇锋眰
+ * @param response 鍝嶅簲
+ * @param projectPlanBooksCmd 椤圭洰瑙勫垝涔md
+ */
+ @Override
+ public void export(HttpServletRequest request, HttpServletResponse response, ProjectPlanBooksCmd projectPlanBooksCmd) {
+ Map<String, Object> projectPlanBook = new HashMap<>(7);
+ if (!(ObjectUtils.isEmpty(projectPlanBooksCmd.getYear()))) {
+ projectPlanBook.put("year", projectPlanBooksCmd.getYear());
+ }
+ if (!(ObjectUtils.isEmpty(projectPlanBooksCmd.getProjectName()))) {
+ projectPlanBook.put("project_name", projectPlanBooksCmd.getProjectName());
+ }
+ if (!(ObjectUtils.isEmpty(projectPlanBooksCmd.getDepartmentCode()))) {
+ projectPlanBook.put("department_code", projectPlanBooksCmd.getDepartmentCode());
+ }
+ if (!(ObjectUtils.isEmpty(projectPlanBooksCmd.getPlanBookType()))) {
+ projectPlanBook.put("plan_book_type", projectPlanBooksCmd.getPlanBookType());
+ }
+ if (!(ObjectUtils.isEmpty(projectPlanBooksCmd.getProjectType()))) {
+ projectPlanBook.put("project_type", projectPlanBooksCmd.getProjectType());
+ }
+ projectPlanBook.put("plan_type", PlanTypeEnum.ERSHANG);
+ projectPlanBook.put("state","瀹℃牳瀹屾垚");
+ List<ProjectPlanBookPo> projectPlanBookPos = projectPlanBookMapper.selectByMap(projectPlanBook);
+
+
+ if (projectPlanBookPos.size() <= 0) {
+ throw new DataAccessException(new Error(ResponseCode.DATA_ACCESS_NOT_FOUND, null, "鏃犲彲瀵煎嚭鍏宠仈缁忚垂鍗″彿", ""));
+ }
+ /*List<ExportProjectPlanBookOut> exportProjectPlanBookOuts = new ArrayList<>();
+ for (ProjectPlanBookPo projectPlanBookPo : projectPlanBookPos) {
+ ExportProjectPlanBookOut map = MapperUtils.INSTANCE.map(ExportProjectPlanBookOut.class, projectPlanBookPo);
+ exportProjectPlanBookOuts.add(map);
+ }*/
+ List<ExportProjectPlanBookOut> exportProjectPlanBookOuts = MapperUtils.INSTANCE.mapAsList(ExportProjectPlanBookOut.class, projectPlanBookPos);
+
+ response.reset();
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("application/x-download");
+ try {
+ String fileName = URLEncoder.encode("鍏宠仈缁忚垂鍗″彿瀵煎嚭", "UTF-8");
+ response.setHeader("Content-Disposition", "attachment; filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), ExportProjectPlanBookOut.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).sheet("鍏宠仈缁忚垂鍗″彿").
+ doWrite(exportProjectPlanBookOuts);
+ } catch (IOException e) {
+ throw ExceptionUtil.getException(null, "瀵煎嚭鍏宠仈缁忚垂鍗″彿澶辫触锛�");
+ }
+ }
+
/**
* 寰楀埌浠ｇ爜鍒楄〃
*
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PredictionController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PredictionController.java
index cdddf6a9..c74aa12d 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PredictionController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PredictionController.java
@@ -179,4 +179,16 @@ public class PredictionController extends BaseController implements IPredictionC
return ok(ResponseCode.SUCCESS);
}
+ /**
+ * 鍒ゆ柇鏄惁绔嬮」
+ *
+ * @param projectNo 椤圭洰娌℃湁
+ * @return {@link Result}<{@link Object}>
+ */
+ @Override
+ @ApiOperation("鍒ゆ柇鏄惁绔嬮」")
+ public Result<Object> judge(String projectNo) {
+ return ok(ResponseCode.SUCCESS, queryYBInfoService.judge(projectNo));
+ }
+
}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
index 74e65556..8decde24 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
@@ -325,4 +325,17 @@ public class ProjectPlanController extends BaseController implements IProjectPla
public Result<Integer> initQuotaInfo() {
return ok(ResponseCode.SUCCESS, commandSvr.initQuotaInfo());
}
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param request 璇锋眰
+ * @param response 鍝嶅簲
+ * @return {@link Result}<{@link Object}>
+ */
+ @Override
+ @ApiOperation("瀵煎嚭鍏宠仈缁忚垂鍗″彿")
+ public void export(HttpServletRequest request, HttpServletResponse response, @RequestBody ProjectPlanBooksCmd projectPlanBooksCmd) {
+ queryService.export(request, response, projectPlanBooksCmd);
+ }
}
--
GitLab
From 1002be2a0ceaac1505c833f0d05cc69dad5c9ff7 Mon Sep 17 00:00:00 2001
From: wxj334 <2241669945@qq.com>
Date: Thu, 2 Jun 2022 15:21:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=96=B9?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../infrastructure/rpc/TripartiteRPCImpl.java | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/TripartiteRPCImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/TripartiteRPCImpl.java
index d261a614..917a2108 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/TripartiteRPCImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/TripartiteRPCImpl.java
@@ -14,8 +14,8 @@ public class TripartiteRPCImpl implements TripartiteRPC{
@Resource
ExternalInterface externalInterface;
- private final String GetPojectBudgetData_arrival_url = "http://cwlx.lixin.edu.cn:8012/ExternalInterface/BusinessProject/GetPojectBudgetData";
- //private final String GetPojectBudgetData_arrival_url = "http://192.168.1.77:8075/ExternalInterface/BusinessProject/GetPojectBudgetData";
+ //private final String GetPojectBudgetData_arrival_url = "http://cwlx.lixin.edu.cn:8012/ExternalInterface/BusinessProject/GetPojectBudgetData";
+ private final String GetPojectBudgetData_arrival_url = "http://192.168.1.77:8075/ExternalInterface/BusinessProject/GetPojectBudgetData";
/**
* 鏄惁绔嬮」
*
@@ -30,8 +30,8 @@ public class TripartiteRPCImpl implements TripartiteRPC{
- private final String CreateProject_arrival_url = "http://cwlx.lixin.edu.cn:8012/ExternalInterface/BusinessProject/CreateProject";
- //private final String CreateProject_arrival_url = "http://192.168.1.77:8075/ExternalInterface/BusinessProject/CreateProject";
+ //private final String CreateProject_arrival_url = "http://cwlx.lixin.edu.cn:8012/ExternalInterface/BusinessProject/CreateProject";
+ private final String CreateProject_arrival_url = "http://192.168.1.77:8075/ExternalInterface/BusinessProject/CreateProject";
/**
* 绔嬮」
*
@@ -47,8 +47,8 @@ public class TripartiteRPCImpl implements TripartiteRPC{
- private final String CreateProjectInfo_arrival_url = "http://cwlx.lixin.edu.cn:8012/ExternalInterface/BusinessProject/CreateProjectInfo";
- //private final String CreateProjectInfo_arrival_url = "http://192.168.1.77:8075/ExternalInterface/BusinessProject/CreateProjectInfo";
+ //private final String CreateProjectInfo_arrival_url = "http://cwlx.lixin.edu.cn:8012/ExternalInterface/BusinessProject/CreateProjectInfo";
+ private final String CreateProjectInfo_arrival_url = "http://192.168.1.77:8075/ExternalInterface/BusinessProject/CreateProjectInfo";
/**
* 椤圭洰鎷ㄦ
*
@@ -63,8 +63,8 @@ public class TripartiteRPCImpl implements TripartiteRPC{
- private final String CreateControlsInfo_arrival_url = "http://cwlx.lixin.edu.cn:8012/ExternalInterface/BusinessProject/CreateControlsInfo";
- //private final String CreateControlsInfo_arrival_url = "http://192.168.1.77:8075/ExternalInterface/BusinessProject/CreateControlsInfo";
+ //private final String CreateControlsInfo_arrival_url = "http://cwlx.lixin.edu.cn:8012/ExternalInterface/BusinessProject/CreateControlsInfo";
+ private final String CreateControlsInfo_arrival_url = "http://192.168.1.77:8075/ExternalInterface/BusinessProject/CreateControlsInfo";
/**
* 棰濆害鎷ㄦ
*
@@ -78,8 +78,8 @@ public class TripartiteRPCImpl implements TripartiteRPC{
}
- private final String getProjectBudDate_arrival = "http://cwlx.lixin.edu.cn:8012/ExternalInterface/BusinessProject/GetProjectBudData?ProjectCode=";
- //private final String getProjectBudDate_arrival = "http://192.168.1.77:8075/ExternalInterface/BusinessProject/GetProjectBudData?ProjectCode=";
+ //private final String getProjectBudDate_arrival = "http://cwlx.lixin.edu.cn:8012/ExternalInterface/BusinessProject/GetProjectBudData?ProjectCode=";
+ private final String getProjectBudDate_arrival = "http://192.168.1.77:8075/ExternalInterface/BusinessProject/GetProjectBudData?ProjectCode=";
/**
* 鍒ゆ柇鏄惁鏈夐搴︿俊鎭�
--
GitLab
From 258cd810aadd64194605a9f6010b3fb6c75840cd Mon Sep 17 00:00:00 2001
From: wxj334 <2241669945@qq.com>
Date: Thu, 2 Jun 2022 15:58:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E8=BF=94?=
=?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/seasky/projectplan/api/IProjectPlan.java | 2 +-
.../interfaces/controller/ProjectPlanController.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java
index 1eba9595..d7b25a05 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java
@@ -371,5 +371,5 @@ public interface IProjectPlan {
* @param projectPlanBooksCmd 椤圭洰瑙勫垝涔md
*/
@PostMapping(path = "/export")
- void export(HttpServletRequest request, HttpServletResponse response, ProjectPlanBooksCmd projectPlanBooksCmd);
+ Result<Object> export(HttpServletRequest request, HttpServletResponse response, ProjectPlanBooksCmd projectPlanBooksCmd);
}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
index 8decde24..9fe919b1 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
@@ -335,7 +335,8 @@ public class ProjectPlanController extends BaseController implements IProjectPla
*/
@Override
@ApiOperation("瀵煎嚭鍏宠仈缁忚垂鍗″彿")
- public void export(HttpServletRequest request, HttpServletResponse response, @RequestBody ProjectPlanBooksCmd projectPlanBooksCmd) {
+ public Result<Object> export(HttpServletRequest request, HttpServletResponse response, @RequestBody ProjectPlanBooksCmd projectPlanBooksCmd) {
queryService.export(request, response, projectPlanBooksCmd);
+ return ok(ResponseCode.SUCCESS);
}
}
--
GitLab