异常工时统计增删改接口

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursController.java

@@ -61,6 +61,8 @@ public class FbsAbnormalWorkingHoursController {
 									  HttpServletRequest req) {
 		Result<IPage<FbsAbnormalWorkingHours>> result = new Result<IPage<FbsAbnormalWorkingHours>>();
 		QueryWrapper<FbsAbnormalWorkingHours> queryWrapper = QueryGenerator.initQueryWrapper(fbsAbnormalWorkingHours, req.getParameterMap());
+		queryWrapper.lambda().eq(FbsAbnormalWorkingHours::getDelFlag,"0");
+		queryWrapper.lambda().orderByDesc(FbsAbnormalWorkingHours::getCreateTime);
 		Page<FbsAbnormalWorkingHours> page = new Page<FbsAbnormalWorkingHours>(pageNo, pageSize);
 		IPage<FbsAbnormalWorkingHours> pageList = fbsAbnormalWorkingHoursService.page(page, queryWrapper);
 		result.setSuccess(true);
@@ -86,6 +88,8 @@ public class FbsAbnormalWorkingHoursController {
 		}
 		return result;
 	}
+
+
 	
 	/**
 	  *  编辑
@@ -108,6 +112,8 @@ public class FbsAbnormalWorkingHoursController {
 		
 		return result;
 	}
+
+
 	
 	/**
 	  *   通过id删除
@@ -234,4 +240,77 @@ public class FbsAbnormalWorkingHoursController {
       return Result.ok("文件导入失败！");
   }
 
+	 /**
+	  * @Author chenchuang
+	  * @Description //TODO 新增子表数据以及子表数据
+	  * @Date 2020/10/14 15:36
+	  * @Param [fbsAbnormalWorkingHours]
+	  * @return org.jeecg.common.api.vo.Result<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
+	  */
+	 @PostMapping(value = "/addAndChild")
+	 public Result<FbsAbnormalWorkingHours> addAndChild(@RequestBody FbsAbnormalWorkingHours fbsAbnormalWorkingHours) {
+		 Result<FbsAbnormalWorkingHours> result = new Result<FbsAbnormalWorkingHours>();
+		 try {
+			 fbsAbnormalWorkingHoursService.addAndChild(fbsAbnormalWorkingHours);
+			 result.success("添加成功！");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 log.info(e.getMessage());
+			 result.error500("操作失败");
+		 }
+		 return result;
+	 }
+
+	 /**
+	  * @Author chenchuang
+	  * @Description //TODO 修改主表和子表数据
+	  * @Date 2020/10/14 15:40
+	  * @Param [fbsAbnormalWorkingHours]
+	  * @return org.jeecg.common.api.vo.Result<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
+	  */
+	 @PutMapping(value = "/updateAndChild")
+	 public Result<FbsAbnormalWorkingHours> updateAndChild(@RequestBody FbsAbnormalWorkingHours fbsAbnormalWorkingHours) {
+		 Result<FbsAbnormalWorkingHours> result = new Result<FbsAbnormalWorkingHours>();
+		 FbsAbnormalWorkingHours fbsAbnormalWorkingHoursEntity = fbsAbnormalWorkingHoursService.getById(fbsAbnormalWorkingHours.getId());
+		 if(fbsAbnormalWorkingHoursEntity==null) {
+			 result.error500("未找到对应实体");
+		 }else {
+			 boolean ok = false;
+			 try {
+				 ok = fbsAbnormalWorkingHoursService.updateAndChild(fbsAbnormalWorkingHours);
+			 } catch (Exception e) {
+				 result.error500("修改失败："+e.getMessage());
+			 }
+			 //TODO 返回false说明什么？
+			 if(ok) {
+				 result.success("修改成功!");
+			 }
+		 }
+		 return result;
+	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 删除主表和子表
+	 * @Date 2020/10/14 15:45
+	 * @Param [id]
+	 * @return org.jeecg.common.api.vo.Result<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
+	 */
+	 @DeleteMapping(value = "/deleteAndChild")
+	 public Result<FbsAbnormalWorkingHours> deleteAndChild(@RequestParam(name="id",required=true) String id) {
+		 Result<FbsAbnormalWorkingHours> result = new Result<FbsAbnormalWorkingHours>();
+		 FbsAbnormalWorkingHours fbsAbnormalWorkingHours = fbsAbnormalWorkingHoursService.getById(id);
+		 if(fbsAbnormalWorkingHours==null) {
+			 result.error500("未找到对应实体");
+		 }else {
+			 fbsAbnormalWorkingHours.setDelFlag("1");
+			 boolean ok = fbsAbnormalWorkingHoursService.updateById(fbsAbnormalWorkingHours);
+			 if(ok) {
+				 result.success("删除成功!");
+			 }
+		 }
+
+		 return result;
+	 }
+
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursDescribeController.java

@@ -0,0 +1,239 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe;
+import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursDescribeService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+
+ /**
+ * @Title: Controller
+ * @Description: 异常工时描述
+ * @author： jeecg-boot
+ * @date：   2020-10-14
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHoursDescribe")
+@Slf4j
+public class FbsAbnormalWorkingHoursDescribeController {
+	@Autowired
+	private IFbsAbnormalWorkingHoursDescribeService fbsAbnormalWorkingHoursDescribeService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsAbnormalWorkingHoursDescribe
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsAbnormalWorkingHoursDescribe>> queryPageList(FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsAbnormalWorkingHoursDescribe>> result = new Result<IPage<FbsAbnormalWorkingHoursDescribe>>();
+		QueryWrapper<FbsAbnormalWorkingHoursDescribe> queryWrapper = QueryGenerator.initQueryWrapper(fbsAbnormalWorkingHoursDescribe, req.getParameterMap());
+		queryWrapper.lambda().eq(FbsAbnormalWorkingHoursDescribe::getDelFlag,"0");
+		queryWrapper.lambda().orderByAsc(FbsAbnormalWorkingHoursDescribe::getSort);
+		Page<FbsAbnormalWorkingHoursDescribe> page = new Page<FbsAbnormalWorkingHoursDescribe>(pageNo, pageSize);
+		IPage<FbsAbnormalWorkingHoursDescribe> pageList = fbsAbnormalWorkingHoursDescribeService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsAbnormalWorkingHoursDescribe
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsAbnormalWorkingHoursDescribe> add(@RequestBody FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe) {
+		Result<FbsAbnormalWorkingHoursDescribe> result = new Result<FbsAbnormalWorkingHoursDescribe>();
+		try {
+			fbsAbnormalWorkingHoursDescribeService.save(fbsAbnormalWorkingHoursDescribe);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsAbnormalWorkingHoursDescribe
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsAbnormalWorkingHoursDescribe> edit(@RequestBody FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe) {
+		Result<FbsAbnormalWorkingHoursDescribe> result = new Result<FbsAbnormalWorkingHoursDescribe>();
+		FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribeEntity = fbsAbnormalWorkingHoursDescribeService.getById(fbsAbnormalWorkingHoursDescribe.getId());
+		if(fbsAbnormalWorkingHoursDescribeEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsAbnormalWorkingHoursDescribeService.updateById(fbsAbnormalWorkingHoursDescribe);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsAbnormalWorkingHoursDescribe> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsAbnormalWorkingHoursDescribe> result = new Result<FbsAbnormalWorkingHoursDescribe>();
+		FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe = fbsAbnormalWorkingHoursDescribeService.getById(id);
+		if(fbsAbnormalWorkingHoursDescribe==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsAbnormalWorkingHoursDescribeService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsAbnormalWorkingHoursDescribe> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsAbnormalWorkingHoursDescribe> result = new Result<FbsAbnormalWorkingHoursDescribe>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.fbsAbnormalWorkingHoursDescribeService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsAbnormalWorkingHoursDescribe> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsAbnormalWorkingHoursDescribe> result = new Result<FbsAbnormalWorkingHoursDescribe>();
+		FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe = fbsAbnormalWorkingHoursDescribeService.getById(id);
+		if(fbsAbnormalWorkingHoursDescribe==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsAbnormalWorkingHoursDescribe);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsAbnormalWorkingHoursDescribe> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe = JSON.parseObject(deString, FbsAbnormalWorkingHoursDescribe.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsAbnormalWorkingHoursDescribe, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsAbnormalWorkingHoursDescribe> pageList = fbsAbnormalWorkingHoursDescribeService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "异常工时描述列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsAbnormalWorkingHoursDescribe.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("异常工时描述列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<FbsAbnormalWorkingHoursDescribe> listFbsAbnormalWorkingHoursDescribes = ExcelImportUtil.importExcel(file.getInputStream(), FbsAbnormalWorkingHoursDescribe.class, params);
+              for (FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribeExcel : listFbsAbnormalWorkingHoursDescribes) {
+                  fbsAbnormalWorkingHoursDescribeService.save(fbsAbnormalWorkingHoursDescribeExcel);
+              }
+              return Result.ok("文件导入成功！数据行数：" + listFbsAbnormalWorkingHoursDescribes.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败！");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursTypeController.java

@@ -0,0 +1,239 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursType;
+import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursTypeService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+
+ /**
+ * @Title: Controller
+ * @Description: 异常类别
+ * @author： jeecg-boot
+ * @date：   2020-10-14
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHoursType")
+@Slf4j
+public class FbsAbnormalWorkingHoursTypeController {
+	@Autowired
+	private IFbsAbnormalWorkingHoursTypeService fbsAbnormalWorkingHoursTypeService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsAbnormalWorkingHoursType
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsAbnormalWorkingHoursType>> queryPageList(FbsAbnormalWorkingHoursType fbsAbnormalWorkingHoursType,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsAbnormalWorkingHoursType>> result = new Result<IPage<FbsAbnormalWorkingHoursType>>();
+		QueryWrapper<FbsAbnormalWorkingHoursType> queryWrapper = QueryGenerator.initQueryWrapper(fbsAbnormalWorkingHoursType, req.getParameterMap());
+		queryWrapper.lambda().eq(FbsAbnormalWorkingHoursType::getDelFlag,"0");
+		queryWrapper.lambda().orderByAsc(FbsAbnormalWorkingHoursType::getSort);
+		Page<FbsAbnormalWorkingHoursType> page = new Page<FbsAbnormalWorkingHoursType>(pageNo, pageSize);
+		IPage<FbsAbnormalWorkingHoursType> pageList = fbsAbnormalWorkingHoursTypeService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsAbnormalWorkingHoursType
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsAbnormalWorkingHoursType> add(@RequestBody FbsAbnormalWorkingHoursType fbsAbnormalWorkingHoursType) {
+		Result<FbsAbnormalWorkingHoursType> result = new Result<FbsAbnormalWorkingHoursType>();
+		try {
+			fbsAbnormalWorkingHoursTypeService.save(fbsAbnormalWorkingHoursType);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsAbnormalWorkingHoursType
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsAbnormalWorkingHoursType> edit(@RequestBody FbsAbnormalWorkingHoursType fbsAbnormalWorkingHoursType) {
+		Result<FbsAbnormalWorkingHoursType> result = new Result<FbsAbnormalWorkingHoursType>();
+		FbsAbnormalWorkingHoursType fbsAbnormalWorkingHoursTypeEntity = fbsAbnormalWorkingHoursTypeService.getById(fbsAbnormalWorkingHoursType.getId());
+		if(fbsAbnormalWorkingHoursTypeEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsAbnormalWorkingHoursTypeService.updateById(fbsAbnormalWorkingHoursType);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsAbnormalWorkingHoursType> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsAbnormalWorkingHoursType> result = new Result<FbsAbnormalWorkingHoursType>();
+		FbsAbnormalWorkingHoursType fbsAbnormalWorkingHoursType = fbsAbnormalWorkingHoursTypeService.getById(id);
+		if(fbsAbnormalWorkingHoursType==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsAbnormalWorkingHoursTypeService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsAbnormalWorkingHoursType> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsAbnormalWorkingHoursType> result = new Result<FbsAbnormalWorkingHoursType>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.fbsAbnormalWorkingHoursTypeService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsAbnormalWorkingHoursType> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsAbnormalWorkingHoursType> result = new Result<FbsAbnormalWorkingHoursType>();
+		FbsAbnormalWorkingHoursType fbsAbnormalWorkingHoursType = fbsAbnormalWorkingHoursTypeService.getById(id);
+		if(fbsAbnormalWorkingHoursType==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsAbnormalWorkingHoursType);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsAbnormalWorkingHoursType> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsAbnormalWorkingHoursType fbsAbnormalWorkingHoursType = JSON.parseObject(deString, FbsAbnormalWorkingHoursType.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsAbnormalWorkingHoursType, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsAbnormalWorkingHoursType> pageList = fbsAbnormalWorkingHoursTypeService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "异常类别列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsAbnormalWorkingHoursType.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("异常类别列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<FbsAbnormalWorkingHoursType> listFbsAbnormalWorkingHoursTypes = ExcelImportUtil.importExcel(file.getInputStream(), FbsAbnormalWorkingHoursType.class, params);
+              for (FbsAbnormalWorkingHoursType fbsAbnormalWorkingHoursTypeExcel : listFbsAbnormalWorkingHoursTypes) {
+                  fbsAbnormalWorkingHoursTypeService.save(fbsAbnormalWorkingHoursTypeExcel);
+              }
+              return Result.ok("文件导入成功！数据行数：" + listFbsAbnormalWorkingHoursTypes.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败！");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHours.java

@@ -2,7 +2,10 @@ package org.jeecg.modules.fbsAbnormalWorkingHours.entity;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -135,4 +138,12 @@ public class FbsAbnormalWorkingHours implements Serializable {
 	/**生产线名称*/
 	@Excel(name = "生产线名称", width = 15)
 	private String productionLineName;
+
+	//异常工时描述集合
+	@TableField(exist = false)
+	private List<FbsAbnormalWorkingHoursDescribe> fbsAbnormalWorkingHoursDescribeList;
+
+	//异常类别
+	@TableField(exist = false)
+	private List<FbsAbnormalWorkingHoursType> fbsAbnormalWorkingHoursTypeList;
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHoursDescribe.java

@@ -0,0 +1,73 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 异常工时描述
+ * @author： jeecg-boot
+ * @date：   2020-10-14
+ * @version： V1.0
+ */
+@Data
+@TableName("fbs_abnormal_working_hours_describe")
+public class FbsAbnormalWorkingHoursDescribe implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**异常原因描述主键*/
+	@TableId(type = IdType.UUID)
+	private String id;
+	/**异常工时主键id*/
+	@Excel(name = "异常工时主键id", width = 15)
+	private String abnormalWorkingHoursId;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+	private String describes;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+	private String memo;
+	/**删除标记0正常1删除*/
+	@Excel(name = "删除标记0正常1删除", width = 15)
+	private String delFlag;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+	private String createBy;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	/**最后修改人*/
+	@Excel(name = "最后修改人", width = 15)
+	private String updateBy;
+	/**最后修改时间*/
+	@Excel(name = "最后修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	/**自定义字段1*/
+	@Excel(name = "自定义字段1", width = 15)
+	private String def1;
+	/**自定义字段2*/
+	@Excel(name = "自定义字段2", width = 15)
+	private String def2;
+	/**自定义字段3*/
+	@Excel(name = "自定义字段3", width = 15)
+	private String def3;
+	/**自定义字段4*/
+	@Excel(name = "自定义字段4", width = 15)
+	private String def4;
+	/**自定义字段5*/
+	@Excel(name = "自定义字段5", width = 15)
+	private String def5;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+	private Integer sort;
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHoursType.java

@@ -0,0 +1,73 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 异常类别
+ * @author： jeecg-boot
+ * @date：   2020-10-14
+ * @version： V1.0
+ */
+@Data
+@TableName("fbs_abnormal_working_hours_type")
+public class FbsAbnormalWorkingHoursType implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**异常类型主键*/
+	@TableId(type = IdType.UUID)
+	private String id;
+	/**异常工时主键id*/
+	@Excel(name = "异常工时主键id", width = 15)
+	private String abnormalWorkingHoursId;
+	/**类型名称*/
+	@Excel(name = "类型名称", width = 15)
+	private String typeName;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+	private String memo;
+	/**删除标记0正常1删除*/
+	@Excel(name = "删除标记0正常1删除", width = 15)
+	private String delFlag;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+	private String createBy;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	/**最后修改人*/
+	@Excel(name = "最后修改人", width = 15)
+	private String updateBy;
+	/**最后修改时间*/
+	@Excel(name = "最后修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	/**自定义字段1*/
+	@Excel(name = "自定义字段1", width = 15)
+	private String def1;
+	/**自定义字段2*/
+	@Excel(name = "自定义字段2", width = 15)
+	private String def2;
+	/**自定义字段3*/
+	@Excel(name = "自定义字段3", width = 15)
+	private String def3;
+	/**自定义字段4*/
+	@Excel(name = "自定义字段4", width = 15)
+	private String def4;
+	/**自定义字段5*/
+	@Excel(name = "自定义字段5", width = 15)
+	private String def5;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+	private Integer sort;
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/FbsAbnormalWorkingHoursDescribeMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 异常工时描述
+ * @author： jeecg-boot
+ * @date：   2020-10-14
+ * @version： V1.0
+ */
+public interface FbsAbnormalWorkingHoursDescribeMapper extends BaseMapper<FbsAbnormalWorkingHoursDescribe> {
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/FbsAbnormalWorkingHoursTypeMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 异常类别
+ * @author： jeecg-boot
+ * @date：   2020-10-14
+ * @version： V1.0
+ */
+public interface FbsAbnormalWorkingHoursTypeMapper extends BaseMapper<FbsAbnormalWorkingHoursType> {
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/xml/FbsAbnormalWorkingHoursDescribeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.fbsAbnormalWorkingHours.mapper.FbsAbnormalWorkingHoursDescribeMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/xml/FbsAbnormalWorkingHoursTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.fbsAbnormalWorkingHours.mapper.FbsAbnormalWorkingHoursTypeMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/IFbsAbnormalWorkingHoursDescribeService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.service;
+
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 异常工时描述
+ * @author： jeecg-boot
+ * @date：   2020-10-14
+ * @version： V1.0
+ */
+public interface IFbsAbnormalWorkingHoursDescribeService extends IService<FbsAbnormalWorkingHoursDescribe> {
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/IFbsAbnormalWorkingHoursService.java

@@ -10,5 +10,21 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @version： V1.0
  */
 public interface IFbsAbnormalWorkingHoursService extends IService<FbsAbnormalWorkingHours> {
+    /**
+    * @Author chenchuang
+    * @Description //TODO 保存主表以及异常工时描述子表和异常类别子表
+    * @Date 2020/10/14 14:51
+    * @Param [fbsAbnormalWorkingHours]
+    * @return boolean
+    */
+    boolean addAndChild(FbsAbnormalWorkingHours fbsAbnormalWorkingHours);
 
+    /**
+    * @Author chenchuang
+    * @Description //TODO 修改
+    * @Date 2020/10/14 15:15
+    * @Param [fbsAbnormalWorkingHours]
+    * @return boolean
+    */
+    boolean updateAndChild(FbsAbnormalWorkingHours fbsAbnormalWorkingHours);
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/IFbsAbnormalWorkingHoursTypeService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.service;
+
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 异常类别
+ * @author： jeecg-boot
+ * @date：   2020-10-14
+ * @version： V1.0
+ */
+public interface IFbsAbnormalWorkingHoursTypeService extends IService<FbsAbnormalWorkingHoursType> {
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursDescribeServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.service.impl;
+
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe;
+import org.jeecg.modules.fbsAbnormalWorkingHours.mapper.FbsAbnormalWorkingHoursDescribeMapper;
+import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursDescribeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 异常工时描述
+ * @author： jeecg-boot
+ * @date：   2020-10-14
+ * @version： V1.0
+ */
+@Service
+public class FbsAbnormalWorkingHoursDescribeServiceImpl extends ServiceImpl<FbsAbnormalWorkingHoursDescribeMapper, FbsAbnormalWorkingHoursDescribe> implements IFbsAbnormalWorkingHoursDescribeService {
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursServiceImpl.java

@@ -1,11 +1,20 @@
 package org.jeecg.modules.fbsAbnormalWorkingHours.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours;
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe;
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursType;
 import org.jeecg.modules.fbsAbnormalWorkingHours.mapper.FbsAbnormalWorkingHoursMapper;
+import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursDescribeService;
 import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursService;
+import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
 
 /**
  * @Description: 生产异常信息统计单
@@ -14,6 +23,99 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @version： V1.0
  */
 @Service
+@Transactional
 public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalWorkingHoursMapper, FbsAbnormalWorkingHours> implements IFbsAbnormalWorkingHoursService {
 
+    @Resource
+    private FbsAbnormalWorkingHoursMapper fbsAbnormalWorkingHoursMapper;
+
+    @Resource
+    private IFbsAbnormalWorkingHoursDescribeService iFbsAbnormalWorkingHoursDescribeService;
+
+    @Resource
+    private IFbsAbnormalWorkingHoursTypeService iFbsAbnormalWorkingHoursTypeService;
+
+    @Override
+    public boolean addAndChild(FbsAbnormalWorkingHours fbsAbnormalWorkingHours) {
+        boolean resulet=true;
+        //新增主表
+        fbsAbnormalWorkingHoursMapper.insert(fbsAbnormalWorkingHours);
+
+        //新增子表
+        addChild(fbsAbnormalWorkingHours);
+
+        return resulet;
+    }
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 新增子表
+    * @Date 2020/10/14 15:21
+    * @Param [fbsAbnormalWorkingHours]
+    * @return void
+    */
+    public void addChild(FbsAbnormalWorkingHours fbsAbnormalWorkingHours){
+        //新增异常工时描述
+        if(fbsAbnormalWorkingHours.getFbsAbnormalWorkingHoursDescribeList()!=null){
+            Integer sort=1;
+            for(FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe:fbsAbnormalWorkingHours.getFbsAbnormalWorkingHoursDescribeList()){
+                fbsAbnormalWorkingHoursDescribe.setId(null);
+                fbsAbnormalWorkingHoursDescribe.setAbnormalWorkingHoursId(fbsAbnormalWorkingHours.getId());
+                fbsAbnormalWorkingHoursDescribe.setSort(sort);
+                sort++;
+            }
+            //批量保存
+            iFbsAbnormalWorkingHoursDescribeService.saveBatch(fbsAbnormalWorkingHours.getFbsAbnormalWorkingHoursDescribeList());
+        }
+
+        //新增异常类别
+        if(fbsAbnormalWorkingHours.getFbsAbnormalWorkingHoursTypeList()!=null){
+            Integer sort=1;
+            for(FbsAbnormalWorkingHoursType fbsAbnormalWorkingHoursType:fbsAbnormalWorkingHours.getFbsAbnormalWorkingHoursTypeList()){
+                fbsAbnormalWorkingHoursType.setId(null);
+                fbsAbnormalWorkingHoursType.setAbnormalWorkingHoursId(fbsAbnormalWorkingHours.getId());
+                fbsAbnormalWorkingHoursType.setSort(sort);
+                sort++;
+            }
+            //批量保存
+            iFbsAbnormalWorkingHoursTypeService.saveBatch(fbsAbnormalWorkingHours.getFbsAbnormalWorkingHoursTypeList());
+        }
+    }
+
+    @Override
+    public boolean updateAndChild(FbsAbnormalWorkingHours fbsAbnormalWorkingHours) {
+        boolean resulet=true;
+        //新增主表
+        fbsAbnormalWorkingHoursMapper.updateById(fbsAbnormalWorkingHours);
+        //物理删除子表旧数据
+        deleteChild(fbsAbnormalWorkingHours);
+        //新增子表
+        addChild(fbsAbnormalWorkingHours);
+
+        return resulet;
+    }
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 物理删除子表数据
+    * @Date 2020/10/14 15:33
+    * @Param [fbsAbnormalWorkingHours]
+    * @return void
+    */
+    public void deleteChild(FbsAbnormalWorkingHours fbsAbnormalWorkingHours){
+        //物理删除异常工时描述
+        LambdaQueryWrapper<FbsAbnormalWorkingHoursDescribe> describeLambdaQueryWrapper=new LambdaQueryWrapper<>();
+        describeLambdaQueryWrapper.eq(FbsAbnormalWorkingHoursDescribe::getAbnormalWorkingHoursId,fbsAbnormalWorkingHours.getId());
+        describeLambdaQueryWrapper.eq(FbsAbnormalWorkingHoursDescribe::getDelFlag,"0");
+        FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe=new FbsAbnormalWorkingHoursDescribe();
+        fbsAbnormalWorkingHoursDescribe.setDelFlag("1");
+        iFbsAbnormalWorkingHoursDescribeService.update(fbsAbnormalWorkingHoursDescribe,describeLambdaQueryWrapper);
+        //物理删除异常类别
+        LambdaQueryWrapper<FbsAbnormalWorkingHoursType> typeLambdaQueryWrapper=new LambdaQueryWrapper<>();
+        typeLambdaQueryWrapper.eq(FbsAbnormalWorkingHoursType::getAbnormalWorkingHoursId,fbsAbnormalWorkingHours.getId());
+        typeLambdaQueryWrapper.eq(FbsAbnormalWorkingHoursType::getDelFlag,"0");
+        FbsAbnormalWorkingHoursType fbsAbnormalWorkingHoursType=new FbsAbnormalWorkingHoursType();
+        fbsAbnormalWorkingHoursType.setDelFlag("1");
+        iFbsAbnormalWorkingHoursTypeService.update(fbsAbnormalWorkingHoursType,typeLambdaQueryWrapper);
+    }
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursTypeServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.service.impl;
+
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursType;
+import org.jeecg.modules.fbsAbnormalWorkingHours.mapper.FbsAbnormalWorkingHoursTypeMapper;
+import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursTypeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 异常类别
+ * @author： jeecg-boot
+ * @date：   2020-10-14
+ * @version： V1.0
+ */
+@Service
+public class FbsAbnormalWorkingHoursTypeServiceImpl extends ServiceImpl<FbsAbnormalWorkingHoursTypeMapper, FbsAbnormalWorkingHoursType> implements IFbsAbnormalWorkingHoursTypeService {
+
+}

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -61,6 +61,8 @@ public class FbsWorkshopDispatchListController {
 									  HttpServletRequest req) {
 		Result<IPage<FbsWorkshopDispatchList>> result = new Result<IPage<FbsWorkshopDispatchList>>();
 		QueryWrapper<FbsWorkshopDispatchList> queryWrapper = QueryGenerator.initQueryWrapper(fbsWorkshopDispatchList, req.getParameterMap());
+		queryWrapper.lambda().eq(FbsWorkshopDispatchList::getDelFlag,"0");
+		queryWrapper.lambda().orderByDesc(FbsWorkshopDispatchList::getCreateTime);
 		Page<FbsWorkshopDispatchList> page = new Page<FbsWorkshopDispatchList>(pageNo, pageSize);
 		IPage<FbsWorkshopDispatchList> pageList = fbsWorkshopDispatchListService.page(page, queryWrapper);
 		result.setSuccess(true);
@@ -234,4 +236,28 @@ public class FbsWorkshopDispatchListController {
       return Result.ok("文件导入失败！");
   }
 
+  /**
+  * @Author chenchuang
+  * @Description //TODO 删除全部
+  * @Date 2020/10/14 15:51
+  * @Param [id]
+  * @return org.jeecg.common.api.vo.Result<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+  */
+	 @DeleteMapping(value = "/deleteAndChild")
+	 public Result<FbsWorkshopDispatchList> deleteAndChild(@RequestParam(name="id",required=true) String id) {
+		 Result<FbsWorkshopDispatchList> result = new Result<FbsWorkshopDispatchList>();
+		 FbsWorkshopDispatchList fbsWorkshopDispatchList = fbsWorkshopDispatchListService.getById(id);
+		 if(fbsWorkshopDispatchList==null) {
+			 result.error500("未找到对应实体");
+		 }else {
+			 fbsWorkshopDispatchList.setDelFlag("1");
+			 boolean ok = fbsWorkshopDispatchListService.updateById(fbsWorkshopDispatchList);
+			 if(ok) {
+				 result.success("删除成功!");
+			 }
+		 }
+
+		 return result;
+	 }
+
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -43,7 +43,7 @@ public class FbsWorkshopDispatchList implements Serializable {
 	private String productionOrderNumberId;
 	/**生产订单号名称*/
 	@Excel(name = "生产订单号名称", width = 15)
-	private String productionOrderNumberIdName;
+	private String productionOrderNumberName;
 	/**产品*/
 	@Excel(name = "产品", width = 15)
 	private String product;

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -6,6 +6,7 @@ import org.jeecg.modules.fbsWorkshopDispatchList.service.IFbsWorkshopDispatchLis
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description: 车间派工单
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @version： V1.0
  */
 @Service
+@Transactional
 public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopDispatchListMapper, FbsWorkshopDispatchList> implements IFbsWorkshopDispatchListService {
 
 }