aps-明细更新时间和更新人，修改冲突信息时不进行更新

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOperationProcessEquDao.java

@@ -136,6 +136,8 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
     List<ApsProcessOperationProcessEquCheckVo> getNeedCheckEquList(@Param("startTime") DateTime startTime, @Param("tenantId") String tenantId);
 
     void repairePlanStartDate2(@Param("userId") String userId,@Param("userName")String userName);
+
+    void myUpdateConflictdes(@Param("apsProcessOperationProcessEquDo") ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo);
 }
 
 

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

@@ -8,14 +8,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.collect.Lists;
 import com.rongwei.bscommon.sys.dao.ApsProcessOperationProcessEquDao;
 import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bscommon.sys.utils.ApsUtils;
 import com.rongwei.bsentity.domain.*;
 import com.rongwei.bsentity.vo.*;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
-import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
@@ -414,7 +412,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     processEqus.setPlanstartdate(new Date(planstartdate.getTime() - timeInterval));
                     // 计划完工时间=计划完工时间-开工时间间隔
                     processEqus.setPlanenddate(new Date(processEqus.getPlanenddate().getTime() - timeInterval));
-
+                    processEqus.setModifydate(DateUtil.date());
+                    processEqus.setModifyusername(nowWorkUser.getName());
+                    processEqus.setModifyuserid(nowWorkUser.getId());
                     checkConflictVos.add(new CheckConflictVo(processEqus.getId(), processEqus.getProcessdeviceid(),
                             processEqus.getPlanstartdate(), processEqus.getPlanenddate()));
                     saveList.add(processEqus);
@@ -517,6 +517,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                         newProcessEqu.setCancelroll(0);
                         newProcessEqu.setLeavewaitworkroll(newProcessEqu.getPlanprocessrall());
                         newProcessEqu.setLeavewaitjobroll(newProcessEqu.getPlanprocessrall());
+                        newProcessEqu.setModifydate(DateUtil.date());
+                        newProcessEqu.setModifyusername(nowWorkUser.getName());
+                        newProcessEqu.setModifyuserid(nowWorkUser.getId());
                         if (ObjectUtil.isNotEmpty(newBachMaterProcess)) {
                             newProcessEqu.setBachmaterialprocess(String.join(",", newBachMaterProcess));
                         }
@@ -826,7 +829,6 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 this.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
                         .eq(ApsProcessOperationProcessEquDo::getId, nextProcessEqu.getId())
                         .set(ApsProcessOperationProcessEquDo::getConflictdes, nextNewConflictdes)
-                        .set(BaseDo::getModifydate, new Date())
                         .set(ApsProcessOperationProcessEquDo::getHasconflict, StringUtils.isBlank(nextNewConflictdes) &&
                                 StringUtils.isBlank(nextProcessEqu.getSoftconflictdes()) ? LOCKMARK_N : LOCKMARK_Y)
                 );
@@ -871,7 +873,6 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 .eq(ApsProcessOperationProcessEquDo::getId, apsProcessOperationProcessEquDo.getId())
                 .set(ApsProcessOperationProcessEquDo::getConflictdes, newConflictdes)
                 .set(ApsProcessOperationProcessEquDo::getSoftconflictdes, newSoftconflictdes)
-                .set(BaseDo::getModifydate, new Date())
                 .set(ApsProcessOperationProcessEquDo::getHasconflict, StringUtils.isBlank(newConflictdes) &&
                         StringUtils.isBlank(newSoftconflictdes) ? LOCKMARK_N : LOCKMARK_Y)
         );
@@ -941,6 +942,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         List<UpdateConflictVo> updateConflictVos = new ArrayList<>();
         Set<String> blankIdSet = new HashSet<>();
         UpdateConflictVo vo;
