数据导出

jeecg-boot-module-system/src/main/java/org/jeecg/modules/schedulingInformation/controller/BdAnnualLeaveController.java

@@ -8,6 +8,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -20,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.viewClockIn.entity.ExportClockDay;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -81,6 +84,12 @@ public class BdAnnualLeaveController extends JeecgController<BdAnnualLeave, IBdA
 	@ApiOperation(value="年度假期管理-添加", notes="年度假期管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody BdAnnualLeave bdAnnualLeave) {
+		LambdaQueryWrapper<BdAnnualLeave> query = new LambdaQueryWrapper<BdAnnualLeave>();
+		query.eq(BdAnnualLeave::getYearName,bdAnnualLeave.getYearName());
+		List<BdAnnualLeave> list = bdAnnualLeaveService.list(query);
+		if(list.size() > 0){
+			return Result.error("新增失败，"+bdAnnualLeave.getYearName()+"年度已存在!");
+		}
 		bdAnnualLeaveService.save(bdAnnualLeave);
 		return Result.OK("添加成功！");
 	}
@@ -95,6 +104,13 @@ public class BdAnnualLeaveController extends JeecgController<BdAnnualLeave, IBdA
 	@ApiOperation(value="年度假期管理-编辑", notes="年度假期管理-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody BdAnnualLeave bdAnnualLeave) {
+		LambdaQueryWrapper<BdAnnualLeave> query = new LambdaQueryWrapper<BdAnnualLeave>();
+		query.eq(BdAnnualLeave::getYearName,bdAnnualLeave.getYearName());
+		query.ne(BdAnnualLeave::getId,bdAnnualLeave.getId());
+		List<BdAnnualLeave> list = bdAnnualLeaveService.list(query);
+		if(list.size() > 0){
+			return Result.error("修改失败，"+bdAnnualLeave.getYearName()+"年度已存在!");
+		}
 		bdAnnualLeaveService.updateById(bdAnnualLeave);
 		return Result.OK("编辑成功!");
 	}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/controller/viewClockInController.java

@@ -677,7 +677,15 @@ public class viewClockInController extends JeecgController<ViewClockIn, IviewClo
 	   */
 	  @RequestMapping(value = "/exportXlsDay")
 	  public ModelAndView exportXlsDay(HttpServletRequest request, ExportClockDay viewClockIn) {
-
+//	  	  List<ExportClockInfo> list = viewClockInService.exportErrotInfo(userName,mDate,userType);
+//		  LambdaQueryWrapper<ExportClockDay> query = new LambdaQueryWrapper<ExportClockDay>();
+//		  if(userName != null && userName != ""){
+//			  String[] s = userName.split("（");
+//			  query.eq(ViewClockIn::getRealname,s[0]);//姓名
+//		  }
+//		  if(mDate != null && mDate != ""){
+//			  query.eq(ExportClockDay::getRealname,"mDate");//月份
+//		  }
 	  	  List<ExportClockDay> list = viewClockInService.exportXlsDay(viewClockIn);
 		  LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		  ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());