diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 9f2d240..9d306e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -62,7 +62,6 @@ statisticsDTO.setDeptId(deptId); statisticsDTO.setDeptName(subList.get(0).getDeptName()); - statisticsDTO.setTotal((long) subList.size()); statisticsDTO.setMonthToExpire(subList.stream().filter(i->i.getCertificateValid().after(new Date()) && DateUtil.month(new Date()) == DateUtil.month(i.getCertificateValid())).count()); statisticsDTO.setExpired(subList.stream().filter(i->i.getCertificateValid().before(new Date())).count()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 9f2d240..9d306e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -62,7 +62,6 @@ statisticsDTO.setDeptId(deptId); statisticsDTO.setDeptName(subList.get(0).getDeptName()); - statisticsDTO.setTotal((long) subList.size()); statisticsDTO.setMonthToExpire(subList.stream().filter(i->i.getCertificateValid().after(new Date()) && DateUtil.month(new Date()) == DateUtil.month(i.getCertificateValid())).count()); statisticsDTO.setExpired(subList.stream().filter(i->i.getCertificateValid().before(new Date())).count()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 2750303..c11cf6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -240,17 +240,22 @@ if (StrUtil.isEmpty(importDTO.getDeptName())) { importDTO.setDeptId(user.getDeptId()); } + // 所在单位 for (Dept dept : deptList) { if (ObjectUtil.isEmpty(importDTO.getCompanyId()) && dept.getFullName().equals(importDTO.getCompanyName().trim()) && dept.getPid().equals(top.getId())) { importDTO.setCompanyId(dept.getId()); } - if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { - importDTO.setDeptId(dept.getId()); - } } if (ObjectUtil.isEmpty(importDTO.getCompanyId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "所在单位不合法")); } + // 所属部门（必须是所在单位的下级部门,或者就是所在单位） + List subDeptIds = deptList.stream().filter(d->d.getId().equals(importDTO.getCompanyId()) || (StrUtil.isNotEmpty(d.getPids()) && d.getPids().contains(importDTO.getCompanyId().toString()))).collect(Collectors.toList()); + for (Dept dept : subDeptIds) { + if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { + importDTO.setDeptId(dept.getId()); + } + } if (ObjectUtil.isEmpty(importDTO.getDeptId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "使用部门不合法")); } @@ -402,7 +407,7 @@ @Override public Page certificateListPage(Page page, EquipmentCertificateQueryForm queryForm) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - + dataScope.setScopeName("e.dept_id"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 9f2d240..9d306e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -62,7 +62,6 @@ statisticsDTO.setDeptId(deptId); statisticsDTO.setDeptName(subList.get(0).getDeptName()); - statisticsDTO.setTotal((long) subList.size()); statisticsDTO.setMonthToExpire(subList.stream().filter(i->i.getCertificateValid().after(new Date()) && DateUtil.month(new Date()) == DateUtil.month(i.getCertificateValid())).count()); statisticsDTO.setExpired(subList.stream().filter(i->i.getCertificateValid().before(new Date())).count()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 2750303..c11cf6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -240,17 +240,22 @@ if (StrUtil.isEmpty(importDTO.getDeptName())) { importDTO.setDeptId(user.getDeptId()); } + // 所在单位 for (Dept dept : deptList) { if (ObjectUtil.isEmpty(importDTO.getCompanyId()) && dept.getFullName().equals(importDTO.getCompanyName().trim()) && dept.getPid().equals(top.getId())) { importDTO.setCompanyId(dept.getId()); } - if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { - importDTO.setDeptId(dept.getId()); - } } if (ObjectUtil.isEmpty(importDTO.getCompanyId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "所在单位不合法")); } + // 所属部门（必须是所在单位的下级部门,或者就是所在单位） + List subDeptIds = deptList.stream().filter(d->d.getId().equals(importDTO.getCompanyId()) || (StrUtil.isNotEmpty(d.getPids()) && d.getPids().contains(importDTO.getCompanyId().toString()))).collect(Collectors.toList()); + for (Dept dept : subDeptIds) { + if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { + importDTO.setDeptId(dept.getId()); + } + } if (ObjectUtil.isEmpty(importDTO.getDeptId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "使用部门不合法")); } @@ -402,7 +407,7 @@ @Override public Page certificateListPage(Page page, EquipmentCertificateQueryForm queryForm) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - + dataScope.setScopeName("e.dept_id"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java index 9ca18d3..a53147e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java @@ -155,6 +155,7 @@ @Override public List planFinishStatistics(List deptIds) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("e.dept_id"); return this.baseMapper.planFinishStatistics(dataScope,deptIds, CheckCompletionEnum.CHECKED); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 9f2d240..9d306e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -62,7 +62,6 @@ statisticsDTO.setDeptId(deptId); statisticsDTO.setDeptName(subList.get(0).getDeptName()); - statisticsDTO.setTotal((long) subList.size()); statisticsDTO.setMonthToExpire(subList.stream().filter(i->i.getCertificateValid().after(new Date()) && DateUtil.month(new Date()) == DateUtil.month(i.getCertificateValid())).count()); statisticsDTO.setExpired(subList.stream().filter(i->i.getCertificateValid().before(new Date())).count()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 2750303..c11cf6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -240,17 +240,22 @@ if (StrUtil.isEmpty(importDTO.getDeptName())) { importDTO.setDeptId(user.getDeptId()); } + // 所在单位 for (Dept dept : deptList) { if (ObjectUtil.isEmpty(importDTO.getCompanyId()) && dept.getFullName().equals(importDTO.getCompanyName().trim()) && dept.getPid().equals(top.getId())) { importDTO.setCompanyId(dept.getId()); } - if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { - importDTO.setDeptId(dept.getId()); - } } if (ObjectUtil.isEmpty(importDTO.getCompanyId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "所在单位不合法")); } + // 所属部门（必须是所在单位的下级部门,或者就是所在单位） + List subDeptIds = deptList.stream().filter(d->d.getId().equals(importDTO.getCompanyId()) || (StrUtil.isNotEmpty(d.getPids()) && d.getPids().contains(importDTO.getCompanyId().toString()))).collect(Collectors.toList()); + for (Dept dept : subDeptIds) { + if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { + importDTO.setDeptId(dept.getId()); + } + } if (ObjectUtil.isEmpty(importDTO.getDeptId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "使用部门不合法")); } @@ -402,7 +407,7 @@ @Override public Page certificateListPage(Page page, EquipmentCertificateQueryForm queryForm) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - + dataScope.setScopeName("e.dept_id"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java index 9ca18d3..a53147e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java @@ -155,6 +155,7 @@ @Override public List planFinishStatistics(List deptIds) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("e.dept_id"); return this.baseMapper.planFinishStatistics(dataScope,deptIds, CheckCompletionEnum.CHECKED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java index 99cbf42..6b03d8b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,7 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -30,6 +32,7 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; @@ -40,11 +43,15 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; + /** *

* 资源管理-委托方管理-要求、委托书及合同评审表 服务实现类 @@ -58,6 +65,7 @@ public class BizResourceCustomerExamineFormServiceImpl extends ServiceImpl implements IBizResourceCustomerExamineFormService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page approvalListPage(Page page, ExamineFormApprovalListRequest request) throws Exception { @@ -88,4 +96,54 @@ this.update(updateWrapper); } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerExamineForm examineForm = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(examineForm)){ + Map map = BeanUtil.beanToMap(examineForm); + //测试、校准或检定方法类型 + examineForm.getMeasureMethodType(); + map.put("type1", "\u25CB"); + map.put("type2", "\u25CB"); + map.put("type3", "\u25CB"); + map.put("type4", "\u25CB"); + map.put("type5", "\u25CB"); + switch (examineForm.getMeasureMethodType()){ + case "1": + map.put("type1", "\u2299"); + break; + case "2": + map.put("type2", "\u2299"); + break; + case "3": + map.put("type3", "\u2299"); + break; + case "4": + map.put("type4", "\u2299"); + break; + case "5": + map.put("type5", "\u2299"); + break; + } + //受控 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("control1", "\u2299"); + map.put("control2", "\u25CB"); + }else { + map.put("control1", "\u25CB"); + map.put("control2", "\u2299"); + } + //方法是否已确认 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("confirm1", "\u2299"); + map.put("confirm2", "\u25CB"); + }else { + map.put("confirm1", "\u25CB"); + map.put("confirm2", "\u2299"); + } + printFileRegister.registerPrintFile(CUSTOMER_EXAMINE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 9f2d240..9d306e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -62,7 +62,6 @@ statisticsDTO.setDeptId(deptId); statisticsDTO.setDeptName(subList.get(0).getDeptName()); - statisticsDTO.setTotal((long) subList.size()); statisticsDTO.setMonthToExpire(subList.stream().filter(i->i.getCertificateValid().after(new Date()) && DateUtil.month(new Date()) == DateUtil.month(i.getCertificateValid())).count()); statisticsDTO.setExpired(subList.stream().filter(i->i.getCertificateValid().before(new Date())).count()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 2750303..c11cf6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -240,17 +240,22 @@ if (StrUtil.isEmpty(importDTO.getDeptName())) { importDTO.setDeptId(user.getDeptId()); } + // 所在单位 for (Dept dept : deptList) { if (ObjectUtil.isEmpty(importDTO.getCompanyId()) && dept.getFullName().equals(importDTO.getCompanyName().trim()) && dept.getPid().equals(top.getId())) { importDTO.setCompanyId(dept.getId()); } - if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { - importDTO.setDeptId(dept.getId()); - } } if (ObjectUtil.isEmpty(importDTO.getCompanyId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "所在单位不合法")); } + // 所属部门（必须是所在单位的下级部门,或者就是所在单位） + List subDeptIds = deptList.stream().filter(d->d.getId().equals(importDTO.getCompanyId()) || (StrUtil.isNotEmpty(d.getPids()) && d.getPids().contains(importDTO.getCompanyId().toString()))).collect(Collectors.toList()); + for (Dept dept : subDeptIds) { + if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { + importDTO.setDeptId(dept.getId()); + } + } if (ObjectUtil.isEmpty(importDTO.getDeptId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "使用部门不合法")); } @@ -402,7 +407,7 @@ @Override public Page certificateListPage(Page page, EquipmentCertificateQueryForm queryForm) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - + dataScope.setScopeName("e.dept_id"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java index 9ca18d3..a53147e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java @@ -155,6 +155,7 @@ @Override public List planFinishStatistics(List deptIds) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("e.dept_id"); return this.baseMapper.planFinishStatistics(dataScope,deptIds, CheckCompletionEnum.CHECKED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java index 99cbf42..6b03d8b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,7 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -30,6 +32,7 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; @@ -40,11 +43,15 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; + /** *

* 资源管理-委托方管理-要求、委托书及合同评审表 服务实现类 @@ -58,6 +65,7 @@ public class BizResourceCustomerExamineFormServiceImpl extends ServiceImpl implements IBizResourceCustomerExamineFormService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page approvalListPage(Page page, ExamineFormApprovalListRequest request) throws Exception { @@ -88,4 +96,54 @@ this.update(updateWrapper); } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerExamineForm examineForm = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(examineForm)){ + Map map = BeanUtil.beanToMap(examineForm); + //测试、校准或检定方法类型 + examineForm.getMeasureMethodType(); + map.put("type1", "\u25CB"); + map.put("type2", "\u25CB"); + map.put("type3", "\u25CB"); + map.put("type4", "\u25CB"); + map.put("type5", "\u25CB"); + switch (examineForm.getMeasureMethodType()){ + case "1": + map.put("type1", "\u2299"); + break; + case "2": + map.put("type2", "\u2299"); + break; + case "3": + map.put("type3", "\u2299"); + break; + case "4": + map.put("type4", "\u2299"); + break; + case "5": + map.put("type5", "\u2299"); + break; + } + //受控 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("control1", "\u2299"); + map.put("control2", "\u25CB"); + }else { + map.put("control1", "\u25CB"); + map.put("control2", "\u2299"); + } + //方法是否已确认 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("confirm1", "\u2299"); + map.put("confirm2", "\u25CB"); + }else { + map.put("confirm1", "\u25CB"); + map.put("confirm2", "\u2299"); + } + printFileRegister.registerPrintFile(CUSTOMER_EXAMINE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index 83017f8..c4ecdee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -1,10 +1,13 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -17,6 +20,7 @@ import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import com.casic.missiles.utils.NoGeneratorUtil; import lombok.RequiredArgsConstructor; @@ -24,7 +28,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; /** *

@@ -39,6 +49,7 @@ public class BizResourceCustomerResultReviewNoticeServiceImpl extends ServiceImpl implements IBizResourceCustomerResultReviewNoticeService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page listPage(Page page, CustomerResultReviewNoticeListRequest request) { @@ -57,5 +68,27 @@ return meterFilePage; } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerResultReviewNotice resultReviewNotice = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(resultReviewNotice)){ + Map map = BeanUtil.beanToMap(resultReviewNotice); + Date submitDate = DateUtil.parse(resultReviewNotice.getSubmitDate()); + map.put("submitYear", DateUtil.year(submitDate)); + map.put("submitMonth", DateUtil.month(submitDate)); + map.put("submitDay", DateUtil.dayOfMonth(submitDate)); + Date returnDate = DateUtil.parse(resultReviewNotice.getReturnDate()); + map.put("returnYear", DateUtil.year(returnDate)); + map.put("returnMonth", DateUtil.month(returnDate)); + map.put("returnDay", DateUtil.dayOfMonth(returnDate)); + Date noticeDate = DateUtil.parse(resultReviewNotice.getNoticeDate()); + map.put("noticeYear", DateUtil.year(noticeDate)); + map.put("noticeMonth", DateUtil.month(noticeDate)); + map.put("noticeDay", DateUtil.dayOfMonth(noticeDate)); + printFileRegister.registerPrintFile(CUSTOMER_RESULT_REVIEW_NOTICE, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 9f2d240..9d306e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -62,7 +62,6 @@ statisticsDTO.setDeptId(deptId); statisticsDTO.setDeptName(subList.get(0).getDeptName()); - statisticsDTO.setTotal((long) subList.size()); statisticsDTO.setMonthToExpire(subList.stream().filter(i->i.getCertificateValid().after(new Date()) && DateUtil.month(new Date()) == DateUtil.month(i.getCertificateValid())).count()); statisticsDTO.setExpired(subList.stream().filter(i->i.getCertificateValid().before(new Date())).count()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 2750303..c11cf6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -240,17 +240,22 @@ if (StrUtil.isEmpty(importDTO.getDeptName())) { importDTO.setDeptId(user.getDeptId()); } + // 所在单位 for (Dept dept : deptList) { if (ObjectUtil.isEmpty(importDTO.getCompanyId()) && dept.getFullName().equals(importDTO.getCompanyName().trim()) && dept.getPid().equals(top.getId())) { importDTO.setCompanyId(dept.getId()); } - if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { - importDTO.setDeptId(dept.getId()); - } } if (ObjectUtil.isEmpty(importDTO.getCompanyId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "所在单位不合法")); } + // 所属部门（必须是所在单位的下级部门,或者就是所在单位） + List subDeptIds = deptList.stream().filter(d->d.getId().equals(importDTO.getCompanyId()) || (StrUtil.isNotEmpty(d.getPids()) && d.getPids().contains(importDTO.getCompanyId().toString()))).collect(Collectors.toList()); + for (Dept dept : subDeptIds) { + if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { + importDTO.setDeptId(dept.getId()); + } + } if (ObjectUtil.isEmpty(importDTO.getDeptId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "使用部门不合法")); } @@ -402,7 +407,7 @@ @Override public Page certificateListPage(Page page, EquipmentCertificateQueryForm queryForm) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - + dataScope.setScopeName("e.dept_id"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java index 9ca18d3..a53147e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java @@ -155,6 +155,7 @@ @Override public List planFinishStatistics(List deptIds) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("e.dept_id"); return this.baseMapper.planFinishStatistics(dataScope,deptIds, CheckCompletionEnum.CHECKED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java index 99cbf42..6b03d8b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,7 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -30,6 +32,7 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; @@ -40,11 +43,15 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; + /** *

* 资源管理-委托方管理-要求、委托书及合同评审表 服务实现类 @@ -58,6 +65,7 @@ public class BizResourceCustomerExamineFormServiceImpl extends ServiceImpl implements IBizResourceCustomerExamineFormService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page approvalListPage(Page page, ExamineFormApprovalListRequest request) throws Exception { @@ -88,4 +96,54 @@ this.update(updateWrapper); } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerExamineForm examineForm = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(examineForm)){ + Map map = BeanUtil.beanToMap(examineForm); + //测试、校准或检定方法类型 + examineForm.getMeasureMethodType(); + map.put("type1", "\u25CB"); + map.put("type2", "\u25CB"); + map.put("type3", "\u25CB"); + map.put("type4", "\u25CB"); + map.put("type5", "\u25CB"); + switch (examineForm.getMeasureMethodType()){ + case "1": + map.put("type1", "\u2299"); + break; + case "2": + map.put("type2", "\u2299"); + break; + case "3": + map.put("type3", "\u2299"); + break; + case "4": + map.put("type4", "\u2299"); + break; + case "5": + map.put("type5", "\u2299"); + break; + } + //受控 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("control1", "\u2299"); + map.put("control2", "\u25CB"); + }else { + map.put("control1", "\u25CB"); + map.put("control2", "\u2299"); + } + //方法是否已确认 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("confirm1", "\u2299"); + map.put("confirm2", "\u25CB"); + }else { + map.put("confirm1", "\u25CB"); + map.put("confirm2", "\u2299"); + } + printFileRegister.registerPrintFile(CUSTOMER_EXAMINE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index 83017f8..c4ecdee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -1,10 +1,13 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -17,6 +20,7 @@ import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import com.casic.missiles.utils.NoGeneratorUtil; import lombok.RequiredArgsConstructor; @@ -24,7 +28,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; /** *

@@ -39,6 +49,7 @@ public class BizResourceCustomerResultReviewNoticeServiceImpl extends ServiceImpl implements IBizResourceCustomerResultReviewNoticeService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page listPage(Page page, CustomerResultReviewNoticeListRequest request) { @@ -57,5 +68,27 @@ return meterFilePage; } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerResultReviewNotice resultReviewNotice = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(resultReviewNotice)){ + Map map = BeanUtil.beanToMap(resultReviewNotice); + Date submitDate = DateUtil.parse(resultReviewNotice.getSubmitDate()); + map.put("submitYear", DateUtil.year(submitDate)); + map.put("submitMonth", DateUtil.month(submitDate)); + map.put("submitDay", DateUtil.dayOfMonth(submitDate)); + Date returnDate = DateUtil.parse(resultReviewNotice.getReturnDate()); + map.put("returnYear", DateUtil.year(returnDate)); + map.put("returnMonth", DateUtil.month(returnDate)); + map.put("returnDay", DateUtil.dayOfMonth(returnDate)); + Date noticeDate = DateUtil.parse(resultReviewNotice.getNoticeDate()); + map.put("noticeYear", DateUtil.year(noticeDate)); + map.put("noticeMonth", DateUtil.month(noticeDate)); + map.put("noticeDay", DateUtil.dayOfMonth(noticeDate)); + printFileRegister.registerPrintFile(CUSTOMER_RESULT_REVIEW_NOTICE, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index ef56a5f..90bf7c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -192,6 +192,7 @@ QueryWrapper queryWrapper = commonQuery(queryForm); queryWrapper.eq("approval.approval_status",ApprovalStatusEnum.PASSED); DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("info.dept_id"); List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); list.forEach(this::warpApprovalInfo); page.setRecords(list); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 9f2d240..9d306e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -62,7 +62,6 @@ statisticsDTO.setDeptId(deptId); statisticsDTO.setDeptName(subList.get(0).getDeptName()); - statisticsDTO.setTotal((long) subList.size()); statisticsDTO.setMonthToExpire(subList.stream().filter(i->i.getCertificateValid().after(new Date()) && DateUtil.month(new Date()) == DateUtil.month(i.getCertificateValid())).count()); statisticsDTO.setExpired(subList.stream().filter(i->i.getCertificateValid().before(new Date())).count()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 2750303..c11cf6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -240,17 +240,22 @@ if (StrUtil.isEmpty(importDTO.getDeptName())) { importDTO.setDeptId(user.getDeptId()); } + // 所在单位 for (Dept dept : deptList) { if (ObjectUtil.isEmpty(importDTO.getCompanyId()) && dept.getFullName().equals(importDTO.getCompanyName().trim()) && dept.getPid().equals(top.getId())) { importDTO.setCompanyId(dept.getId()); } - if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { - importDTO.setDeptId(dept.getId()); - } } if (ObjectUtil.isEmpty(importDTO.getCompanyId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "所在单位不合法")); } + // 所属部门（必须是所在单位的下级部门,或者就是所在单位） + List subDeptIds = deptList.stream().filter(d->d.getId().equals(importDTO.getCompanyId()) || (StrUtil.isNotEmpty(d.getPids()) && d.getPids().contains(importDTO.getCompanyId().toString()))).collect(Collectors.toList()); + for (Dept dept : subDeptIds) { + if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { + importDTO.setDeptId(dept.getId()); + } + } if (ObjectUtil.isEmpty(importDTO.getDeptId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "使用部门不合法")); } @@ -402,7 +407,7 @@ @Override public Page certificateListPage(Page page, EquipmentCertificateQueryForm queryForm) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - + dataScope.setScopeName("e.dept_id"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java index 9ca18d3..a53147e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java @@ -155,6 +155,7 @@ @Override public List planFinishStatistics(List deptIds) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("e.dept_id"); return this.baseMapper.planFinishStatistics(dataScope,deptIds, CheckCompletionEnum.CHECKED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java index 99cbf42..6b03d8b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,7 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -30,6 +32,7 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; @@ -40,11 +43,15 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; + /** *

* 资源管理-委托方管理-要求、委托书及合同评审表 服务实现类 @@ -58,6 +65,7 @@ public class BizResourceCustomerExamineFormServiceImpl extends ServiceImpl implements IBizResourceCustomerExamineFormService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page approvalListPage(Page page, ExamineFormApprovalListRequest request) throws Exception { @@ -88,4 +96,54 @@ this.update(updateWrapper); } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerExamineForm examineForm = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(examineForm)){ + Map map = BeanUtil.beanToMap(examineForm); + //测试、校准或检定方法类型 + examineForm.getMeasureMethodType(); + map.put("type1", "\u25CB"); + map.put("type2", "\u25CB"); + map.put("type3", "\u25CB"); + map.put("type4", "\u25CB"); + map.put("type5", "\u25CB"); + switch (examineForm.getMeasureMethodType()){ + case "1": + map.put("type1", "\u2299"); + break; + case "2": + map.put("type2", "\u2299"); + break; + case "3": + map.put("type3", "\u2299"); + break; + case "4": + map.put("type4", "\u2299"); + break; + case "5": + map.put("type5", "\u2299"); + break; + } + //受控 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("control1", "\u2299"); + map.put("control2", "\u25CB"); + }else { + map.put("control1", "\u25CB"); + map.put("control2", "\u2299"); + } + //方法是否已确认 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("confirm1", "\u2299"); + map.put("confirm2", "\u25CB"); + }else { + map.put("confirm1", "\u25CB"); + map.put("confirm2", "\u2299"); + } + printFileRegister.registerPrintFile(CUSTOMER_EXAMINE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index 83017f8..c4ecdee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -1,10 +1,13 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -17,6 +20,7 @@ import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import com.casic.missiles.utils.NoGeneratorUtil; import lombok.RequiredArgsConstructor; @@ -24,7 +28,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; /** *

@@ -39,6 +49,7 @@ public class BizResourceCustomerResultReviewNoticeServiceImpl extends ServiceImpl implements IBizResourceCustomerResultReviewNoticeService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page listPage(Page page, CustomerResultReviewNoticeListRequest request) { @@ -57,5 +68,27 @@ return meterFilePage; } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerResultReviewNotice resultReviewNotice = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(resultReviewNotice)){ + Map map = BeanUtil.beanToMap(resultReviewNotice); + Date submitDate = DateUtil.parse(resultReviewNotice.getSubmitDate()); + map.put("submitYear", DateUtil.year(submitDate)); + map.put("submitMonth", DateUtil.month(submitDate)); + map.put("submitDay", DateUtil.dayOfMonth(submitDate)); + Date returnDate = DateUtil.parse(resultReviewNotice.getReturnDate()); + map.put("returnYear", DateUtil.year(returnDate)); + map.put("returnMonth", DateUtil.month(returnDate)); + map.put("returnDay", DateUtil.dayOfMonth(returnDate)); + Date noticeDate = DateUtil.parse(resultReviewNotice.getNoticeDate()); + map.put("noticeYear", DateUtil.year(noticeDate)); + map.put("noticeMonth", DateUtil.month(noticeDate)); + map.put("noticeDay", DateUtil.dayOfMonth(noticeDate)); + printFileRegister.registerPrintFile(CUSTOMER_RESULT_REVIEW_NOTICE, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index ef56a5f..90bf7c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -192,6 +192,7 @@ QueryWrapper queryWrapper = commonQuery(queryForm); queryWrapper.eq("approval.approval_status",ApprovalStatusEnum.PASSED); DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("info.dept_id"); List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); list.forEach(this::warpApprovalInfo); page.setRecords(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index d86249b..4dd3d44 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -65,7 +65,7 @@ @Override public Page listScopePage(Page page, String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, subcontractorName, createTimeStart, createTimeEnd); page.setRecords(this.baseMapper.listScopePage(dataScope,page,queryWrapper)); return page; @@ -74,7 +74,7 @@ @Override public List listScope(String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd, List ids) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper; if(CollUtil.isNotEmpty(ids)){ queryWrapper = new QueryWrapper<>(); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 9f2d240..9d306e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -62,7 +62,6 @@ statisticsDTO.setDeptId(deptId); statisticsDTO.setDeptName(subList.get(0).getDeptName()); - statisticsDTO.setTotal((long) subList.size()); statisticsDTO.setMonthToExpire(subList.stream().filter(i->i.getCertificateValid().after(new Date()) && DateUtil.month(new Date()) == DateUtil.month(i.getCertificateValid())).count()); statisticsDTO.setExpired(subList.stream().filter(i->i.getCertificateValid().before(new Date())).count()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 2750303..c11cf6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -240,17 +240,22 @@ if (StrUtil.isEmpty(importDTO.getDeptName())) { importDTO.setDeptId(user.getDeptId()); } + // 所在单位 for (Dept dept : deptList) { if (ObjectUtil.isEmpty(importDTO.getCompanyId()) && dept.getFullName().equals(importDTO.getCompanyName().trim()) && dept.getPid().equals(top.getId())) { importDTO.setCompanyId(dept.getId()); } - if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { - importDTO.setDeptId(dept.getId()); - } } if (ObjectUtil.isEmpty(importDTO.getCompanyId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "所在单位不合法")); } + // 所属部门（必须是所在单位的下级部门,或者就是所在单位） + List subDeptIds = deptList.stream().filter(d->d.getId().equals(importDTO.getCompanyId()) || (StrUtil.isNotEmpty(d.getPids()) && d.getPids().contains(importDTO.getCompanyId().toString()))).collect(Collectors.toList()); + for (Dept dept : subDeptIds) { + if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { + importDTO.setDeptId(dept.getId()); + } + } if (ObjectUtil.isEmpty(importDTO.getDeptId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "使用部门不合法")); } @@ -402,7 +407,7 @@ @Override public Page certificateListPage(Page page, EquipmentCertificateQueryForm queryForm) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - + dataScope.setScopeName("e.dept_id"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java index 9ca18d3..a53147e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java @@ -155,6 +155,7 @@ @Override public List planFinishStatistics(List deptIds) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("e.dept_id"); return this.baseMapper.planFinishStatistics(dataScope,deptIds, CheckCompletionEnum.CHECKED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java index 99cbf42..6b03d8b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,7 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -30,6 +32,7 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; @@ -40,11 +43,15 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; + /** *

* 资源管理-委托方管理-要求、委托书及合同评审表 服务实现类 @@ -58,6 +65,7 @@ public class BizResourceCustomerExamineFormServiceImpl extends ServiceImpl implements IBizResourceCustomerExamineFormService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page approvalListPage(Page page, ExamineFormApprovalListRequest request) throws Exception { @@ -88,4 +96,54 @@ this.update(updateWrapper); } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerExamineForm examineForm = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(examineForm)){ + Map map = BeanUtil.beanToMap(examineForm); + //测试、校准或检定方法类型 + examineForm.getMeasureMethodType(); + map.put("type1", "\u25CB"); + map.put("type2", "\u25CB"); + map.put("type3", "\u25CB"); + map.put("type4", "\u25CB"); + map.put("type5", "\u25CB"); + switch (examineForm.getMeasureMethodType()){ + case "1": + map.put("type1", "\u2299"); + break; + case "2": + map.put("type2", "\u2299"); + break; + case "3": + map.put("type3", "\u2299"); + break; + case "4": + map.put("type4", "\u2299"); + break; + case "5": + map.put("type5", "\u2299"); + break; + } + //受控 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("control1", "\u2299"); + map.put("control2", "\u25CB"); + }else { + map.put("control1", "\u25CB"); + map.put("control2", "\u2299"); + } + //方法是否已确认 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("confirm1", "\u2299"); + map.put("confirm2", "\u25CB"); + }else { + map.put("confirm1", "\u25CB"); + map.put("confirm2", "\u2299"); + } + printFileRegister.registerPrintFile(CUSTOMER_EXAMINE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index 83017f8..c4ecdee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -1,10 +1,13 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -17,6 +20,7 @@ import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import com.casic.missiles.utils.NoGeneratorUtil; import lombok.RequiredArgsConstructor; @@ -24,7 +28,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; /** *

@@ -39,6 +49,7 @@ public class BizResourceCustomerResultReviewNoticeServiceImpl extends ServiceImpl implements IBizResourceCustomerResultReviewNoticeService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page listPage(Page page, CustomerResultReviewNoticeListRequest request) { @@ -57,5 +68,27 @@ return meterFilePage; } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerResultReviewNotice resultReviewNotice = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(resultReviewNotice)){ + Map map = BeanUtil.beanToMap(resultReviewNotice); + Date submitDate = DateUtil.parse(resultReviewNotice.getSubmitDate()); + map.put("submitYear", DateUtil.year(submitDate)); + map.put("submitMonth", DateUtil.month(submitDate)); + map.put("submitDay", DateUtil.dayOfMonth(submitDate)); + Date returnDate = DateUtil.parse(resultReviewNotice.getReturnDate()); + map.put("returnYear", DateUtil.year(returnDate)); + map.put("returnMonth", DateUtil.month(returnDate)); + map.put("returnDay", DateUtil.dayOfMonth(returnDate)); + Date noticeDate = DateUtil.parse(resultReviewNotice.getNoticeDate()); + map.put("noticeYear", DateUtil.year(noticeDate)); + map.put("noticeMonth", DateUtil.month(noticeDate)); + map.put("noticeDay", DateUtil.dayOfMonth(noticeDate)); + printFileRegister.registerPrintFile(CUSTOMER_RESULT_REVIEW_NOTICE, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index ef56a5f..90bf7c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -192,6 +192,7 @@ QueryWrapper queryWrapper = commonQuery(queryForm); queryWrapper.eq("approval.approval_status",ApprovalStatusEnum.PASSED); DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("info.dept_id"); List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); list.forEach(this::warpApprovalInfo); page.setRecords(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index d86249b..4dd3d44 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -65,7 +65,7 @@ @Override public Page listScopePage(Page page, String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, subcontractorName, createTimeStart, createTimeEnd); page.setRecords(this.baseMapper.listScopePage(dataScope,page,queryWrapper)); return page; @@ -74,7 +74,7 @@ @Override public List listScope(String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd, List ids) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper; if(CollUtil.isNotEmpty(ids)){ queryWrapper = new QueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java index 4d4904e..e6af5fd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java @@ -33,7 +33,7 @@ @Override public Page listScopePage(Page page) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("create_dept_id"); List list = this.baseMapper.listScopePage(dataScope,page,null); page.setRecords(list); return page; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 9f2d240..9d306e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -62,7 +62,6 @@ statisticsDTO.setDeptId(deptId); statisticsDTO.setDeptName(subList.get(0).getDeptName()); - statisticsDTO.setTotal((long) subList.size()); statisticsDTO.setMonthToExpire(subList.stream().filter(i->i.getCertificateValid().after(new Date()) && DateUtil.month(new Date()) == DateUtil.month(i.getCertificateValid())).count()); statisticsDTO.setExpired(subList.stream().filter(i->i.getCertificateValid().before(new Date())).count()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 2750303..c11cf6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -240,17 +240,22 @@ if (StrUtil.isEmpty(importDTO.getDeptName())) { importDTO.setDeptId(user.getDeptId()); } + // 所在单位 for (Dept dept : deptList) { if (ObjectUtil.isEmpty(importDTO.getCompanyId()) && dept.getFullName().equals(importDTO.getCompanyName().trim()) && dept.getPid().equals(top.getId())) { importDTO.setCompanyId(dept.getId()); } - if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { - importDTO.setDeptId(dept.getId()); - } } if (ObjectUtil.isEmpty(importDTO.getCompanyId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "所在单位不合法")); } + // 所属部门（必须是所在单位的下级部门,或者就是所在单位） + List subDeptIds = deptList.stream().filter(d->d.getId().equals(importDTO.getCompanyId()) || (StrUtil.isNotEmpty(d.getPids()) && d.getPids().contains(importDTO.getCompanyId().toString()))).collect(Collectors.toList()); + for (Dept dept : subDeptIds) { + if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { + importDTO.setDeptId(dept.getId()); + } + } if (ObjectUtil.isEmpty(importDTO.getDeptId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "使用部门不合法")); } @@ -402,7 +407,7 @@ @Override public Page certificateListPage(Page page, EquipmentCertificateQueryForm queryForm) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - + dataScope.setScopeName("e.dept_id"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java index 9ca18d3..a53147e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java @@ -155,6 +155,7 @@ @Override public List planFinishStatistics(List deptIds) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("e.dept_id"); return this.baseMapper.planFinishStatistics(dataScope,deptIds, CheckCompletionEnum.CHECKED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java index 99cbf42..6b03d8b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,7 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -30,6 +32,7 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; @@ -40,11 +43,15 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; + /** *

* 资源管理-委托方管理-要求、委托书及合同评审表 服务实现类 @@ -58,6 +65,7 @@ public class BizResourceCustomerExamineFormServiceImpl extends ServiceImpl implements IBizResourceCustomerExamineFormService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page approvalListPage(Page page, ExamineFormApprovalListRequest request) throws Exception { @@ -88,4 +96,54 @@ this.update(updateWrapper); } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerExamineForm examineForm = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(examineForm)){ + Map map = BeanUtil.beanToMap(examineForm); + //测试、校准或检定方法类型 + examineForm.getMeasureMethodType(); + map.put("type1", "\u25CB"); + map.put("type2", "\u25CB"); + map.put("type3", "\u25CB"); + map.put("type4", "\u25CB"); + map.put("type5", "\u25CB"); + switch (examineForm.getMeasureMethodType()){ + case "1": + map.put("type1", "\u2299"); + break; + case "2": + map.put("type2", "\u2299"); + break; + case "3": + map.put("type3", "\u2299"); + break; + case "4": + map.put("type4", "\u2299"); + break; + case "5": + map.put("type5", "\u2299"); + break; + } + //受控 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("control1", "\u2299"); + map.put("control2", "\u25CB"); + }else { + map.put("control1", "\u25CB"); + map.put("control2", "\u2299"); + } + //方法是否已确认 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("confirm1", "\u2299"); + map.put("confirm2", "\u25CB"); + }else { + map.put("confirm1", "\u25CB"); + map.put("confirm2", "\u2299"); + } + printFileRegister.registerPrintFile(CUSTOMER_EXAMINE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index 83017f8..c4ecdee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -1,10 +1,13 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -17,6 +20,7 @@ import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import com.casic.missiles.utils.NoGeneratorUtil; import lombok.RequiredArgsConstructor; @@ -24,7 +28,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; /** *

@@ -39,6 +49,7 @@ public class BizResourceCustomerResultReviewNoticeServiceImpl extends ServiceImpl implements IBizResourceCustomerResultReviewNoticeService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page listPage(Page page, CustomerResultReviewNoticeListRequest request) { @@ -57,5 +68,27 @@ return meterFilePage; } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerResultReviewNotice resultReviewNotice = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(resultReviewNotice)){ + Map map = BeanUtil.beanToMap(resultReviewNotice); + Date submitDate = DateUtil.parse(resultReviewNotice.getSubmitDate()); + map.put("submitYear", DateUtil.year(submitDate)); + map.put("submitMonth", DateUtil.month(submitDate)); + map.put("submitDay", DateUtil.dayOfMonth(submitDate)); + Date returnDate = DateUtil.parse(resultReviewNotice.getReturnDate()); + map.put("returnYear", DateUtil.year(returnDate)); + map.put("returnMonth", DateUtil.month(returnDate)); + map.put("returnDay", DateUtil.dayOfMonth(returnDate)); + Date noticeDate = DateUtil.parse(resultReviewNotice.getNoticeDate()); + map.put("noticeYear", DateUtil.year(noticeDate)); + map.put("noticeMonth", DateUtil.month(noticeDate)); + map.put("noticeDay", DateUtil.dayOfMonth(noticeDate)); + printFileRegister.registerPrintFile(CUSTOMER_RESULT_REVIEW_NOTICE, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index ef56a5f..90bf7c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -192,6 +192,7 @@ QueryWrapper queryWrapper = commonQuery(queryForm); queryWrapper.eq("approval.approval_status",ApprovalStatusEnum.PASSED); DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("info.dept_id"); List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); list.forEach(this::warpApprovalInfo); page.setRecords(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index d86249b..4dd3d44 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -65,7 +65,7 @@ @Override public Page listScopePage(Page page, String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, subcontractorName, createTimeStart, createTimeEnd); page.setRecords(this.baseMapper.listScopePage(dataScope,page,queryWrapper)); return page; @@ -74,7 +74,7 @@ @Override public List listScope(String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd, List ids) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper; if(CollUtil.isNotEmpty(ids)){ queryWrapper = new QueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java index 4d4904e..e6af5fd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java @@ -33,7 +33,7 @@ @Override public Page listScopePage(Page page) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("create_dept_id"); List list = this.baseMapper.listScopePage(dataScope,page,null); page.setRecords(list); return page; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerExamineFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerExamineFormService.java index 304ea44..b71e22d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerExamineFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerExamineFormService.java @@ -2,12 +2,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -24,4 +26,6 @@ void updateSignStatus(Long id, String signStatus); + void exportFile(ExportDTO exportDTO, HttpServletResponse response); + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 305c409..b1ef7ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -9,5 +9,7 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; + String CUSTOMER_EXAMINE_FORM = "要求、委托书及合同评审表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 421c87c..1438f80 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; @@ -26,6 +23,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -69,4 +67,10 @@ return ReturnUtil.success(); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + examineFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 3199612..e0489ef 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,10 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -22,6 +19,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -52,4 +50,10 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java index 17ff364..379c2db 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerExamineForm.java @@ -75,6 +75,9 @@ @TableField("lab_code") private String labCode; + @TableField(exist = false) + private String labCodeName; + /** * 组别代码(字典code) */ @@ -84,6 +87,9 @@ @TableField("group_code") private String groupCode; + @TableField(exist = false) + private String groupCodeName; + /** * 评审表编号(按西昌规则生成) */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 9f2d240..9d306e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -62,7 +62,6 @@ statisticsDTO.setDeptId(deptId); statisticsDTO.setDeptName(subList.get(0).getDeptName()); - statisticsDTO.setTotal((long) subList.size()); statisticsDTO.setMonthToExpire(subList.stream().filter(i->i.getCertificateValid().after(new Date()) && DateUtil.month(new Date()) == DateUtil.month(i.getCertificateValid())).count()); statisticsDTO.setExpired(subList.stream().filter(i->i.getCertificateValid().before(new Date())).count()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 2750303..c11cf6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -240,17 +240,22 @@ if (StrUtil.isEmpty(importDTO.getDeptName())) { importDTO.setDeptId(user.getDeptId()); } + // 所在单位 for (Dept dept : deptList) { if (ObjectUtil.isEmpty(importDTO.getCompanyId()) && dept.getFullName().equals(importDTO.getCompanyName().trim()) && dept.getPid().equals(top.getId())) { importDTO.setCompanyId(dept.getId()); } - if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { - importDTO.setDeptId(dept.getId()); - } } if (ObjectUtil.isEmpty(importDTO.getCompanyId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "所在单位不合法")); } + // 所属部门（必须是所在单位的下级部门,或者就是所在单位） + List subDeptIds = deptList.stream().filter(d->d.getId().equals(importDTO.getCompanyId()) || (StrUtil.isNotEmpty(d.getPids()) && d.getPids().contains(importDTO.getCompanyId().toString()))).collect(Collectors.toList()); + for (Dept dept : subDeptIds) { + if (ObjectUtil.isEmpty(importDTO.getDeptId()) && dept.getFullName().equals(importDTO.getDeptName().trim())) { + importDTO.setDeptId(dept.getId()); + } + } if (ObjectUtil.isEmpty(importDTO.getDeptId())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "使用部门不合法")); } @@ -402,7 +407,7 @@ @Override public Page certificateListPage(Page page, EquipmentCertificateQueryForm queryForm) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - + dataScope.setScopeName("e.dept_id"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java index 9ca18d3..a53147e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java @@ -155,6 +155,7 @@ @Override public List planFinishStatistics(List deptIds) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("e.dept_id"); return this.baseMapper.planFinishStatistics(dataScope,deptIds, CheckCompletionEnum.CHECKED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java index 99cbf42..6b03d8b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,7 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -30,6 +32,7 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; @@ -40,11 +43,15 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; + /** *

* 资源管理-委托方管理-要求、委托书及合同评审表 服务实现类 @@ -58,6 +65,7 @@ public class BizResourceCustomerExamineFormServiceImpl extends ServiceImpl implements IBizResourceCustomerExamineFormService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page approvalListPage(Page page, ExamineFormApprovalListRequest request) throws Exception { @@ -88,4 +96,54 @@ this.update(updateWrapper); } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerExamineForm examineForm = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(examineForm)){ + Map map = BeanUtil.beanToMap(examineForm); + //测试、校准或检定方法类型 + examineForm.getMeasureMethodType(); + map.put("type1", "\u25CB"); + map.put("type2", "\u25CB"); + map.put("type3", "\u25CB"); + map.put("type4", "\u25CB"); + map.put("type5", "\u25CB"); + switch (examineForm.getMeasureMethodType()){ + case "1": + map.put("type1", "\u2299"); + break; + case "2": + map.put("type2", "\u2299"); + break; + case "3": + map.put("type3", "\u2299"); + break; + case "4": + map.put("type4", "\u2299"); + break; + case "5": + map.put("type5", "\u2299"); + break; + } + //受控 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("control1", "\u2299"); + map.put("control2", "\u25CB"); + }else { + map.put("control1", "\u25CB"); + map.put("control2", "\u2299"); + } + //方法是否已确认 + if(examineForm.getMeasureMethodControlled().equals(1)){ + map.put("confirm1", "\u2299"); + map.put("confirm2", "\u25CB"); + }else { + map.put("confirm1", "\u25CB"); + map.put("confirm2", "\u2299"); + } + printFileRegister.registerPrintFile(CUSTOMER_EXAMINE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index 83017f8..c4ecdee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -1,10 +1,13 @@ package com.casic.missiles.service.impl.resource; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -17,6 +20,7 @@ import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import com.casic.missiles.utils.NoGeneratorUtil; import lombok.RequiredArgsConstructor; @@ -24,7 +28,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; /** *

@@ -39,6 +49,7 @@ public class BizResourceCustomerResultReviewNoticeServiceImpl extends ServiceImpl implements IBizResourceCustomerResultReviewNoticeService { private final AbstractPermissionContext permissionContext; + private final PrintFileRegister printFileRegister; @Override public Page listPage(Page page, CustomerResultReviewNoticeListRequest request) { @@ -57,5 +68,27 @@ return meterFilePage; } + @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { + BizResourceCustomerResultReviewNotice resultReviewNotice = this.baseMapper.selectById(exportDTO.getId()); + if(Objects.nonNull(resultReviewNotice)){ + Map map = BeanUtil.beanToMap(resultReviewNotice); + Date submitDate = DateUtil.parse(resultReviewNotice.getSubmitDate()); + map.put("submitYear", DateUtil.year(submitDate)); + map.put("submitMonth", DateUtil.month(submitDate)); + map.put("submitDay", DateUtil.dayOfMonth(submitDate)); + Date returnDate = DateUtil.parse(resultReviewNotice.getReturnDate()); + map.put("returnYear", DateUtil.year(returnDate)); + map.put("returnMonth", DateUtil.month(returnDate)); + map.put("returnDay", DateUtil.dayOfMonth(returnDate)); + Date noticeDate = DateUtil.parse(resultReviewNotice.getNoticeDate()); + map.put("noticeYear", DateUtil.year(noticeDate)); + map.put("noticeMonth", DateUtil.month(noticeDate)); + map.put("noticeDay", DateUtil.dayOfMonth(noticeDate)); + printFileRegister.registerPrintFile(CUSTOMER_RESULT_REVIEW_NOTICE, "1", null, map, exportDTO.isPdf(), response); + } + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index ef56a5f..90bf7c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -192,6 +192,7 @@ QueryWrapper queryWrapper = commonQuery(queryForm); queryWrapper.eq("approval.approval_status",ApprovalStatusEnum.PASSED); DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("info.dept_id"); List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); list.forEach(this::warpApprovalInfo); page.setRecords(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index d86249b..4dd3d44 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -65,7 +65,7 @@ @Override public Page listScopePage(Page page, String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, subcontractorName, createTimeStart, createTimeEnd); page.setRecords(this.baseMapper.listScopePage(dataScope,page,queryWrapper)); return page; @@ -74,7 +74,7 @@ @Override public List listScope(String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd, List ids) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper; if(CollUtil.isNotEmpty(ids)){ queryWrapper = new QueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java index 4d4904e..e6af5fd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/RemindConfigServiceImpl.java @@ -33,7 +33,7 @@ @Override public Page listScopePage(Page page) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("createDeptId"); + dataScope.setScopeName("create_dept_id"); List list = this.baseMapper.listScopePage(dataScope,page,null); page.setRecords(list); return page; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerExamineFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerExamineFormService.java index 304ea44..b71e22d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerExamineFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerExamineFormService.java @@ -2,12 +2,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.ExamineFormSendToRequest; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -24,4 +26,6 @@ void updateSignStatus(Long id, String signStatus); + void exportFile(ExportDTO exportDTO, HttpServletResponse response); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerResultReviewNoticeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerResultReviewNoticeService.java index 6ec1df1..c66338a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerResultReviewNoticeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerResultReviewNoticeService.java @@ -2,11 +2,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.CustomerResultReviewNoticeListRequest; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -21,4 +23,5 @@ Page listPage(Page page, CustomerResultReviewNoticeListRequest request); + void exportFile(ExportDTO exportDTO, HttpServletResponse response); }