+        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
         List<String> returnAboutIds = new ArrayList<>();
         for (ChangeStartTimeVo changeStartTimeVo : changeStartTimeVos) {
             vo = new UpdateConflictVo();
@@ -981,8 +983,12 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             // 当前工序的加工方式
             processEquDo.setPlanstartdate(changeStartTimeVo.getPlanStartTime());
             processEquDo.setPlanenddate(changeStartTimeVo.getPlanEndTime());
+            processEquDo.setModifydate(DateUtil.date());
+            processEquDo.setModifyuserid(currentUser.getId());
+            processEquDo.setModifyusername(currentUser.getName());
             vo.setApsProcessOperationProcessEquDo(processEquDo);
 
+
             updateConflictVos.add(vo);
             this.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
                     .eq(ApsProcessOperationProcessEquDo::getId, id)
@@ -990,6 +996,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     .set(ApsProcessOperationProcessEquDo::getPlanenddate, changeStartTimeVo.getPlanEndTime())
                     .set(StringUtils.isNotBlank(changeStartTimeVo.getEquId()), ApsProcessOperationProcessEquDo::getProcessdeviceid, changeStartTimeVo.getEquId())
                     .set(StringUtils.isNotBlank(changeStartTimeVo.getEquName()), ApsProcessOperationProcessEquDo::getProcessdevice, changeStartTimeVo.getEquName())
+                    .set(ApsProcessOperationProcessEquDo::getModifydate,DateUtil.date())
+                    .set(ApsProcessOperationProcessEquDo::getModifyuserid,currentUser.getId())
+                    .set(ApsProcessOperationProcessEquDo::getModifyusername,currentUser.getName())
             );
         }
         updateConflictVos.forEach(data -> {
@@ -1030,6 +1039,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     @Transactional(rollbackFor = Exception.class)
     public R updateDetails(JobDetailsVo jobDetailsVo) {
 //        ApsUtils.checkScheduling(null);
+        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
         List<String> affectedIdList = new ArrayList<>();
         List<String> mergeWorkerIdList = new ArrayList<>();
         String id = jobDetailsVo.getId();
@@ -1090,6 +1100,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     info.setPlanenddate(new Date(info.getPlanenddate().getTime() +
                             jobDetailsVo.getPlanStartTime().getTime() - oldPlanstartdate.getTime()));
                 }
+                info.setModifydate(DateUtil.date());
+                info.setModifyuserid(currentUser.getId());
+                info.setModifyusername(currentUser.getName());
             });
             //避免合并加工时，找到除去本身之外同一计划开工日期同一设备‘更新时间’更改之后存在冲突的工序作业明细
             this.updateBatchById(changeApsProcessEquList);
@@ -1134,11 +1147,17 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 // 自动计算计划完工时间=原完工时间+新计划开工时间-原计划开工时间
                 apsProcessOperationProcessEquDo.setPlanenddate(new Date(apsProcessOperationProcessEquDo.getPlanenddate().getTime() +
                         jobDetailsVo.getPlanStartTime().getTime() - oldPlanstartdate.getTime()));
+                apsProcessOperationProcessEquDo.setModifydate(DateUtil.date());
+                apsProcessOperationProcessEquDo.setModifyuserid(currentUser.getId());
+                apsProcessOperationProcessEquDo.setModifyusername(currentUser.getName());
                 this.updateById(apsProcessOperationProcessEquDo);
                 // 增加受影响的工序作业信息
                 affectedIdList.addAll(checkProcessingTimeConflict(apsProcessOperationProcessEquDo, oldPlanstartdate,
                         oldPlanenddate, oldEquId, apsProcessOperationDo.getProcessway(), new ArrayList<>()));
             } else {
+                apsProcessOperationProcessEquDo.setModifydate(DateUtil.date());
+                apsProcessOperationProcessEquDo.setModifyuserid(currentUser.getId());
+                apsProcessOperationProcessEquDo.setModifyusername(currentUser.getName());
                 this.updateById(apsProcessOperationProcessEquDo);
             }
 //            this.updateById(apsProcessOperationProcessEquDo);
@@ -1290,7 +1309,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                                 data.getPlanStartTime().getTime() - currentProcessEquDo.getPlanstartdate().getTime()));
                     }
                     newDo.setCreatedate(new Date());
-                    newDo.setModifydate(new Date());
+                    newDo.setModifydate(DateUtil.date());
+                    newDo.setModifyuserid(nowWorkUser.getId());
+                    newDo.setModifyusername(nowWorkUser.getName());
                     newDataList.add(newDo);
                     this.updateById(newDo);
                     affectedIdList.add(newDo.getId());
@@ -1368,7 +1389,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                         }
                     }
                     affectedIdList.add(oldDo.getId());
-                    oldDo.setModifydate(new Date());
+                    oldDo.setModifydate(DateUtil.date());
+                    oldDo.setModifyuserid(nowWorkUser.getId());
+                    oldDo.setModifyusername(nowWorkUser.getName());
                     this.updateById(oldDo);
 //                    // 增加受影响的工序作业信息
 //                    affectedIdList.addAll(checkProcessingTimeConflict(oldDo,
