diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index a676898..6896661 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -157,6 +157,7 @@ } private List getDateRange(String startDate, String endDate){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date d1 = DateUtil.parseDate(startDate); Date d2 = DateUtil.parseDate(endDate); //定义日期实例 @@ -166,12 +167,12 @@ List dates = new ArrayList<>(); //判断是否到结束日期 while(cal.getTime().before(d2)){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String str = sdf.format(cal.getTime()); dates.add(str); //进行当前日期月份加1 cal.add(Calendar.DAY_OF_MONTH, 1); } + dates.add(sdf.format(d2.getTime())); return dates; } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index a676898..6896661 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -157,6 +157,7 @@ } private List getDateRange(String startDate, String endDate){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date d1 = DateUtil.parseDate(startDate); Date d2 = DateUtil.parseDate(endDate); //定义日期实例 @@ -166,12 +167,12 @@ List dates = new ArrayList<>(); //判断是否到结束日期 while(cal.getTime().before(d2)){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String str = sdf.format(cal.getTime()); dates.add(str); //进行当前日期月份加1 cal.add(Calendar.DAY_OF_MONTH, 1); } + dates.add(sdf.format(d2.getTime())); return dates; } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java new file mode 100644 index 0000000..3b41f00 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.register.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.service.ICommonDeptService; +import com.casic.missiles.modular.system.model.Dept; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +@Controller +public class IrisOfflineController { + @Autowired + private ICommonDeptService deptService; + + @RequestMapping("/dept/listAll") + @ResponseBody + public Object deptListAll(){ + List list = deptService.getDeptByTips(null); + return ResponseData.success(list); + } +}