[IMP] 修复项目面板拖动issue自定义流转报错

xianglujun · Sep 1, 2020 · 41f4c8a · 41f4c8a
1 parent 39824df
commit 41f4c8a
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/src/main/java/io/choerodon/agile/app/service/impl/StatusFieldSettingServiceImpl.java b/src/main/java/io/choerodon/agile/app/service/impl/StatusFieldSettingServiceImpl.java
@@ -80,6 +80,8 @@ public class StatusFieldSettingServiceImpl implements StatusFieldSettingService
         FIELD_CODE.put(FieldCode.EPIC, "epicId");
         FIELD_CODE.put(FieldCode.CREATION_DATE, "creationDate");
         FIELD_CODE.put(FieldCode.LAST_UPDATE_DATE, "lastUpdateDate");
+        FIELD_CODE.put(FieldCode.ESTIMATED_END_TIME, "estimatedEndTime");
+        FIELD_CODE.put(FieldCode.ESTIMATED_START_TIME, "estimatedStartTime");
     }
     @Override
     public List<StatusFieldSettingVO> createOrUpdate(Long project, Long issueType, Long statusId, Long objectVersionNumber, String applyType, List<StatusFieldSettingVO> list) {
@@ -263,7 +265,9 @@ private void handlerFieldName(IssueUpdateVO issueUpdateVO, List<StatusFieldValue
                 break;
             case FieldCode.CREATION_DATE:
             case FieldCode.LAST_UPDATE_DATE:
-                field.set(issueUpdateVO, handlerTimeField(fieldValueSettingDTO));
+            case FieldCode.ESTIMATED_START_TIME:
+            case FieldCode.ESTIMATED_END_TIME:
+                field.set(issueUpdateVO, handlerPredefinedTimeField(fieldValueSettingDTO));
                 break;
             case FieldCode.EPIC:
             case FieldCode.PRIORITY:
@@ -301,6 +305,21 @@ private void handlerFieldName(IssueUpdateVO issueUpdateVO, List<StatusFieldValue
         }
     }
 
+    private Date handlerPredefinedTimeField(StatusFieldValueSettingDTO fieldValueSettingDTO) {
+        Date date = null;
+        if ("add".equals(fieldValueSettingDTO.getOperateType())) {
+            BigDecimal dateAddValue = fieldValueSettingDTO.getDateAddValue();
+            Calendar cal = Calendar.getInstance();
+            cal.add(Calendar.DAY_OF_MONTH, dateAddValue.intValue());
+            date = cal.getTime();
+        } else if ("current_time".equals(fieldValueSettingDTO.getOperateType())) {
+            date = new Date();
+        } else {
+            date = fieldValueSettingDTO.getDateValue();
+        }
+        return date;
+    }
+
     private BigDecimal handlerPredefinedNumber(StatusFieldValueSettingDTO statusFieldValueSettingDTO, BigDecimal oldValue) {
         BigDecimal bigDecimal = null;
         if ("add".equals(statusFieldValueSettingDTO.getOperateType())) {