From dab0c3db124c0da43b198ad117a870551150ed21 Mon Sep 17 00:00:00 2001
From: liao <2948196353@qq.com>
Date: Fri, 3 Dec 2021 11:29:49 +0800
Subject: [PATCH 01/13] leo

---
 .../resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml
index 3ad98715..911ee3ff 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml
@@ -21,7 +21,7 @@
                 and name like concat('%',#{name},'%')
             </if>
             <if test="project_id != null and project_id != ''">
-                and project_id = #{project_id}
+                and project_id = #{projectId}
             </if>
             <if test="project_name != null and project_name != ''">
                 and project_name = #{project_name}
@@ -111,7 +111,7 @@
                 name = #{name},
             </if>
             <if test="project_id != null and project_id != ''">
-                project_id = #{project_id},
+                project_id = #{projectId},
             </if>
             <if test="project_name != null and project_name != ''">
                 project_name = #{project_name},
@@ -254,7 +254,7 @@
                 #{name},
             </if>
             <if test="project_id != null and project_id != ''">
-                #{project_id},
+                #{projectId},
             </if>
             <if test="project_name != null and project_name != ''">
                 #{project_name},

From 7f88babb5fa90fcdc792b6c097fe3561ef0b38ac Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Sun, 5 Dec 2021 15:09:19 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=20=EF=BC=81=20=E7=99=BD=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/login/security/WebMvcConfig.java   |  2 ++
 .../controller/EsRevisePlanController.java    | 21 ++++++++++++++++++-
 .../entity/StandAttrInfoDto.java              |  2 ++
 .../SarStandProjectLibraryServiceImpl.java    |  5 ++++-
 .../entity/SarStandardsInfo.java              |  4 ++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
index 3bbea18e..d9051d84 100644
--- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
+++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
@@ -85,6 +85,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
     //调研流程下载接口
     addInterceptor.excludePathPatterns("/api/att/attFile/downloadFile");
 
+    addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo");
+
 
 //    //测试接口使用
 //    addInterceptor.excludePathPatterns("/api/**");
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 e9eee749..d327ee5d 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
@@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
@@ -54,7 +55,7 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
 
 
     @ApiOperation(value = "获取是否存在重复名企标名称接口")
-    @GetMapping("getDataByName")
+    @GetMapping("/getDataByName")
     public ResponseMessage<Object> getDataByName(EsRevisePlan esRevisePlan){
         return Result.success(iEsRevisePlanService.getDataByName(esRevisePlan));
     }
@@ -65,18 +66,36 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
         return Result.success(iEsRevisePlanService.modPlan(esRevisePlan));
     }
 
+    @ApiOperation(value = "编辑企标计划")
+    @PostMapping("/modPlanByWk")
+    public ResponseMessage<Object> modPlanByWk(@RequestBody EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.modPlan(esRevisePlan));
+    }
+
     @ApiOperation(value = "添加企标计划")
     @PostMapping("addPlan")
     public ResponseMessage<Object> addPlan(EsRevisePlan esRevisePlan){
         return Result.success(iEsRevisePlanService.addPlan(esRevisePlan));
     }
 
+    @ApiOperation(value = "添加企标计划")
+    @PostMapping("/addPlanByWk")
+    public ResponseMessage<Object> addPlanByWk(@RequestBody EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.addPlan(esRevisePlan));
+    }
+
     @ApiOperation(value = "删除单个企标计划")
     @GetMapping("delPlan")
     public ResponseMessage<Object> delPlan(String id){
         return Result.success(iEsRevisePlanService.delPlan(id));
     }
 
+    @ApiOperation(value = "删除单个企标计划")
+    @GetMapping("delPlanByWk")
+    public ResponseMessage<Object> delPlanByWk(@RequestParam("id") String id){
+        return Result.success(iEsRevisePlanService.delPlans(id));
+    }
+
     @ApiOperation(value = "批量删除企标计划")
     @GetMapping("delPlans")
     public ResponseMessage<Object> delPlans(String ids){
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
index fb26f972..e6a4db9e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
@@ -61,4 +61,6 @@ public class StandAttrInfoDto {
     private String CYCVPPSCN;
 
     private Long unCount;
+
+    private String endTimes;
 }
\ No newline at end of file
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 b427434a..7ac6049d 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
@@ -379,7 +379,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
         wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" +
-                " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ");
+                " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ",
+                "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME )  from sar_stand_unqualified where " +
+                " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes ");
         wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'");
         Page<SarStandardsInfo> page1 = new Page<>(current, pageSize);
         IPage<SarStandardsInfo> userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1);
@@ -407,6 +409,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             p.setStandType(s.getStandType());
             p.setStandEnName(s.getStandEnName());
             p.setUnCount(s.getUnCount());