@@ -1615,130 +1638,129 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         }
     }
 
-    /**
-     * 更新设备或者时间之后 更新冲突描述
-     *
-     * @param beforeUpdatingConflictId 当前作业更新设备或者时间之后与该作业存在冲突的工序作业信息
-     * @param removeConflictsDesc      需要被删除的冲突描述
-     */
-    public void updateProcessEquBeforeAddConflictsDesc(List<ApsProcessOperationProcessEquDo> beforeUpdatingConflictId,
-                                                       String removeConflictsDesc, String processway,
-                                                       Date newPlanStartDate,
-                                                       Date newOldEndDate,
-                                                       String aboutId) {
-        if (beforeUpdatingConflictId.isEmpty()) {
-            return;
-        }
-        beforeUpdatingConflictId.forEach(info -> {
-//            // 判断是否和其他工序作业明细存在冲突
-//            List<ApsProcessOperationProcessEquDo> conflictId = this.baseMapper.getConflictId(info.getProcessdeviceid(),
-//                    info.getId(), info.getPlanstartdate(), info.getPlanenddate(), processway);
-//            if (!conflictId.isEmpty()) {
+//    /**
+//     * 更新设备或者时间之后 更新冲突描述
+//     *
+//     * @param beforeUpdatingConflictId 当前作业更新设备或者时间之后与该作业存在冲突的工序作业信息
+//     * @param removeConflictsDesc      需要被删除的冲突描述
+//     */
+//    public void updateProcessEquBeforeAddConflictsDesc(List<ApsProcessOperationProcessEquDo> beforeUpdatingConflictId,
+//                                                       String removeConflictsDesc, String processway,
+//                                                       Date newPlanStartDate,
+//                                                       Date newOldEndDate,
+//                                                       String aboutId) {
+//        if (beforeUpdatingConflictId.isEmpty()) {
+//            return;
+//        }
+//        beforeUpdatingConflictId.forEach(info -> {
+////            // 判断是否和其他工序作业明细存在冲突
+////            List<ApsProcessOperationProcessEquDo> conflictId = this.baseMapper.getConflictId(info.getProcessdeviceid(),
+////                    info.getId(), info.getPlanstartdate(), info.getPlanenddate(), processway);
+////            if (!conflictId.isEmpty()) {
+////                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)) {
 //                info.setConflictdes(removeConflictsDesc(info.getConflictdes(), removeConflictsDesc));
 //                info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) &&
 //                        StringUtils.isBlank(info.getSoftconflictdes()) ?
 //                        LOCKMARK_N : LOCKMARK_Y);
+//                info.setModifydate(new Date());
+//                apsConflictLogService.recordLog(info.getId(),
+//                        aboutId, removeConflictsDesc, 2, null);
+//            } 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);
+//                    info.setModifydate(new Date());
+//                    apsConflictLogService.recordLog(info.getId(),
+//                            aboutId, removeConflictsDesc, 2, null);
+//                }
 //            }
-            if (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);
-                info.setModifydate(new Date());
-                apsConflictLogService.recordLog(info.getId(),
-                        aboutId, removeConflictsDesc, 2, null);
-            } 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);
-                    info.setModifydate(new Date());
-                    apsConflictLogService.recordLog(info.getId(),
-                            aboutId, removeConflictsDesc, 2, null);
-                }
-            }
+//
+////            else {
+////                info.setConflictdes(addNewConflictsDesc(info.getConflictdes(), removeConflictsDesc));
+////                info.setHasconflict(LOCKMARK_Y);
+////            }
+//        });
+//        this.updateBatchById(beforeUpdatingConflictId);
+//    }
 
-//            else {
-//                info.setConflictdes(addNewConflictsDesc(info.getConflictdes(), removeConflictsDesc));
-//                info.setHasconflict(LOCKMARK_Y);
+//    /**
+//     * 更新设备或者时间之后 更新冲突描述
+//     *
+//     * @param aboutProcessEquList 工序作业明细影响到的工序作业明细数据
+//     * @param removeConflictsDesc 需要被删除的冲突描述
+//     */
+//    public void updateProcessEquAboutBeforeAddConflictsDesc(List<ApsProcessOperationProcessEquDo> aboutProcessEquList,
+//                                                            String removeConflictsDesc, String processway,
+//                                                            Date newPlanStartDate,
+//                                                            Date newOldEndDate,
+//                                                            String aboutId) {
+//        if (aboutProcessEquList.isEmpty()) {
+//            return;
+//        }
+//        //删除之前受影响的工序作业明细的‘与加工设备其他作业加工时间重叠’冲突
+//        aboutProcessEquList.forEach(info -> {
+//            if (StringUtils.isNotBlank(info.getConflictdes()) && info.getConflictdes().contains(removeConflictsDesc)) {
+//                if (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);
+//                    info.setModifydate(new Date());
+//                    apsConflictLogService.recordLog(info.getId(),
+//                            aboutId, removeConflictsDesc, 2, null);
+//                } 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);
+//                        info.setModifydate(new Date());
+//                        apsConflictLogService.recordLog(info.getId(),
+//                                aboutId, removeConflictsDesc, 2, null);
+//                    }
+//                }
 //            }
