From 59ffec30e51330ba9fb19c3fc8a00919681af02d Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Thu, 10 Aug 2023 10:14:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=B7=A5=E7=A8=8B=E4=B8=8B?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E5=8F=AF=E9=87=8D=E5=A4=8D=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../csdevice/pojo/param/AppProjectAuditParm.java  |  1 +
 .../njcn/csdevice/pojo/vo/ProjectEquipmentVO.java |  2 +-
 .../mapper/mapping/CsEquipmentDeliveryMapper.xml  |  3 ++-
 .../service/impl/AppProjectServiceImpl.java       | 15 ++++++++-------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectAuditParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectAuditParm.java
index d8e7cde..b7c775c 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectAuditParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectAuditParm.java
@@ -23,6 +23,7 @@ public class AppProjectAuditParm {
 
     @ApiModelProperty(value="项目名称")
     private String name;
+    private String engineeringId;
 
 
 
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
index 72e19a1..42cce64 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
@@ -47,6 +47,6 @@ public class ProjectEquipmentVO  {
     private String createTime;
     @ApiModelProperty(value = "是否是主用户0-否，1-是")
     private String isPrimaryUser;
-
+    private Integer runStatus;
 
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
index 3cb57b7..ff80bda 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
@@ -38,7 +38,8 @@
         b.name projectName,
         c.id equipmentId,
         c.name equipmentName,
-        c.create_time createTime
+        c.create_time createTime,
+        c.run_status
         FROM
         (select * from cs_ledger where LEVEL = 0 ) a,
         (select * from cs_ledger where LEVEL = 1 ) b,
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
index 6d48ba3..ff44d6d 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
@@ -58,7 +58,7 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
 //            throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
 //        }
 
-        if(checkName(appProjectAddOrAuditParm.getName(),"")){
+        if(checkName(appProjectAddOrAuditParm.getName(),"",appProjectAddOrAuditParm.getEngineeringId())){
             throw new BusinessException(AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
         }
         BeanUtils.copyProperties (appProjectAddOrAuditParm, appProjectPO);
@@ -120,14 +120,14 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
         return save;
     }
 
-    private Boolean checkName( String name,String id) {
-        QueryWrapper<AppProjectPO> queryWrapper = new QueryWrapper ( );
+    private Boolean checkName( String name,String id,String engineeringId) {
+        QueryWrapper<CsLedger> queryWrapper = new QueryWrapper ( );
         queryWrapper.select ("1").
-                eq ("status", "1").
-                ne(StringUtils.isNotBlank(id),"id",id).
+                eq ("state", 1).
+                ne(StringUtils.isNotBlank(id),"id",id).eq("pid",engineeringId).
 //                eq ("user_id", userId).
                 eq ("name", name);
-        Integer integer = appProjectMapper.selectCount (queryWrapper);
+        Integer integer = csLedgerMapper.selectCount (queryWrapper);
         return integer > 0 ? true : false;
     }
 
@@ -166,7 +166,8 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
 
 
         }
-        if(checkName(appProjectAuditParm.getName(),appProjectAuditParm.getId())){
+
+        if(checkName(appProjectAuditParm.getName(),appProjectAuditParm.getId(),appProjectAuditParm.getEngineeringId())){
             throw new BusinessException(AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
         }