+            p.setEndTimes(s.getEndTimes());
             for (SarStandAttrInfo a:list2){
                 if(s.getId().equals(a.getStandId())){
                     p.setCYCVPPSBM(a.getCycvppsbm());
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
index b4cefc56..35ed503f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
@@ -146,6 +146,10 @@ public class SarStandardsInfo extends BaseEntity {
     @TableField(exist = false)
     private Long unCount;
 
+    @ApiModelProperty(value = "整改完成时间")
+    @TableField(exist = false)
+    private String endTimes;
+
 
     // 以下为非表中字段
     @TableField(exist = false)

From 51e67d44401b77278427d4edbf5fe44cf755933f Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Sun, 5 Dec 2021 15:50:46 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8D=89=E7=A8=BF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20api/lawss/activiti/delCG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/FeignClient/workFlowFeignClient.java  | 3 +++
 .../adc/da/FeignClientImpl/workFlowFeignClientImpl.java   | 4 ++++
 .../adc/da/workFlow/controller/WorkFlowController.java    | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
index 88a26c51..1a14a949 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
@@ -408,4 +408,7 @@ public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlockSAM",method = RequestMethod.GET)
     List<BusProcessNew> everyDayTenOlockSAM();
+
+    @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.GET)
+    String delCG(@RequestParam("id") String id);
 }
diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
index 80c35fdd..bd7a87ff 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
@@ -321,4 +321,8 @@ public class workFlowFeignClientImpl {
     public List<BusProcessName> queryBusProcessNameForEnd(@RequestBody String prcNum){
         return workFlowFeignClient.queryBusProcessNameForEnd(prcNum);
     }
+
+    public String delCG(@RequestParam("id") String id){
+        return workFlowFeignClient.delCG(id);
+    }
 }
diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
index 134b17ab..4e0b18f7 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
@@ -687,4 +687,12 @@ public class WorkFlowController {
         }
         return Result.success("发送成功");
     }
+
+    @ApiOperation(value = "草稿删除")
+    @GetMapping("/delCG")
+    public String delCG(@RequestParam("id")String id){
+        return workFlowFeignClient.delCG(id);
+    }
+
+
 }

From 02edc0ba2ee37710488b3f0873dc84b792a9ad55 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Sun, 5 Dec 2021 20:25:49 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=B8=BA=E7=AC=A6=E5=90=88=E9=A1=B9=20?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
index 305cb1c0..a0970a42 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
@@ -52,6 +52,7 @@
             and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
             or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
         </if>
+        order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
         limit #{start},#{end}
     </select>
 

From 3a952eea82b63e0f27d15c5d2482f08757c997ef Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 6 Dec 2021 09:45:36 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E7=AC=A6=E5=90=88-?=
 =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88-=E4=B8=8D=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=20=E4=BB=A5=E5=8F=8A=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=8B=E6=9C=AA=E7=BB=B4=E6=8A=A4=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarStandProjectLibraryServiceImpl.java       | 11 +++++++++--
 .../sarStandardsInfo/entity/SarStandardsInfo.java     |  4 ++++
 .../SarStandProjectLibraryMapper.xml                  |  4 ++--
 3 files changed, 15 insertions(+), 4 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 7ac6049d..210feb35 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
@@ -379,7 +379,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
         wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" +
-                " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ",
+                " 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 " +
                 " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes ");
         wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'");
@@ -408,7 +409,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             p.setStandName(s.getStandName());
             p.setStandType(s.getStandType());
             p.setStandEnName(s.getStandEnName());
