From 0c0f1fb68b93095c43d4b714f03fd156c3578dfb Mon Sep 17 00:00:00 2001 From: 2369059705@qq.com <2369059705@qq.com> Date: 星期三, 28 六月 2023 16:56:43 +0800 Subject: [PATCH] 项目预警 --- product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java | 31 +++++++++++++++ product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java | 30 +++++++++++--- product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java | 8 ++- 3 files changed, 59 insertions(+), 10 deletions(-) diff --git a/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java b/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java index a373a43..3c798f7 100644 --- a/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java +++ b/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java @@ -8,7 +8,7 @@ public static final String PRODUCT_PROJECT_QXLW="product_project_qxlw"; //椤圭洰淇℃伅 public static final String PRODUCT_PROJECT_ITEM="product_project_item"; //椤圭洰鍒嗛」 public static final String PRODUCT_PROJECT_BUDGET="product_project_budget"; //棰勭畻 - + //瀛楁鍚� public static final String MATERIAL_TYPE="material_type"; public static final String MATERIAL_CODE="material_code"; @@ -20,10 +20,12 @@ public static final String ITEMIZE_CODE="itemize_code"; public static final String ITEMIZE_TYPE="itemize_type"; public static final String ITEMIZE_PARENT_CODE="itemize_parent_code"; - - + + //鍙傛暟 public static final String PROJECTTYPE="projectType"; public static final String PROJECT_UUID="project_uuid"; public static final String ITEMIZE_UUID="itemize_uuid"; + public static final String UUID="uuid"; + } 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 4042289..eaa6c84 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 @@ -214,6 +214,37 @@ } } /** + * 鑾峰彇椤圭洰鍒嗛」鏉愭枡 + * @param request + * @return + */ + @RequestMapping(value = "/list-material-v/{version}", method = RequestMethod.POST) + @ApiVersion(1) + public String listMaterialV(HttpServletRequest request) { + try { + //鑾峰彇鍙傛暟 + FieldSetEntity fse = BaseUtil.getFieldSetEntity(request); + + //鍒ゆ柇uuid鏄惁涓虹┖ + if (BaseUtil.strIsNull(fse.getString(Cmnconst.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.listMaterialV(fse.getString(Cmnconst.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()); + } + } + /** * 鏍规嵁uuid鑾峰彇椤圭洰鍒嗛」鏍戠粨鏋勮鎯� * @param request * @return diff --git a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java index ef04c1d..e414305 100644 --- a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java +++ b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java @@ -6,6 +6,7 @@ import java.util.Map; import com.alibaba.fastjson.JSONArray; +import com.product.core.websocket.config.CmnConst; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -198,18 +199,33 @@ return dtItemizeBudget; } + /** + * 鏇村叿椤圭洰鍒嗛」uuid鑾峰彇椤圭洰鍒嗛」涓嬬殑鏉愭枡 + * @param uuid + * @param capge + * @param pageSize + * @return + */ + public DataTableEntity listMaterialV(String uuid, Integer capge, Integer pageSize) { + return baseDao.listTable("product_project_base_material_v","project_itemize_uuid=?",new String[]{uuid},null,null,pageSize, capge); + } + + /** + * 鏍规嵁椤圭洰uuid鑾峰彇椤圭洰鍒嗛」鏍戠粨鏋� + * @param uuid + * @return + */ + public JSONArray getTreeProjectItem(String uuid) { - FieldSetEntity fseProject = baseDao.getFieldSetEntity(Cmnconst.PRODUCT_PROJECT_QXLW, uuid, true); - DataTableEntity newDtProjectItem = BaseUtil.dataTableToTreeTable(fseProject.getSubDataTable(Cmnconst.PRODUCT_PROJECT_ITEM), Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE, null); + DataTableEntity dtProjectItemize = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_ITEM, "project_uuid=?", new Object[]{uuid}, new Object[]{CoreConst.UUID, Cmnconst.ITEMIZE, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE}); + DataTableEntity newDtProjectItem = BaseUtil.dataTableToTreeTable(dtProjectItemize, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE, null); JSONArray objects = BaseUtil.dataTableEntityToJson(newDtProjectItem); JSONObject json = new JSONObject(); - json.put("itemize", "椤圭洰鍒嗛儴鍒嗛」"); - json.put("children", objects); - json.put("type", 1); - + json.set("itemize", "椤圭洰鍒嗛儴鍒嗛」"); + json.set("children", objects); + json.set("type", 1); JSONArray array = new JSONArray(); array.add(json); - return array; } } -- Gitblit v1.9.2