diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java deleted file mode 100644 index f16cee6c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.jero.modules.laws.enterprise.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - - -/** - * @Description: 企标宣贯 - * @Author: jero-boot - * @Date: 2022-02-12 - * @Version: V1.0 - */ -@Api(tags="企标宣贯") -@RestController -@RequestMapping("/enterprise/declare") -@Slf4j -public class EnterpriseStandardDeclareController extends JeroController { - - @Resource - private EnterpriseStandardDeclareService esDeclareService; - - /** - * 分页列表查询 - * - * @return - */ - @RequiresPermissions("enterpriseStandardLibrary:publicize:search") - @AutoLog(value = "企标宣贯-分页列表查询") - @ApiOperation(value="企标宣贯-分页列表查询", notes="企标宣贯-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(ESQueryCommonDTO esDeclare, - @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { - IPage pageList= esDeclareService.queryPageList(esDeclare, pageNo, pageSize); - return Result.OK(pageList); - } - - @RequiresPermissions("enterpriseStandardLibrary:publicize:export") - @AutoLog(value = "企标宣贯-导出") - @ApiOperation(value="企标宣贯-导出", notes="企标宣贯-导出") - @GetMapping("/exportData") - public void exportData(HttpServletResponse response, ESQueryCommonDTO esQueryCommonDTO) { - esDeclareService.export(response, esQueryCommonDTO, "企标宣贯", "企标宣贯"); - } - - @RequiresPermissions("enterpriseStandardLibrary:publicize:fileExport") - @AutoLog(value = "企标宣贯-带文件导出") - @ApiOperation(value="企标宣贯-带文件导出", notes="企标宣贯-带文件导出") - @GetMapping("/exportDataWithFile") - public void exportDataWithFile(HttpServletRequest request, HttpServletResponse response, ESQueryCommonDTO esQueryCommonDTO) throws IOException { - esDeclareService.exportDataWithFile(request, response, esQueryCommonDTO); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java deleted file mode 100644 index 4fd7176a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.jero.modules.laws.enterprise.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectDelayService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - - -/** - * @Description: 企标稽查 - * @Author: jero-boot - * @Date: 2022-02-12 - * @Version: V1.0 - */ -@Api(tags="企标稽查") -@RestController -@RequestMapping("/enterprise/inspect") -@Slf4j -public class EnterpriseStandardInspectController extends JeroController { - - @Resource - private EnterpriseStandardInspectService esInspectService; - - @Resource - private EnterpriseStandardInspectDelayService esInspectDelayService; - - @Resource - private EnterpriseStandardInspectReportService esInspectReportService; - - @Resource - private EnterpriseStandardInspectRectifyPlanService esInspectRectifyPlanService; - - /** - * 分页列表查询 - * - * @return - */ - @Deprecated - @RequiresPermissions("enterpriseStandardLibrary:check:search") - @AutoLog(value = "企标稽查-分页列表查询") - @ApiOperation(value="企标稽查-分页列表查询", notes="企标稽查-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(ESQueryCommonDTO esInspect, - @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { - IPage pageList = esInspectService.queryPageList(esInspect, pageNo, pageSize); - return Result.OK(pageList); - } - - /** - * 企标稽查-分页列表查询2 - * - * @return - */ - @AutoLog(value = "企标稽查-分页列表查询2") - @RequiresPermissions("enterpriseStandardLibrary:check:search") - @ApiOperation(value="企标稽查-分页列表查询2", notes="企标稽查-分页列表查询2") - @GetMapping(value = "/queryByPage") - public Result> queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - IPage pageList = esInspectService.queryByPage(enterpriseStandardInspectVo, pageNo, pageSize); - return Result.OK(pageList); - } - - /** - * 企标稽查-列表查询2 - * - * @return - */ - @AutoLog(value = "企标稽查-列表查询2") - @ApiOperation(value="企标稽查-列表查询2", notes="企标稽查-列表查询2") - @GetMapping(value = "/queryByList") - public Result> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) { - return Result.OK(esInspectService.queryByList(enterpriseStandardInspectVo)); - } - - /** - * 延期稽查 - * - * @return - */ - @RequiresPermissions("enterpriseStandardLibrary:check:deferredCheck") - @AutoLog(value = "企标稽查-延期稽查") - @ApiOperation(value="企标稽查-延期稽查", notes="企标稽查-延期稽查") - @GetMapping(value = "/delayInspect") - public Result delayInspect(@RequestParam("id") @ApiParam("稽查数据Id") String inspectId) { - EnterpriseStandardInspectDelay esInspectDelay = esInspectDelayService.getLastDelayInspect(inspectId); - return Result.OK(esInspectDelay); - } - - /** - * 稽查报告 - * - * @return - */ - @RequiresPermissions("enterpriseStandardLibrary:check:checkReport") - @AutoLog(value = "企标稽查-稽查报告") - @ApiOperation(value="企标稽查-稽查报告", notes="企标稽查-稽查报告") - @GetMapping(value = "/inspectReport") - public Result inspectReport(@RequestParam("id") @ApiParam("稽查数据Id") String inspectId, - @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { - IPage pageList = esInspectReportService.getInspectReport(inspectId, pageNo, pageSize); - return Result.OK(pageList); - } - - /** - * 整改计划 - * - * @return - */ - @RequiresPermissions("enterpriseStandardLibrary:check:rectificationPlan") - @AutoLog(value = "企标稽查-整改计划") - @ApiOperation(value="企标稽查-整改计划", notes="企标稽查-整改计划") - @GetMapping(value = "/rectifyPlan") - public Result rectifyPlan(@RequestParam("id") @ApiParam("稽查数据Id") String inspectId, - @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { - IPage pageList = esInspectRectifyPlanService.getRectifyPlan(inspectId, pageNo, pageSize); - return Result.OK(pageList); - } - - @RequiresPermissions("enterpriseStandardLibrary:check:export") - @AutoLog(value = "企标稽查-导出") - @ApiOperation(value="企标稽查-导出", notes="企标稽查-导出") - @GetMapping("/exportData") - public void exportData(HttpServletResponse response, EnterpriseStandardInspectVo enterpriseStandardInspectVo) { - esInspectService.export(response, enterpriseStandardInspectVo, "企标稽查", "企标稽查"); - } - - @RequiresPermissions("enterpriseStandardLibrary:check:exportPostponeData") - @AutoLog(value = "企标稽查-导出延期数据") - @ApiOperation(value="企标稽查-导出延期数据", notes="企标稽查-导出延期数据") - @GetMapping("/exportDataWithDelay") - public ModelAndView exportDataWithDelay(HttpServletRequest request, EnterpriseStandardInspectVo enterpriseStandardInspectVo) { - return esInspectService.exportDataWithDelay(request, enterpriseStandardInspectVo); - } - - @RequiresPermissions("enterpriseStandardLibrary:check:exportRectificationPlan") - @AutoLog(value = "企标稽查-导出整改计划") - @ApiOperation(value="企标稽查-导出整改计划", notes="企标稽查-导出整改计划") - @GetMapping("/exportDataRectifyPlan") - public ModelAndView exportDataRectifyPlan(HttpServletRequest request, EnterpriseStandardInspectVo enterpriseStandardInspectVo) { - return esInspectService.exportDataRectifyPlan(request, enterpriseStandardInspectVo); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectDelayController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectDelayController.java deleted file mode 100644 index 91f64327..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectDelayController.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.jero.modules.laws.enterprise.controller; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectDelayService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; - - - /** - * @Description: 企标延期稽查 - * @Author: jero-boot - * @Date: 2023-11-24 - * @Version: V1.0 - */ -@Api(tags="企标延期稽查") -@RestController -@RequestMapping("/laws.enterprise/EnterpriseStandardInspectDelay") -@Slf4j -public class EnterpriseStandardInspectDelayController extends JeroController { - @Autowired - private EnterpriseStandardInspectDelayService EnterpriseStandardInspectDelayService; - - /** - * 分页列表查询 - * - * @param EnterpriseStandardInspectDelay - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "企标延期稽查-分页列表查询") - @ApiOperation(value="企标延期稽查-分页列表查询", notes="企标延期稽查-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = EnterpriseStandardInspectDelayService.queryPage(EnterpriseStandardInspectDelay, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param EnterpriseStandardInspectDelay - * @param req - * @return - */ - @AutoLog(value = "企标延期稽查-列表查询") - @ApiOperation(value="企标延期稽查-列表查询", notes="企标延期稽查-列表查询") - @GetMapping(value = "/list") - public Result> queryList(EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay, HttpServletRequest req) { - List list = EnterpriseStandardInspectDelayService.queryList(EnterpriseStandardInspectDelay, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param EnterpriseStandardInspectDelay - * @return - */ - @AutoLog(value = "企标延期稽查-添加") - @ApiOperation(value="企标延期稽查-添加", notes="企标延期稽查-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay) { - EnterpriseStandardInspectDelayService.add(EnterpriseStandardInspectDelay); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param EnterpriseStandardInspectDelay - * @return - */ - @AutoLog(value = "企标延期稽查-编辑") - @ApiOperation(value="企标延期稽查-编辑", notes="企标延期稽查-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay) { - EnterpriseStandardInspectDelayService.editById(EnterpriseStandardInspectDelay); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标延期稽查-通过id删除") - @ApiOperation(value="企标延期稽查-通过id删除", notes="企标延期稽查-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - EnterpriseStandardInspectDelayService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标延期稽查-批量删除") - @ApiOperation(value="企标延期稽查-批量删除", notes="企标延期稽查-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.EnterpriseStandardInspectDelayService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "企标延期稽查-通过id查询") - @ApiOperation(value="企标延期稽查-通过id查询", notes="企标延期稽查-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay = EnterpriseStandardInspectDelayService.queryById(id); - if(EnterpriseStandardInspectDelay==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(EnterpriseStandardInspectDelay); - } - - /** - * 导出excel - * - * @param request - * @param EnterpriseStandardInspectDelay - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay) { - return super.exportXls(request, EnterpriseStandardInspectDelay, EnterpriseStandardInspectDelay.class, "企标延期稽查"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, EnterpriseStandardInspectDelay.class); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectObjectController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectObjectController.java deleted file mode 100644 index 06b62ba7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectObjectController.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.jero.modules.laws.enterprise.controller; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectObject; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectObjectService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; - - - /** - * @Description: 企标稽查对象 - * @Author: jero-boot - * @Date: 2023-11-24 - * @Version: V1.0 - */ -@Api(tags="企标稽查对象") -@RestController -@RequestMapping("/com.jero.modules.laws.enterprise.entity/enterpriseStandardInspectObject") -@Slf4j -public class EnterpriseStandardInspectObjectController extends JeroController { - @Autowired - private EnterpriseStandardInspectObjectService enterpriseStandardInspectObjectService; - - /** - * 分页列表查询 - * - * @param enterpriseStandardInspectObject - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "企标稽查对象-分页列表查询") - @ApiOperation(value="企标稽查对象-分页列表查询", notes="企标稽查对象-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(EnterpriseStandardInspectObject enterpriseStandardInspectObject, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = enterpriseStandardInspectObjectService.queryPage(enterpriseStandardInspectObject, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param enterpriseStandardInspectObject - * @param req - * @return - */ - @AutoLog(value = "企标稽查对象-列表查询") - @ApiOperation(value="企标稽查对象-列表查询", notes="企标稽查对象-列表查询") - @GetMapping(value = "/list") - public Result> queryList(EnterpriseStandardInspectObject enterpriseStandardInspectObject, HttpServletRequest req) { - List list = enterpriseStandardInspectObjectService.queryList(enterpriseStandardInspectObject, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param enterpriseStandardInspectObject - * @return - */ - @AutoLog(value = "企标稽查对象-添加") - @ApiOperation(value="企标稽查对象-添加", notes="企标稽查对象-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody EnterpriseStandardInspectObject enterpriseStandardInspectObject) { - enterpriseStandardInspectObjectService.add(enterpriseStandardInspectObject); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param enterpriseStandardInspectObject - * @return - */ - @AutoLog(value = "企标稽查对象-编辑") - @ApiOperation(value="企标稽查对象-编辑", notes="企标稽查对象-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody EnterpriseStandardInspectObject enterpriseStandardInspectObject) { - enterpriseStandardInspectObjectService.editById(enterpriseStandardInspectObject); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查对象-通过id删除") - @ApiOperation(value="企标稽查对象-通过id删除", notes="企标稽查对象-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - enterpriseStandardInspectObjectService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查对象-批量删除") - @ApiOperation(value="企标稽查对象-批量删除", notes="企标稽查对象-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.enterpriseStandardInspectObjectService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "企标稽查对象-通过id查询") - @ApiOperation(value="企标稽查对象-通过id查询", notes="企标稽查对象-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - EnterpriseStandardInspectObject enterpriseStandardInspectObject = enterpriseStandardInspectObjectService.queryById(id); - if(enterpriseStandardInspectObject==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(enterpriseStandardInspectObject); - } - - /** - * 导出excel - * - * @param request - * @param enterpriseStandardInspectObject - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, EnterpriseStandardInspectObject enterpriseStandardInspectObject) { - return super.exportXls(request, enterpriseStandardInspectObject, EnterpriseStandardInspectObject.class, "企标稽查对象"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, EnterpriseStandardInspectObject.class); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectRectifyPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectRectifyPlanController.java deleted file mode 100644 index eb8cb420..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectRectifyPlanController.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.jero.modules.laws.enterprise.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - - /** - * @Description: 企标稽查执行计划 - * @Author: jero-boot - * @Date: 2023-11-24 - * @Version: V1.0 - */ -@Api(tags="企标稽查执行计划") -@RestController -@RequestMapping("/laws.enterprise/enterpriseStandardInspectRectifyPlan") -@Slf4j -public class EnterpriseStandardInspectRectifyPlanController extends JeroController { - @Autowired - private EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService; - - /** - * 分页列表查询 - * - * @param enterpriseStandardInspectRectifyPlan - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "企标稽查执行计划-分页列表查询") - @ApiOperation(value="企标稽查执行计划-分页列表查询", notes="企标稽查执行计划-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = enterpriseStandardInspectRectifyPlanService.queryPage(enterpriseStandardInspectRectifyPlan, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param enterpriseStandardInspectRectifyPlan - * @param req - * @return - */ - @AutoLog(value = "企标稽查执行计划-列表查询") - @ApiOperation(value="企标稽查执行计划-列表查询", notes="企标稽查执行计划-列表查询") - @GetMapping(value = "/list") - public Result> queryList(EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan, HttpServletRequest req) { - List list = enterpriseStandardInspectRectifyPlanService.queryList(enterpriseStandardInspectRectifyPlan, req); - return Result.OK(list); - } - - /** - * 企标稽查执行计划-通过企标稽查流程id查询企标稽查执行计划 - * - * @param processEsInspectId - * @return - */ - @AutoLog(value = "企标稽查执行计划-通过企标稽查流程id查询企标稽查执行计划") - @ApiOperation(value="企标稽查执行计划-通过企标稽查流程id查询企标稽查执行计划", notes="企标稽查执行计划-通过企标稽查流程id查询企标稽查执行计划") - @GetMapping(value = "/queryByProcessEsInspectId") - @Translation - public Result> queryByProcessEsInspectId(@ApiParam("企标稽查流程id") String processEsInspectId) { - return Result.OK(enterpriseStandardInspectRectifyPlanService.queryByProcessEsInspectId(processEsInspectId)); - } - - /** - * 添加 - * - * @param enterpriseStandardInspectRectifyPlan - * @return - */ - @AutoLog(value = "企标稽查执行计划-添加") - @ApiOperation(value="企标稽查执行计划-添加", notes="企标稽查执行计划-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan) { - enterpriseStandardInspectRectifyPlanService.add(enterpriseStandardInspectRectifyPlan); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param enterpriseStandardInspectRectifyPlan - * @return - */ - @AutoLog(value = "企标稽查执行计划-编辑") - @ApiOperation(value="企标稽查执行计划-编辑", notes="企标稽查执行计划-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan) { - enterpriseStandardInspectRectifyPlanService.editById(enterpriseStandardInspectRectifyPlan); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查执行计划-通过id删除") - @ApiOperation(value="企标稽查执行计划-通过id删除", notes="企标稽查执行计划-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - enterpriseStandardInspectRectifyPlanService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查执行计划-批量删除") - @ApiOperation(value="企标稽查执行计划-批量删除", notes="企标稽查执行计划-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.enterpriseStandardInspectRectifyPlanService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "企标稽查执行计划-通过id查询") - @ApiOperation(value="企标稽查执行计划-通过id查询", notes="企标稽查执行计划-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = enterpriseStandardInspectRectifyPlanService.queryById(id); - if(enterpriseStandardInspectRectifyPlan==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(enterpriseStandardInspectRectifyPlan); - } - - /** - * 导出excel - * - * @param request - * @param enterpriseStandardInspectRectifyPlan - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan) { - return super.exportXls(request, enterpriseStandardInspectRectifyPlan, EnterpriseStandardInspectRectifyPlan.class, "企标稽查执行计划"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, EnterpriseStandardInspectRectifyPlan.class); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectReportController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectReportController.java deleted file mode 100644 index d46e343e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectReportController.java +++ /dev/null @@ -1,204 +0,0 @@ -package com.jero.modules.laws.enterprise.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - - /** - * @Description: 企标稽查报告 - * @Author: jero-boot - * @Date: 2023-11-24 - * @Version: V1.0 - */ -@Api(tags="企标稽查报告") -@RestController -@RequestMapping("/laws.enterprise/EnterpriseStandardInspectReport") -@Slf4j -public class EnterpriseStandardInspectReportController extends JeroController { - @Autowired - private EnterpriseStandardInspectReportService EnterpriseStandardInspectReportService; - - /** - * 分页列表查询 - * - * @param EnterpriseStandardInspectReport - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "企标稽查报告-分页列表查询") - @ApiOperation(value="企标稽查报告-分页列表查询", notes="企标稽查报告-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(EnterpriseStandardInspectReport EnterpriseStandardInspectReport, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = EnterpriseStandardInspectReportService.queryPage(EnterpriseStandardInspectReport, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param EnterpriseStandardInspectReport - * @param req - * @return - */ - @AutoLog(value = "企标稽查报告-列表查询") - @ApiOperation(value="企标稽查报告-列表查询", notes="企标稽查报告-列表查询") - @GetMapping(value = "/list") - public Result> queryList(EnterpriseStandardInspectReport EnterpriseStandardInspectReport, HttpServletRequest req) { - List list = EnterpriseStandardInspectReportService.queryList(EnterpriseStandardInspectReport, req); - return Result.OK(list); - } - - /** - * 企标稽查报告-通过企标稽查内容id查询企标稽查报告 - * - * @param inspectContentId - * @return - */ - @AutoLog(value = "企标稽查报告-通过企标稽查内容id查询企标稽查报告") - @ApiOperation(value="企标稽查报告-通过企标稽查内容id查询企标稽查报告", notes="企标稽查报告-通过企标稽查内容id查询企标稽查报告") - @GetMapping(value = "/queryByInspectContentId") - public Result queryByInspectContentId(@ApiParam("企标稽查内容id") String inspectContentId) { - return Result.OK(EnterpriseStandardInspectReportService.queryByInspectContentId(inspectContentId)); - } - - /** - * 企标稽查报告-通过企标稽查流程id查询稽查报告 - * - * @param processEsInspectId - * @return - */ - @AutoLog(value = "企标稽查报告-通过企标稽查流程id查询稽查报告") - @ApiOperation(value="企标稽查报告-通过企标稽查流程id查询稽查报告", notes="企标稽查报告-通过企标稽查流程id查询稽查报告") - @GetMapping(value = "/queryByProcessEsInspectId") - public Result> queryByProcessEsInspectId(@ApiParam("企标稽查流程id") String processEsInspectId) { - return Result.OK(EnterpriseStandardInspectReportService.queryByProcessEsInspectId(processEsInspectId)); - } - - /** - * 添加 - * - * @param EnterpriseStandardInspectReport - * @return - */ - @AutoLog(value = "企标稽查报告-添加") - @ApiOperation(value="企标稽查报告-添加", notes="企标稽查报告-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody EnterpriseStandardInspectReport EnterpriseStandardInspectReport) { - EnterpriseStandardInspectReportService.add(EnterpriseStandardInspectReport); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param EnterpriseStandardInspectReport - * @return - */ - @AutoLog(value = "企标稽查报告-编辑") - @ApiOperation(value="企标稽查报告-编辑", notes="企标稽查报告-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody EnterpriseStandardInspectReport EnterpriseStandardInspectReport) { - EnterpriseStandardInspectReportService.editById(EnterpriseStandardInspectReport); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查报告-通过id删除") - @ApiOperation(value="企标稽查报告-通过id删除", notes="企标稽查报告-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - EnterpriseStandardInspectReportService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查报告-批量删除") - @ApiOperation(value="企标稽查报告-批量删除", notes="企标稽查报告-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.EnterpriseStandardInspectReportService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "企标稽查报告-通过id查询") - @ApiOperation(value="企标稽查报告-通过id查询", notes="企标稽查报告-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - EnterpriseStandardInspectReport EnterpriseStandardInspectReport = EnterpriseStandardInspectReportService.queryById(id); - if(EnterpriseStandardInspectReport==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(EnterpriseStandardInspectReport); - } - - /** - * 导出excel - * - * @param request - * @param EnterpriseStandardInspectReport - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, EnterpriseStandardInspectReport EnterpriseStandardInspectReport) { - return super.exportXls(request, EnterpriseStandardInspectReport, EnterpriseStandardInspectReport.class, "企标稽查报告"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, EnterpriseStandardInspectReport.class); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java deleted file mode 100644 index 6d71eea5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.jero.modules.laws.enterprise.entity; - -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 com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 企业标准宣贯 - * @Author: jero-boot - * @Date: 2023-09-06 - * @Version: V1.0 - */ -@Data -@TableName("laws_enterprise_standard_declare") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_enterprise_standard_declare对象", description="企业标准宣贯") -public class EnterpriseStandardDeclare implements Serializable { - - private static final long serialVersionUID = 1786685778697687681L; - - /** 主键ID */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /** 创建人 */ - @ApiModelProperty(value = "创建人") - private String createBy; - - /** 创建时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** 更新人 */ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /** 更新时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /** 所属部门 */ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /** 企标编号 */ - @ApiModelProperty(value = "企标Id") - private String standardId; - - /** 企标编号 */ - @ApiModelProperty(value = "企标编号") - private String standardNo; - - /** 宣贯日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "宣贯日期") - private Date declareDate; - - /** 宣贯人 */ - @ApiModelProperty(value = "宣贯人id") - private String declareUser; - - /** 主题 */ - @ApiModelProperty(value = "主题") - private String declareTopic; - - /** 相关材料 */ - @ApiModelProperty(value = "相关材料") - private String declareFile; - - /** 内容 */ - @ApiModelProperty(value = "内容") - private String declareContent; - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java deleted file mode 100644 index fa259cd7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.jero.modules.laws.enterprise.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 企业标准稽查 - * @Author: jero-boot - * @Date: 2023-09-06 - * @Version: V1.0 - */ -@Data -@TableName("laws_enterprise_standard_inspect") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_enterprise_standard_inspect对象", description="企业标准稽查") -public class EnterpriseStandardInspect implements Serializable { - - private static final long serialVersionUID = 1796127867689768122L; - - /** 主键ID */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /** 创建人 */ - @ApiModelProperty(value = "创建人") - private String createBy; - - /** 创建时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** 更新人 */ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /** 更新时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /** 所属部门 */ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /** 稽查依据标准号 */ - @ApiModelProperty(value = "稽查依据标准号") - private String inspectNo; - - /** 稽查依据标准名称 */ - @ApiModelProperty(value = "稽查依据标准名称") - private String inspectName; - - /** 主责标准化工作组 */ - @ApiModelProperty(value = "主责标准化工作组") - private String standardizationWorkGroup; - - /** 所属部门 */ - @ApiModelProperty(value = "所属部门") - private String belongDept; - - /** 计划稽查日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "计划稽查日期") - private Date planInspectDate; - - /** 稽查负责人 */ - @ApiModelProperty(value = "稽查负责人") - private String inspectUser; - - /** 标准化组对接人 */ - @ApiModelProperty(value = "标准化组对接人") - private String standardizationDockingUser; - - /** 实际稽查完成日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "实际稽查完成日期") - private Date completeDate; - - /** 实际稽查人 */ - @ApiModelProperty(value = "实际稽查人") - private String actualInspectUser; - - /** 稽查状态 */ - @ApiModelProperty(value = "稽查状态") - private String inspectStatus; - - /** - * 企标稽查计划id - */ - @ApiModelProperty(value = "企标稽查计划id") - private String processEsInspectPlanId; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectDelay.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectDelay.java deleted file mode 100644 index a1832512..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectDelay.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.jero.modules.laws.enterprise.entity; - -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 com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - * - * @TableName laws_enterprise_standard_inspect_delay - */ -@TableName(value ="laws_enterprise_standard_inspect_delay") -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_enterprise_standard_inspect_delay对象", description="企业标准稽查延期") -public class EnterpriseStandardInspectDelay implements Serializable { - /** - * 主键ID - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /** - * 创建人 - */ - @ApiModelProperty(value = "创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** - * 更新人 - */ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /** - * 所属部门 - */ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /** - * 稽查id - */ - @ApiModelProperty(value = "稽查id") - private String inspectId; - - /** - * 申请延期日期 - */ - @Excel(name = "申请延期日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "申请延期日期") - private Date requestDelayDate; - - /** - * 延期说明 - */ - @ApiModelProperty(value = "延期说明") - @Excel(name = "延期说明", width = 15) - private String delayDescription; - - @TableField(exist = false) - private static final long serialVersionUID = 1876978687698678769L; -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectObject.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectObject.java deleted file mode 100644 index fa6f688f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectObject.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.jero.modules.laws.enterprise.entity; - -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 com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 企业标准稽查对象 - * @Author: jero-boot - * @Date: 2023-09-06 - * @Version: V1.0 - */ -@Data -@TableName("laws_enterprise_standard_inspect_object") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_enterprise_standard_inspect_object对象", description="企业标准稽查对象") -public class EnterpriseStandardInspectObject implements Serializable { - - private static final long serialVersionUID = 1213487621365476578L; - - /** 主键ID */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /** 创建人 */ - @ApiModelProperty(value = "创建人") - private String createBy; - - /** 创建时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** 更新人 */ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /** 更新时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /** 所属部门 */ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /** 稽查id */ - @ApiModelProperty(value = "稽查id") - private String inspectId; - - /** 计划稽查对象 */ - @ApiModelProperty(value = "计划稽查对象") - private String planInspectObject; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java deleted file mode 100644 index 3fdfd130..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.jero.modules.laws.enterprise.entity; - -import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - * - * @TableName laws_enterprise_standard_inspect_rectify_plan - */ -@TableName(value ="laws_enterprise_standard_inspect_rectify_plan") -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_enterprise_standard_inspect_rectify_plan对象", description="企业标准稽查整改计划") -public class EnterpriseStandardInspectRectifyPlan implements Serializable { - /** - * 主键ID - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /** - * 创建人 - */ - @ApiModelProperty(value = "创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - - /** - * 更新人 - */ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; - - /** - * 所属部门 - */ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /** - * 稽查id - */ - @ApiModelProperty(value = "稽查id") - private String inspectId; - - /** - * 是否需要整改(1是0否) - */ - @ApiModelProperty(value = "是否需要整改(1是0否)") - @Dict(dicCode = "yn") - private String isRectify; - - /** - * 存在问题 - */ - @Excel(name = "存在问题", width = 15) - @ApiModelProperty(value = "存在问题") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String issue; - - /** - * 整改措施 - */ - @Excel(name = "整改措施", width = 15) - @ApiModelProperty(value = "整改措施") - private String rectifyMeasure; - - /** - * 整改负责人 - */ - @Excel(name = "整改负责人", width = 15) - @ApiModelProperty(value = "整改负责人") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - private String responseUser; - - /** - * 整改负责人 翻译 - */ - @ApiModelProperty(value = "整改负责人 翻译") - @TableField(exist = false) - private String responseUserDictText; - - /** - * 整改单位 - */ - @ApiModelProperty(value = "整改单位") - @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") - private String responseDepart; - /** - * 整改单位 翻译 - */ - @ApiModelProperty(value = "整改单位 翻译") - @TableField(exist = false) - private String responseDepartDictText; - - /** - * 整改计划完成时间 - */ - @Excel(name = "整改计划完成时间", width = 18, format = "yyyy-MM-dd") - @ApiModelProperty(value = "整改计划完成时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(format = "yyyy-MM-dd") - private Date planCompleteDate; - - /** - * 整改实际完成时间 - */ - @Excel(name = "整改实际完成时间", width = 18, format = "yyyy-MM-dd") - @ApiModelProperty(value = "整改实际完成时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date actualCompleteDate; - - /** - * 整改状态 - */ - @Excel(name = "整改状态", width = 15, dicCode = "inspect_rectify_status") - @Dict(dicCode = "inspect_rectify_status") - @ApiModelProperty(value = "整改状态") - private String rectifyStatus; - - /** 企标稽查报告id */ - @ApiModelProperty(value = "企标稽查报告id") - private String inspectReportId; - - /** 企标稽查流程id */ - @ApiModelProperty(value = "企标稽查流程id") - private String processEsInspectId; - - @TableField(exist = false) - private static final long serialVersionUID = 1980978879087908791L; - - /** - * 稽查报告 - */ - @TableField(exist = false) - @ApiModelProperty(value = "稽查报告") - private EnterpriseStandardInspectReport enterpriseStandardInspectReport; - /** - * 稽查内容id - */ - @ApiModelProperty(value = "稽查内容id") - @TableField(exist = false) - private String inspectContentId; -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java deleted file mode 100644 index e0a45b54..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.jero.modules.laws.enterprise.entity; - -import com.alibaba.fastjson.annotation.JSONField; -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 com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 企业标准检查报告 - * @Author: jero-boot - * @Date: 2023-09-06 - * @Version: V1.0 - */ -@Data -@TableName("laws_enterprise_standard_inspect_report") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_enterprise_standard_inspect_report对象", description="企业标准检查报告") -public class EnterpriseStandardInspectReport implements Serializable { - - private static final long serialVersionUID = 5342778371294563420L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - - /**创建时间*/ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /**更新时间*/ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /**稽查id*/ - @ApiModelProperty(value = "稽查id") - private String inspectId; - - /**依据条款id*/ - @ApiModelProperty(value = "依据条款id") - private String clauseBasedId; - - /**评分*/ - @ApiModelProperty(value = "评分") - private String evaluateScore; - - /**执行情况*/ - @ApiModelProperty(value = "执行情况") - private String executionStatus; - - /**附件*/ - @ApiModelProperty(value = "附件") - private String attachment; - - /**附件名*/ - @ApiModelProperty(value = "附件名") - @TableField(exist = false) - private String attachmentName; - - /** 企标稽查流程id */ - @ApiModelProperty(value = "企标稽查流程id") - private String processEsInspectId; - - /** 企标稽查内容id */ - @ApiModelProperty(value = "企标稽查内容id") - private String inspectContentId; - - /**依据条款*/ - @TableField(exist = false) - @ApiModelProperty(value = "依据条款") - private String baseClause; - - /**标准内容或要求*/ - @TableField(exist = false) - @ApiModelProperty(value = "标准内容或要求") - private String standardRequire; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/EnterpriseStandardDeclareExPortDto.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/EnterpriseStandardDeclareExPortDto.java deleted file mode 100644 index 0b6c88cd..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/EnterpriseStandardDeclareExPortDto.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jero.modules.laws.enterprise.entity.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * @author: Mzaxd - * @Date: 2023/9/7 14:53 - */ - -@Data -public class EnterpriseStandardDeclareExPortDto { - - @ApiModelProperty(value = "主键id") - private String id; - - @Excel(name = "企标编号", width = 15, orderNum = "1") - @ApiModelProperty(value = "企标编号") - private String standardNo; - - @Excel(name = "企标名称", width = 15, orderNum = "1") - @ApiModelProperty(value = "企标名称") - private String standardName; - - @Excel(name = "发布日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "发布日期") - private Date releaseDate; - - @Excel(name = "实施日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "实施日期") - private Date implementationDate; - - @Excel(name = "宣贯日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "宣贯日期") - private Date declareDate; - - @ApiModelProperty(value = "宣贯人id") - private String declareUser; - - @Excel(name = "宣贯人姓名", width = 15, orderNum = "1") - @ApiModelProperty(value = "宣贯人姓名") - private String declareUserName; - - @ApiModelProperty(value = "相关材料id") - private String declareFile; - - @Excel(name = "相关材料", width = 15, orderNum = "1") - @ApiModelProperty(value = "相关材料文件名") - private String declareFileName; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java index 411d2162..38e6abda 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java @@ -3,16 +3,12 @@ package com.jero.modules.laws.enterprise.entity.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; import org.springframework.format.annotation.DateTimeFormat; -import java.util.Collections; import java.util.Date; -import java.util.List; /** * @author: Mzaxd @@ -148,13 +144,6 @@ public class EnterpriseStandardInspectVo { @ApiModelProperty(value = "延期稽查标识") private boolean delayFlag; - /** - * 整改计划 - */ - @ApiModelProperty(value = "整改计划") - @ExcelCollection(name = "") - private List enterpriseStandardInspectRectifyPlanLists = Collections.emptyList(); - /** * 企标稽查计划id */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java deleted file mode 100644 index 5c7ecd02..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jero.modules.laws.enterprise.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_declare】的数据库操作Mapper -* @createDate 2023-09-07 11:19:54 -* @Entity generator.entity.EnterpriseStandardDeclare -*/ -public interface EnterpriseStandardDeclareMapper extends BaseMapper { - - /** - * 宣贯列表 - * @param page - * @param esDeclare - * @return - */ - IPage page(IPage page, @Param("param") ESQueryCommonDTO esDeclare); - - /** - * 宣贯列表 - * @param esDeclare - * @return - */ - List list(@Param("param") ESQueryCommonDTO esDeclare); -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectDelayMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectDelayMapper.java deleted file mode 100644 index 58556cf5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectDelayMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jero.modules.laws.enterprise.mapper; - -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_delay】的数据库操作Mapper -* @createDate 2023-09-13 13:46:35 -* @Entity com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay -*/ -public interface EnterpriseStandardInspectDelayMapper extends BaseMapper { - -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java deleted file mode 100644 index 3b9eeeb6..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.jero.modules.laws.enterprise.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectDelayVo; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect(企业标准)】的数据库操作Mapper -* @createDate 2023-09-07 11:19:57 -* @Entity generator.entity.EnterpriseStandardInspect -*/ -public interface EnterpriseStandardInspectMapper extends BaseMapper { - - /** - * 稽查列表 - * @param page - * @param esInspect - * @return - */ - IPage page(IPage page, @Param("param") ESQueryCommonDTO esInspect); - - /** - * 稽查列表-带延期数据 - * @param page - * @param esQueryCommonDTO - * @return - */ - IPage pageWithDelay(IPage page, @Param("param") ESQueryCommonDTO esQueryCommonDTO); - - /** - * 企标稽查-分页列表查询2 - * @param page - * @param queryWrapper - * @return - */ - IPage queryByPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); - - /** - * 企标稽查-列表查询2 - * @param queryWrapper - * @return - */ - List queryByList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectObjectMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectObjectMapper.java deleted file mode 100644 index fc0438b6..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectObjectMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jero.modules.laws.enterprise.mapper; - -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectObject; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_object】的数据库操作Mapper -* @createDate 2023-09-07 11:20:03 -* @Entity generator.entity.EnterpriseStandardInspectObject -*/ -public interface EnterpriseStandardInspectObjectMapper extends BaseMapper { - -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectRectifyPlanMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectRectifyPlanMapper.java deleted file mode 100644 index e1761d96..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectRectifyPlanMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jero.modules.laws.enterprise.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_rectify_plan】的数据库操作Mapper -* @createDate 2023-09-13 15:24:16 -* @Entity com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan -*/ -public interface EnterpriseStandardInspectRectifyPlanMapper extends BaseMapper { - - IPage page(IPage page, @Param("inspectId") String inspectId); - - List list(@Param("inspectId") String inspectId); -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectReportMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectReportMapper.java deleted file mode 100644 index 265be8ea..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectReportMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jero.modules.laws.enterprise.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_report】的数据库操作Mapper -* @createDate 2023-09-07 11:20:06 -* @Entity generator.entity.EnterpriseStandardInspectReport -*/ -public interface EnterpriseStandardInspectReportMapper extends BaseMapper { - - IPage page(IPage page, @Param("inspectId") String inspectId); -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml deleted file mode 100644 index a67f70ee..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id,create_by,create_time, - update_by,update_time,org_code, - standard_no,declare_date,declare_user, - declare_topic,declare_file,declare_content - - - - - - - - - SELECT - d.id, - s.standard_number AS standardNo, - s.standard_name, - s.release_date, - s.implementation_date, - d.declare_date, - d.declare_user, - CONCAT(u.realname, '(', u.username, ')') AS declareUserName, - d.declare_file - FROM - `laws_enterprise_standard_declare` AS d - LEFT JOIN laws_enterprise_standard AS s ON d.standard_id = s.id - LEFT JOIN sys_user AS u ON u.id = d.declare_user - Where 1 = 1 - - - AND s.standard_number LIKE CONCAT('%',#{param.standardNo},'%') - - - - AND s.standard_name LIKE CONCAT('%',#{param.standardName},'%') - - - - AND d.declare_date BETWEEN #{param.declareStartDate} AND #{param.declareEndDate} - - - - AND u.username LIKE CONCAT('%',#{param.declareUserName},'%') - - - AND d.id IN - - #{item} - - - ORDER BY - d.create_time DESC - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectDelayMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectDelayMapper.xml deleted file mode 100644 index b3d48a8b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectDelayMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - id,create_by,create_time, - update_by,update_time,org_code, - inspect_id,request_delay_date,delay_descprtion - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml deleted file mode 100644 index ade6e263..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select t.* - from (select lesi.id, - lesi.create_by, - lesi.create_time, - lesi.update_by, - lesi.update_time, - lesi.process_es_inspect_plan_id, - inspect_no, - (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name, - standardization_work_group, - belong_dept, - plan_inspect_date, - inspect_user, - standardization_docking_user, - complete_date, - actual_inspect_user, - inspect_status, - group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object, - (IF(lesid.id IS NOT NULL, TRUE, FALSE)) delay_flag, - realname - from laws_enterprise_standard_inspect lesi - left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0' - left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id - left join laws_enterprise_standard_inspect_delay lesid on lesi.id = lesid.inspect_id - left join sys_user u on lesi.inspect_user = u.id - group by lesi.id) t - ${ew.customSqlSegment} - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectObjectMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectObjectMapper.xml deleted file mode 100644 index 4f91c19e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectObjectMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - id,create_by,create_time, - update_by,update_time,org_code, - inspect_id,plan_inspect_objecy - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml deleted file mode 100644 index 7d0ea3c4..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id,create_by,create_time, - update_by,update_time,org_code, - inspect_id,issue,rectify_measure, - response_user,plan_complete_date,actual_complete_date, - rectify_status - - - - - - - - SELECT - irp.id, - irp.issue, - irp.rectify_measure, - (concat(u.realname,'(',u.username,')')) AS responseUser, - irp.plan_complete_date, - irp.actual_complete_date, - irp.rectify_status, - irp.inspect_report_id - FROM - `laws_enterprise_standard_inspect_rectify_plan` AS irp - LEFT JOIN sys_user AS u ON u.id = irp.response_user - WHERE - irp.inspect_id = #{inspectId} - ORDER BY - irp.create_time DESC - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml deleted file mode 100644 index 14261c72..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id,create_by,create_time, - update_by,update_time,org_code, - inspect_id,clause_based_id,evaluate_score, - execution_status,attachment - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java deleted file mode 100644 index d6ffbffb..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.jero.modules.laws.enterprise.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.InputStream; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_declare】的数据库操作Service -* @createDate 2023-09-07 11:19:54 -*/ -public interface EnterpriseStandardDeclareService extends IService { - - /** - * 企标宣贯列表 - * @param esDeclare - * @param pageNo - * @param pageSize - * @return - */ - IPage queryPageList(ESQueryCommonDTO esDeclare, Integer pageNo, Integer pageSize); - - /** - * 企标宣贯导出 - * @param response - * @param esQueryCommonDTO - * @param fileName - * @param sheetName - */ - void export(HttpServletResponse response, ESQueryCommonDTO esQueryCommonDTO, String fileName, String sheetName); - - /** - * 企标宣贯带文件导出 - * @param response - * @param parameterMap - * @param fileName - * @param sheetName - */ - void exportDataWithFile(HttpServletResponse response, ESQueryCommonDTO parameterMap, String fileName, String sheetName); - - void exportDataWithFile(HttpServletRequest request, HttpServletResponse response, ESQueryCommonDTO parameterMap) throws IOException; - - void writeToLocal(String destination, InputStream input) - throws IOException; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectDelayService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectDelayService.java deleted file mode 100644 index 1c44384b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectDelayService.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.jero.modules.laws.enterprise.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; -import com.baomidou.mybatisplus.extension.service.IService; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_delay】的数据库操作Service -* @createDate 2023-09-13 13:46:35 -*/ -public interface EnterpriseStandardInspectDelayService extends IService { - - /** - * 稽查列表获取最新的延期极差信息 - * @param inspectId - * @return - */ - EnterpriseStandardInspectDelay getLastDelayInspect(String inspectId); - - /** - * 分页查询 - * - * @param EnterpriseStandardInspectDelay - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param EnterpriseStandardInspectDelay - * @param req - * @return - */ - List queryList(EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay, HttpServletRequest req); - - /** - * 保存 - * - * @param EnterpriseStandardInspectDelay - * @return - */ - void add(EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay); - - /** - * 更新 - * - * @param EnterpriseStandardInspectDelay - * @return - */ - void editById(EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - EnterpriseStandardInspectDelay queryById(String id); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectObjectService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectObjectService.java deleted file mode 100644 index d6e9ae62..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectObjectService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.jero.modules.laws.enterprise.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectObject; -import com.baomidou.mybatisplus.extension.service.IService; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_object】的数据库操作Service -* @createDate 2023-09-07 11:20:03 -*/ -public interface EnterpriseStandardInspectObjectService extends IService { - - /** - * 分页查询 - * - * @param enterpriseStandardInspectObject - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(EnterpriseStandardInspectObject enterpriseStandardInspectObject, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param enterpriseStandardInspectObject - * @param req - * @return - */ - List queryList(EnterpriseStandardInspectObject enterpriseStandardInspectObject, HttpServletRequest req); - - /** - * 保存 - * - * @param enterpriseStandardInspectObject - * @return - */ - void add(EnterpriseStandardInspectObject enterpriseStandardInspectObject); - - /** - * 更新 - * - * @param enterpriseStandardInspectObject - * @return - */ - void editById(EnterpriseStandardInspectObject enterpriseStandardInspectObject); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - EnterpriseStandardInspectObject queryById(String id); - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectRectifyPlanService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectRectifyPlanService.java deleted file mode 100644 index 6bba5b4c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectRectifyPlanService.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.jero.modules.laws.enterprise.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.baomidou.mybatisplus.extension.service.IService; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_rectify_plan】的数据库操作Service -* @createDate 2023-09-13 15:24:16 -*/ -public interface EnterpriseStandardInspectRectifyPlanService extends IService { - - /** - * 整改计划列表 - * @param inspectId - * @param pageNo - * @param pageSize - * @return - */ - IPage getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize); - - /** - * 分页查询 - * - * @param enterpriseStandardInspectRectifyPlan - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param enterpriseStandardInspectRectifyPlan - * @param req - * @return - */ - List queryList(EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan, HttpServletRequest req); - - /** - * 保存 - * - * @param enterpriseStandardInspectRectifyPlan - * @return - */ - void add(EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan); - - /** - * 更新 - * - * @param enterpriseStandardInspectRectifyPlan - * @return - */ - void editById(EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - EnterpriseStandardInspectRectifyPlan queryById(String id); - - /** - * 企标稽查执行计划-通过企标稽查内容id查询企标稽查执行计划 - * @param inspectContentId - * @return - */ - List queryByInspectContentId(String inspectContentId); - - /** - * 企标稽查执行计划-通过企标稽查流程id查询企标稽查执行计划 - * @param processEsInspectId - * @return - */ - List queryByProcessEsInspectId(String processEsInspectId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java deleted file mode 100644 index cdf1a61f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.jero.modules.laws.enterprise.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; -import com.baomidou.mybatisplus.extension.service.IService; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_report】的数据库操作Service -* @createDate 2023-09-07 11:20:06 -*/ -public interface EnterpriseStandardInspectReportService extends IService { - - /** - * 稽查报告列表 - * - * @param inspectId - * @param pageNo - * @param pageSize - * @return - */ - IPage getInspectReport(String inspectId, Integer pageNo, Integer pageSize); - - /** - * 分页查询 - * - * @param EnterpriseStandardInspectReport - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(EnterpriseStandardInspectReport EnterpriseStandardInspectReport, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param EnterpriseStandardInspectReport - * @param req - * @return - */ - List queryList(EnterpriseStandardInspectReport EnterpriseStandardInspectReport, HttpServletRequest req); - - /** - * 保存 - * - * @param EnterpriseStandardInspectReport - * @return - */ - void add(EnterpriseStandardInspectReport EnterpriseStandardInspectReport); - - /** - * 更新 - * - * @param EnterpriseStandardInspectReport - * @return - */ - void editById(EnterpriseStandardInspectReport EnterpriseStandardInspectReport); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - EnterpriseStandardInspectReport queryById(String id); - - /** - * - * @param inspectContentId - * @return - */ - EnterpriseStandardInspectReport queryByInspectContentId(String inspectContentId); - - /** - * - * @param processEsInspectId - * @return - */ - List queryByProcessEsInspectId(String processEsInspectId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java deleted file mode 100644 index 58e90254..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.jero.modules.laws.enterprise.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect(企业标准)】的数据库操作Service -* @createDate 2023-09-07 11:19:57 -*/ -public interface EnterpriseStandardInspectService extends IService { - - /** - * 分页列表 - * @param esInspect - * @param pageNo - * @param pageSize - * @return - */ - IPage queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize); - - /** - * 企标稽查-导出 - * @param response - * @param enterpriseStandardInspectVo - * @param fileName - * @param sheetName - */ - void export(HttpServletResponse response, EnterpriseStandardInspectVo enterpriseStandardInspectVo, String fileName, String sheetName); - - /** - * 企标稽查-导出 - * @param response - * @param enterpriseStandardInspectVo - * @param fileName - * @param sheetName - */ - void exportDataWithDelay(HttpServletResponse response, EnterpriseStandardInspectVo enterpriseStandardInspectVo, String fileName, String sheetName); - - /** - * 企标稽查-导出整改计划 - * - * 这里导出的是压缩包 - * @param response - * @param enterpriseStandardInspectVo - * @param sheetName - * @param fileName - */ - void exportDataRectifyPlan(HttpServletResponse response, EnterpriseStandardInspectVo enterpriseStandardInspectVo, String sheetName, String fileName) throws IOException; - - /** - * 企标稽查-分页列表查询2 - * @param enterpriseStandardInspectVo - * @param pageNo - * @param pageSize - * @return - */ - IPage queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo, Integer pageNo, Integer pageSize); - - /** - * 企标稽查-列表查询2 - * @param enterpriseStandardInspectVo - * @return - */ - List queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo); - - /** - * 企标稽查-导出整改计划 - * @param request - * @param enterpriseStandardInspectVo - */ - ModelAndView exportDataRectifyPlan(HttpServletRequest request, EnterpriseStandardInspectVo enterpriseStandardInspectVo); - - /** - * 企标稽查-导出延期数据 - * @param request - * @param enterpriseStandardInspectVo - */ - ModelAndView exportDataWithDelay(HttpServletRequest request, EnterpriseStandardInspectVo enterpriseStandardInspectVo); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java deleted file mode 100644 index e1e0294e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java +++ /dev/null @@ -1,317 +0,0 @@ -package com.jero.modules.laws.enterprise.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.exception.JeroBootException; -import com.jero.common.util.FileUtils; -import com.jero.common.util.MessageUtils; -import com.jero.common.util.MinioUtil; -import com.jero.common.util.ZipUtil; -import com.jero.modules.laws.common.service.ILawsCommonService; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.dto.EnterpriseStandardDeclareExPortDto; -import com.jero.modules.laws.enterprise.entity.vo.DeclareFileList; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareExcel; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardDeclareMapper; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; -import com.jero.modules.laws.enterprise.util.BeanCopyUtils; -import com.jero.modules.oss.entity.OSSFile; -import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.system.util.SysWaterMarkUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.*; -import org.jeecgframework.poi.excel.ExcelExportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.util.*; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_declare】的数据库操作Service实现 -* @createDate 2023-09-07 11:19:54 -*/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -@Slf4j -public class EnterpriseStandardDeclareServiceImpl extends ServiceImpl - implements EnterpriseStandardDeclareService{ - - @Resource - private EnterpriseStandardDeclareMapper esDeclareMapper; - - @Resource - private IOSSFileService ossFileService; - - @Resource - private ILawsCommonService lawsCommonService; - @Resource - private SysWaterMarkUtil sysWaterMarkUtil; - - @Value("${jero.path.exportExcelTempPath}") - private String exportExcelTempPath; - - private static final String EXPORT_EXCEL_TEMP = "exportExcelTemp"; - - @Override - public IPage queryPageList(ESQueryCommonDTO esDeclare, Integer pageNo, Integer pageSize) { - IPage page = new Page<>(pageNo, pageSize); - IPage pageList = esDeclareMapper.page(page, esDeclare); - for (EnterpriseStandardDeclareVo enterpriseStandardDeclareVo : pageList.getRecords()) { - if (StringUtils.isNotBlank(enterpriseStandardDeclareVo.getDeclareFile())){ - List fileIdList = Arrays.asList(enterpriseStandardDeclareVo.getDeclareFile().split(",")); - List ossFileList = ossFileService.listByIds(fileIdList); - if (!ossFileList.isEmpty()){ - enterpriseStandardDeclareVo.setDeclareFileName(ossFileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(","))); - } - } - } - return pageList; - } - - @Override - public void export(HttpServletResponse response, ESQueryCommonDTO esQueryCommonDTO, String fileName, String sheetName) { - try { - // 获取数据 - IPage enterpriseStandardDeclareVoIPage = this.queryPageList(esQueryCommonDTO, 1, Integer.MAX_VALUE); - List records = enterpriseStandardDeclareVoIPage.getRecords(); - - // 设置导出参数 - ExportParams exportParams = new ExportParams(null, sheetName); // 可以为标题添加更多的配置 - Workbook workbook = ExcelExportUtil.exportExcel(exportParams, EnterpriseStandardDeclareVo.class, records); - - // 设置响应头和内容类型 - response.setContentType("application/vnd.ms-excel"); - response.setHeader("Content-Disposition", "attachment; filename=" + fileName + ".xls"); - - // 写出到响应流 - workbook.write(response.getOutputStream()); - workbook.close(); - } catch (Exception e) { - log.error("导出excel异常", e); - throw new JeroBootException(MessageUtils.getMessage(ResultCommon.EXPORT_ERROR), e); - } - } - - @Override - public void exportDataWithFile(HttpServletResponse response, ESQueryCommonDTO esQueryCommonDTO, String fileName, String sheetName) { - try { - // 获取数据 - IPage enterpriseStandardDeclareVoIPage = this.queryPageList(esQueryCommonDTO, 1, Integer.MAX_VALUE); - List records = enterpriseStandardDeclareVoIPage.getRecords(); - // 设置文件字段 - this.setRecordFile(records); - List enterpriseStandardDeclareExPorts = BeanCopyUtils.copyBeanList(records, EnterpriseStandardDeclareExPortDto.class); - - // 设置导出参数 - ExportParams exportParams = new ExportParams(null, sheetName); // 可以为标题添加更多的配置 - Workbook workbook = ExcelExportUtil.exportExcel(exportParams, EnterpriseStandardDeclareExPortDto.class, enterpriseStandardDeclareExPorts); - - // 设置响应头和内容类型 - response.setContentType("application/vnd.ms-excel"); - response.setHeader("Content-Disposition", "attachment; filename=" + fileName + ".xls"); - - // 使用 ByteArrayOutputStream 来捕获 Excel 数据 - ByteArrayOutputStream excelOutputStream = new ByteArrayOutputStream(); - workbook.write(excelOutputStream); - workbook.close(); - - // 准备ZIP - // 获取编码后的文件名 - String encodedZipName = URLEncoder.encode(fileName + ".zip", "UTF-8"); - response.setContentType("application/zip"); - response.setHeader("Content-Disposition", "attachment; filename=" + encodedZipName); - response.setHeader("Content-Transfer-Encoding", "binary"); - response.setHeader("Pragma", "public"); - response.setHeader("Cache-Control", "no-store"); - response.setHeader("Expires", "0"); - ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream()); - - // 将Excel加入ZIP - ZipEntry excelEntry = new ZipEntry(fileName + ".xls"); - zipOut.putNextEntry(excelEntry); - byte[] bytes = excelOutputStream.toByteArray(); - zipOut.write(bytes, 0, bytes.length); - zipOut.closeEntry(); - - List fileIds = records.stream().map(EnterpriseStandardDeclareVo::getDeclareFile).collect(Collectors.toList()); - LambdaQueryWrapper ossFileLambdaQueryWrapper = new LambdaQueryWrapper<>(); - ossFileLambdaQueryWrapper.in(OSSFile::getId, fileIds); - List files = ossFileService.list(ossFileLambdaQueryWrapper); - Map ossFileMap = files.stream().collect(Collectors.toMap(OSSFile::getId, ossFile -> ossFile)); - - // 将文件和文件夹加入ZIP - for (EnterpriseStandardDeclareVo vo : records) { - OSSFile ossFile = ossFileMap.get(vo.getDeclareFile()); - if (Objects.isNull(ossFile) || StringUtils.isBlank(vo.getDeclareFile()) || StringUtils.isBlank(vo.getDeclareFileName())){ - continue; - } - ZipEntry fileEntry = new ZipEntry(vo.getDeclareFileName()); - zipOut.putNextEntry(fileEntry); - - // 将文件取出存入流中 - bytes = lawsCommonService.getMinioFileContent(ossFile); - zipOut.write(bytes, 0, bytes.length); - zipOut.closeEntry(); - } - zipOut.close(); - } catch (Exception e) { - log.error("导出zip异常", e); - throw new JeroBootException("导出zip异常", e); - } - } - - @Override - public void exportDataWithFile(HttpServletRequest request, HttpServletResponse response, ESQueryCommonDTO parameterMap) throws IOException { - String fileName = "企标宣贯"; - String url = exportExcelTempPath.replace(EXPORT_EXCEL_TEMP, fileName); - File file = new File(url); - if (!file.exists()){ - boolean mkdirs = file.mkdirs(); - log.info("创建临时目录：{}", mkdirs); - } - try (FileOutputStream fos = new FileOutputStream(url + File.separator + fileName + ".xls")){ - // 查询数据 - List list = esDeclareMapper.list(parameterMap); - // 过滤勾选数据 - if (StringUtils.isNotBlank(parameterMap.getSelections())){ - List selections = Arrays.asList(parameterMap.getSelections().split(",")); - list = list.stream().filter(v -> selections.contains(v.getId())).collect(Collectors.toList()); - } - // 构建一对多关系 - List enterpriseStandardDeclareExcels = com.jero.common.util.BeanCopyUtils.copyBeanList(list, EnterpriseStandardDeclareExcel.class); - List newEnterpriseStandardDeclareExcels = new ArrayList<>(enterpriseStandardDeclareExcels); - // 处理文件 - settleDocuments(url, enterpriseStandardDeclareExcels); - - // 生成excel - ExportParams exportParams = new ExportParams(); - exportParams.setType(ExcelType.HSSF); - Workbook workbook = ExcelExportUtil.exportExcel(exportParams, EnterpriseStandardDeclareExcel.class, enterpriseStandardDeclareExcels); - // 生成超链接 - generateHyperlink(newEnterpriseStandardDeclareExcels, workbook); - // 导出excel - workbook.write(fos); - // 生成并导出zip - ZipUtil.toZip(url, response.getOutputStream(), response, true); - }catch (Exception e){ - log.error(e.getMessage()); - throw new JeroBootException("excel导出失败!"); - }finally { - // 删除文件 - if (new File(url).exists()) { - FileUtils.deleteFolders(url); - } - } - } - - private static void generateHyperlink(List newEnterpriseStandardDeclareExcels, Workbook workbook) { - Sheet sheet = workbook.getSheetAt(0); - // 设置字体颜色、下划线 - CellStyle cellStyle = workbook.createCellStyle(); - Font font = workbook.createFont(); - font.setColor(IndexedColors.BLUE.getIndex()); - font.setUnderline(Font.U_SINGLE); - cellStyle.setFont(font); - cellStyle.setWrapText(true); - int i = 1; - for (EnterpriseStandardDeclareExcel enterpriseStandardDeclareExcel : newEnterpriseStandardDeclareExcels) { - if (!Objects.isNull(enterpriseStandardDeclareExcel.getDeclareFileList()) && !enterpriseStandardDeclareExcel.getDeclareFileList().isEmpty()){ - for (DeclareFileList declareFileList : enterpriseStandardDeclareExcel.getDeclareFileList()) { - Row row = sheet.getRow(i); - Cell cell = row.getCell(6); - // 设置超链接 HYPERLINK("https://www.baidu.com", "百度") - cell.setCellFormula("HYPERLINK(\"" + declareFileList.getFileName() + "\", \"" + declareFileList.getFileName() + "\")"); - cell.setCellStyle(cellStyle); - i += 1; - } - }else { - i += 1; - } - } - } - - private void settleDocuments(String url, List enterpriseStandardDeclareExcels) throws IOException { - for (EnterpriseStandardDeclareExcel enterpriseStandardDeclareExcel : enterpriseStandardDeclareExcels) { - // 查询文件 - if (StringUtils.isNotBlank(enterpriseStandardDeclareExcel.getDeclareFile())){ - List fileIdList = Arrays.asList(enterpriseStandardDeclareExcel.getDeclareFile().split(",")); - List ossFileList = ossFileService.listByIds(fileIdList); - if (!ossFileList.isEmpty()){ - // 赋值 - List declareFileLists = com.jero.common.util.BeanCopyUtils.copyBeanList(ossFileList, DeclareFileList.class); - enterpriseStandardDeclareExcel.setDeclareFileList(declareFileLists); - // 写出文件 - for (OSSFile ossFile : ossFileList) { - InputStream inputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), ossFile.getUrl()); - // pdf加水印 - if (StringUtils.endsWithIgnoreCase(ossFile.getFileName(), ".pdf")){ - inputStream = sysWaterMarkUtil.addWatermarkToPdf(inputStream); - } - // 导出文件 - String filePath = url + File.separator + ossFile.getFileName(); - writeToLocal(filePath, inputStream); - } - } - } - } - } - - /** - * 将InputStream写入本地文件 - * - * @param filePath 写入本地目录 - * @param input 输入流 - * @throws IOException - */ - @Override - public void writeToLocal(String filePath, InputStream input) - throws IOException { - int index; - byte[] bytes = new byte[1024]; - try (FileOutputStream downloadFile = new FileOutputStream(filePath)){ - while ((index = input.read(bytes)) != -1) { - downloadFile.write(bytes, 0, index); - downloadFile.flush(); - } - }catch (Exception e){ - log.error("将InputStream写入本地失败:{}", e.getMessage()); - }finally { - input.close(); - } - } - - /** - * 设置导出的Excel中的相关文件字段 - * @param records - */ - private void setRecordFile(List records) { - for (EnterpriseStandardDeclareVo enterpriseStandardDeclareVo : records) { - if (StringUtils.isBlank(enterpriseStandardDeclareVo.getDeclareFile())){ - continue; - } - enterpriseStandardDeclareVo.setDeclareFileName(enterpriseStandardDeclareVo.getStandardNo().replace("/", "_") + "/" + enterpriseStandardDeclareVo.getDeclareFileName()); - } - } -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectDelayServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectDelayServiceImpl.java deleted file mode 100644 index 51fa343c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectDelayServiceImpl.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.jero.modules.laws.enterprise.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectDelayService; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectDelayMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_delay】的数据库操作Service实现 -* @createDate 2023-09-13 13:46:35 -*/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -@Slf4j -public class EnterpriseStandardInspectDelayServiceImpl extends ServiceImpl - implements EnterpriseStandardInspectDelayService{ - - @Override - public EnterpriseStandardInspectDelay getLastDelayInspect(String inspectId) { - // 多次延期只返回最新的信息 - LambdaQueryWrapper esInspectDelayWrapper = new LambdaQueryWrapper<>(); - esInspectDelayWrapper.orderByDesc(EnterpriseStandardInspectDelay::getCreateTime); - List list = list(esInspectDelayWrapper); - return list.get(0); - } - - /** - * 分页查询 - * - * @param EnterpriseStandardInspectDelay - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(EnterpriseStandardInspectDelay, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param EnterpriseStandardInspectDelay - * @param req - * @return - */ - @Override - public List queryList(EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(EnterpriseStandardInspectDelay, req.getParameterMap())); - } - - /** - * 保存 - * - * @param EnterpriseStandardInspectDelay - * @return - */ - @Override - public void add(EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay) { - Date now = new Date(); - EnterpriseStandardInspectDelay.setCreateTime(now); - EnterpriseStandardInspectDelay.setUpdateTime(now); - save(EnterpriseStandardInspectDelay); - } - - /** - * 更新 - * - * @param EnterpriseStandardInspectDelay - * @return - */ - @Override - public void editById(EnterpriseStandardInspectDelay EnterpriseStandardInspectDelay) { - Date now = new Date(); - EnterpriseStandardInspectDelay.setUpdateTime(now); - saveOrUpdate(EnterpriseStandardInspectDelay); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public EnterpriseStandardInspectDelay queryById(String id) { - return getById(id); - } -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectObjectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectObjectServiceImpl.java deleted file mode 100644 index 294f61a7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectObjectServiceImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.jero.modules.laws.enterprise.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectObject; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectObjectMapper; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectObjectService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - - -/** - * @Description: 企标稽查对象 - * @Author: jero-boot - * @Date: 2023-11-24 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class EnterpriseStandardInspectObjectServiceImpl extends ServiceImpl implements EnterpriseStandardInspectObjectService { - - - /** - * 分页查询 - * - * @param enterpriseStandardInspectObject - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(EnterpriseStandardInspectObject enterpriseStandardInspectObject, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(enterpriseStandardInspectObject, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param enterpriseStandardInspectObject - * @param req - * @return - */ - @Override - public List queryList(EnterpriseStandardInspectObject enterpriseStandardInspectObject, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(enterpriseStandardInspectObject, req.getParameterMap())); - } - - /** - * 保存 - * - * @param enterpriseStandardInspectObject - * @return - */ - @Override - public void add(EnterpriseStandardInspectObject enterpriseStandardInspectObject) { - Date now = new Date(); - enterpriseStandardInspectObject.setCreateTime(now); - enterpriseStandardInspectObject.setUpdateTime(now); - save(enterpriseStandardInspectObject); - } - - /** - * 更新 - * - * @param enterpriseStandardInspectObject - * @return - */ - @Override - public void editById(EnterpriseStandardInspectObject enterpriseStandardInspectObject) { - Date now = new Date(); - enterpriseStandardInspectObject.setUpdateTime(now); - saveOrUpdate(enterpriseStandardInspectObject); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public EnterpriseStandardInspectObject queryById(String id) { - return getById(id); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java deleted file mode 100644 index f1859754..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.jero.modules.laws.enterprise.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; -import com.jero.modules.system.entity.SysDepart; -import com.jero.modules.system.service.ISysDepartService; -import com.jero.modules.system.service.ISysUserService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_rectify_plan】的数据库操作Service实现 -* @createDate 2023-09-13 15:24:16 -*/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -@Slf4j -public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl - implements EnterpriseStandardInspectRectifyPlanService{ - - @Resource - ISysBaseAPI sysBaseAPI; - - @Resource - private EnterpriseStandardInspectRectifyPlanMapper esInspectRectifyPlanMapper; - - @Resource - private com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService EnterpriseStandardInspectReportService; - - @Resource - private ISysUserService sysUserService; - - @Resource - private ISysDepartService sysDepartService; - - @Resource - private EnterpriseStandardInspectContentService enterpriseStandardInspectContentService; - - @Override - public IPage getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize) { - IPage page = new Page<>(pageNo, pageSize); - esInspectRectifyPlanMapper.page(page, inspectId); - setProperty(page.getRecords()); - return page; - } - - /** - * 分页查询 - * - * @param enterpriseStandardInspectRectifyPlan - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(enterpriseStandardInspectRectifyPlan, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param enterpriseStandardInspectRectifyPlan - * @param req - * @return - */ - @Override - public List queryList(EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(enterpriseStandardInspectRectifyPlan, req.getParameterMap())); - } - - /** - * 保存 - * - * @param enterpriseStandardInspectRectifyPlan - * @return - */ - @Override - public void add(EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan) { - Date now = new Date(); - enterpriseStandardInspectRectifyPlan.setCreateTime(now); - enterpriseStandardInspectRectifyPlan.setUpdateTime(now); - save(enterpriseStandardInspectRectifyPlan); - } - - /** - * 更新 - * - * @param enterpriseStandardInspectRectifyPlan - * @return - */ - @Override - public void editById(EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan) { - Date now = new Date(); - enterpriseStandardInspectRectifyPlan.setUpdateTime(now); - saveOrUpdate(enterpriseStandardInspectRectifyPlan); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public EnterpriseStandardInspectRectifyPlan queryById(String id) { - EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = getById(id); - ArrayList enterpriseStandardInspectRectifyPlans = new ArrayList<>(); - enterpriseStandardInspectRectifyPlans.add(enterpriseStandardInspectRectifyPlan); - setProperty(enterpriseStandardInspectRectifyPlans); - return enterpriseStandardInspectRectifyPlans.get(0); - } - - @Override - public List queryByInspectContentId(String inspectContentId) { - return list(new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectRectifyPlan::getProcessEsInspectId, inspectContentId) - .orderByAsc(EnterpriseStandardInspectRectifyPlan::getCreateTime)); - } - - @Override - public List queryByProcessEsInspectId(String processEsInspectId) { - List list = list(new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectRectifyPlan::getProcessEsInspectId, processEsInspectId) - .orderByAsc(EnterpriseStandardInspectRectifyPlan::getCreateTime)); - setProperty(list); - return list; - } - - private void setProperty(List list) { - list.forEach(item -> { - // 填充稽查报告 - EnterpriseStandardInspectReport enterpriseStandardInspectReport = EnterpriseStandardInspectReportService.getById(item.getInspectReportId()); - if (Objects.isNull(enterpriseStandardInspectReport)){ - return; - } - // 稽查内容查询 - EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); - item.setInspectContentId(enterpriseStandardInspectContent.getId()); - enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause()); - enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); - item.setEnterpriseStandardInspectReport(enterpriseStandardInspectReport); - // 翻译 - item.setResponseUserDictText(sysUserService.dictByIdsOrUserNames(item.getResponseUser(), "")); - SysDepart sysDepart = sysDepartService.getById(item.getResponseDepart()); - if (!Objects.isNull(sysDepart)){ - item.setResponseDepartDictText(sysDepart.getDepartName()); - } - }); - } -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java deleted file mode 100644 index bee45b32..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java +++ /dev/null @@ -1,220 +0,0 @@ -package com.jero.modules.laws.enterprise.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.LanguageEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.util.MessageUtils; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectReportMapper; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; -import com.jero.modules.oss.service.IOSSFileService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect_report】的数据库操作Service实现 -* @createDate 2023-09-07 11:20:06 -*/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -@Slf4j -public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl - implements EnterpriseStandardInspectReportService { - - @Resource - private EnterpriseStandardInspectReportMapper esInspectReportMapper; - - @Resource - private EnterpriseStandardInspectContentService enterpriseStandardInspectContentService; - - @Resource - private IOSSFileService ossFileService; - - @Override - public IPage getInspectReport(String inspectId, Integer pageNo, Integer pageSize) { - IPage page = new Page<>(pageNo, pageSize); - esInspectReportMapper.page(page, inspectId); - return page; - } - - /** - * 分页查询 - * - * @param EnterpriseStandardInspectReport - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(EnterpriseStandardInspectReport EnterpriseStandardInspectReport, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(EnterpriseStandardInspectReport, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param EnterpriseStandardInspectReport - * @param req - * @return - */ - @Override - public List queryList(EnterpriseStandardInspectReport EnterpriseStandardInspectReport, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(EnterpriseStandardInspectReport, req.getParameterMap())); - } - - /** - * 保存 - * - * @param enterpriseStandardInspectReport - * @return - */ - @Override - public void add(EnterpriseStandardInspectReport enterpriseStandardInspectReport) { - // 企标稽查内容唯一性校验 - int count = count(new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectReport::getInspectContentId, enterpriseStandardInspectReport.getInspectContentId())); - if (count > 0){ - if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){ - throw new JeroBootException("该章节条款已存在!"); - }else { - throw new JeroBootException("This section clause already exists!"); - } - } - Date now = new Date(); - enterpriseStandardInspectReport.setCreateTime(now); - enterpriseStandardInspectReport.setUpdateTime(now); - save(enterpriseStandardInspectReport); - } - - /** - * 更新 - * - * @param enterpriseStandardInspectReport - * @return - */ - @Override - public void editById(EnterpriseStandardInspectReport enterpriseStandardInspectReport) { - // 企标稽查内容唯一性校验 - int count = count(new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectReport::getInspectContentId, enterpriseStandardInspectReport.getInspectContentId()) - .ne(EnterpriseStandardInspectReport::getId, enterpriseStandardInspectReport.getId())); - if (count > 0){ - if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){ - throw new JeroBootException("该章节条款已存在!"); - }else { - throw new JeroBootException("This section clause already exists!"); - } - } - Date now = new Date(); - enterpriseStandardInspectReport.setUpdateTime(now); - saveOrUpdate(enterpriseStandardInspectReport); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public EnterpriseStandardInspectReport queryById(String id) { - EnterpriseStandardInspectReport enterpriseStandardInspectReport = getById(id); - // 稽查内容查询 - EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); - if (!Objects.isNull(enterpriseStandardInspectContent)){ - if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getClause())){ - enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause()); - } - if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getRequirement())){ - enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); - } - } - return enterpriseStandardInspectReport; - } - - @Override - public EnterpriseStandardInspectReport queryByInspectContentId(String inspectContentId) { - EnterpriseStandardInspectReport enterpriseStandardInspectReport = getOne(new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectReport::getInspectContentId, inspectContentId) - .orderByAsc(EnterpriseStandardInspectReport::getCreateTime)); - // 稽查内容查询 - EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); - if (!Objects.isNull(enterpriseStandardInspectContent)){ - if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getClause())){ - enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause()); - } - if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getRequirement())){ - enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); - } - } - return enterpriseStandardInspectReport; - } - - @Override - public List queryByProcessEsInspectId(String processEsInspectId) { - List list = list(new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectReport::getProcessEsInspectId, processEsInspectId) - .orderByAsc(EnterpriseStandardInspectReport::getCreateTime)); - - for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : list) { - // 稽查内容查询 - EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); - if (Objects.isNull(enterpriseStandardInspectContent)){ - continue; - } - if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getClause())){ - enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause()); - } - if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getRequirement())){ - enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); - } - } - return list; - } -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java deleted file mode 100644 index 12ea5022..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java +++ /dev/null @@ -1,394 +0,0 @@ -package com.jero.modules.laws.enterprise.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.util.BeanCopyUtils; -import com.jero.common.util.oConvertUtils; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectDelayVo; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; -import com.jero.modules.laws.enterprise.entity.vo.ExportDataWithDelayVo; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectMapper; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectDelayService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; -import com.jero.modules.system.service.ISysUserService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.excel.ExcelExportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.jetbrains.annotations.NotNull; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -import static com.jero.common.system.base.controller.JeroController.*; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_inspect(企业标准)】的数据库操作Service实现 -* @createDate 2023-09-07 11:19:57 -*/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -@Slf4j -public class EnterpriseStandardInspectServiceImpl extends ServiceImpl - implements EnterpriseStandardInspectService { - - @Resource - private EnterpriseStandardInspectMapper esInspectMapper; - - @Resource - private EnterpriseStandardInspectRectifyPlanMapper esInspectRectifyPlanMapper; - - @Resource - private ISysUserService sysUserService; - - @Resource - private EnterpriseStandardInspectDelayService enterpriseStandardInspectDelayService; - - @Override - public IPage queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize) { - IPage page = new Page<>(pageNo, pageSize); - esInspectMapper.page(page, esInspect); - return page; - } - - @Override - public void export(HttpServletResponse response, EnterpriseStandardInspectVo enterpriseStandardInspectVo, String fileName, String sheetName) { - try { - // 获取数据 - List enterpriseStandardInspectVoList= this.queryByList(enterpriseStandardInspectVo); - if (Objects.isNull(enterpriseStandardInspectVoList)){ - enterpriseStandardInspectVoList = new ArrayList<>(); - } - if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getSelections())){ - enterpriseStandardInspectVoList = enterpriseStandardInspectVoList.stream() - .filter(v -> enterpriseStandardInspectVo.getSelections().contains(v.getId())) - .collect(Collectors.toList()); - } - // 设置导出参数 - ExportParams exportParams = new ExportParams(null, sheetName); // 可以为标题添加更多的配置 - String[] excludes = {"存在问题", "整改措施", "整改负责人", "整改计划完成时间", "整改实际完成时间", "整改状态"}; - exportParams.setExclusions(excludes); - Workbook workbook = ExcelExportUtil.exportExcel(exportParams, EnterpriseStandardInspectVo.class, enterpriseStandardInspectVoList); - - // 编码文件名以兼容各种浏览器 - String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20"); - - // 设置响应头和内容类型 - response.setContentType("application/vnd.ms-excel"); - response.setHeader("Content-Disposition", "attachment; filename=" + encodedFileName + ".xls"); - - // 写出到响应流 - workbook.write(response.getOutputStream()); - workbook.close(); - } catch (Exception e) { - log.error("导出excel异常", e); - throw new JeroBootException("导出excel异常", e); - } - } - - @Override - public void exportDataWithDelay(HttpServletResponse response, EnterpriseStandardInspectVo enterpriseStandardInspectVo, String fileName, String sheetName) { - try { - // 获取数据 - IPage page = new Page<>(1, Integer.MAX_VALUE); - // 查询参数转换 - ESQueryCommonDTO esQueryCommonDTO = new ESQueryCommonDTO(); - esQueryCommonDTO.setStandardNo(enterpriseStandardInspectVo.getInspectNo()); - esQueryCommonDTO.setStandardName(enterpriseStandardInspectVo.getInspectName()); - esQueryCommonDTO.setInspectStatus(enterpriseStandardInspectVo.getInspectStatus()); - esQueryCommonDTO.setInspectDept(enterpriseStandardInspectVo.getBelongDept()); - // TODO 时间范围查询 等待VO添加对应参数后再添加 - IPage enterpriseStandardInspectDelayVoIPage = esInspectMapper.pageWithDelay(page, esQueryCommonDTO); - List records = enterpriseStandardInspectDelayVoIPage.getRecords(); - - // 设置导出参数 - ExportParams exportParams = new ExportParams(null, sheetName); // 可以为标题添加更多的配置 - Workbook workbook = ExcelExportUtil.exportExcel(exportParams, EnterpriseStandardInspectDelayVo.class, records); - - // 编码文件名以兼容各种浏览器 - String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20"); - - // 设置响应头和内容类型 - response.setContentType("application/vnd.ms-excel"); - response.setHeader("Content-Disposition", "attachment; filename=" + encodedFileName + ".xls"); - - // 写出到响应流 - workbook.write(response.getOutputStream()); - workbook.close(); - } catch (Exception e) { - log.error("导出excel异常", e); - throw new JeroBootException("导出excel异常", e); - } - } - - @Override - public void exportDataRectifyPlan(HttpServletResponse response, EnterpriseStandardInspectVo enterpriseStandardInspectVo, String sheetName, String fileName) throws UnsupportedEncodingException { - // 在内存中创建一个 Zip 输出流 - ByteArrayOutputStream zipOutputStream = new ByteArrayOutputStream(); - try (ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) { - - // 获取需要导出的稽查报告 - IPage enterpriseStandardInspectVoIPage = this.queryByPage(enterpriseStandardInspectVo, 1, Integer.MAX_VALUE); - List records = enterpriseStandardInspectVoIPage.getRecords(); - - // 处理 inspectNo - records.forEach(vo -> vo.setInspectNo(vo.getInspectNo().replace("/", "-"))); - - // 复制 records 列表以避免修改 - List copyRecords = new ArrayList<>(records); - - for (EnterpriseStandardInspectVo vo : copyRecords) { - try { - IPage page = new Page<>(1, Integer.MAX_VALUE); - esInspectRectifyPlanMapper.page(page, vo.getId()); - List rectifyPlanList = page.getRecords(); - - if (rectifyPlanList.size() == 0) { - continue; - } - - ExportParams exportParams = new ExportParams(null, sheetName); - Workbook workbook = ExcelExportUtil.exportExcel(exportParams, EnterpriseStandardInspectRectifyPlan.class, rectifyPlanList); - - // 创建一个字节数组输出流保存 Excel 数据 - ByteArrayOutputStream excelOutputStream = new ByteArrayOutputStream(); - workbook.write(excelOutputStream); - workbook.close(); - - // 在 Zip 文件中为该 Excel 文件创建一个新目录 - String folderName = vo.getInspectNo(); // 根据需要更改文件夹名称 - ZipEntry folderZipEntry = new ZipEntry(folderName + "/"); - zos.putNextEntry(folderZipEntry); - zos.closeEntry(); - - // 将 Excel 文件添加到这个新目录中 - ZipEntry zipEntry = new ZipEntry(folderName + "/" + fileName + ".xls"); - zos.putNextEntry(zipEntry); - zos.write(excelOutputStream.toByteArray()); - zos.closeEntry(); - - } catch (Exception e) { - log.error("导出excel异常", e); - throw new JeroBootException("导出excel异常", e); - } - } - } catch (IOException e) { - log.error("创建ZIP文件时发生错误", e); - } - - // 编码文件名以兼容各种浏览器 - String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20"); - - // 将 Zip 文件写出到响应流中 - response.setContentType("application/zip"); - response.setHeader("Content-Disposition", "attachment; filename=" + encodedFileName + ".zip"); - try { - response.getOutputStream().write(zipOutputStream.toByteArray()); - } catch (IOException e) { - log.error("写入响应流时发生错误", e); - } - } - - @Override - public IPage queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo, Integer pageNo, Integer pageSize) { - QueryWrapper queryWrapper = getEnterpriseStandardInspectVoQueryWrapper(enterpriseStandardInspectVo); - IPage enterpriseStandardInspectVoIPage = esInspectMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper); - setProperty(enterpriseStandardInspectVoIPage.getRecords()); - return enterpriseStandardInspectVoIPage; - } - - @Override - public List queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) { - QueryWrapper queryWrapper = getEnterpriseStandardInspectVoQueryWrapper(enterpriseStandardInspectVo); - List enterpriseStandardInspectVos = esInspectMapper.queryByList(queryWrapper); - setProperty(enterpriseStandardInspectVos); - return esInspectMapper.queryByList(queryWrapper); - } - - @Override - public ModelAndView exportDataRectifyPlan(HttpServletRequest request, EnterpriseStandardInspectVo enterpriseStandardInspectVo) { - String title = "企标稽查-整改计划"; - // Step.1 组装查询条件 - // Step.2 获取导出数据 - List pageList = queryByList(enterpriseStandardInspectVo); - // 整改计划查询 - for (EnterpriseStandardInspectVo standardInspectVo : pageList) { - List list = esInspectRectifyPlanMapper.list(standardInspectVo.getId()); - if (CollectionUtils.isNotEmpty(list)){ - standardInspectVo.setEnterpriseStandardInspectRectifyPlanLists(list); - } - } - List exportList = null; - - // 过滤选中数据 - String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - exportList = pageList.stream().filter(item -> selectionList.contains(getId(item))).collect(Collectors.toList()); - } else { - exportList = pageList; - } - - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(CLASS, EnterpriseStandardInspectVo.class); - //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- - ExportParams exportParams=new ExportParams(null, title); - exportParams.setType(ExcelType.HSSF); - //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- - mv.addObject(PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, exportList); - return mv; - } - - @Override - public ModelAndView exportDataWithDelay(HttpServletRequest request, EnterpriseStandardInspectVo enterpriseStandardInspectVo) { - String title = "企标稽查-延期数据"; - // Step.1 组装查询条件 - // Step.2 获取导出数据 - List pageList = queryByList(enterpriseStandardInspectVo); - pageList = pageList.stream().filter(EnterpriseStandardInspectVo::isDelayFlag).collect(Collectors.toList()); - List exportDataWithDelayVos = BeanCopyUtils.copyBeanList(pageList, ExportDataWithDelayVo.class); - // 延期数据查询 - for (ExportDataWithDelayVo exportDataWithDelayVo : exportDataWithDelayVos) { - EnterpriseStandardInspectDelay enterpriseStandardInspectDelay = enterpriseStandardInspectDelayService.getOne( - new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectDelay::getInspectId, exportDataWithDelayVo.getId()) - .orderByDesc(EnterpriseStandardInspectDelay::getCreateTime) - .last("limit 1"), false); - if (!Objects.isNull(enterpriseStandardInspectDelay)){ - exportDataWithDelayVo.setRequestDelayDate(enterpriseStandardInspectDelay.getRequestDelayDate()); - exportDataWithDelayVo.setDelayDescription(enterpriseStandardInspectDelay.getDelayDescription()); - } - } - List exportList = null; - - // 过滤选中数据 - String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - exportList = exportDataWithDelayVos.stream().filter(item -> selectionList.contains(getId(item))).collect(Collectors.toList()); - } else { - exportList = exportDataWithDelayVos; - } - - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(CLASS, ExportDataWithDelayVo.class); - //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- - ExportParams exportParams=new ExportParams(null, title); - exportParams.setType(ExcelType.HSSF); - //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- - mv.addObject(PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, exportList); - return mv; - } - - /** - * 获取对象ID - * - * @return - */ - private String getId(EnterpriseStandardInspectVo item) { - try { - return PropertyUtils.getProperty(item, "id").toString(); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - /** - * 获取对象ID - * - * @return - */ - private String getId(ExportDataWithDelayVo item) { - try { - return PropertyUtils.getProperty(item, "id").toString(); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - private void setProperty(List list) { - } - - @NotNull - private static QueryWrapper getEnterpriseStandardInspectVoQueryWrapper(EnterpriseStandardInspectVo enterpriseStandardInspectVo) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getId()), "id", enterpriseStandardInspectVo.getId()); - if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getIds())){ - List list = Arrays.asList(enterpriseStandardInspectVo.getIds().split(",")); - queryWrapper.in("id", list); - } - if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getFilterIds())){ - List list = Arrays.asList(enterpriseStandardInspectVo.getFilterIds().split(",")); - queryWrapper.notIn("id", list); - } - String inspectStatus = enterpriseStandardInspectVo.getInspectStatus(); - if (StringUtils.isNotBlank(inspectStatus)){ - List list = Arrays.asList(inspectStatus.split(",")); - queryWrapper.and(qw -> list.forEach(v -> qw.or(iqw -> iqw.eq("inspect_status", v)))); - } - if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getCreateDate())){ - String[] date = enterpriseStandardInspectVo.getCreateDate().split(","); - queryWrapper.between("create_time", date[0], date[1]); - } - if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getPlanInspectDates())){ - String[] date = enterpriseStandardInspectVo.getPlanInspectDates().split(","); - queryWrapper.between("plan_inspect_date", date[0], date[1]); - } - if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNoOrName())){ - queryWrapper.and(qw -> - qw.like("inspect_no", enterpriseStandardInspectVo.getInspectNoOrName()) - .or().like("inspect_name", enterpriseStandardInspectVo.getInspectNoOrName())); - } - queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getBelongDept()), "belong_dept", enterpriseStandardInspectVo.getBelongDept()); - queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNo()), "inspect_no", enterpriseStandardInspectVo.getInspectNo()); - queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectName()), "inspect_name", enterpriseStandardInspectVo.getInspectName()); - queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectUser()), "inspect_user", enterpriseStandardInspectVo.getInspectUser()); - queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getRealname()), "realname", enterpriseStandardInspectVo.getRealname()); - queryWrapper.orderByDesc("create_time"); - return queryWrapper; - } -} - - - -