判断条件变更

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -485,18 +485,19 @@
         </foreach>
     </select>
 
-    <!--根据流程定义号查询项目需求名称-->
+    <!--根据流程定义号查询项目需求名称-施工交底流程-->
     <select id="idProjectName" resultType="string">
         select reserveProjectName
         from xm_construction_clarificaiton
         where proc_ins_id = #{procInsId};
     </select>
-    <!--施工流程记录表根据流程定义号获取项目名称-->
+    <!--施工验收流程记录表根据流程定义号获取项目名称-->
     <select id="idProjectName3" resultType="string">
         select reserveProjectName
         from sg_construction_process
         where proc_ins_id = #{procInsId};
     </select>
+    <!--结算验收流程根据流程定义号获取项目名称-->
     <select id="idProjectName4" resultType="java.lang.String">
         select reserveProjectName
         from xm_settlement_process
@@ -510,7 +511,7 @@
     <select id="idProjectName2" resultType="string">
         select reserveProjectName
         from xm_material_project
-        where id in (SELECT project_id from md_acquisition_process where proc_ins_id = #{procInsId})
+        where reserveProjectName like concat('%', #{projectName}, '%')
     </select>
     <select id="insIdByName" resultType="java.lang.String">
         select proc_ins_id
@@ -520,7 +521,7 @@
     <select id="insIdByName2" resultType="java.lang.String">
         select proc_ins_id
         from md_acquisition_process
-        where project_id in (select id from xm_project_details where require_name like concat('%', #{projectName}, '%'))
+        where reserveProjectName like concat('%', #{projectName}, '%');
     </select>
     <select id="insIdByName3" resultType="java.lang.String">
         select proc_ins_id
@@ -530,7 +531,7 @@
     <select id="insIdByName4" resultType="java.lang.String">
         select proc_ins_id
         from xm_settlement_process
-        where reserveProjectName like concat('%', #{projectName}, '%')
+        where reserveProjectName like concat('%', #{projectName}, '%');
     </select>
 
     <select id="findDisclosePage" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction">

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/ProjectMapper.java

@@ -110,7 +110,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
     /**
      * 根据名称查询项目拆旧信息
      * */
-    Project findTearByName(String name);
+    List<Project> findTearByName(String name);
 
     /**
      * 根据名称查询施工任务分配信息

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProjectImportUtil.java

@@ -374,8 +374,8 @@ public class ProjectImportUtil {
                 if (reserveProjectName != null && reserveProjectName != "" && a.equals(reserveProjectName)) {
                     Project assByName = projectMapper.findAssByName(reserveProjectName);
                     Project basicByName = projectMapper.findProByName(reserveProjectName);
-                    Project tearByName = projectMapper.findTearByName(reserveProjectName);
-                    if (assByName == null || basicByName == null || tearByName == null) {
+                    List<Project> tearByName = projectMapper.findTearByName(reserveProjectName);
+                    if (assByName == null || basicByName == null || tearByName == null || tearByName.size()<=0) {
                         flagStr += reserveProjectName + "请先完善项目的前置信息\n";
                         continue;
                     } else {