-        });
-        this.updateBatchById(beforeUpdatingConflictId);
-    }
-
-    /**
-     * 更新设备或者时间之后 更新冲突描述
-     *
-     * @param aboutProcessEquList 工序作业明细影响到的工序作业明细数据
-     * @param removeConflictsDesc 需要被删除的冲突描述
-     */
-    public void updateProcessEquAboutBeforeAddConflictsDesc(List<ApsProcessOperationProcessEquDo> aboutProcessEquList,
-                                                            String removeConflictsDesc, String processway,
-                                                            Date newPlanStartDate,
-                                                            Date newOldEndDate,
-                                                            String aboutId) {
-        if (aboutProcessEquList.isEmpty()) {
-            return;
-        }
-        //删除之前受影响的工序作业明细的‘与加工设备其他作业加工时间重叠’冲突
-        aboutProcessEquList.forEach(info -> {
-            if (StringUtils.isNotBlank(info.getConflictdes()) && info.getConflictdes().contains(removeConflictsDesc)) {
-                if (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);
-                    info.setModifydate(new Date());
-                    apsConflictLogService.recordLog(info.getId(),
-                            aboutId, removeConflictsDesc, 2, null);
-                } 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);
-                        info.setModifydate(new Date());
-                        apsConflictLogService.recordLog(info.getId(),
-                                aboutId, removeConflictsDesc, 2, null);
-                    }
-                }
-            }
-        });
-        this.updateBatchById(aboutProcessEquList);
-    }
+//        });
+//        this.updateBatchById(aboutProcessEquList);
+//    }
 
 
-    /**
-     * 更新设备或者时间之后 更新冲突描述
-     *
-     * @param afterTheUpdateConflictId 当前作业更新设备或者时间之后与该作业存在冲突的工序作业信息
-     * @param conflictsDesc            冲突描述
-     */
-    public void updateProcessEquAfterAddConflictsDesc(List<ApsProcessOperationProcessEquDo> afterTheUpdateConflictId,
-                                                      String conflictsDesc, String aboutId) {
-        if (afterTheUpdateConflictId.isEmpty()) {
-            return;
-        }
-        afterTheUpdateConflictId.forEach(info -> {
-            String newConflictsDesc = addNewConflictsDesc(info.getConflictdes(), conflictsDesc);
-            info.setConflictdes(newConflictsDesc);
-            info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) && StringUtils.isBlank(info.getSoftconflictdes()) ?
-                    LOCKMARK_N : LOCKMARK_Y);
-            info.setModifydate(new Date());
-            apsConflictLogService.recordLog(info.getId(), aboutId, EQ_TIME_CROSS, 1, null);
-        });
-        this.updateBatchById(afterTheUpdateConflictId);
-    }
+//    /**
+//     * 更新设备或者时间之后 更新冲突描述
+//     *
+//     * @param afterTheUpdateConflictId 当前作业更新设备或者时间之后与该作业存在冲突的工序作业信息
+//     * @param conflictsDesc            冲突描述
+//     */
+//    public void updateProcessEquAfterAddConflictsDesc(List<ApsProcessOperationProcessEquDo> afterTheUpdateConflictId,
+//                                                      String conflictsDesc, String aboutId) {
+//        if (afterTheUpdateConflictId.isEmpty()) {
+//            return;
+//        }
+//        afterTheUpdateConflictId.forEach(info -> {
+//            String newConflictsDesc = addNewConflictsDesc(info.getConflictdes(), conflictsDesc);
+//            info.setConflictdes(newConflictsDesc);
+//            info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) && StringUtils.isBlank(info.getSoftconflictdes()) ?
+//                    LOCKMARK_N : LOCKMARK_Y);
+//            info.setModifydate(new Date());
+//            apsConflictLogService.recordLog(info.getId(), aboutId, EQ_TIME_CROSS, 1, null);
+//        });
+//        this.updateBatchById(afterTheUpdateConflictId);
+//    }
 
     //新增冲突
     public void addConflict(List<ProcessVo> needAddConflictList, String conflictsDesc, String aboutId) {
         if (needAddConflictList.isEmpty()) {
             return;
         }
-        List<ApsProcessOperationProcessEquDo> needUpdateList = new LinkedList<>();
         for (ProcessVo needRemove : needAddConflictList) {
             ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = new ApsProcessOperationProcessEquDo();
             apsProcessOperationProcessEquDo.setId(needRemove.getProcessEquId());
@@ -1746,11 +1768,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             apsProcessOperationProcessEquDo.setConflictdes(newConflictsDesc);
             apsProcessOperationProcessEquDo.setHasconflict(StringUtils.isBlank(apsProcessOperationProcessEquDo.getConflictdes()) && StringUtils.isBlank(needRemove.getSoftconflictdes()) ?
                     LOCKMARK_N : LOCKMARK_Y);
-            apsProcessOperationProcessEquDo.setModifydate(new Date());
-            needUpdateList.add(apsProcessOperationProcessEquDo);
             apsConflictLogService.recordLog(apsProcessOperationProcessEquDo.getId(), aboutId, EQ_TIME_CROSS, 1, null);
+            this.baseMapper.myUpdateConflictdes(apsProcessOperationProcessEquDo);
         }
-        this.updateBatchById(needUpdateList);
     }
 
     //删除冲突
