12

src/main/java/com/fdkankan/ucenter/controller/IncrementController.java

@@ -6,6 +6,7 @@ import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.entity.UserIncrement;
 import com.fdkankan.ucenter.service.IIncrementTypeService;
 import com.fdkankan.ucenter.service.IUserIncrementService;
+import com.fdkankan.ucenter.util.DateUserUtil;
 import com.fdkankan.ucenter.vo.request.IncrementParam;
 import com.fdkankan.ucenter.vo.response.ResponseUserIncrement;
 import org.apache.commons.lang3.StringUtils;
@@ -64,9 +65,10 @@ public class IncrementController {
         UserIncrement userIncrementEntity = userIncrementService.getById(param.getId());
         ResponseUserIncrement responseUserIncrement = new ResponseUserIncrement();
         BeanUtils.copyProperties(userIncrementEntity, responseUserIncrement);
-        responseUserIncrement.setIncrementStartStr(DateUtil.date2String(responseUserIncrement.getIncrementStartTime(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
-        responseUserIncrement.setIncrementEndStr(DateUtil.date2String(responseUserIncrement.getIncrementEndTime(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
-        responseUserIncrement.setCreateStr(DateUtil.date2String(responseUserIncrement.getCreateTime(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
+
+        responseUserIncrement.setIncrementStartStr(DateUserUtil.getDayTime(responseUserIncrement.getIncrementStartTime()));
+        responseUserIncrement.setIncrementEndStr(DateUserUtil.getDayTime(responseUserIncrement.getIncrementEndTime()));
+        responseUserIncrement.setCreateStr(DateUserUtil.getDayTime(responseUserIncrement.getCreateTime()));
         return Result.success(userIncrementEntity);
     }
 }

src/main/java/com/fdkankan/ucenter/util/DateUserUtil.java

@@ -61,4 +61,5 @@ public class DateUserUtil {
         Date date2 = DateUserUtil.getDate(getLastDate());
         return ( date2.getTime() - date1.getTime() ) /1000;
     }
+
 }