From 443b575f774d8eb50c16d4eefccce5218fb8de2a Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期二, 14 十一月 2023 13:40:48 +0800
Subject: [PATCH] 项目信息和出库信息高级搜索
---
product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java | 98 +++++++++++++++++++++++-------------------------
1 files changed, 47 insertions(+), 51 deletions(-)
diff --git a/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java b/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java
index 4bf7bab..fb891e4 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java
@@ -24,6 +24,34 @@
@Autowired
ProjectInfoService projectInfoService;
+
+ /**
+ * 鑾峰彇椤圭洰鍒楄〃锛堟牴鎹垱寤轰汉锛�
+ *
+ * @param request
+ * @return
+ */
+ @RequestMapping(value = "/list-project-by-created/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String listProjectByCreated(HttpServletRequest request) {
+ try {
+ // 鑾峰彇鍙傛暟
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+
+ //鍒ゆ柇鍒嗛〉鍙傛暟鏄惁涓虹┖
+ if (BaseUtil.strIsNull(fse.getString(CoreConst.CPAGE)) || BaseUtil.strIsNull(fse.getString(CoreConst.PAGESIZE))) {
+ return this.error(SystemCode.SYSTEM_CPAGES_NOT_NULL.getValue(), SystemCode.SYSTEM_CPAGES_NOT_NULL.getText());
+ }
+ return OK_List(projectInfoService.listProjectByCreated(fse));
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return this.error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
+ }
+ }
/**
* 鑾峰彇妯℃澘椤圭洰鍒嗛」
@@ -48,8 +76,8 @@
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
- return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
}
}
@@ -76,8 +104,8 @@
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
- return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
}
}
@@ -104,8 +132,8 @@
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
- return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
}
}
@@ -125,39 +153,11 @@
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
- return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
}
}
- /**
- * 鑾峰彇椤圭洰鍒嗘瀽鏁版嵁
- *
- * @param request
- * @return
- */
- @RequestMapping(value = "/statist-analysis-report/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String statistAnalysis(HttpServletRequest request) {
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
-
- //鍒ゆ柇uuid鏄惁涓虹┖
- if (BaseUtil.strIsNull(fse.getString(Cmnconst.PROJECT_UUID))) {
- return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
- }
- return ResultInfo.success(projectInfoService.statistAnalysis(fse.getString(Cmnconst.PROJECT_UUID)));
-// return OK_List(projectInfoService.statistAnalysis(fse.getString(Cmnconst.PROJECT_UUID)));
- } catch (BaseException e) {
- e.printStackTrace();
- return this.error(e);
- } catch (Exception e) {
- e.printStackTrace();
- return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
- }
- }
/**
* 鍒犻櫎鍗曚釜椤圭洰鍒嗛」楠岃瘉锛堟牴鎹绠楅獙璇佹槸鍚﹀垹闄わ級
@@ -183,8 +183,8 @@
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
- return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
}
}
@@ -201,23 +201,19 @@
//鑾峰彇鍙傛暟
FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- //鍒ゆ柇uuid鏄惁涓虹┖
- if (BaseUtil.strIsNull(fse.getString(Cmnconst.PROJECT_UUID))) {
- return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
- }
//鍒ゆ柇鍒嗛〉鍙傛暟鏄惁涓虹┖
if (BaseUtil.strIsNull(fse.getString(CoreConst.CPAGE)) || BaseUtil.strIsNull(fse.getString(CoreConst.PAGESIZE))) {
return this.error(SystemCode.SYSTEM_CPAGES_NOT_NULL.getValue(), SystemCode.SYSTEM_CPAGES_NOT_NULL.getText());
}
- return OK_List(projectInfoService.listItemizeBudget(fse.getString(Cmnconst.PROJECT_UUID), fse.getString(Cmnconst.ITEMIZE_CODE), fse.getInteger(CoreConst.CPAGE), fse.getInteger(CoreConst.PAGESIZE)));
+ return OK_List(projectInfoService.listItemizeBudget(fse.getString(Cmnconst.ITEMIZE_UUID), fse.getInteger(CoreConst.CPAGE), fse.getInteger(CoreConst.PAGESIZE)));
} catch (BaseException e) {
e.printStackTrace();
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
- return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
}
}
@@ -249,8 +245,8 @@
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
- return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
}
}
@@ -276,8 +272,8 @@
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
- return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
}
}
@@ -304,8 +300,8 @@
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
- return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
}
}
--
Gitblit v1.9.2