From 182142987021d6e9d7aa2d539590a1ed57b16487 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Tue, 2 Apr 2024 15:27:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E6=AE=B5=E5=B7=A5=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/Constant.java | 6 ++ .../common/core/utils/ImportExcelUtils.java | 56 ++++++++++++------ .../entity/system/base/vo/ProImportVo.java | 15 +++++ .../entity/system/base/vo/ProVo.java | 15 +++++ .../base/service/impl/ProServiceImpl.java | 17 +++++- .../main/resources/download/pro_model.xlsx | Bin 267694 -> 267918 bytes .../main/resources/mapper/base/ProMapper.xml | 22 ++++++- 7 files changed, 111 insertions(+), 20 deletions(-) diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java index 0c6ad3f..e76f5e6 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java @@ -61,6 +61,12 @@ public class Constant { "12G0,宣城","12H0,阜阳","12J0,铜陵","12L0,蚌埠","12M0,滁州","12N0,六安","12P0,淮北","12Q0,宿州","12R0,池州", "12S0,黄山","12T0,亳州","12Z0,建设分公司"}; + /*工程阶段*/ + public final static String[] BID_TYPE_ARR = {"0,设计","1,监理","2,施工","3,监理加施工"}; + + /*变电站类型*/ + public final static String[] SUB_TYPE_ARR = {"1,土建","2,电气","3,变电"}; + public final static Integer CELL_1 = 1; public final static Integer CELL_2 = 2; public final static Integer CELL_3 = 3; diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ImportExcelUtils.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ImportExcelUtils.java index c20ede1..65dc494 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ImportExcelUtils.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ImportExcelUtils.java @@ -213,6 +213,26 @@ public class ImportExcelUtils { // 工程简介 obj.put("proBrief", row.getCell(Constant.CELL_17).getStringCellValue()); } + if (row.getCell(Constant.CELL_18) != null) { + // 工程阶段 + obj.put("bidType", row.getCell(Constant.CELL_18).getStringCellValue()); + } + if (row.getCell(Constant.CELL_19) != null) { + // 施工项目经理 + obj.put("sgManage", row.getCell(Constant.CELL_19).getStringCellValue()); + } + if (row.getCell(Constant.CELL_20) != null) { + // 监理工程师 + obj.put("jlManage", row.getCell(Constant.CELL_20).getStringCellValue()); + } + if (row.getCell(Constant.CELL_21) != null) { + // 变电站类型包括:1 土建,2 电气,3 变电 + obj.put("subType", row.getCell(Constant.CELL_21).getStringCellValue()); + } + if (row.getCell(Constant.CELL_22) != null) { + // 投产时间 + obj.put("tcDate", row.getCell(Constant.CELL_22).getStringCellValue()); + } obj = setFileObj(row, obj, files); return obj; } @@ -343,25 +363,25 @@ public class ImportExcelUtils { continue; } String keyName = null; - if (cAnchor.getCol1() == 18) { + if (cAnchor.getCol1() == 23) { PRONAME_LIST.add(row.getCell(1).getStringCellValue()); keyName = "file" + "_" + cAnchor.getRow1() + "_1"; - } else if (cAnchor.getCol1() == 19) { + } else if (cAnchor.getCol1() == 24) { PRONAME_LIST.add(row.getCell(1).getStringCellValue()); keyName = "file" + "_" + cAnchor.getRow1() + "_2"; - } else if (cAnchor.getCol1() == 20) { + } else if (cAnchor.getCol1() == 25) { PRONAME_LIST.add(row.getCell(1).getStringCellValue()); keyName = "file" + "_" + cAnchor.getRow1() + "_3"; - } else if (cAnchor.getCol1() == 21) { + } else if (cAnchor.getCol1() == 26) { PRONAME_LIST.add(row.getCell(1).getStringCellValue()); keyName = "file" + "_" + cAnchor.getRow1() + "_4"; - } else if (cAnchor.getCol1() == 22) { + } else if (cAnchor.getCol1() == 27) { PRONAME_LIST.add(row.getCell(1).getStringCellValue()); keyName = "file" + "_" + cAnchor.getRow1() + "_5"; - } else if (cAnchor.getCol1() == 23) { + } else if (cAnchor.getCol1() == 28) { PRONAME_LIST.add(row.getCell(1).getStringCellValue()); keyName = "file" + "_" + cAnchor.getRow1() + "_6"; - } else if (cAnchor.getCol1() == 24) { + } else if (cAnchor.getCol1() == 29) { PRONAME_LIST.add(row.getCell(1).getStringCellValue()); keyName = "file" + "_" + cAnchor.getRow1() + "_7"; } @@ -415,19 +435,19 @@ public class ImportExcelUtils { if (Objects.equals(className, Constant.PRO_IMPORT_VO)) { switch (col) { - case "18": - return "file" + "_" + row.getRowNum() + "_1"; - case "19": - return "file" + "_" + row.getRowNum() + "_2"; - case "20": - return "file" + "_" + row.getRowNum() + "_3"; - case "21": - return "file" + "_" + row.getRowNum() + "_4"; - case "22": - return "file" + "_" + row.getRowNum() + "_5"; case "23": - return "file" + "_" + row.getRowNum() + "_6"; + return "file" + "_" + row.getRowNum() + "_1"; case "24": + return "file" + "_" + row.getRowNum() + "_2"; + case "25": + return "file" + "_" + row.getRowNum() + "_3"; + case "26": + return "file" + "_" + row.getRowNum() + "_4"; + case "27": + return "file" + "_" + row.getRowNum() + "_5"; + case "28": + return "file" + "_" + row.getRowNum() + "_6"; + case "29": return "file" + "_" + row.getRowNum() + "_7"; default: return null; diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProImportVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProImportVo.java index 7420f49..292a485 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProImportVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProImportVo.java @@ -69,6 +69,21 @@ public class ProImportVo { @ApiModelProperty(value = "实际竣工时间") private String endTime; + @ApiModelProperty(value = "0：设计，1：监理，2：施工，3：监理加施工") + private String bidType; + + @ApiModelProperty(value = "施工项目经理") + private String sgManage; + + @ApiModelProperty(value = "监理工程师") + private String jlManage; + + @ApiModelProperty(value = "变电站类型包括:1 土建,2 电气,3 变电") + private String subType; + + @ApiModelProperty(value = "投产时间") + private String tcDate; + @ApiModelProperty(value = "工程平面图") private MultipartFile file; diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProVo.java index 3d0226e..a27f650 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProVo.java @@ -109,6 +109,21 @@ public class ProVo { @ApiModelProperty(value = "平面图数量") private int proFileNum; + @ApiModelProperty(value = "0：设计，1：监理，2：施工，3：监理加施工") + private String bidType; + + @ApiModelProperty(value = "施工项目经理") + private String sgManage; + + @ApiModelProperty(value = "监理工程师") + private String jlManage; + + @ApiModelProperty(value = "变电站类型包括:1 土建,2 电气,3 变电") + private String subType; + + @ApiModelProperty(value = "投产时间") + private String tcDate; + @ApiModelProperty(value = "类型 1.新增 2.修改") private int type; diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java index 858fe0d..1f5f383 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java @@ -464,6 +464,11 @@ public class ProServiceImpl implements IProService { vo.setPlanEndTime(obj.getString("planEndTime")); vo.setStartTime(obj.getString("startTime")); vo.setEndTime(obj.getString("endTime")); + vo.setBidType(getBidAndSubType(obj.getString("bidType"),1)); + vo.setSgManage(obj.getString("sgManage")); + vo.setJlManage(obj.getString("jlManage")); + vo.setSubType(getBidAndSubType(obj.getString("subType"),2)); + vo.setTcDate(obj.getString("tcDate")); vo.setFile(obj.get("file") != null ? (MultipartFile) obj.get("file") : null); List files = new ArrayList(); if (obj.get(Constant.FILE_2) != null) { @@ -507,7 +512,6 @@ public class ProServiceImpl implements IProService { if (!StringUtils.isEmpty(buildName)) { for (String build : Constant.BUILD_ARR) { if (build.contains(buildName)) { - System.err.println(build); return build.split(",")[0]; } } @@ -515,6 +519,17 @@ public class ProServiceImpl implements IProService { return null; } + public static String getBidAndSubType(String name,int type) { + if (!StringUtils.isEmpty(name)) { + for (String value : type == 1 ? Constant.BID_TYPE_ARR : Constant.SUB_TYPE_ARR) { + if (value.contains(name)) { + return value.split(",")[0]; + } + } + } + return null; + } + @Override @Transactional(rollbackFor = Exception.class) public AjaxResult editProStatus(ProVo vo) { diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/download/pro_model.xlsx b/securitycontrol-model/securitycontrol-system/src/main/resources/download/pro_model.xlsx index 73ec89f9a0c69cd4b5f63e237e751d8be5287a7f..c3f225fab8495a6e0a514b22712fcd6be2fc5eac 100644 GIT binary patch delta 5991 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 delta 5770 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 I1ii!l57^|6s{jB1 diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml index d602dee..ddab2c6 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml @@ -27,6 +27,11 @@ end_time, org, del_flag, + bid_type, + sg_manage, + jl_manage, + sub_type, + tc_date, #{proId}, @@ -50,6 +55,11 @@ #{endTime}, #{org}, 0, + #{bidType}, + #{sgManage}, + #{jlManage}, + #{subType}, + #{tcDate}, @@ -73,6 +83,11 @@ start_time = #{startTime}, end_time = #{endTime}, org = #{org}, + bid_type = #{bidType}, + sg_manage = #{sgManage}, + jl_manage = #{jlManage}, + sub_type = #{subType}, + tc_date = #{tcDate}, WHERE pro_id = #{proId} @@ -234,7 +249,12 @@ tp.plan_end_time AS planEndTime, tp.start_time AS startTime, tp.end_time AS endTime, - tp.org + tp.org, + tp.bid_type AS bidType, + tp.sg_manage AS sgManage, + tp.jl_manage AS jlManage, + tp.sub_type AS subType, + tp.tc_date AS tcDate FROM tb_project tp WHERE pro_id = #{proId}