|
@@ -15,13 +15,14 @@ import org.jeecg.modules.jixiaoPersonPrice.dto.JixiaoPersonPriceAddDTO;
|
|
|
import org.jeecg.modules.jixiaoPersonPrice.dto.JixiaoPersonPriceExportDTO;
|
|
|
import org.jeecg.modules.jixiaoPersonPrice.entity.JixiaoPersonPrice;
|
|
|
import org.jeecg.modules.jixiaoPersonPrice.service.IJixiaoPersonPriceService;
|
|
|
-import org.jeecg.modules.jixiaoPersonPrice.vo.JixiaoPersonPriceExportVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.text.ParseException;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -52,7 +53,14 @@ public class JixiaoPersonPriceController extends JeecgController<JixiaoPersonPri
|
|
|
@ApiOperation("人员绩效——按时间导出excel")
|
|
|
@RequestMapping(value = "/exportXlsByTime")
|
|
|
public ModelAndView exportXlsByTime(HttpServletResponse response, String beginDate,String endDate) {
|
|
|
-
|
|
|
+ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ Date date= null;
|
|
|
+ try {
|
|
|
+ date = sdf.parse(endDate);
|
|
|
+ } catch (ParseException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ endDate=sdf.format(date.getTime() + (1000 * 60 * 60 * 24));
|
|
|
|
|
|
JixiaoPersonPriceExportDTO dto = new JixiaoPersonPriceExportDTO();
|
|
|
dto.setBeginDate(beginDate);
|