diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index aa0098d..39f0dab 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -6,11 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.SupervisionRepDTO; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.business.BizBusinessOutsourceAssess; import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; @@ -67,15 +64,16 @@ @ApiOperation("导出") @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + public void export(@RequestBody IdsDTO ids, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + bizQualitySupervisionRepService.export(ids,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - //to-do pdf导出 - bizQualitySupervisionRepService.exportFile(exportDTO,response); + //to-do pdf导出 + bizQualitySupervisionRepService.exportFile(exportDTO, response); } @ApiOperation("新增接口") @@ -110,12 +108,14 @@ bizQualitySupervisionRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualitySupervisionRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + @ApiOperation("详情查询") @GetMapping(value = "/detail") public ReturnDTO detail(String id) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index aa0098d..39f0dab 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -6,11 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.SupervisionRepDTO; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.business.BizBusinessOutsourceAssess; import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; @@ -67,15 +64,16 @@ @ApiOperation("导出") @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + public void export(@RequestBody IdsDTO ids, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + bizQualitySupervisionRepService.export(ids,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - //to-do pdf导出 - bizQualitySupervisionRepService.exportFile(exportDTO,response); + //to-do pdf导出 + bizQualitySupervisionRepService.exportFile(exportDTO, response); } @ApiOperation("新增接口") @@ -110,12 +108,14 @@ bizQualitySupervisionRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualitySupervisionRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + @ApiOperation("详情查询") @GetMapping(value = "/detail") public ReturnDTO detail(String id) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java index c174ec9..6d38e33 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java @@ -1,13 +1,16 @@ package com.casic.missiles.controller.quality.base; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.GeneralApprovalDTO; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.application.context.factory.PermissionContextFactory; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.BaseApprovalListRequest; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; import com.casic.missiles.service.IGeneralApprovalService; import io.swagger.annotations.ApiOperation; @@ -32,7 +35,7 @@ } @Override - public ReturnDTO> approvalListPage(R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { AuthUser user = PermissionContextFactory.me().getAuthService().getLoginUser(); if (user != null) { request.setCreateUserId(user.getId()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index aa0098d..39f0dab 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -6,11 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.SupervisionRepDTO; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.business.BizBusinessOutsourceAssess; import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; @@ -67,15 +64,16 @@ @ApiOperation("导出") @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + public void export(@RequestBody IdsDTO ids, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + bizQualitySupervisionRepService.export(ids,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - //to-do pdf导出 - bizQualitySupervisionRepService.exportFile(exportDTO,response); + //to-do pdf导出 + bizQualitySupervisionRepService.exportFile(exportDTO, response); } @ApiOperation("新增接口") @@ -110,12 +108,14 @@ bizQualitySupervisionRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualitySupervisionRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + @ApiOperation("详情查询") @GetMapping(value = "/detail") public ReturnDTO detail(String id) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java index c174ec9..6d38e33 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java @@ -1,13 +1,16 @@ package com.casic.missiles.controller.quality.base; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.GeneralApprovalDTO; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.application.context.factory.PermissionContextFactory; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.BaseApprovalListRequest; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; import com.casic.missiles.service.IGeneralApprovalService; import io.swagger.annotations.ApiOperation; @@ -32,7 +35,7 @@ } @Override - public ReturnDTO> approvalListPage(R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { AuthUser user = PermissionContextFactory.me().getAuthService().getLoginUser(); if (user != null) { request.setCreateUserId(user.getId()); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml index dde5b49..88ae784 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml @@ -136,7 +136,7 @@ - and creator = #{request.createUserId} + and a.creator = #{request.createUserId} and a.creator_name like concat('%',#{request.creatorName},'%') diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index aa0098d..39f0dab 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -6,11 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.SupervisionRepDTO; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.business.BizBusinessOutsourceAssess; import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; @@ -67,15 +64,16 @@ @ApiOperation("导出") @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + public void export(@RequestBody IdsDTO ids, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + bizQualitySupervisionRepService.export(ids,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - //to-do pdf导出 - bizQualitySupervisionRepService.exportFile(exportDTO,response); + //to-do pdf导出 + bizQualitySupervisionRepService.exportFile(exportDTO, response); } @ApiOperation("新增接口") @@ -110,12 +108,14 @@ bizQualitySupervisionRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualitySupervisionRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + @ApiOperation("详情查询") @GetMapping(value = "/detail") public ReturnDTO detail(String id) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java index c174ec9..6d38e33 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java @@ -1,13 +1,16 @@ package com.casic.missiles.controller.quality.base; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.GeneralApprovalDTO; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.application.context.factory.PermissionContextFactory; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.BaseApprovalListRequest; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; import com.casic.missiles.service.IGeneralApprovalService; import io.swagger.annotations.ApiOperation; @@ -32,7 +35,7 @@ } @Override - public ReturnDTO> approvalListPage(R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { AuthUser user = PermissionContextFactory.me().getAuthService().getLoginUser(); if (user != null) { request.setCreateUserId(user.getId()); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml index dde5b49..88ae784 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml @@ -136,7 +136,7 @@ - and creator = #{request.createUserId} + and a.creator = #{request.createUserId} and a.creator_name like concat('%',#{request.creatorName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml index 2e40fac..b425105 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml @@ -113,7 +113,7 @@ - and commander_id = #{request.createUserId} + and a.commander_id = #{request.createUserId} and b.work_name like concat('%',#{request.workName},'%') diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index aa0098d..39f0dab 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -6,11 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.SupervisionRepDTO; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.business.BizBusinessOutsourceAssess; import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; @@ -67,15 +64,16 @@ @ApiOperation("导出") @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + public void export(@RequestBody IdsDTO ids, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + bizQualitySupervisionRepService.export(ids,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - //to-do pdf导出 - bizQualitySupervisionRepService.exportFile(exportDTO,response); + //to-do pdf导出 + bizQualitySupervisionRepService.exportFile(exportDTO, response); } @ApiOperation("新增接口") @@ -110,12 +108,14 @@ bizQualitySupervisionRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualitySupervisionRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + @ApiOperation("详情查询") @GetMapping(value = "/detail") public ReturnDTO detail(String id) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java index c174ec9..6d38e33 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java @@ -1,13 +1,16 @@ package com.casic.missiles.controller.quality.base; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.GeneralApprovalDTO; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.application.context.factory.PermissionContextFactory; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.BaseApprovalListRequest; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; import com.casic.missiles.service.IGeneralApprovalService; import io.swagger.annotations.ApiOperation; @@ -32,7 +35,7 @@ } @Override - public ReturnDTO> approvalListPage(R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { AuthUser user = PermissionContextFactory.me().getAuthService().getLoginUser(); if (user != null) { request.setCreateUserId(user.getId()); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml index dde5b49..88ae784 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml @@ -136,7 +136,7 @@ - and creator = #{request.createUserId} + and a.creator = #{request.createUserId} and a.creator_name like concat('%',#{request.creatorName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml index 2e40fac..b425105 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml @@ -113,7 +113,7 @@ - and commander_id = #{request.createUserId} + and a.commander_id = #{request.createUserId} and b.work_name like concat('%',#{request.workName},'%') diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index a4a37fd..41ce093 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import com.alibaba.druid.util.HttpClientUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,32 +12,28 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.SupervisionRepDTO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; -import org.apache.commons.beanutils.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.Serializable; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_REPORT; @@ -131,7 +128,7 @@ if (Objects.nonNull(bizQualitySupervisionRep)) { String date = DateUtil.format(bizQualitySupervisionRep.getLogTime(), "yyyy-MM-dd"); Map map = BeanUtil.beanToMap(bizQualitySupervisionRep); - map.put("logTime",date); + map.put("logTime", date); // if (bizQualitySupervisionRep.getConfirmTime() != null){ // String date = DateUtil.format(bizQualitySupervisionRep.getConfirmTime(), "yyyy-MM-dd"); // Calendar calendar = Calendar.getInstance(); @@ -144,10 +141,17 @@ // map.put("month1",calendar.get(Calendar.MONTH)+1); // map.put("day1",calendar.get(Calendar.DAY_OF_MONTH)); // } + printFileRegister.registerPrintFile(QUALITY_SUPERVISION_REPORT, "导出模板", null, map, exportDTO.isPdf(), response); } } + @Transactional + @Override + public void export(IdsDTO ids, HttpServletResponse response) { + + } + /** * 对象封装 * diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index aa0098d..39f0dab 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -6,11 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.SupervisionRepDTO; -import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.business.BizBusinessOutsourceAssess; import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; @@ -67,15 +64,16 @@ @ApiOperation("导出") @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + public void export(@RequestBody IdsDTO ids, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + bizQualitySupervisionRepService.export(ids,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - //to-do pdf导出 - bizQualitySupervisionRepService.exportFile(exportDTO,response); + //to-do pdf导出 + bizQualitySupervisionRepService.exportFile(exportDTO, response); } @ApiOperation("新增接口") @@ -110,12 +108,14 @@ bizQualitySupervisionRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualitySupervisionRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + @ApiOperation("详情查询") @GetMapping(value = "/detail") public ReturnDTO detail(String id) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java index c174ec9..6d38e33 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/base/QualityApprovalController.java @@ -1,13 +1,16 @@ package com.casic.missiles.controller.quality.base; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.GeneralApprovalDTO; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.application.context.factory.PermissionContextFactory; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.BaseApprovalListRequest; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; import com.casic.missiles.service.IGeneralApprovalService; import io.swagger.annotations.ApiOperation; @@ -32,7 +35,7 @@ } @Override - public ReturnDTO> approvalListPage(R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { AuthUser user = PermissionContextFactory.me().getAuthService().getLoginUser(); if (user != null) { request.setCreateUserId(user.getId()); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml index dde5b49..88ae784 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonReviewFormMapper.xml @@ -136,7 +136,7 @@ - and creator = #{request.createUserId} + and a.creator = #{request.createUserId} and a.creator_name like concat('%',#{request.creatorName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml index 2e40fac..b425105 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityScenePlanMapper.xml @@ -113,7 +113,7 @@ - and commander_id = #{request.createUserId} + and a.commander_id = #{request.createUserId} and b.work_name like concat('%',#{request.workName},'%') diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index a4a37fd..41ce093 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import com.alibaba.druid.util.HttpClientUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,32 +12,28 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.SupervisionRepDTO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; -import org.apache.commons.beanutils.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.Serializable; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_REPORT; @@ -131,7 +128,7 @@ if (Objects.nonNull(bizQualitySupervisionRep)) { String date = DateUtil.format(bizQualitySupervisionRep.getLogTime(), "yyyy-MM-dd"); Map map = BeanUtil.beanToMap(bizQualitySupervisionRep); - map.put("logTime",date); + map.put("logTime", date); // if (bizQualitySupervisionRep.getConfirmTime() != null){ // String date = DateUtil.format(bizQualitySupervisionRep.getConfirmTime(), "yyyy-MM-dd"); // Calendar calendar = Calendar.getInstance(); @@ -144,10 +141,17 @@ // map.put("month1",calendar.get(Calendar.MONTH)+1); // map.put("day1",calendar.get(Calendar.DAY_OF_MONTH)); // } + printFileRegister.registerPrintFile(QUALITY_SUPERVISION_REPORT, "导出模板", null, map, exportDTO.isPdf(), response); } } + @Transactional + @Override + public void export(IdsDTO ids, HttpServletResponse response) { + + } + /** * 对象封装 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java index e7c560e..ab8bc56 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.QualityApprovalBaseDTO; import com.casic.missiles.dto.quality.approval.SupervisionRepDTO; @@ -38,4 +39,11 @@ void updateAgree(String id, String confirmRemarks); void exportFile(ExportDTO exportDTO, HttpServletResponse response); + + /** + * 文件打包导出 + * @param ids 主键 + * @param response 响应 + */ + void export(IdsDTO ids, HttpServletResponse response); }