From 6798b4289702f3b6ac6378f988a617aa0388d93e Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Thu, 7 Mar 2024 14:15:43 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AE=80=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/warn/projectBrief.js | 10 + .../projectBrief/index.vue | 1662 +++++++++++++++++ .../projectBrief/options/index.vue | 382 ++++ .../src/main/resources/vm/vue/index.vue.vm | 4 +- 4 files changed, 2056 insertions(+), 2 deletions(-) create mode 100644 jwtech-admin-page/src/api/warn/projectBrief.js create mode 100644 jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/index.vue create mode 100644 jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue diff --git a/jwtech-admin-page/src/api/warn/projectBrief.js b/jwtech-admin-page/src/api/warn/projectBrief.js new file mode 100644 index 00000000..19d5957f --- /dev/null +++ b/jwtech-admin-page/src/api/warn/projectBrief.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 查询工作简报列表 +export function listById(query) { + return request({ + url: '/build/gzjb/listById', + method: 'post', + data: query + }) +} \ No newline at end of file diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/index.vue new file mode 100644 index 00000000..266023d9 --- /dev/null +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/index.vue @@ -0,0 +1,1662 @@ + + + + diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue new file mode 100644 index 00000000..e1756ade --- /dev/null +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue @@ -0,0 +1,382 @@ + + + + diff --git a/jwtech-generator/src/main/resources/vm/vue/index.vue.vm b/jwtech-generator/src/main/resources/vm/vue/index.vue.vm index eeab9051..c5b56388 100644 --- a/jwtech-generator/src/main/resources/vm/vue/index.vue.vm +++ b/jwtech-generator/src/main/resources/vm/vue/index.vue.vm @@ -310,7 +310,7 @@ export default { // 按哪个字段排序 orderBy: "create_time", // desc降序，升序asc - sort: "desc", + sortBy: "desc", }, }, // 表单参数 @@ -415,7 +415,7 @@ export default { // 按哪个字段排序 orderBy: "create_time", // desc降序，升序asc - sort: "desc", + sortBy: "desc", }, }; this.resetForm("form"); From a09be81c550cf982e110c91ed825facfc05fd287 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 7 Mar 2024 14:20:25 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/build/service/BsSgcJsjdBuiGzjbService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java index e46dd0ee..067d2209 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java @@ -53,12 +53,13 @@ public class BsSgcJsjdBuiGzjbService extends BaseService list = bsSgcjsjdBuiProInfoMapper.list(sysUser.getId(), sysUser.getUserType(), bsSgcJsjdBuiGzjb.getStartDate(), bsSgcJsjdBuiGzjb.getEndDate(), + List list = bsSgcjsjdBuiProInfoMapper.list(sysUser.getId(), sysUser.getUserType(), + data.getStartDate(), + data.getEndDate(), sysXzqhService.getSubString(adcd), sp.getPageNum(), sp.getPageSize()); From 12e769a52105766f0c82ad212c2b0122c21de4c9 Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Thu, 7 Mar 2024 14:23:31 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectBrief/options/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue index e1756ade..b792b3b0 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue @@ -251,7 +251,10 @@ export default { pageNum: 1, pageSize: 10, ids: null, - data: {}, + data: { + startDate: "2024-01-01", + endDate: "2024-04-01", + }, // 排序方式 params: { // 按哪个字段排序 @@ -312,10 +315,7 @@ export default { /** 查询项目基本信息管理列表 */ getList() { this.loading = true; - listById({ - startDate: "2024-01-01", - endDate: "2024-04-01", - }).then((res) => { + listById(this.queryParams).then((res) => { console.log(1111, res); }); this.loading = false; From 9004e140fe83969af281cedbbdb8752a921ddcf1 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 7 Mar 2024 14:42:47 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java | 3 ++- .../kms/build/service/BsSgcJsjdBuiGzjbService.java | 1 + .../mapper/build/BsSgcjsjdBuiProInfoMapper.xml | 12 ++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java index df7d66f7..ae10cee9 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java @@ -52,11 +52,12 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper list(@Param("uerId") String id, + List list(@Param("userId") String uerId, @Param("userType") String userType, @Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("adcd") String adcd, + @Param("orderBy") String orderBy, @Param("pageNum") int pageNum, @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java index 067d2209..02c61089 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java @@ -61,6 +61,7 @@ public class BsSgcJsjdBuiGzjbService extends BaseService - + + and adcd like concat(#{adcd},'%') + order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize}; - + + and adcd like concat(#{adcd},'%') + - order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize}; + - GROUP BY t.PRO_CODE + GROUP BY t.PRO_CODE LIMIT #{pageNum},#{pageSize}; From ada11baff485ca1505279d7a94800c7b44e9ee36 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 7 Mar 2024 16:11:38 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/build/domain/BsSgcJsjdBuiGzjb.java | 7 ++ .../mapper/BsSgcjsjdBuiProInfoMapper.java | 2 + .../service/BsSgcJsjdBuiGzjbService.java | 2 + .../build/BsSgcjsjdBuiProInfoMapper.xml | 112 ++++++++++++++---- 4 files changed, 102 insertions(+), 21 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiGzjb.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiGzjb.java index 8e6848b4..ab4473f8 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiGzjb.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiGzjb.java @@ -1,6 +1,8 @@ package com.kms.build.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -58,5 +60,10 @@ public class BsSgcJsjdBuiGzjb extends BaseEntity @Excel(name = "序号") @ApiModelProperty("序号") private String updateUid; + @TableField(exist = false) + private String proNo; + + @TableField(exist = false) + private String proCode; } diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java index ae10cee9..4ade2bee 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java @@ -56,6 +56,8 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper list = bsSgcjsjdBuiProInfoMapper.list(sysUser.getId(), sysUser.getUserType(), data.getStartDate(), data.getEndDate(), + data.getProNo(), + data.getProCode(), sysXzqhService.getSubString(adcd), "create_time", sp.getPageNum(), sp.getPageSize()); diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index 2dd2292b..d5dbef38 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -240,29 +240,99 @@ From 84de2cbc3df19a9e4890c73a95ba52bf7a45be84 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 7 Mar 2024 17:17:42 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/warn/domain/BsSgcJsjdWarnResult.java | 39 ++++++------------- .../build/BsSgcjsjdBuiProInfoMapper.xml | 4 +- 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java index cb2d5246..70c6335e 100644 --- a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java +++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java @@ -25,49 +25,34 @@ public class BsSgcJsjdWarnResult extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") + private String createUid; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") + private String updateUid; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") + private String proCode; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") + private String proNo; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") + private String owerDept; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") + + //预警事项 private String warnType; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") + private String warnSubType; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") + + //结果类型（1，不用处理。2，处理） private String resultType; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") + + //问题描述 private String warnResult; /** 是否处理（0：未处理，1：已处理） */ diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index d5dbef38..0dd1c90b 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -12,7 +12,8 @@ pi.project_type, pi.CONSTRUCTION_NATURE, pi.is_major, - pi.total + pi.total, + pi.pro_no from bs_sgc_jsjd_bui_pro_info pi left join bs_slgc_qqjd_spe_pro_proposal pp on pi.pro_code = pp.project_code and pi.pro_no = pp.pro_no @@ -68,6 +69,7 @@ + From f72ed71b80621c778285c83adbe8ee0a31511940 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Fri, 8 Mar 2024 10:16:25 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpecialProjectGainController.java | 10 +++ .../SpecialProjectInfoController.java | 6 ++ .../BsSgcJsjdWarnResultHandleController.java | 11 ++++ .../domain/BsSgcJsjdWarnResultHandle.java | 16 +++++ .../BsSgcJsjdWarnResultHandleService.java | 65 +++++++++++++++++++ 5 files changed, 108 insertions(+) diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectGainController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectGainController.java index d8676cc8..bf058757 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectGainController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectGainController.java @@ -2,7 +2,9 @@ package com.kms.earlyStage.controller; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; @@ -86,6 +88,14 @@ public class SpecialProjectGainController extends BaseController public AjaxResult add(@RequestBody SpecialProjectGain specialProjectGain) { BaseEntityUtils.preInsert(specialProjectGain); + String evaluationName = specialProjectGain.getEvaluationName(); + List list = specialProjectGainService.list(Wrappers.lambdaQuery(SpecialProjectGain.class) + .eq(SpecialProjectGain::getProNo,specialProjectGain.getProNo())); + List collect = list.stream().filter(e -> e.getEvaluationName().equals(evaluationName)).collect(Collectors.toList()); + if (collect.size() > 0) { + return AjaxResult.error("该评价规划名称已存在"); + } + return toAjax(specialProjectGainService.save(specialProjectGain)); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java index 8cea6f49..90f8dfc3 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java @@ -164,6 +164,12 @@ public class SpecialProjectInfoController extends BaseController { public AjaxResult add(@RequestBody SpecialProjectInfo specialProjectInfo) { BaseEntityUtils.preInsert(specialProjectInfo); String adcd = specialProjectInfo.getAdcd(); + String projectName = specialProjectInfo.getProjectName(); + List list = specialProjectInfoService.list(); + List infoList = list.stream().filter(x -> x.getProjectName().equals(projectName)).collect(Collectors.toList()); + if (infoList.size() > 0) { + return AjaxResult.error("该项目已存在"); + } if (adcd == null) { SysUser user = UserUtils.getUser(); String deptId = user.getDeptId(); diff --git a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java index 39dd4a17..c220ecd1 100644 --- a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java +++ b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java @@ -45,6 +45,17 @@ public class BsSgcJsjdWarnResultHandleController extends BaseController @Autowired private BsSgcJsjdWarnResultHandleService bsSgcJsjdWarnResultHandleService; + + + @PostMapping("/listById") + @ApiOperation("预警处理列表") + public BsSgcJsjdWarnResultHandle listById(@RequestBody SearchParam sp) + { + return bsSgcJsjdWarnResultHandleService.listById(sp); + } + + + /** * 查询预警处理列表 */ diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java index 3f07bad0..e906b2f5 100644 --- a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java +++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java @@ -80,4 +80,20 @@ public class BsSgcJsjdWarnResultHandle extends BaseEntity @ApiModelProperty("${comment}") private String checkPhone; + + private String projectName; + + private String unit; + + private String adcd; + + private String warnType; + + private String warnResult; + + + + + + } diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java index cf3db70f..8a00eeba 100644 --- a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java +++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java @@ -1,10 +1,25 @@ package com.kms.warn.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.jianwei.common.core.domain.SearchParam; +import com.kms.build.domain.BsSgcJsjdBuiEnteInfo; +import com.kms.build.mapper.BsSgcJsjdBuiEnteInfoMapper; +import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper; +import com.kms.earlyStage.domain.SpecialProjectProposal; +import com.kms.earlyStage.mapper.SpecialProjectProposalMapper; +import com.kms.warn.domain.BsSgcJsjdWarnResult; +import com.kms.warn.mapper.BsSgcJsjdWarnResultMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.warn.mapper.BsSgcJsjdWarnResultHandleMapper; import com.kms.warn.domain.BsSgcJsjdWarnResultHandle; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + /** * 预警处理Service接口 * @@ -14,4 +29,54 @@ import com.kms.warn.domain.BsSgcJsjdWarnResultHandle; @Service public class BsSgcJsjdWarnResultHandleService extends BaseService{ + @Autowired + private BsSgcJsjdWarnResultHandleMapper bsSgcJsjdWarnResultHandleMapper; + + @Autowired + private BsSgcJsjdWarnResultMapper bsSgcJsjdWarnResultMapper; + + + @Autowired + private BsSgcjsjdBuiProInfoMapper bsSgcjsjdBuiProInfoMapper; + + + @Autowired + private SpecialProjectProposalMapper specialProjectProposalMapper; + + @Autowired + private BsSgcJsjdBuiEnteInfoMapper bsSgcJsjdBuiEnteInfoMapper; + + public BsSgcJsjdWarnResultHandle listById(SearchParam sp) { + BsSgcJsjdWarnResultHandle data = sp.getData(); + + BsSgcJsjdWarnResult bsSgcJsjdWarnResult = bsSgcJsjdWarnResultMapper.selectById(data.getResultId()); + + SpecialProjectProposal specialProjectProposal = specialProjectProposalMapper.selectOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProNo, data.getProNo()) + .eq(SpecialProjectProposal::getProjectCode, data.getProCode())); + + String projectName = specialProjectProposal.getProjectName(); + String adcd = specialProjectProposal.getAdcd(); + + List bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoMapper.selectList(Wrappers.lambdaQuery(BsSgcJsjdBuiEnteInfo.class) + .eq(BsSgcJsjdBuiEnteInfo::getProNo, data.getProNo()) + .eq(BsSgcJsjdBuiEnteInfo::getProCode, data.getProCode())); + + List collect = bsSgcJsjdBuiEnteInfos.stream().filter(x -> x.getEnterpriseType().equals("1")).collect(Collectors.toList()); + String enterpriseName = ""; + if (collect.size() > 0) { + enterpriseName = collect.get(0).getEnterpriseName(); + } + + BsSgcJsjdWarnResultHandle bsSgcJsjdWarnResultHandle = new BsSgcJsjdWarnResultHandle(); + bsSgcJsjdWarnResultHandle.setWarnResult(bsSgcJsjdWarnResult.getWarnResult()); + bsSgcJsjdWarnResultHandle.setWarnType(bsSgcJsjdWarnResult.getWarnType()); + bsSgcJsjdWarnResultHandle.setCreateTime(bsSgcJsjdWarnResult.getCreateTime()); + + bsSgcJsjdWarnResultHandle.setAdcd(adcd); + bsSgcJsjdWarnResultHandle.setProjectName(projectName); + bsSgcJsjdWarnResultHandle.setUnit(enterpriseName); + return bsSgcJsjdWarnResultHandle; + + } } From fff15a12844bd4b3fc3bf067c79cd69343ca7b85 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Fri, 8 Mar 2024 10:35:16 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/warn/service/BsSgcJsjdWarnResultHandleService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java index 8a00eeba..1085ee73 100644 --- a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java +++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java @@ -49,7 +49,7 @@ public class BsSgcJsjdWarnResultHandleService extends BaseService sp) { BsSgcJsjdWarnResultHandle data = sp.getData(); - BsSgcJsjdWarnResult bsSgcJsjdWarnResult = bsSgcJsjdWarnResultMapper.selectById(data.getResultId()); + SpecialProjectProposal specialProjectProposal = specialProjectProposalMapper.selectOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) .eq(SpecialProjectProposal::getProNo, data.getProNo()) @@ -69,9 +69,6 @@ public class BsSgcJsjdWarnResultHandleService extends BaseService Date: Mon, 11 Mar 2024 10:52:08 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jwtech-admin-page/src/layout/components/Sidebar/Logo.vue | 5 +++-- jwtech-admin-page/src/settings.js | 3 +-- jwtech-admin-page/src/views/loginbg.vue | 4 ++-- jwtech-admin-page/src/views/project/bid/index.vue | 6 +++--- .../src/views/project/special/options/basePage.vue | 2 +- jwtech-admin-page/vue.config.js | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue b/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue index 9eceb40a..cc6bca47 100644 --- a/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue +++ b/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue @@ -35,9 +35,10 @@ export default { }, data() { return { - title: "广东省水工程建设管理系统", + title: "管理系统", // title: '安全知识图谱管理平台', - logo: logoImg, + // logo: logoImg, + logo: "", }; }, created() { diff --git a/jwtech-admin-page/src/settings.js b/jwtech-admin-page/src/settings.js index 0ceed228..d06907e9 100644 --- a/jwtech-admin-page/src/settings.js +++ b/jwtech-admin-page/src/settings.js @@ -1,6 +1,5 @@ module.exports = { - // title: '安全知识图谱管理平台', - title: '广东省水工程建设管理系统后台', + title: '管理系统后台', /** * 是否系统布局配置 diff --git a/jwtech-admin-page/src/views/loginbg.vue b/jwtech-admin-page/src/views/loginbg.vue index 68e0c579..fd95ee3d 100644 --- a/jwtech-admin-page/src/views/loginbg.vue +++ b/jwtech-admin-page/src/views/loginbg.vue @@ -2,8 +2,8 @@ + diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue index b792b3b0..941becc2 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue @@ -90,25 +90,34 @@ label="所在省" align="center" min-width="80" - prop="1111" + prop="adcd" + :formatter="(row) => adcdFormat(row, 'province')" fixed /> - + @@ -164,33 +173,53 @@ min-width="120" > - - - + + + - - - + + + - - - + + + - + - - + + - - + + - + - + import { listById } from "@/api/warn/projectBrief"; +import { getInfo } from "@/api/build/projectInfo"; +import { regionData, codeToText, TextToCode } from "element-china-area-data"; import { getAreasData } from "@/api/areas/index"; export default { name: "Info", @@ -246,6 +277,8 @@ export default { total: 0, // 项目简报表格数据 infoList: [], + // 工程等别字典 + engineeringGradeOptions: [], // 查询参数 queryParams: { pageNum: 1, @@ -280,10 +313,31 @@ export default { }, created() { this.getList(); + this.getDicts("engineering_grade").then((response) => { + this.engineeringGradeOptions = response.data; + }); this.routeList = JSON.parse(this.$store.state.basePageData.routeList); this.getTreeData(); }, methods: { + // 工程等别字典翻译 + engineeringGradeFormat(row, column) { + return this.selectDictLabel( + this.engineeringGradeOptions, + row.engineeringGrade + ); + }, + adcdFormat(row, key) { + if (row.adcd) { + let provinceCode = row.adcd.slice(0, 2); + let cityCode = row.adcd.slice(2, 4); + let areaCode = row.adcd.slice(4, 6); + if (key === "province") return codeToText[provinceCode]; + if (key === "city") return codeToText[provinceCode + cityCode]; + if (key === "county") + return codeToText[provinceCode + cityCode + areaCode]; + } + }, goBack() { this.$router.back(); }, @@ -315,10 +369,16 @@ export default { /** 查询项目基本信息管理列表 */ getList() { this.loading = true; - listById(this.queryParams).then((res) => { - console.log(1111, res); + getInfo(this.$route.query.baseDataId).then((response) => { + // console.log(2222, response); + this.queryParams.data.proNo = response.data.proNo; + this.queryParams.data.proCode = response.data.proCode; + listById(this.queryParams).then((res) => { + // console.log(1111, res); + this.infoList = res.records; + this.loading = false; + }); }); - this.loading = false; }, // 取消按钮 cancel() { From 858cc03c5940d1a6144ee49f2057e51925955811 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Mon, 11 Mar 2024 14:20:35 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BsSgcjsjdBuiProInfoMapper.java | 25 ++++++++++--------- .../service/BsSgcjsjdBuiProInfoService.java | 9 +++---- .../build/BsSgcjsjdBuiProInfoMapper.xml | 5 ++-- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java index 4ade2bee..aeeeca32 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java @@ -1,5 +1,7 @@ package com.kms.build.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.build.domain.BsSgcjsjdBuiProInfo; import com.kms.build.domain.dto.AssertStatisticsDto; import com.kms.build.domain.dto.GzjbDto; @@ -44,22 +46,21 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper selectPageByCode(@Param("id") String id, + IPage selectPageByCode(@Param("id") String id, @Param("projectName") String projectName, @Param("projectType") String projectType, @Param("adcd") String adcd, @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + Page page); List list(@Param("userId") String uerId, - @Param("userType") String userType, - @Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("proNo") String proNo, - @Param("proCode") String proCode, - @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + @Param("userType") String userType, + @Param("startDate") Date startDate, + @Param("endDate") Date endDate, + @Param("proNo") String proNo, + @Param("proCode") String proCode, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index 1eb58143..2ddc12da 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java @@ -201,19 +201,16 @@ public class BsSgcjsjdBuiProInfoService extends BaseService params = sp.getParams(); assert sysUser != null; - List list = null; + IPage list = null; String deptId = sysUser.getDeptId(); SysDept sysDept = sysDeptService.get(deptId); String xzqhId = sysDept.getXzqhId(); list=bsSgcjsjdBuiProInfoMapper.selectPageByCode(data.getId(),data.getProjectName(),data.getProjectType(), sysXzqhService.getSubString(xzqhId), - "create_time",sp.getPageNum(),sp.getPageSize()); + "create_time",new Page<>(sp.getPageNum(),sp.getPageSize())); - Page page = new Page<>(); - page.setRecords(list); - page.setTotal(list.size()); - return page; + return list; } } diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index 0dd1c90b..6ac11055 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -240,7 +240,6 @@ From f3f99294045e2174b680bf82166b1e2b45a33e48 Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Mon, 11 Mar 2024 16:02:58 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../earlyWarningManage/warning/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue index 03ab3f6b..87ae5182 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue @@ -285,6 +285,7 @@ export default { }, projectTypeOptionProps: { emitPath: false, + checkStrictly: true, //选择任意一级 }, }; }, @@ -318,21 +319,21 @@ export default { let op = [ { label: "重大项目", - value: "0", + value: "0, ", children: this.zd_projectTypeOptions.map((item) => { return { label: item.dictLabel, - value: "zd" + item.dictValue, + value: "0," + item.dictValue, }; }), }, { label: "面上项目", - value: "1", + value: "1, ", children: this.ms_projectTypeOptions.map((item) => { return { label: item.dictLabel, - value: "ms" + item.dictValue, + value: "1," + item.dictValue, }; }), }, From 21a23a71f990df627b086d54cc8985e6f1190383 Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Mon, 11 Mar 2024 16:22:37 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../earlyWarningManage/warning/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue index 87ae5182..8539dd1b 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue @@ -319,21 +319,21 @@ export default { let op = [ { label: "重大项目", - value: "0, ", + value: "zd, ", children: this.zd_projectTypeOptions.map((item) => { return { label: item.dictLabel, - value: "0," + item.dictValue, + value: "zd," + item.dictValue, }; }), }, { label: "面上项目", - value: "1, ", + value: "ms, ", children: this.ms_projectTypeOptions.map((item) => { return { label: item.dictLabel, - value: "1," + item.dictValue, + value: "ms," + item.dictValue, }; }), }, From 38b445d53eb4328a61502f0a7f79b3d459ba0e8c Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Mon, 11 Mar 2024 16:37:26 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BsSgcJsjdBuiProgressMapper.java | 19 ++++---- .../mapper/BsSgcjsjdBuiProInfoMapper.java | 1 + .../service/BsSgcJsjdBuiProgressService.java | 9 ++-- .../service/BsSgcjsjdBuiProInfoService.java | 44 ++++++++++++------- .../build/BsSgcJsjdBuiProgressMapper.xml | 7 ++- .../build/BsSgcjsjdBuiProInfoMapper.xml | 3 ++ 6 files changed, 49 insertions(+), 34 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressMapper.java index 8b83a6a3..bef50f26 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressMapper.java @@ -1,5 +1,7 @@ package com.kms.build.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.build.domain.BsSgcJsjdBuiProgress; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -17,13 +19,12 @@ import java.util.List; @Repository public interface BsSgcJsjdBuiProgressMapper extends BaseMapper { - List getProgress(@Param("userId") String userId, - @Param("userType") String userType, - @Param("id") String id, - @Param("projectName") String projectName, - @Param("projectType") String projectType, - @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + IPage getProgress(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("projectType") String projectType, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + Page page); } diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java index aeeeca32..9e08de61 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java @@ -40,6 +40,7 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper selectManagePage(@Param("id") String id, @Param("projectName") String projectName, + @Param("isMajor") String isMajor, @Param("projectType") String projectType, @Param("adcd") String adcd, @Param("orderBy") String orderBy, diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressService.java index 5915409c..bdbd81fa 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressService.java @@ -46,15 +46,12 @@ public class BsSgcJsjdBuiProgressService extends BaseService list = bsSgcJsjdBuiProgressMapper.getProgress(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), + IPage list = bsSgcJsjdBuiProgressMapper.getProgress(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProjectType(), sysXzqhService.getSubString(xzqhId), - "create_time", sp.getPageNum(), sp.getPageSize()); + "create_time",new Page<>(sp.getPageNum(), sp.getPageSize())); - Page page = new Page<>(); - page.setRecords(list); - page.setTotal(list.size()); - return page; + return list; } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index 2ddc12da..4784bc74 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java @@ -109,11 +109,11 @@ public class BsSgcjsjdBuiProInfoService extends BaseService params = sp.getParams(); + String isMajor = null; + + + + String projectType = data.getProjectType(); + if (!ObjectUtil.isNull(projectType)) { + String[] split = projectType.split(","); + isMajor=split[0]; + if (" ".equals(split[1])) { + projectType=null; + }else { + projectType=split[1]; + } + } + + + assert sysUser != null; List list = null; - if (ObjectUtil.isNull(params)) { - list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(),data.getProjectName(),data.getProjectType(), - sysXzqhService.getSubString(sp.getData().getAdcd()), - "create_time",sp.getPageNum(),sp.getPageSize()); - }else { - list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), - data.getProjectName(),data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); - } + + list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor,projectType, + sysXzqhService.getSubString(sp.getData().getAdcd()), + "create_time", sp.getPageNum(), sp.getPageSize()); + for (BsSgcjsjdBuiProInfo buiProInfo : list) { String proNo = buiProInfo.getProNo(); @@ -180,7 +194,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService(sp.getPageNum(),sp.getPageSize())); + "create_time", new Page<>(sp.getPageNum(), sp.getPageSize())); return list; diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml index cfc16f24..700d9122 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml @@ -20,13 +20,12 @@ - + diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index 6ac11055..6b3129ee 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -163,6 +163,9 @@ and pi.project_name like concat('%',#{projectName},'%') + + and pi.is_major=#{isMajor} + and pi.project_type=#{projectType}