From 101fb1a06320704950b03a90166162e9b8c68c7d Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Thu, 1 Sep 2022 14:13:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B=E4=B8=AD?=
 =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarStandProjectLibraryServiceImpl.java       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index 8504e688..27bfb941 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -460,7 +460,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         //cars传回值为1时判断是从车型项目库中调取
 
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
-        wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","(select count(*) from sar_stand_unqualified " +
+        wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","ISSUE_TIME","(select count(*) from sar_stand_unqualified " +
                 " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ","(select count(*) from sar_stand_unqualified" +
                         " where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ",
                 "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME )  from sar_stand_unqualified where " +
@@ -474,8 +474,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                 "STAND_YEAR," +
                 "STAND_NAME," +
                 "STAND_EN_NAME," +
-                "'' as TEXT_STATUS," +
-                "'' as STAND_TYPE," +
+                "TEXT_STATUS_BUSS as TEXT_STATUS," +
+                "'BUSINESS_STAND' as STAND_TYPE," +
+                "ISSUE_TIME,"+
                 "( SELECT count( * ) FROM sar_stand_unqualified WHERE STAND_ID = r.stand_id AND CLOSE_STATE = '1' ) AS unCount," +
                 "( SELECT count( * ) FROM sar_stand_unqualified WHERE STAND_ID = r.stand_id AND CLOSE_STATE = '2' ) AS counts," +
                 "(" +
@@ -526,6 +527,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             p.setStandType(s.getStandType());
             p.setStandEnName(s.getStandEnName());
             p.setTextStatus(s.getTextStatus());
+
             if (s.getUnCount()==0L && s.getCounts()>0L) {
                 p.setUnCount(s.getUnCount());
             }else if (s.getUnCount() == 0L && s.getCounts()==0L){
@@ -542,6 +544,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                     p.setZRBM(a.getZrbm());
                 }
             }
+            if(StringUtils.equals(s.getStandType(),"BUSINESS_STAND")){
+                p.setSSRQ(s.getIssueTime());
+            }
             list.add(p);
         }
         IPage<StandAttrInfoDto> userIPage = new Page<>();