feature 解决冲突没有正确消除的问题

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -838,11 +838,22 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
 //                        StringUtils.isBlank(info.getSoftconflictdes()) ?
 //                        LOCKMARK_N : LOCKMARK_Y);
 //            }
-            if (info.getPlanstartdate().equals(newPlanStartDate) && PROCESS_WAY_MERGE.equals(processway)) {
-                info.setConflictdes(removeConflictsDesc(info.getConflictdes(), removeConflictsDesc));
-                info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) &&
-                        StringUtils.isBlank(info.getSoftconflictdes()) ?
-                        LOCKMARK_N : LOCKMARK_Y);
+            if(PROCESS_WAY_MERGE.equals(processway)){
+                if (info.getPlanstartdate().equals(newPlanStartDate)) {
+                    info.setConflictdes(removeConflictsDesc(info.getConflictdes(), removeConflictsDesc));
+                    info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) &&
+                            StringUtils.isBlank(info.getSoftconflictdes()) ?
+                            LOCKMARK_N : LOCKMARK_Y);
+                }
+            }else{
+                if(newPlanStartDate.compareTo(info.getPlanenddate())>0 ||
+                        newOldEndDate.compareTo(info.getPlanstartdate())<0 ){
+                    info.setConflictdes(removeConflictsDesc(info.getConflictdes(), removeConflictsDesc));
+                    info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) &&
+                            StringUtils.isBlank(info.getSoftconflictdes()) ?
+                            LOCKMARK_N : LOCKMARK_Y);
+                }
+
             }
 //            else {
 //                info.setConflictdes(addNewConflictsDesc(info.getConflictdes(), removeConflictsDesc));