Explorar o código

fix绩效导出

LLL hai 1 ano
pai
achega
c1bfa992f0

+ 10 - 2
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/jixiaoPersonPrice/controller/JixiaoPersonPriceController.java

@@ -15,13 +15,14 @@ import org.jeecg.modules.jixiaoPersonPrice.dto.JixiaoPersonPriceAddDTO;
 import org.jeecg.modules.jixiaoPersonPrice.dto.JixiaoPersonPriceExportDTO;
 import org.jeecg.modules.jixiaoPersonPrice.dto.JixiaoPersonPriceExportDTO;
 import org.jeecg.modules.jixiaoPersonPrice.entity.JixiaoPersonPrice;
 import org.jeecg.modules.jixiaoPersonPrice.entity.JixiaoPersonPrice;
 import org.jeecg.modules.jixiaoPersonPrice.service.IJixiaoPersonPriceService;
 import org.jeecg.modules.jixiaoPersonPrice.service.IJixiaoPersonPriceService;
-import org.jeecg.modules.jixiaoPersonPrice.vo.JixiaoPersonPriceExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -52,7 +53,14 @@ public class JixiaoPersonPriceController extends JeecgController<JixiaoPersonPri
 	@ApiOperation("人员绩效——按时间导出excel")
 	@ApiOperation("人员绩效——按时间导出excel")
 	@RequestMapping(value = "/exportXlsByTime")
 	@RequestMapping(value = "/exportXlsByTime")
 	public ModelAndView exportXlsByTime(HttpServletResponse response, String beginDate,String endDate) {
 	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();
 		JixiaoPersonPriceExportDTO dto = new JixiaoPersonPriceExportDTO();
 		dto.setBeginDate(beginDate);
 		dto.setBeginDate(beginDate);

+ 1 - 1
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/jixiaoPersonPrice/service/impl/JixiaoPersonPriceServiceImpl.java

@@ -81,8 +81,8 @@ public class JixiaoPersonPriceServiceImpl extends ServiceImpl<JixiaoPersonPriceM
                 if(key.equals("weituo_no") || key.equals("TOTAL") || key.equals("create_time")) continue;
                 if(key.equals("weituo_no") || key.equals("TOTAL") || key.equals("create_time")) continue;
                 filedsList.add(new ExcelExportEntity((String) key, (String)key));
                 filedsList.add(new ExcelExportEntity((String) key, (String)key));
             }
             }
-            filedsList.add(new ExcelExportEntity("完结时间", "create_time"));
             filedsList.add(new ExcelExportEntity("总计", "TOTAL"));
             filedsList.add(new ExcelExportEntity("总计", "TOTAL"));
+            filedsList.add(new ExcelExportEntity("完结时间", "create_time",20));
         }
         }
 
 
         // Step.3 AutoPoi 导出Excel
         // Step.3 AutoPoi 导出Excel