优化代码结构

wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java

@@ -66,7 +66,7 @@ public enum BASE_RESP_CODE_ENUM {
     NO_WORK_ORDERS_HAVE_BEEN_REJECTED("645", "暂无驳回未提交工单"),
     LEAVE_JOB_USER("646","账号状态异常，请联系管理员"),
     PROJECT_NOT_USER("648", "该项目还没有参与人员"),
-    theNewContent_IsEqual_ToTheOriginal_Content("649","更新内容与旧内容一致，更新失败"),
+    theNewContent_IsEqual_ToTheOriginal_Content("649","修改内容与旧内容一致，修改失败"),
     REASON_CANNOT_BE_EMPTY("650", "更变原因不能为空"),
     START_NOT_THAN_END_DATE("651", "开始时间不能大于结束时间"),
     HOLIDAY_NOT_IS_NULL("652", "该节假日已经不存在，请刷新页面!"),

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java

@@ -1171,9 +1171,12 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         log.info("WorkTimeOrderServiceImpl[]updateOrderChange[]input.param.OrderChangeVo:{}" + vo);
         // 1.判断参数是否为空
         OrderChangeVoIsNull(vo, true);
-        // 2.获取原工单
+        // 2.获取原工单，并验证修改内容是否与原工单一致
         WorkTimeOrder workTimeOrderOld = workTimeOrderMapper.selectById(vo.getWorkId());
         List<WorkTimeOrder> workTimeOrders = getByDay(workTimeOrderOld.getUserId(), vo.getWorkDay());
+        if (vo.getWorkDay().equals(workTimeOrderOld.getWorkDay()) || vo.getWorkTime().equals(workTimeOrderOld.getWorkTime()) || vo.getDes().equals(workTimeOrderOld.getDes())) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
+        }
         vo.setUserId(workTimeOrderOld.getUserId());
         vo.setProjectId(workTimeOrderOld.getProjectId());
         vo.setType(workTimeOrderOld.getType());