@@ -1758,7 +1778,6 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         if (needRemoveConflictList.isEmpty()) {
             return;
         }
-        List<ApsProcessOperationProcessEquDo> needUpdateList = new LinkedList<>();
         for (ProcessVo needRemove : needRemoveConflictList) {
             ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = new ApsProcessOperationProcessEquDo();
             apsProcessOperationProcessEquDo.setId(needRemove.getProcessEquId());
@@ -1766,11 +1785,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             apsProcessOperationProcessEquDo.setConflictdes(newConflictsDesc);
             apsProcessOperationProcessEquDo.setHasconflict(StringUtils.isBlank(apsProcessOperationProcessEquDo.getConflictdes()) && StringUtils.isBlank(needRemove.getSoftconflictdes()) ?
                     LOCKMARK_N : LOCKMARK_Y);
-            apsProcessOperationProcessEquDo.setModifydate(new Date());
-            needUpdateList.add(apsProcessOperationProcessEquDo);
             apsConflictLogService.recordLog(apsProcessOperationProcessEquDo.getId(), aboutId, EQ_TIME_CROSS, 2, null);
+            this.baseMapper.myUpdateConflictdes(apsProcessOperationProcessEquDo);
         }
-        this.updateBatchById(needUpdateList);
     }
 
     /**
@@ -1871,7 +1888,6 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         this.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
                 .eq(ApsProcessOperationProcessEquDo::getId, processEquDo.getId())
                 .set(ApsProcessOperationProcessEquDo::getConflictdes, newConflictdes)
-                .set(BaseDo::getModifydate, new Date())
                 .set(ApsProcessOperationProcessEquDo::getHasconflict, StringUtils.isBlank(newConflictdes) &&
                         StringUtils.isBlank(processEquDo.getSoftconflictdes()) ? LOCKMARK_N : LOCKMARK_Y)
         );

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

@@ -423,6 +423,20 @@
           AND PLANSTARTDATE is not null
           AND ACTUALSTARTDATE != PLANSTARTDATE
     </update>
+    <update id="myUpdateConflictdes">
+        update aps_process_operation_process_equ
+        <set>
+            <if test="apsProcessOperationProcessEquDo.conflictdes != null">
+                CONFLICTDES = #{apsProcessOperationProcessEquDo.conflictdes},
+            </if>
+            <if test="apsProcessOperationProcessEquDo.hasconflict != null">
+                HASCONFLICT = #{apsProcessOperationProcessEquDo.hasconflict},
+            </if>
+        </set>
+        <where>
+            ID = #{apsProcessOperationProcessEquDo.ID}
+        </where>
+    </update>
     <select id="getOptionalEquipmentById" resultType="com.rongwei.bsentity.vo.OptionalEquipmentVo">
         SELECT
         CONCAT(aci.USEDEPTID, '/', aci.ID ) AS value ,