From 3ffc4a9bfd9385369d2f9a314a38b05f4202e31c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 23:11:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectLibraryBaseController.java   | 10 ++++++++++
 .../mapper/xml/ProjectLibraryBaseMapper.xml        | 14 ++++++++++++--
 .../impl/ProjectLibraryBaseServiceImpl.java        |  3 +++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index 8eff66690..2f4fcbf67 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -61,6 +61,16 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 		Page pages = projectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
 		return Result.OK(params.get("cut").toString(),pages);
 	}
+	@AutoLog(value = "认证清单引用交付物")
+	@ApiOperation(value="认证清单引用交付物", notes="认证清单引用交付物")
+	@PostMapping(value = "/quotePage")
+//	@PostMapping(value = "/page")
+	public Result<?> quotePage(@RequestBody Map<String,Object> params) {
+		params.put("flag","quote");
+		List<ProjectLibraryBase> pageList= projectLibraryBaseService.queryPageList(params);
+		Page pages = projectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
+		return Result.OK(params.get("cut").toString(),pages);
+	}
 
 	/**
 	 * 勾选法规清单进行关联平台件
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 2e5692fe3..82cecb02a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -66,7 +66,11 @@
         <include refid="select_item"/>
 
         <where>
-            plb.platform is null
+        1=1
+            <if test="params.flag != 'quote'">
+                and plb.platform is null
+            </if>
+
             <if test="params.projectName != null and params.projectName != ''">
                 <!--搜索条件:项目名称,包含%,单独搜索-->
                 <choose>
@@ -128,7 +132,13 @@
                 and plb.brand = #{params.brand}
             </if>
         </where>
-        order by plb.sort desc, plb.create_time desc
+        <if test="params.flag = 'quote'">
+            order by plb.platform, plb.sort desc, plb.create_time desc
+        </if>
+        <if test="params.flag != 'quote'">
+            order by plb.sort desc, plb.create_time desc
+        </if>
+
     </select>
     <select id="queryMaimList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index cf2c10e3a..977b15d06 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1084,6 +1084,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 */
 	@Override
 	public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
+		String quote = (String) params.get("quote");
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		Integer isViewer = sysRoleMapper.queryUserRoleByCode(ProjectRoleEnum.VIEWER.getName(), loginUser.getId());
 		Set<String> projectIds = new HashSet<>();
@@ -1148,6 +1149,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 						+ "-" + projectLibraryBase.getYearName()
 						+ "-" + targetMarket
 						+ "-" + projectVersion);
+			}else{
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectNameId());
 			}
 		}