-            p.setUnCount(s.getUnCount());
+            if (s.getUnCount()==0L && s.getCounts()>0L) {
+                p.setUnCount(s.getUnCount());
+            }else if (s.getUnCount() == 0L && s.getCounts()==0L){
+                p.setUnCount(2L);
+            }else {
+                p.setUnCount(1L);
+            }
             p.setEndTimes(s.getEndTimes());
             for (SarStandAttrInfo a:list2){
                 if(s.getId().equals(a.getStandId())){
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
index 35ed503f..142e98a1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
@@ -146,6 +146,10 @@ public class SarStandardsInfo extends BaseEntity {
     @TableField(exist = false)
     private Long unCount;
 
+    @ApiModelProperty(value = "为符合数量")
+    @TableField(exist = false)
+    private Long counts;
+
     @ApiModelProperty(value = "整改完成时间")
     @TableField(exist = false)
     private String endTimes;
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
index 2a39e883..d385bc1a 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
@@ -120,10 +120,10 @@
         ON team.project_code = library.project_number
         WHERE
         <if test="flag == 1">
-            library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 2">
-            library.id IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 4">
             1=1

From 5df6ea6c7311eb2757ab62e9d3edc410702b2c71 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 6 Dec 2021 09:47:48 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandProjectLibraryMapper.xml                      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
index d385bc1a..49f537ee 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
@@ -61,10 +61,10 @@
         WHERE
 
         <if test="flag == 1">
-            library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 2">
-            library.id IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 4">
             1=1
@@ -185,10 +185,10 @@
         ON team.project_code = library.project_number
         WHERE
         <if test="flag == 1">
-            library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 2">
-            library.id IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 4">
             1=1

From 6b3d87c8904a006615fcab0f6d3287c942260fd8 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 6 Dec 2021 14:51:25 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandUnqualifiedMapper.xml             | 73 +++++++++++++++++--
 1 file changed, 67 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
index a0970a42..20c72636 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
@@ -31,7 +31,7 @@
     </select>
 
 
-    <select id="getSarStandUnqualifiedPage" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
+    <select id="getSarStandUnqualifiedPageNew" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
         SELECT
         sar_stand_unqualified.*, sar_standards_info.STAND_TYPE as standType
         from
@@ -49,14 +49,45 @@
             and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
         </if>
         <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
-            and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
-            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
+            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
         </if>
         order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
         limit #{start},#{end}
     </select>
 
-    <select id="getSarStandUnqualifiedCount" resultType="java.lang.Integer">
+    <select id="getSarStandUnqualifiedPage" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
+        SELECT
+        c.*
+        FROM
+        (
+        SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM (
+            SELECT  (@i:=@i+1) as rows,sar_stand_unqualified.*  FROM
+            sar_stand_unqualified,(SELECT @i:=0)j
+            WHERE
+            close_state = 1
+            <if test="sar.standId != null and sar.standId != '' ">
+                and STAND_ID = #{standId}
+            </if>
+            <if test="sar.productName != null and sar.productName != '' ">
+                and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
+            </if>
+            <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
+                and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
+            </if>
+            <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
+                and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+                or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
+            </if>
+        order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
+        limit #{start},#{end}
+        )b
+        left join sar_standards_info on b.STAND_ID = sar_standards_info.id
+        )c
+        ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
+    </select>
+
+    <select id="getSarStandUnqualifiedCountNew" resultType="java.lang.Integer">
         SELECT
          count(sar_stand_unqualified.ID)
         from
@@ -74,8 +105,38 @@
             and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
         </if>
         <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
-            and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
-            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
+            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
         </if>
     </select>
+
+    <select id="getSarStandUnqualifiedCount" resultType="java.lang.Integer">
+        SELECT
+        count(c.ID)
+        FROM
+        (
+        SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM (
+        SELECT  (@i:=@i+1) as rows,sar_stand_unqualified.*  FROM
+        sar_stand_unqualified,(SELECT @i:=0)j
+        WHERE
+        close_state = 1
+        <if test="sar.standId != null and sar.standId != '' ">
+            and STAND_ID = #{standId}
+        </if>
+        <if test="sar.productName != null and sar.productName != '' ">
+            and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
+        </if>
+        <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
+            and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
+        </if>
+        <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
+            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
+        </if>
+        order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
+        )b
+        left join sar_standards_info on b.STAND_ID = sar_standards_info.id
+        )c
+        ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
+    </select>
 </mapper>

From 58cbe73a0925eb3945cc99f3c36c888b99abfb85 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 6 Dec 2021 15:39:10 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5-----?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8id=20=E5=92=8C=20=E9=83=A8=E9=97=A8=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java   | 5 ++++-
 .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml   | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
index 4923f79b..e77056ef 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
@@ -2,6 +2,7 @@ package com.adc.da.sys.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -14,6 +15,7 @@ import java.util.List;
  * <b>日期：</b> 2018-09-03 <br>
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
+@Data
 public class UserEO extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 3658632939727891047L;
@@ -51,7 +53,8 @@ public class UserEO extends BaseEntity implements Serializable {
     private Integer unlockFlag;
     private String userInfoId;
     private String orgType;
-
+    private String institutionName;
+    private String institutionId;
     private String ssoId;
     private String token;
     /**
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
index 2ffc9c1b..0b4986d5 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
@@ -28,6 +28,8 @@
         <result column="FAX_ADDRESS" property="faxAddress"/>
         <result column="userInfoId" property="userInfoId"/>
         <result column="role_id" property="roleId"/>
+        <result column="INSTITUTION_NAME" property="institutionName"/>
+        <result column="INSTITUTION_ID" property="institutionId"/>
     </resultMap>
 
     <resultMap id="SSOResultMap" type="com.adc.da.sys.entity.UserEO">
@@ -78,6 +80,7 @@
     <!-- TS_USER table all fields -->
     <sql id="Base_Column_List">
 		usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type
+		,INSTITUTION_NAME,INSTITUTION_ID
 	</sql>
 
     <sql id="SSO_Column_List">

From 82aa2a113980a5f1840626cec4543b9cbeacc07f Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 6 Dec 2021 17:05:37 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=20=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E9=83=A8=E9=97=A8=20id=E5=92=8C=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/adc/da/sys/entity/UserEO.java  |  5 +++++
 .../resources/mybatis/mapper/sys/UserEOMapper.xml    | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
index e77056ef..e05e2dd8 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
@@ -34,6 +34,11 @@ public class UserEO extends BaseEntity implements Serializable {
     private String password;
     private String account;
     private String usid;
+    private String sex;
+    private String phone;
+    private String upDeptName;
+    private String upDeptId;
+
     // 扩展字段
     private  String userType;
     private String orgId;
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
index 0b4986d5..c0bb3b8a 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
@@ -30,6 +30,8 @@
         <result column="role_id" property="roleId"/>
         <result column="INSTITUTION_NAME" property="institutionName"/>
         <result column="INSTITUTION_ID" property="institutionId"/>
+        <result column="SEX" property="sex"/>
+        <result column="PHONE" property="phone"/>
     </resultMap>
 
     <resultMap id="SSOResultMap" type="com.adc.da.sys.entity.UserEO">
@@ -80,7 +82,7 @@
     <!-- TS_USER table all fields -->
     <sql id="Base_Column_List">
 		usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type
-		,INSTITUTION_NAME,INSTITUTION_ID
+		,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE
 	</sql>
 
     <sql id="SSO_Column_List">
@@ -751,9 +753,11 @@
 
     <!-- 根据account获取未逻辑删除的UserEO -->
     <select id="getUserEOByAccountNotDeleted" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        <include refid="Base_Column_List"/>
-        from TS_USER where account = #{account} and VALID_FLAG != 1
+        select usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type
+		,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE,ts_institution.name as upDeptName,ts_institution.id as upDeptId
+        from TS_USER
+        left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
+        where account = #{account} and VALID_FLAG != 1
     </select>
 
     <select id="getNamesByIds" resultType="java.lang.String" parameterType="java.util.List">

From a2d002d65970c61b1a749ada1fee62b30b083cfc Mon Sep 17 00:00:00 2001
From: zj <1376702416@qq.com>
Date: Mon, 6 Dec 2021 18:06:28 +0800
Subject: [PATCH 10/13] =?UTF-8?q?ocr=E5=9B=9E=E5=88=B0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=96=9C=E6=9D=A0=E8=BD=AC=E6=8D=A2=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E9=80=A0=E6=88=90=E8=B7=AF=E5=BE=84=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java
index c79bdc83..90dad375 100644
--- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java
@@ -161,7 +161,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
         String saveWordFileName=null;
         logger.info("将文件保存至本地");
         if(wordFile!=null && !wordFile.isEmpty()){
-            saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename();
+            saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename().replace("/","_");
             saveWordFilePath=ocrFilePath+saveWordFileName;
             logger.info(saveWordFilePath);
             //生成保存文件
@@ -175,12 +175,12 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
         String saveJsonFilePath=null;
         String saveJsonFileName=null;
         if(jsonFile!=null && !jsonFile.isEmpty()){
-            saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename();
+            saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename().replace("/","_");
             saveJsonFilePath=ocrFilePath+saveJsonFileName;
             logger.info(saveJsonFilePath);
             File saveJsonFile = new File(saveJsonFilePath);
             System.out.println(saveJsonFile);
-            wordFile.transferTo(saveJsonFile);
+            jsonFile.transferTo(saveJsonFile);
 //            FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath));
 //            savePic(jsonFile.getInputStream(),saveJsonFilePath);
             logger.info("Json存储完成");

From 1edd95bccc18e39692c615f6a61857f1900bc787 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 7 Dec 2021 15:19:55 +0800
Subject: [PATCH 11/13] =?UTF-8?q?Ocr=E9=83=A8=E5=88=86bug=20=E5=92=8C?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=83=A8=E5=88=86bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/FeignClient/workFlowFeignClient.java |  2 +-
 .../workFlow/controller/WorkFlowController.java |  2 +-
 .../da/workFlow/entity/ProcessDetailExport.java |  2 +-
 .../da/slrs/sarInstitution/entity/TsUserVO.java |  8 ++++++++
 .../sarStandIdea/dao/SarPublicIdeaAllDao.java   |  5 +++++
 .../Impl/SarPublicIdeaAllServiceImpl.java       | 11 +++++++----
 .../com/adc/da/slrs/wgDept/entity/WgDept.java   |  7 +++++++
 .../adc/da/slrs/wgNetInfo/entity/WgNetInfo.java |  9 +++++++++
 .../sarInstitution/TsInstitutionMapper.xml      |  6 ++++--
 .../sarStandIdea/SarPublicIdeaAllMapper.xml     | 17 +++++++++++++++++
 .../mybatis/mapper/wgDept/WgDeptMapper.xml      | 10 ++++++----
 .../mapper/wgNetInfo/WgNetInfoMapper.xml        |  4 ++--
 .../da/ocr/controller/OCRRestfulController.java |  3 +++
 .../java/com/adc/da/ocr/dao/OcrRecordEODao.java |  1 +
 .../adc/da/ocr/service/OcrRecordEOService.java  |  2 ++
 .../service/impl/OcrRecordEOServiceImpl.java    |  5 +++++
 .../mybatis/mapper/ocr/OcrRecordEOMapper.xml    | 14 ++++++++++++++
 17 files changed, 93 insertions(+), 15 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
index 1a14a949..8316969c 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
@@ -409,6 +409,6 @@ public interface workFlowFeignClient {
     @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlockSAM",method = RequestMethod.GET)
     List<BusProcessNew> everyDayTenOlockSAM();
 
-    @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.GET)
+    @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.POST)
     String delCG(@RequestParam("id") String id);
 }
diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
index 4e0b18f7..c77639d5 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
@@ -689,7 +689,7 @@ public class WorkFlowController {
     }
 
     @ApiOperation(value = "草稿删除")
-    @GetMapping("/delCG")
+    @PostMapping("/delCG")
     public String delCG(@RequestParam("id")String id){
         return workFlowFeignClient.delCG(id);
     }
diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java
index 348a6ce5..1cde1409 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java
@@ -15,7 +15,7 @@ public class ProcessDetailExport {
     private Date startTime;
     @Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15)
     private Date endTime;
-    @Excel(name = "审批意见", orderNum = "5",width = 15)
+    @Excel(name = "流程信息", orderNum = "5",width = 15)
     private String comment;
     @Excel(name = "状态", orderNum = "6",width = 15)
     private String flag;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java
index 3111f5d9..e33d3e4c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java
@@ -118,4 +118,12 @@ public class TsUserVO {
     @ApiModelProperty(value = "岗位")
     @TableField(exist = false)
     private List<TsPosition> positions;
+
+    @ApiModelProperty(value = "单位")
+    @TableField(exist = false)
+    private String unit;
+
+    @ApiModelProperty(value = "单位Id")
+    @TableField(exist = false)
+    private String unitId;
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
index 3719ea86..55791c62 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandIdea.dao;
 
 import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,4 +22,8 @@ import java.util.List;
 public interface SarPublicIdeaAllDao extends BaseMapper<SarPublicIdeaAll> {
 
     List<SarPublicIdeaAll> getPublicIdea(@Param("unique")String unique);
+
+    List<SarPublicIdeaAll> getAllDataByIdea(@Param("page")Integer page,@Param("size")Integer size, @Param("ideaId")String ideaId);
+
+    Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java
index 99547e00..4063dab4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java
@@ -48,10 +48,13 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-            QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
-            wrapper.eq("idea_id", detAllStandDto.getIdeaId());
-            Page<SarPublicIdeaAll> page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize());
-            IPage<SarPublicIdeaAll> userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper);
+            List<SarPublicIdeaAll> sarPublicIdeaAlls=sarPublicIdeaAllDao.getAllDataByIdea(detAllStandDto.getPage(),detAllStandDto.getSize(),detAllStandDto.getIdeaId());
+            Integer a=sarPublicIdeaAllDao.getAllDataByIdeaCount(detAllStandDto.getIdeaId());
+            Page userIPage=new Page();
+            userIPage.setTotal(a);
+            userIPage.setRecords(sarPublicIdeaAlls);
+            userIPage.setSize(detAllStandDto.getSize());
+            userIPage.setCurrent(detAllStandDto.getPage());
             System.out.println("总条数" + userIPage.getTotal());
             System.out.println("总页数" + userIPage.getPages());
             List<SarPublicIdeaAll> list = userIPage.getRecords();
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java
index 0566b276..60644bd3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java
@@ -58,5 +58,12 @@ public class WgDept extends BaseEntity {
     @TableField("join_id")
     private String joinId;
 
+    @ApiModelProperty(value = "手机号")
+    @TableField("phone")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    @TableField("email")
+    private String email;
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java
index 12b1edec..6ec1cf93 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java
@@ -44,5 +44,14 @@ public class WgNetInfo extends BaseEntity {
     @TableField("join_id")
     private String joinId;
 
+    @ApiModelProperty(value = "手机号")
+    @TableField("phone")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    @TableField("email")
+    private String email;
+
+
 
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
index d466c37e..cce76150 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
@@ -40,9 +40,11 @@
         select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID,
         ts_user.INSTITUTION_ID,ts_user.INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE,
         ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE,
-        ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname
+        ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname,
+        ts_institution.name as unit,ts_institution.id as unitId
         from ts_user
-		WHERE institution_id=#{institutionId}
+        left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
+        WHERE institution_id=#{institutionId}
 		<if test="userName != null and userName != '' ">
             and ( ts_user.ACCOUNT like concat(concat('%',#{userName}),'%') or ts_user.UNAME like concat(concat('%',#{userName}),'%') )
         </if>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
index 8beb3f8a..61e052a0 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
@@ -7,4 +7,21 @@
         INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id
         WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}
     </select>
+
+    <select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
+         SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_user.INSTITUTION_NAME as dept_name,sar_public_idea_all.old_text,
+         sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
+         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid
+         FROM sar_public_idea_all
+         left join ts_user on sar_public_idea_all.user_id=ts_user.USID
+         WHERE
+         sar_public_idea_all.idea_id = #{ideaId}
+         LIMIT ${(page-1)*size},${page*size}
+    </select>
+
+    <select id="getAllDataByIdeaCount" resultType="java.lang.Integer">
+         SELECT count(id)
+         FROM sar_public_idea_all WHERE
+         idea_id = #{ideaId}
+    </select>
 </mapper>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml
index 0cef7c6d..6a3e67df 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml
@@ -3,19 +3,21 @@
 <mapper namespace="com.adc.da.slrs.wgDept.dao.WgDeptDao">
 
     <select id="researchDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
-        select wg_dept.* ,ts_user.UNAME as name ,ts_user.PHONE as phone ,ts_user.EMAIL as email,ts_user.INSTITUTION_ID as deptId
-        ,ts_user.INSTITUTION_NAME as deptName
+        select wg_dept.* ,ts_user.UNAME as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
+        ,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unitName , ts_institution.id as unit
         from wg_dept
         left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
+        left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
         where wg_dept.wg_id =#{data}
     </select>
 
     <select id="researchAllDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
-        select wg_dept.* ,ts_user.UNAME as name ,ts_user.PHONE as phone ,ts_user.EMAIL as email,ts_user.INSTITUTION_ID as deptId
-        ,ts_user.INSTITUTION_NAME as deptName
+        select wg_dept.* ,ts_user.UNAME as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
+        ,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unitName , ts_institution.id as unit
         from wg_dept
         left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
         left join wg_work_group on wg_work_group.id = wg_dept.wg_id
+        left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
         where wg_work_group.type = #{type}
     </select>
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml
index 7ed719b5..0d2d005c 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.adc.da.slrs.wgNetInfo.dao.WgNetInfoDao">
 
     <select id="researchDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
-      select wg_net_info.net_id,ts_user.UNAME as name ,ts_user.PHONE as phone, ts_user.EMAIL as email
+      select wg_net_info.net_id,ts_user.UNAME as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email
       ,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id
       from   wg_net_info
       left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id
@@ -11,7 +11,7 @@
     </select>
 
     <select id="researchAllDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
-      select wg_net_info.net_id,ts_user.UNAME as name ,ts_user.PHONE as phone, ts_user.EMAIL as email
+      select wg_net_info.net_id,ts_user.UNAME as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email
       ,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id
       from   wg_net_info
       left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id
diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/controller/OCRRestfulController.java b/adc-da-sys/src/main/java/com/adc/da/ocr/controller/OCRRestfulController.java
index 81fa8c32..72e9e353 100644
--- a/adc-da-sys/src/main/java/com/adc/da/ocr/controller/OCRRestfulController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/ocr/controller/OCRRestfulController.java
@@ -13,6 +13,7 @@ import com.adc.da.ocr.service.OCRRestfulService;
 import com.adc.da.ocr.service.OcrRecordEOService;
 import com.adc.da.ocr.util.MD5Util;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
@@ -107,11 +108,13 @@ public class OCRRestfulController extends BaseController<OcrRecordEO> {
             page.setOrder("desc");
         }
         List<OcrRecordEO> rows = ocrRecordEOService.queryByPage(page);
+        Integer integer = ocrRecordEOService.queryByPageCount(page);
         DecimalFormat df = new DecimalFormat("0.00");//设置保留位数
         for (OcrRecordEO ocrRecordEO : rows){
             ocrRecordEO.setDocRealFile(ocrDownPath+ocrRecordEO.getDocRealName());
             ocrRecordEO.setJsonRealFile(ocrDownPath+ocrRecordEO.getJsonRealName());
         }
+        page.getPager().setRowCount(integer);
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/dao/OcrRecordEODao.java b/adc-da-sys/src/main/java/com/adc/da/ocr/dao/OcrRecordEODao.java
index edd242d4..26df14ae 100644
--- a/adc-da-sys/src/main/java/com/adc/da/ocr/dao/OcrRecordEODao.java
+++ b/adc-da-sys/src/main/java/com/adc/da/ocr/dao/OcrRecordEODao.java
@@ -23,6 +23,7 @@ public interface OcrRecordEODao extends BaseMapper<OcrRecordEO> {
 //    int deleteByIds(@Param("idList") List<String> idList);
 
     List<OcrRecordEO> queryByPage(BasePage var1);
+    Integer queryByPageCount(BasePage var1);
 
     int insertSelective(OcrRecordEO ocrRecordEO);
 
diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/OcrRecordEOService.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/OcrRecordEOService.java
index c059d1df..c939597c 100644
--- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/OcrRecordEOService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/OcrRecordEOService.java
@@ -8,6 +8,8 @@ public interface OcrRecordEOService {
 
     List<OcrRecordEO> queryByPage(OcrRecordEOPage page);
 
+    Integer queryByPageCount(OcrRecordEOPage page);
+
     int updateByPrimaryKeySelective(OcrRecordEO ocrRecordEO);
 
     int deleteByIds(List<String> idList);
diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OcrRecordEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OcrRecordEOServiceImpl.java
index 90e1d5d0..f436cf55 100644
--- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OcrRecordEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OcrRecordEOServiceImpl.java
@@ -26,6 +26,11 @@ public class OcrRecordEOServiceImpl implements OcrRecordEOService {
         return ocrRecordEODao.queryByPage(page);
     }
 
+    @Override
+    public Integer queryByPageCount(OcrRecordEOPage page) {
+        return ocrRecordEODao.queryByPageCount(page);
+    }
+
     @Override
     public int updateByPrimaryKeySelective(OcrRecordEO ocrRecordEO) {
         return ocrRecordEODao.updateByPrimaryKeySelective(ocrRecordEO);
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/ocr/OcrRecordEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/ocr/OcrRecordEOMapper.xml
index 2e851195..277062e1 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/ocr/OcrRecordEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/ocr/OcrRecordEOMapper.xml
@@ -221,6 +221,20 @@
 			) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
   </select>
 
+    <select id="queryByPageCount" parameterType="com.adc.da.base.page.BasePage" resultType="java.lang.Integer">
+	select count(id) from
+		(select tmp_tb.* from
+			(select <include refid="Base_Column_List" />,(UNIX_TIMESTAMP(modify_time)-UNIX_TIMESTAMP(creation_time)) as spendTime from OCR_RECORD
+			 <include refid="Base_Where_Clause"/>
+			 <if test="pager.orderCondition != null and pager.orderCondition != ''" >
+			 	${pager.orderCondition}
+			 </if>
+              <if test="sql != null">
+                  ORDER BY ${sql}
+              </if>
+			) tmp_tb ) a
+  </select>
+
   <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
     select <include refid="Base_Column_List"/> from OCR_RECORD
     <include refid="Base_Where_Clause"/>

From 3da2c21cd9ad1ec3cb1b3e465f1a152ca0886c5c Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 7 Dec 2021 17:33:15 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=A0=87=E5=87=86=20?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E4=BF=AE=E5=A4=8D=20--->=E5=AF=B9=E5=BA=94bu?=
 =?UTF-8?q?g=E4=B8=BA=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarFileSplitMenuEOServiceImpl.java           | 1 +
 .../mapper/standardSplit/SarFileSplitItemsEOMapper.xml        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java
index 5ead95c6..fec300f5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java
@@ -383,6 +383,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService
         sarFileSplitItemsEO.setModifyTime(new Date());
         sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId());
         sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId());
+        sarFileSplitItemsEO.setEditFlag(String.valueOf(UUID.randomUUID()));
         result += sarFileSplitItemsEODao.insertSelective(sarFileSplitItemsEO);
 
         // SAR_FILE_ITEMS_VAL   添加数据，
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml
index 528db8c1..b63aa9be 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml
@@ -205,7 +205,7 @@
                 <if test="creationTime != null" >creation_time,</if>
                 <if test="modifyTime != null" >modify_time,</if>
                 <if test="modifyUser != null" >modify_user,</if>
-
+                <if test="editFlag != null" >edit_flag,</if>
                 <if test="fo != null" >fo,</if>
                 <if test="dutyEngineer != null" >duty_engineer,</if>
                 <if test="claimType != null" >claim_type,</if>
@@ -233,7 +233,7 @@
                 <if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
                 <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
                 <if test="modifyUser != null" >#{modifyUser, jdbcType=VARCHAR},</if>
-
+                <if test="editFlag != null" >#{editFlag,jdbcType=VARCHAR}</if>
                 <if test="fo != null" >#{fo, jdbcType=VARCHAR},</if>
                 <if test="dutyEngineer != null" >#{dutyEngineer, jdbcType=VARCHAR},</if>
                 <if test="claimType != null" >#{claimType, jdbcType=VARCHAR},</if>

From c53b405891a04c410ba4a138b6c4a907b85515db Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 8 Dec 2021 14:06:21 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8E=92=E5=BA=8F--=E3=80=8B=E7=8C=9C?=
 =?UTF-8?q?=E6=B5=8B=E9=9C=80=E8=A6=81=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96=20?=
 =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81=20=E5=90=8E=E7=BB=AD=E7=9C=8B?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=98=AF=E5=90=A6=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ndardComplianceAssessResultController.java | 20 ++----
 .../SarInterpretationNationalStandardDao.java |  7 ++
 ...InterpretationNationalStandardService.java |  5 ++
 ...rpretationNationalStandardServiceImpl.java | 11 +++
 ...arInterpretationNationalStandardMapper.xml | 71 +++++++++++++++++++
 5 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
index 9b921b33..03be8495 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
@@ -234,20 +234,12 @@ public class SarStandardComplianceAssessResultController {
     public ResponseMessage<Object> selectNationalStandard(InterpretationEO eo) throws Exception {
         if (eo.getPosition() == 1) {
             IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-            QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
-            //如果查询条件里标准编号不为空，查询
-            if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber());
-            //如果查询条件里标准名称不为空，查询
-            if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName());
-            //如果查询条件里具体章条不为空，查询
-            if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem());
-
-            if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
-            if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId());
-
-            IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
-            while (page.getRecords().remove(null)) ;
-            return Result.success(page);
+            List<SarInterpretationNationalStandard> standards=iSarInterpretationNationalStandardService.getAllDatas(eo);
+            Integer datasCount=iSarInterpretationNationalStandardService.getAllDatasCount(eo);
+            iPage.setTotal(datasCount);
+            iPage.setRecords(standards);
+            while (iPage.getRecords().remove(null)) ;
+            return Result.success(iPage);
         } else {
             IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
             QueryWrapper<SarInterpretationForeignStandard> queryWrapper = new QueryWrapper<>();
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java
index 5b0f285a..b7a3094c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java
@@ -1,9 +1,12 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
 
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -16,4 +19,8 @@ public interface SarInterpretationNationalStandardDao extends BaseMapper<SarInte
 
     boolean updateData(@Param("find") SarInterpretationNationalStandard findStandDto);
 
+    List<SarInterpretationNationalStandard> getAllDatas(InterpretationEO sarInterpretationNationalStandard);
+
+    Integer getAllDatasCout(InterpretationEO sarInterpretationNationalStandard);
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java
index 3efb40f5..52e6e773 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
 
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -18,4 +19,8 @@ public interface ISarInterpretationNationalStandardService extends IService<SarI
     String saveBath(List<SarInterpretationNationalStandard> sarInterpretationNationalStandards);
 
     boolean updateData(SarInterpretationNationalStandard findStandDto);
+
+    List<SarInterpretationNationalStandard> getAllDatas(InterpretationEO sarInterpretationNationalStandard);
+
+    Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
index b5137a93..5986628f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;
 
 import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationNationalStandardDao;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
@@ -55,4 +56,14 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<Sa
     public boolean updateData(SarInterpretationNationalStandard findStandDto) {
         return sarInterpretationNationalStandardDao.updateData(findStandDto);
     }
+
+    @Override
+    public List<SarInterpretationNationalStandard> getAllDatas(InterpretationEO sarInterpretationNationalStandard) {
+        return sarInterpretationNationalStandardDao.getAllDatas(sarInterpretationNationalStandard);
+    }
+
+    @Override
+    public Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard) {
+        return sarInterpretationNationalStandardDao.getAllDatasCout(sarInterpretationNationalStandard);
+    }
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
index a722018f..69179058 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
@@ -14,4 +14,75 @@
         and sar_interpretation_national_standard.STAND_NAME=#{find.standName}
         and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime}
     </update>
+
+    <select id="getAllDatas"
+            resultType="com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard">
+
+            SELECT c.* FROM (
+            SELECT
+                (@i:=@i+1) as rows,
+                id,
+                INTERPRETATION_TIME,
+                STAND_NUMBER,
+                specific_item,
+                compared_with_previous,
+                CREATION_USER,
+                CREATION_TIME,
+                VALID_FLAG,
+                LAST_VERSION_NUMBER,
+                risk_degree,
+                compliance_state,
+                INTERPRETATION_STATE,
+                STAND_TYPE,
+                MODIFY_TIME,
+                STAND_SORT,
+                STAND_ID,
+                STAND_NAME,
+                core_technical_requirement
+            FROM
+                sar_interpretation_national_standard ,(SELECT @i:=0)j
+            WHERE
+                1=1
+                <if test="interpretationTime!=null ">
+                   and INTERPRETATION_TIME = #{interpretationTime}
+                </if>
+                <if test="standId!=null and standId!=''">
+                    AND STAND_ID = #{standId}
+                </if>
+                <if test="standNumber!=null and standNumber!=''">
+                    AND STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
+                </if>
+                <if test="standName!=null and standName!=''">
+                    AND STAND_NAME like concat(concat('%',#{standName}),'%')
+                </if>
+                <if test="specificItem!=null and specificItem!=''">
+                    AND specific_item like concat(concat('%',#{specificItem}),'%')
+                </if>
+                ORDER BY STAND_ID, specific_item
+                LIMIT ${(current-1)*size},${current*size}
+                ) c  ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows
+    </select>
+    <select id="getAllDatasCout" resultType="java.lang.Integer">
+            SELECT
+            count(id)
+            FROM
+            sar_interpretation_national_standard
+            WHERE
+            1=1
+            <if test="interpretationTime!=null ">
+                and INTERPRETATION_TIME = #{interpretationTime}
+            </if>
+            <if test="standId!=null and standId!=''">
+                AND STAND_ID = #{standId}
+            </if>
+            <if test="standNumber!=null and standNumber!=''">
+                AND STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
+            </if>
+            <if test="standName!=null and standName!=''">
+                AND STAND_NAME like concat(concat('%',#{standName}),'%')
+            </if>
+            <if test="specificItem!=null and specificItem!=''">
+                AND specific_item like concat(concat('%',#{specificItem}),'%')
+            </if>
+    </select>
 </mapper>