feature 合并加工记录冲突

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -418,7 +418,7 @@
                 (apope.PLANSTARTDATE < #{endTime} and apope.PLANENDDATE > #{startTime})
                 )
                 <if test="processway == '合并加工'">
-                    and app.PROCESSWAY != '合并加工'
+                    and ((app.PROCESSWAY != '合并加工') or(app.PROCESSWAY = '合并加工' and apope.PLANSTARTDATE!= #{startTime}) )
                 </if>
             </where>
     </select>