From 505be3cdc9d3fe2984f10c74f531610f33c0da32 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 3 Dec 2021 14:48:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97=20=E5=8D=8A=E9=87=8D?= =?UTF-8?q?=E6=9E=84o(*=EF=BF=A3=EF=B8=B6=EF=BF=A3*)o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 7 +++++ .../esRevisePlan/dao/EsRevisePlanDao.java | 1 + .../esRevisePlan/entity/EsRevisePlan.java | 15 +++++++++++ .../service/IEsRevisePlanService.java | 5 ++-- .../service/impl/EsRevisePlanServiceImpl.java | 27 ++++++++++++++++--- .../esRevisePlan/EsRevisePlanMapper.xml | 13 ++++++++- 6 files changed, 61 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 63852873..e9eee749 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -52,6 +52,13 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.getOnePlan(id)); } + + @ApiOperation(value = "获取是否存在重复名企标名称接口") + @GetMapping("getDataByName") + public ResponseMessage getDataByName(EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.getDataByName(esRevisePlan)); + } + @ApiOperation(value = "编辑企标计划") @PostMapping("modPlan") public ResponseMessage modPlan(EsRevisePlan esRevisePlan){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java index dee08a19..bb010d5e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java @@ -19,6 +19,7 @@ public interface EsRevisePlanDao extends BaseMapper { Integer getQueryTotal(EsRevisePlan esRevisePlan); List selectAll(EsRevisePlan esRevisePlan);//查询所有 List queryAll(EsRevisePlan esRevisePlan);//多条件查询 + List selectPageByName(EsRevisePlan esRevisePlan);//多条件查询 EsRevisePlan selectOne(String id);//查询详情 int updateOne(EsRevisePlan esRevisePlan);//编辑 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 93cfa32f..9625c6d4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.esRevisePlan.entity; import java.util.Date; import com.adc.da.base.page.BasePage; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -46,15 +47,29 @@ public class EsRevisePlan extends BasePage { @ApiModelProperty(value = "工作组组长") private String wgLeader; + + @ApiModelProperty(value = "起草人姓名") + private String drafterName; + + @ApiModelProperty(value = "评审责任人姓名") + private String resPersonName; + + @ApiModelProperty(value = "工作组组长姓名") + private String wgLeaderName; + @ApiModelProperty(value = "计划标准初稿完成时间") @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date draftTime; @ApiModelProperty(value = "计划标准发布时间") @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date releaseTime; @ApiModelProperty(value = "起草责任单位") private String unit; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index cc5eab90..62c17fcf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -18,8 +18,9 @@ public interface IEsRevisePlanService extends IService { List queryAllPlans(EsRevisePlan esRevisePlan);//多条件查询 EsRevisePlan getOnePlan(String id);//查询详情 - int modPlan(EsRevisePlan esRevisePlan);//编辑 - int addPlan(EsRevisePlan esRevisePlan);//插入 + String modPlan(EsRevisePlan esRevisePlan);//编辑 + String addPlan(EsRevisePlan esRevisePlan);//插入 int delPlan(String id);//删除 int delPlans(String ids);//批量删除 + List getDataByName(EsRevisePlan esRevisePlan); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 0e7a4ade..f5a1e950 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -23,6 +23,8 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getAllPlans(EsRevisePlan esRevisePlan) { @@ -46,14 +48,26 @@ public class EsRevisePlanServiceImpl extends ServiceImpl esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); + if (esRevisePlans.size()>0){ + return "企标名称不能重复,请更换新的企标名称。"; + }else { + esRevisePlanDao.updateOne(esRevisePlan); + return "操作成功"; + } } @Override - public int addPlan(EsRevisePlan esRevisePlan) { + public String addPlan(EsRevisePlan esRevisePlan) { esRevisePlan.setId(UUIDUtils.randomUUID(32)); - return esRevisePlanDao.insertOne(esRevisePlan); + List esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); + if (esRevisePlans.size()>0){ + return "企标名称不能重复,请更换新的企标名称"; + }else { + esRevisePlanDao.insertOne(esRevisePlan); + return "操作成功"; + } } @Override @@ -66,4 +80,9 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getDataByName(EsRevisePlan esRevisePlan) { + return esRevisePlanDao.selectPageByName(esRevisePlan); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index fbf42949..b35fc1d7 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -17,7 +17,10 @@ wg_leader, draft_time, release_time, - unit + unit, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName @@ -206,4 +209,12 @@ #{id} + +