2024-03-27 更新

src/main/java/com/spring/modules/project/controller/ProjectController.java

@@ -124,6 +124,14 @@ public class ProjectController {
         return R.ok().put("rows1", rows1).put("rows2", rows2);
     }
 
+    @PostMapping(value="/getContactChooseData2")
+    @ResponseBody
+    public R getContactChooseData2(@RequestBody PlmProjectInfoData data){
+        List<PlmProjectContactData> rows1  = projectService.getPlmProjectContactString2(data);
+        List<PlmProjectContactData> rows2  = projectService.getCustomerContactString2(data);
+        return R.ok().put("rows1", rows1).put("rows2", rows2);
+    }
+
     @PostMapping(value="/saveProjectContactList")
     @ResponseBody
     public R saveProjectContactList(@RequestBody PlmProjectContactData data){

src/main/java/com/spring/modules/project/dao/ProjectDao.java

@@ -215,4 +215,8 @@ public interface ProjectDao extends BaseMapper<PlmProjectInfo> {
 
     List<PlmProjectPartData> getProjectPart(@Param("site") String site,
                                                 @Param("testPartNo") String testPartNo);
+
+    List<PlmProjectContactData> getPlmProjectContactString2(PlmProjectInfoData data);
+
+    List<PlmProjectContactData> getCustomerContactString2(PlmProjectInfoData data);
 }

src/main/java/com/spring/modules/project/service/ProjectService.java

@@ -192,4 +192,8 @@ public interface ProjectService {
 
     List<PlmProjectPartData> getProjectPartList(String site,String testPartNo,String partDesc,String projectId);
     List<PlmProjectPartData> getProjectPartList(String site,String testPartNo);
+
+    List<PlmProjectContactData> getPlmProjectContactString2(PlmProjectInfoData data);
+
+    List<PlmProjectContactData> getCustomerContactString2(PlmProjectInfoData data);
 }

src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java

@@ -183,6 +183,16 @@ public class ProjectServiceImpl implements ProjectService {
         return projectDao.getCustomerContactString(data);
     }
 
+    @Override
+    public List<PlmProjectContactData> getPlmProjectContactString2(PlmProjectInfoData data){
+        return projectDao.getPlmProjectContactString2(data);
+    }
+
+    @Override
+    public List<PlmProjectContactData> getCustomerContactString2(PlmProjectInfoData data){
+        return projectDao.getCustomerContactString2(data);
+    }
+
     @Override
     @Transactional
         public void saveProjectContactList(PlmProjectContactData data){

src/main/resources/mapper/project/ProjectDao.xml

@@ -127,6 +127,31 @@
     where site=#{site} and customer_no=#{customerId} and contact_status='启用'
 </select>
 
+    <select id="getPlmProjectContactString2" resultType="PlmProjectContactData">
+        select
+            b.contact_name
+        from plm_project_contact a
+        left join plm_customer_contact b on a.site = b.site and a.customer_id = b.customer_no and a.contact_name = b.contact_name
+        where
+        <where>
+            a.site = #{site} and a.project_id = #{projectId} and a.customer_id = #{customerId} and b.contact_status = '启用'
+            AND b.codeNo is null
+            <if test = "propertiesItemNo != null and propertiesItemNo != ''">
+                AND a.ItemNo LIKE #{propertiesItemNo}
+            </if>
+            <if test = "itemDesc != null and itemDesc != ''">
+                AND a.ItemDesc LIKE #{itemDesc}
+            </if>
+        </where>
+    </select>
+
+    <select id="getCustomerContactString2" resultType="PlmProjectContactData">
+        select
+            contact_name
+        from plm_customer_contact
+        where site = #{site} and customer_no = #{customerId} and contact_status = '启用'
+    </select>
+
 <delete id="deleteProjectContact">
     delete from plm_project_contact  where site=#{site} and project_id=#{projectId}
 </delete>