diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java index 8bb22d3..65b4af6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java @@ -222,7 +222,10 @@ if (itemCategoryName.contains("电子式绝缘电阻表(指针式)") || itemCategoryName.contains("兆欧表")) { if (StringUtils.isNotEmpty(itemData.getMeasureIndicationValue()) && StringUtils.isNotEmpty(itemData.getAccuracyA())) { //最大允许误差= ±（准确度a*被检表示值） - BigDecimal maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + BigDecimal maximumError = BigDecimal.ZERO; + if (!"∞".equals(itemData.getMeasureIndicationValue())) { + maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + } itemData.setMaximumError("±" + maximumError); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java index 8bb22d3..65b4af6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java @@ -222,7 +222,10 @@ if (itemCategoryName.contains("电子式绝缘电阻表(指针式)") || itemCategoryName.contains("兆欧表")) { if (StringUtils.isNotEmpty(itemData.getMeasureIndicationValue()) && StringUtils.isNotEmpty(itemData.getAccuracyA())) { //最大允许误差= ±（准确度a*被检表示值） - BigDecimal maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + BigDecimal maximumError = BigDecimal.ZERO; + if (!"∞".equals(itemData.getMeasureIndicationValue())) { + maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + } itemData.setMaximumError("±" + maximumError); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java index e5f8bd5..ff27f76 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java @@ -7,6 +7,8 @@ import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -103,17 +105,18 @@ * @param files * @param fileSaveRootPath * @param out + * @param parentDir * @return * @throws Exception */ - private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String dir) throws Exception { - //遍历jsonArray列表获取所有JSONObject对象 + private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String parentDir) throws Exception { for (int i = 0; i < files.length; i++) { - //以论文标题为每个文件命名 + String currentFilePath = fileSaveRootPath + File.separator + files[i].getName(); + if (files[i].isFile()) { - FileInputStream fis = new FileInputStream(fileSaveRootPath + File.separator + files[i].getName()); - out.putNextEntry(new ZipEntry(dir + files[i].getName())); - //写入压缩包 + FileInputStream fis = new FileInputStream(currentFilePath); + String entryName = parentDir + files[i].getName(); + out.putNextEntry(new ZipEntry(entryName)); int len; byte[] buffer = new byte[1024]; while ((len = fis.read(buffer)) > 0) { @@ -122,14 +125,13 @@ out.closeEntry(); fis.close(); } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 File[] childFiles = files[i].listFiles(); - // 需要保留原来的文件结构时,需要对空文件夹进行处理 - // 空文件夹的处理 - out.putNextEntry(new ZipEntry(files[i].getName() + "/")); - // 没有文件，不需要文件的copy - doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, files[i].getName() + File.separator); - out.closeEntry();//关闭当前zip条目读取下一条 + String dirName = parentDir + files[i].getName() + File.separator; + out.putNextEntry(new ZipEntry(dirName)); + out.closeEntry(); // 关闭空目录条目 + + // 递归处理子目录 + doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, dirName); } } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java index 8bb22d3..65b4af6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java @@ -222,7 +222,10 @@ if (itemCategoryName.contains("电子式绝缘电阻表(指针式)") || itemCategoryName.contains("兆欧表")) { if (StringUtils.isNotEmpty(itemData.getMeasureIndicationValue()) && StringUtils.isNotEmpty(itemData.getAccuracyA())) { //最大允许误差= ±（准确度a*被检表示值） - BigDecimal maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + BigDecimal maximumError = BigDecimal.ZERO; + if (!"∞".equals(itemData.getMeasureIndicationValue())) { + maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + } itemData.setMaximumError("±" + maximumError); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java index e5f8bd5..ff27f76 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java @@ -7,6 +7,8 @@ import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -103,17 +105,18 @@ * @param files * @param fileSaveRootPath * @param out + * @param parentDir * @return * @throws Exception */ - private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String dir) throws Exception { - //遍历jsonArray列表获取所有JSONObject对象 + private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String parentDir) throws Exception { for (int i = 0; i < files.length; i++) { - //以论文标题为每个文件命名 + String currentFilePath = fileSaveRootPath + File.separator + files[i].getName(); + if (files[i].isFile()) { - FileInputStream fis = new FileInputStream(fileSaveRootPath + File.separator + files[i].getName()); - out.putNextEntry(new ZipEntry(dir + files[i].getName())); - //写入压缩包 + FileInputStream fis = new FileInputStream(currentFilePath); + String entryName = parentDir + files[i].getName(); + out.putNextEntry(new ZipEntry(entryName)); int len; byte[] buffer = new byte[1024]; while ((len = fis.read(buffer)) > 0) { @@ -122,14 +125,13 @@ out.closeEntry(); fis.close(); } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 File[] childFiles = files[i].listFiles(); - // 需要保留原来的文件结构时,需要对空文件夹进行处理 - // 空文件夹的处理 - out.putNextEntry(new ZipEntry(files[i].getName() + "/")); - // 没有文件，不需要文件的copy - doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, files[i].getName() + File.separator); - out.closeEntry();//关闭当前zip条目读取下一条 + String dirName = parentDir + files[i].getName() + File.separator; + out.putNextEntry(new ZipEntry(dirName)); + out.closeEntry(); // 关闭空目录条目 + + // 递归处理子目录 + doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, dirName); } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index f2a0562..753aab4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,6 +24,7 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); + List selectByUserId(@Param("userId") Long userId); List selectStaffAuthorizeList(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java index 8bb22d3..65b4af6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java @@ -222,7 +222,10 @@ if (itemCategoryName.contains("电子式绝缘电阻表(指针式)") || itemCategoryName.contains("兆欧表")) { if (StringUtils.isNotEmpty(itemData.getMeasureIndicationValue()) && StringUtils.isNotEmpty(itemData.getAccuracyA())) { //最大允许误差= ±（准确度a*被检表示值） - BigDecimal maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + BigDecimal maximumError = BigDecimal.ZERO; + if (!"∞".equals(itemData.getMeasureIndicationValue())) { + maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + } itemData.setMaximumError("±" + maximumError); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java index e5f8bd5..ff27f76 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java @@ -7,6 +7,8 @@ import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -103,17 +105,18 @@ * @param files * @param fileSaveRootPath * @param out + * @param parentDir * @return * @throws Exception */ - private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String dir) throws Exception { - //遍历jsonArray列表获取所有JSONObject对象 + private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String parentDir) throws Exception { for (int i = 0; i < files.length; i++) { - //以论文标题为每个文件命名 + String currentFilePath = fileSaveRootPath + File.separator + files[i].getName(); + if (files[i].isFile()) { - FileInputStream fis = new FileInputStream(fileSaveRootPath + File.separator + files[i].getName()); - out.putNextEntry(new ZipEntry(dir + files[i].getName())); - //写入压缩包 + FileInputStream fis = new FileInputStream(currentFilePath); + String entryName = parentDir + files[i].getName(); + out.putNextEntry(new ZipEntry(entryName)); int len; byte[] buffer = new byte[1024]; while ((len = fis.read(buffer)) > 0) { @@ -122,14 +125,13 @@ out.closeEntry(); fis.close(); } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 File[] childFiles = files[i].listFiles(); - // 需要保留原来的文件结构时,需要对空文件夹进行处理 - // 空文件夹的处理 - out.putNextEntry(new ZipEntry(files[i].getName() + "/")); - // 没有文件，不需要文件的copy - doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, files[i].getName() + File.separator); - out.closeEntry();//关闭当前zip条目读取下一条 + String dirName = parentDir + files[i].getName() + File.separator; + out.putNextEntry(new ZipEntry(dirName)); + out.closeEntry(); // 关闭空目录条目 + + // 递归处理子目录 + doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, dirName); } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index f2a0562..753aab4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,6 +24,7 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); + List selectByUserId(@Param("userId") Long userId); List selectStaffAuthorizeList(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java index 8bb22d3..65b4af6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java @@ -222,7 +222,10 @@ if (itemCategoryName.contains("电子式绝缘电阻表(指针式)") || itemCategoryName.contains("兆欧表")) { if (StringUtils.isNotEmpty(itemData.getMeasureIndicationValue()) && StringUtils.isNotEmpty(itemData.getAccuracyA())) { //最大允许误差= ±（准确度a*被检表示值） - BigDecimal maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + BigDecimal maximumError = BigDecimal.ZERO; + if (!"∞".equals(itemData.getMeasureIndicationValue())) { + maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + } itemData.setMaximumError("±" + maximumError); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java index e5f8bd5..ff27f76 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java @@ -7,6 +7,8 @@ import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -103,17 +105,18 @@ * @param files * @param fileSaveRootPath * @param out + * @param parentDir * @return * @throws Exception */ - private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String dir) throws Exception { - //遍历jsonArray列表获取所有JSONObject对象 + private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String parentDir) throws Exception { for (int i = 0; i < files.length; i++) { - //以论文标题为每个文件命名 + String currentFilePath = fileSaveRootPath + File.separator + files[i].getName(); + if (files[i].isFile()) { - FileInputStream fis = new FileInputStream(fileSaveRootPath + File.separator + files[i].getName()); - out.putNextEntry(new ZipEntry(dir + files[i].getName())); - //写入压缩包 + FileInputStream fis = new FileInputStream(currentFilePath); + String entryName = parentDir + files[i].getName(); + out.putNextEntry(new ZipEntry(entryName)); int len; byte[] buffer = new byte[1024]; while ((len = fis.read(buffer)) > 0) { @@ -122,14 +125,13 @@ out.closeEntry(); fis.close(); } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 File[] childFiles = files[i].listFiles(); - // 需要保留原来的文件结构时,需要对空文件夹进行处理 - // 空文件夹的处理 - out.putNextEntry(new ZipEntry(files[i].getName() + "/")); - // 没有文件，不需要文件的copy - doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, files[i].getName() + File.separator); - out.closeEntry();//关闭当前zip条目读取下一条 + String dirName = parentDir + files[i].getName() + File.separator; + out.putNextEntry(new ZipEntry(dirName)); + out.closeEntry(); // 关闭空目录条目 + + // 递归处理子目录 + doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, dirName); } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index f2a0562..753aab4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,6 +24,7 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); + List selectByUserId(@Param("userId") Long userId); List selectStaffAuthorizeList(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 56c7c0e..38499bc 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -98,11 +98,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} @@ -155,11 +164,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java index 8bb22d3..65b4af6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java @@ -222,7 +222,10 @@ if (itemCategoryName.contains("电子式绝缘电阻表(指针式)") || itemCategoryName.contains("兆欧表")) { if (StringUtils.isNotEmpty(itemData.getMeasureIndicationValue()) && StringUtils.isNotEmpty(itemData.getAccuracyA())) { //最大允许误差= ±（准确度a*被检表示值） - BigDecimal maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + BigDecimal maximumError = BigDecimal.ZERO; + if (!"∞".equals(itemData.getMeasureIndicationValue())) { + maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + } itemData.setMaximumError("±" + maximumError); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java index e5f8bd5..ff27f76 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java @@ -7,6 +7,8 @@ import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -103,17 +105,18 @@ * @param files * @param fileSaveRootPath * @param out + * @param parentDir * @return * @throws Exception */ - private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String dir) throws Exception { - //遍历jsonArray列表获取所有JSONObject对象 + private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String parentDir) throws Exception { for (int i = 0; i < files.length; i++) { - //以论文标题为每个文件命名 + String currentFilePath = fileSaveRootPath + File.separator + files[i].getName(); + if (files[i].isFile()) { - FileInputStream fis = new FileInputStream(fileSaveRootPath + File.separator + files[i].getName()); - out.putNextEntry(new ZipEntry(dir + files[i].getName())); - //写入压缩包 + FileInputStream fis = new FileInputStream(currentFilePath); + String entryName = parentDir + files[i].getName(); + out.putNextEntry(new ZipEntry(entryName)); int len; byte[] buffer = new byte[1024]; while ((len = fis.read(buffer)) > 0) { @@ -122,14 +125,13 @@ out.closeEntry(); fis.close(); } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 File[] childFiles = files[i].listFiles(); - // 需要保留原来的文件结构时,需要对空文件夹进行处理 - // 空文件夹的处理 - out.putNextEntry(new ZipEntry(files[i].getName() + "/")); - // 没有文件，不需要文件的copy - doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, files[i].getName() + File.separator); - out.closeEntry();//关闭当前zip条目读取下一条 + String dirName = parentDir + files[i].getName() + File.separator; + out.putNextEntry(new ZipEntry(dirName)); + out.closeEntry(); // 关闭空目录条目 + + // 递归处理子目录 + doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, dirName); } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index f2a0562..753aab4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,6 +24,7 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); + List selectByUserId(@Param("userId") Long userId); List selectStaffAuthorizeList(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 56c7c0e..38499bc 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -98,11 +98,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} @@ -155,11 +164,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index 69d6c4b..6476565 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -29,12 +29,13 @@ - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java index 8bb22d3..65b4af6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java @@ -222,7 +222,10 @@ if (itemCategoryName.contains("电子式绝缘电阻表(指针式)") || itemCategoryName.contains("兆欧表")) { if (StringUtils.isNotEmpty(itemData.getMeasureIndicationValue()) && StringUtils.isNotEmpty(itemData.getAccuracyA())) { //最大允许误差= ±（准确度a*被检表示值） - BigDecimal maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + BigDecimal maximumError = BigDecimal.ZERO; + if (!"∞".equals(itemData.getMeasureIndicationValue())) { + maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + } itemData.setMaximumError("±" + maximumError); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java index e5f8bd5..ff27f76 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java @@ -7,6 +7,8 @@ import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -103,17 +105,18 @@ * @param files * @param fileSaveRootPath * @param out + * @param parentDir * @return * @throws Exception */ - private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String dir) throws Exception { - //遍历jsonArray列表获取所有JSONObject对象 + private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String parentDir) throws Exception { for (int i = 0; i < files.length; i++) { - //以论文标题为每个文件命名 + String currentFilePath = fileSaveRootPath + File.separator + files[i].getName(); + if (files[i].isFile()) { - FileInputStream fis = new FileInputStream(fileSaveRootPath + File.separator + files[i].getName()); - out.putNextEntry(new ZipEntry(dir + files[i].getName())); - //写入压缩包 + FileInputStream fis = new FileInputStream(currentFilePath); + String entryName = parentDir + files[i].getName(); + out.putNextEntry(new ZipEntry(entryName)); int len; byte[] buffer = new byte[1024]; while ((len = fis.read(buffer)) > 0) { @@ -122,14 +125,13 @@ out.closeEntry(); fis.close(); } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 File[] childFiles = files[i].listFiles(); - // 需要保留原来的文件结构时,需要对空文件夹进行处理 - // 空文件夹的处理 - out.putNextEntry(new ZipEntry(files[i].getName() + "/")); - // 没有文件，不需要文件的copy - doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, files[i].getName() + File.separator); - out.closeEntry();//关闭当前zip条目读取下一条 + String dirName = parentDir + files[i].getName() + File.separator; + out.putNextEntry(new ZipEntry(dirName)); + out.closeEntry(); // 关闭空目录条目 + + // 递归处理子目录 + doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, dirName); } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index f2a0562..753aab4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,6 +24,7 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); + List selectByUserId(@Param("userId") Long userId); List selectStaffAuthorizeList(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 56c7c0e..38499bc 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -98,11 +98,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} @@ -155,11 +164,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index 69d6c4b..6476565 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -29,12 +29,13 @@ SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel, - besci.create_user_name AS checkUserName, besci.check_date + GROUP_CONCAT(bei.manufacture_no SEPARATOR ',') AS checkEquipmentManufactureNo, + besci.create_user_name AS checkUserName, besci.check_date, besci.data_no, beit.manufacture_no AS equipmentManufactureNo FROM biz_equipment_standard_check_record_approval bescra JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id @@ -61,6 +62,12 @@ and besci.create_user_name like concat('%',#{request.createUserName},'%') + + and besci.data_no like concat('%',#{request.dataNo},'%') + + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + and besci.check_date >= #{request.checkDateStart} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml index 7837047..a78cae4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml @@ -7,15 +7,18 @@ + + + - id, equipment_id, standard_id + id, equipment_id, standard_id, update_time, data_sync, sync_time + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java index 8bb22d3..65b4af6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java @@ -222,7 +222,10 @@ if (itemCategoryName.contains("电子式绝缘电阻表(指针式)") || itemCategoryName.contains("兆欧表")) { if (StringUtils.isNotEmpty(itemData.getMeasureIndicationValue()) && StringUtils.isNotEmpty(itemData.getAccuracyA())) { //最大允许误差= ±（准确度a*被检表示值） - BigDecimal maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + BigDecimal maximumError = BigDecimal.ZERO; + if (!"∞".equals(itemData.getMeasureIndicationValue())) { + maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + } itemData.setMaximumError("±" + maximumError); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java index e5f8bd5..ff27f76 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java @@ -7,6 +7,8 @@ import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -103,17 +105,18 @@ * @param files * @param fileSaveRootPath * @param out + * @param parentDir * @return * @throws Exception */ - private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String dir) throws Exception { - //遍历jsonArray列表获取所有JSONObject对象 + private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String parentDir) throws Exception { for (int i = 0; i < files.length; i++) { - //以论文标题为每个文件命名 + String currentFilePath = fileSaveRootPath + File.separator + files[i].getName(); + if (files[i].isFile()) { - FileInputStream fis = new FileInputStream(fileSaveRootPath + File.separator + files[i].getName()); - out.putNextEntry(new ZipEntry(dir + files[i].getName())); - //写入压缩包 + FileInputStream fis = new FileInputStream(currentFilePath); + String entryName = parentDir + files[i].getName(); + out.putNextEntry(new ZipEntry(entryName)); int len; byte[] buffer = new byte[1024]; while ((len = fis.read(buffer)) > 0) { @@ -122,14 +125,13 @@ out.closeEntry(); fis.close(); } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 File[] childFiles = files[i].listFiles(); - // 需要保留原来的文件结构时,需要对空文件夹进行处理 - // 空文件夹的处理 - out.putNextEntry(new ZipEntry(files[i].getName() + "/")); - // 没有文件，不需要文件的copy - doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, files[i].getName() + File.separator); - out.closeEntry();//关闭当前zip条目读取下一条 + String dirName = parentDir + files[i].getName() + File.separator; + out.putNextEntry(new ZipEntry(dirName)); + out.closeEntry(); // 关闭空目录条目 + + // 递归处理子目录 + doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, dirName); } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index f2a0562..753aab4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,6 +24,7 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); + List selectByUserId(@Param("userId") Long userId); List selectStaffAuthorizeList(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 56c7c0e..38499bc 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -98,11 +98,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} @@ -155,11 +164,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index 69d6c4b..6476565 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -29,12 +29,13 @@ SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel, - besci.create_user_name AS checkUserName, besci.check_date + GROUP_CONCAT(bei.manufacture_no SEPARATOR ',') AS checkEquipmentManufactureNo, + besci.create_user_name AS checkUserName, besci.check_date, besci.data_no, beit.manufacture_no AS equipmentManufactureNo FROM biz_equipment_standard_check_record_approval bescra JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id @@ -61,6 +62,12 @@ and besci.create_user_name like concat('%',#{request.createUserName},'%') + + and besci.data_no like concat('%',#{request.dataNo},'%') + + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + and besci.check_date >= #{request.checkDateStart} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml index 7837047..a78cae4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml @@ -7,15 +7,18 @@ + + + - id, equipment_id, standard_id + id, equipment_id, standard_id, update_time, data_sync, sync_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java index 8bb22d3..65b4af6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java @@ -222,7 +222,10 @@ if (itemCategoryName.contains("电子式绝缘电阻表(指针式)") || itemCategoryName.contains("兆欧表")) { if (StringUtils.isNotEmpty(itemData.getMeasureIndicationValue()) && StringUtils.isNotEmpty(itemData.getAccuracyA())) { //最大允许误差= ±（准确度a*被检表示值） - BigDecimal maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + BigDecimal maximumError = BigDecimal.ZERO; + if (!"∞".equals(itemData.getMeasureIndicationValue())) { + maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + } itemData.setMaximumError("±" + maximumError); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java index e5f8bd5..ff27f76 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java @@ -7,6 +7,8 @@ import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -103,17 +105,18 @@ * @param files * @param fileSaveRootPath * @param out + * @param parentDir * @return * @throws Exception */ - private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String dir) throws Exception { - //遍历jsonArray列表获取所有JSONObject对象 + private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String parentDir) throws Exception { for (int i = 0; i < files.length; i++) { - //以论文标题为每个文件命名 + String currentFilePath = fileSaveRootPath + File.separator + files[i].getName(); + if (files[i].isFile()) { - FileInputStream fis = new FileInputStream(fileSaveRootPath + File.separator + files[i].getName()); - out.putNextEntry(new ZipEntry(dir + files[i].getName())); - //写入压缩包 + FileInputStream fis = new FileInputStream(currentFilePath); + String entryName = parentDir + files[i].getName(); + out.putNextEntry(new ZipEntry(entryName)); int len; byte[] buffer = new byte[1024]; while ((len = fis.read(buffer)) > 0) { @@ -122,14 +125,13 @@ out.closeEntry(); fis.close(); } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 File[] childFiles = files[i].listFiles(); - // 需要保留原来的文件结构时,需要对空文件夹进行处理 - // 空文件夹的处理 - out.putNextEntry(new ZipEntry(files[i].getName() + "/")); - // 没有文件，不需要文件的copy - doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, files[i].getName() + File.separator); - out.closeEntry();//关闭当前zip条目读取下一条 + String dirName = parentDir + files[i].getName() + File.separator; + out.putNextEntry(new ZipEntry(dirName)); + out.closeEntry(); // 关闭空目录条目 + + // 递归处理子目录 + doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, dirName); } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index f2a0562..753aab4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,6 +24,7 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); + List selectByUserId(@Param("userId") Long userId); List selectStaffAuthorizeList(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 56c7c0e..38499bc 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -98,11 +98,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} @@ -155,11 +164,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index 69d6c4b..6476565 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -29,12 +29,13 @@ SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel, - besci.create_user_name AS checkUserName, besci.check_date + GROUP_CONCAT(bei.manufacture_no SEPARATOR ',') AS checkEquipmentManufactureNo, + besci.create_user_name AS checkUserName, besci.check_date, besci.data_no, beit.manufacture_no AS equipmentManufactureNo FROM biz_equipment_standard_check_record_approval bescra JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id @@ -61,6 +62,12 @@ and besci.create_user_name like concat('%',#{request.createUserName},'%') + + and besci.data_no like concat('%',#{request.dataNo},'%') + + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + and besci.check_date >= #{request.checkDateStart} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml index 7837047..a78cae4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml @@ -7,15 +7,18 @@ + + + - id, equipment_id, standard_id + id, equipment_id, standard_id, update_time, data_sync, sync_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index 46523a5..f38c5b7 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -66,6 +66,12 @@ return checkInfoService.detail(idDTO.getId()); } + @ApiOperation("删除") + @PostMapping("/delete") + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return checkInfoService.delete(idDTO.getId()); + } + @ApiOperation("导出") @PostMapping("/listExport") public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java index 4d660e6..41e7e41 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -45,6 +45,7 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; + public BizQualityCorrectiveRecordController(IGeneralApprovalService baseApprovalService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { super(baseApprovalService); this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; @@ -152,10 +153,14 @@ return bizQualityCorrectiveRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + List recordList = bizQualityCorrectiveRecordService.selectBizQualityCorrectiveRecordPage(query, page); + bizQualityCorrectiveRecordService.exportZip(recordList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java index fc7d642..86bfb63 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityEffectiveAnalysisController.java @@ -106,10 +106,14 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityEffectiveAnalysisService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityEffectiveAnalysisVO bizQualityEffectiveAnalysisVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityEffectiveAnalysisVO.genQuery(); + List list = bizQualityEffectiveAnalysisService.selectBizQualityEffectiveAnalysisPage(page, query); + bizQualityEffectiveAnalysisService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 5c93549..a2af22a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -15,11 +15,14 @@ import com.casic.missiles.enums.quality.file.QualityExternalRelFileTypeEnum; import com.casic.missiles.model.quality.BizQualityExternalAudit; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.HashMap; import java.util.List; @@ -39,6 +42,7 @@ private final IBizQualityExternalAuditService bizQualityExternalAuditService; private final AbstractDictService dictService; + public BizQualityExternalAuditController(IBizQualityExternalAuditService bizQualityExternalAuditService, AbstractDictService dictService) { this.bizQualityExternalAuditService = bizQualityExternalAuditService; this.dictService = dictService; @@ -133,9 +137,13 @@ return ReturnUtil.success(bizQualityExternalAuditService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityExternalAuditVO bizQualityExternalAuditVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + List repList = bizQualityExternalAuditService.selectBizQualityExternalAuditPage(page, query); + bizQualityExternalAuditService.exportZip(repList, response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index b2194b2..1a800d4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -106,7 +106,7 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityInternalAuditPlanService.getById(id)); } - @ApiOperation("导出zip压缩包") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualityInternalAuditPlanVO bizQualityInternalAuditPlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java index 4a16665..c146379 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditRepController.java @@ -129,10 +129,14 @@ return bizQualityInternalAuditRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityInternalAuditRepVO bizQualityInternalAuditRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityInternalAuditRepVO.genQuery(); + List repList = bizQualityInternalAuditRepService.selectBizQualityInternalAuditRepPage(page, query); + bizQualityInternalAuditRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java index 79f91b8..e0c0452 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementOperationRepController.java @@ -107,10 +107,14 @@ return ReturnUtil.success(bizQualityManagementOperationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementOperationRepVO bizQualityManagementOperationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementOperationRepVO.genQuery(); + List repList = bizQualityManagementOperationRepService.selectBizQualityManagementOperationRepPage(page, query); + bizQualityManagementOperationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 3449c73..a0fd33f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -145,10 +146,14 @@ return ReturnUtil.success(bizQualityManagementReviewService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + List reviewList = bizQualityManagementReviewService.selectBizQualityManagementReviewPage(page, query); + bizQualityManagementReviewService.exportZip(reviewList,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java index 212d6b2..cbb124f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewPlanController.java @@ -90,12 +90,14 @@ bizQualityManagementReviewPlanService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewPlanService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审计划详情 */ @@ -113,10 +115,14 @@ return bizQualityManagementReviewPlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void exportZip(@RequestBody BizQualityManagementReviewPlanVO bizQualityManagementReviewPlanVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewPlanVO.genQuery(); + List list = bizQualityManagementReviewPlanService.selectBizQualityManagementReviewPlanPage(page, query); + bizQualityManagementReviewPlanService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java index 27ba0ff..ffafc6f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewRepController.java @@ -89,12 +89,14 @@ bizQualityManagementReviewRepService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { bizQualityManagementReviewRepService.removeBatchByIds(idsDTO.getIds()); return ReturnUtil.success(); } + /** * 管理评审报告详情 */ @@ -112,15 +114,19 @@ return bizQualityManagementReviewRepService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityManagementReviewRepVO bizQualityManagementReviewRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityManagementReviewRepVO.genQuery(); + List repList = bizQualityManagementReviewRepService.selectBizQualityManagementReviewRepPage(page, query); + bizQualityManagementReviewRepService.exportZip(repList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityManagementReviewRepService.exportFile(exportDTO,response); + bizQualityManagementReviewRepService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java index 4dd23ab..bec98a8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonReviewFormController.java @@ -115,15 +115,19 @@ return bizQualityNonReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityNonReviewFormVO bizQualityNonReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonReviewFormVO.genQuery(); + List formList = bizQualityNonReviewFormService.selectBizQualityNonReviewFormPage(page, query); + bizQualityNonReviewFormService.exportZip(formList,response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { bizQualityNonReviewFormService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index 994e2b4..c2d0c2f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; import com.casic.missiles.model.quality.BizQualityPreventRecord; @@ -115,17 +114,20 @@ return bizQualityPreventRecordService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityPreventRecordVO bizQualityPreventRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 - + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + List recordList = bizQualityPreventRecordService.selectBizQualityPreventRecordPage(query, page); + bizQualityPreventRecordService.exportZip(recordList, response); } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { - bizQualityPreventRecordService.exportFile(exportDTO,response); + bizQualityPreventRecordService.exportFile(exportDTO, response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java index c3348b8..54cb0e2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityReviewFormController.java @@ -112,10 +112,14 @@ public ReturnDTO agree(@RequestBody @Valid BizQualityReviewFormApprovalVO request) { return bizQualityReviewFormService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityReviewFormVO bizQualityReviewFormVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityReviewFormVO.genQuery(); + List reviewFormList = bizQualityReviewFormService.selectBizQualityReviewFormPage(page, query); + bizQualityReviewFormService.exportZip(reviewFormList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java index 2811e5b..e789347 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityScenePlanController.java @@ -113,10 +113,14 @@ return bizQualityScenePlanService.agree(request); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityScenePlanVO bizQualityScenePlanVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityScenePlanVO.genQuery(); + List planList = bizQualityScenePlanService.selectBizQualityScenePlanPage(page, query); + bizQualityScenePlanService.exportZip(planList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index b908a0a..6e1b2b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -157,7 +157,7 @@ return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); } - @ApiOperation("导出") + @ApiOperation("导出zip") @PostMapping("/exportZip") public void export(@RequestBody BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java index 16366ac..55eefda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTargetEvaluationRepController.java @@ -90,10 +90,14 @@ return ReturnUtil.success(bizQualityTargetEvaluationRepService.getById(id)); } - @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @ApiOperation("导出zip") + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityTargetEvaluationRepVO bizQualityTargetEvaluationRepVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityTargetEvaluationRepVO.genQuery(); + List repList = bizQualityTargetEvaluationRepService.selectBizQualityTargetEvaluationRepPage(page, query); + bizQualityTargetEvaluationRepService.exportZip(repList,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java index bf17187..8aceeb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTechnicalAnalysisRepController.java @@ -108,8 +108,8 @@ } @CrossOrigin - @ApiOperation("导出") - @PostMapping("/listExport") + @ApiOperation("导出zip") + @PostMapping("/exportZip") public void exportZip(@RequestBody BizQualityTechnicalAnalysisRepVO bizQualityTechnicalAnalysisRepVO, HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 Page page = PageFactory.defaultPage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java index 4f5b655..139898b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityWorkRegistrationController.java @@ -113,9 +113,13 @@ return bizQualityWorkRegistrationService.agree(request); } @ApiOperation("导出") - @PostMapping("/listExport") - public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { + @PostMapping("/exportZip") + public void export(@RequestBody BizQualityWorkRegistrationVO bizQualityWorkRegistrationVO,HttpServletResponse response) throws Exception { //to-do 所有文件压缩包导出 + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityWorkRegistrationVO.genQuery(); + List list = bizQualityWorkRegistrationService.selectBizQualityWorkRegistrationPage(page, query); + bizQualityWorkRegistrationService.exportZip(list,response); } @ApiOperation("导出word/pdf/打印") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知，工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java index b7b7a47..72ac9b6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.resource.staff.StaffCertRequest; import com.casic.missiles.dto.resource.staff.StaffCertResponse; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.model.resource.BizResourceStaffVerifierDetail; import com.casic.missiles.service.resource.IBizResourceStaffInfoService; import com.casic.missiles.service.resource.IBizResourceStaffVerifierService; import io.swagger.annotations.Api; @@ -63,5 +64,11 @@ return verifierService.expirationReminder(idDTO); } + @ApiOperation("检定员证书持证参数列表") + @PostMapping("/param/list") + public ReturnDTO certParamList(@RequestBody IdDTO idDTO) { + return ReturnUtil.success(verifierService.selectCertParamListById(idDTO.getId())); + } + // TODO: 2023/9/18 证书管理数据插入 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index dbcefc1..896fd33 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -46,16 +46,14 @@ EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"), - EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), - CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), - CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), - EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST(2417,"非法的设备分类，该分类名称不存在"), - EQUIPMENT_MEASURE_DATA_NOT_EXIST(2418,"检定数据不存在"), + CHECK_DATA_IS_AUTO(2419,"当前核查数据由自动检定系统生成，无法删除"), + CHECK_DATA_ALREADY_EXIST(2420,"当前核查数据已生成核查记录，无法删除"), + CHECK_RECORD_ALREADY_EXIST(2421,"当前核查数据已存在原始记录及证书"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java index 8881197..cf13e94 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java @@ -343,10 +343,16 @@ int temConclusionJudge = 0; for (BizEquipmentStandardCheckDataSpectrumAnalyzer checkData : spectrumAnalyzerList) { //平均值（重复性）/平均值（稳定性），先都采用通用保留位数规则 - BigDecimal average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), - checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), - checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); - checkData.setAverageValue(String.valueOf(average)); + BigDecimal average = BigDecimal.ZERO; + if ("稳定性".equals(checkData.getCheckType())) { + average = arithmeticAverage(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix()); + } else if ("重复性".equals(checkData.getCheckType())) { + average = averageForTen(checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), + checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), + checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); + checkData.setAverageValue(String.valueOf(average)); + } if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; checkData.setAverageValue(String.valueOf(average)); @@ -598,9 +604,8 @@ checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP)))); } - //除以10，可整除，无需小数修约 BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen); - BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + BigDecimal average = sum.divide(BigDecimal.valueOf(10)).round(new MathContext(3, RoundingMode.HALF_UP)); checkData.setAverageValue(String.valueOf(average)); BigDecimal repeatability = standardDeviationForTen(1, checkData.getFlatnessOne(), checkData.getFlatnessTwo(), checkData.getFlatnessThree(), checkData.getFlatnessFour(), checkData.getFlatnessFive(), checkData.getFlatnessSix(), checkData.getFlatnessSeven(), @@ -727,16 +732,23 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen()); if (Objects.isNull(average) || average.compareTo(BigDecimal.ZERO) == 0) continue; - checkData.setAverageValue(String.valueOf(average)); + if ("频率".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + checkData.setAverageValue(String.valueOf(average)); + } else { + //保留小数点后3位 + checkData.setAverageValue(String.valueOf(average.setScale(3, RoundingMode.HALF_UP))); + } //重复性S(x) BigDecimal standardDeviation = standardDeviationForTen(1, checkData.getTestValueOne(), checkData.getTestValueTwo(), checkData.getTestValueThree(), checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), checkData.getTestValueSeven(), checkData.getTestValueEight(), checkData.getTestValueNine(), checkData.getTestValueTen(), average); - if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { + if ("频率".equals(checkData.getParams())) { + checkData.setStandardDeviation(String.valueOf(standardDeviation.round(new MathContext(2, RoundingMode.HALF_UP)))); + } else if ("功率".equals(checkData.getParams()) || "相对电平".equals(checkData.getParams()) || "谐波".equals(checkData.getParams())) { checkData.setStandardDeviation(String.valueOf(standardDeviation)); } else { BigDecimal standardDeviationX = standardDeviation.divide(average, 4, RoundingMode.HALF_UP); - checkData.setStandardDeviation(String.valueOf(standardDeviationX)); + checkData.setStandardDeviation(standardDeviationX.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"); } } if ("稳定性".equals(checkData.getCheckType())) { @@ -755,7 +767,7 @@ checkData.setStability(String.valueOf(repeatabilityX)); } //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -932,7 +944,7 @@ checkData.getKuValueFive(), checkData.getKuValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -980,7 +992,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1028,7 +1040,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (repeatability.compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1076,7 +1088,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1124,7 +1136,7 @@ checkData.getTestValueFour(), checkData.getTestValueFive(), checkData.getTestValueSix(), average); checkData.setStability(String.valueOf(repeatability)); //结论 - if (new BigDecimal(checkData.getStandardDeviation()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { + if (new BigDecimal(checkData.getStability()).compareTo(new BigDecimal(checkData.getUrel())) >= 0) { checkData.setLessThan(0); temConclusionJudge = 1; } else { @@ -1160,8 +1172,11 @@ BigDecimal testValueTen = new BigDecimal(testValueTenStr); BigDecimal sum = testValueOne.add(testValueTwo).add(testValueThree).add(testValueFour).add(testValueFive).add(testValueSix) .add(testValueSeven).add(testValueEight).add(testValueNine).add(testValueTen); - //除以10，可整除，无需小数修约 + //如能整除，且小数点位数不超过测量值，无需修约 BigDecimal average = sum.divide(BigDecimal.valueOf(10)); + if (average.scale() > sum.scale() && sum.scale() != 0) { + average = average.setScale(sum.scale(), RoundingMode.HALF_UP); + } return average; } @@ -1278,7 +1293,7 @@ //重复性通用保留小数规则 private static BigDecimal standardDeviationScaleHandle(BigDecimal standardDeviation) { - //当计算结果数值>1或者<-1，则保留小数后2位有效数字，例如1.00，1.12 + //当计算结果数值>1或者<-1，则保留小数后2位小数，例如1.00，1.12 //当计算结果数值为0.**或者-0.**时，需要保留小数点后除0外的3位有效数字，例如0.000121，0.00456，需要科学计数法转换，例如1.21E-5、4.35E-11 //有效数字定义：从一个数的左边第一个非0数字起，到末位数字止，所有的数字都是这个数的有效数字 if (standardDeviation.compareTo(BigDecimal.valueOf(-1)) <= 0 || standardDeviation.compareTo(BigDecimal.valueOf(1)) >= 0) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 98fa2d7..7d4adb2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -796,11 +796,15 @@ } private static void getAbsoluteErrorElectricalSafetyTwo(BizBusinessDeviceMeasureDataElectricalSafety measureData) { - measureData.setAbsoluteError(String.valueOf( - new BigDecimal(measureData.getMeasureIndicationValue()) - .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) - .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) - )); + if ("/".equals(measureData.getZeroRemoveMeasureStandardValue())) { + measureData.setAbsoluteError("/"); + } else { + measureData.setAbsoluteError(String.valueOf( + new BigDecimal(measureData.getMeasureIndicationValue()) + .subtract(new BigDecimal(measureData.getZeroRemoveMeasureStandardValue())) + .setScale(measureData.getResolutionDigit(), RoundingMode.HALF_UP) + )); + } } private static void getMaximumErrorElectricalSafetyOne(BizBusinessDeviceMeasureDataElectricalSafety measureData) { @@ -1605,7 +1609,7 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1660,7 +1664,7 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //标准偏差s(单位固定mg)计算 BigDecimal beforeSum = BigDecimal.ZERO; @@ -1668,17 +1672,17 @@ beforeSum = beforeSum.add((number.subtract(deltaMAverage)).multiply(number.subtract(deltaMAverage))); } BigDecimal divide = beforeSum.divide(BigDecimal.valueOf(deltaMList.size() - 1), 4, RoundingMode.HALF_UP); - BigDecimal sValue = sqrt(divide, 4).stripTrailingZeros(); + BigDecimal sValue = sqrt(divide, 4); measureData.setSValue(String.valueOf(sValue)); //UR(单位固定mg)计算 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setURValue(String.valueOf(URValue)); } else if ("2".equals(measureData.getDataType())) { //偏载误差 BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); - BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.HALF_UP); BigDecimal sValue = BigDecimal.ZERO; //Δmi'最大值、最大偏载位置点计算 if (StringUtils.isNotEmpty(measureData.getPtOne())) { @@ -1701,7 +1705,7 @@ sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 - BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.HALF_UP); measureData.setUEValue(String.valueOf(URValue)); } else if ("3".equals(measureData.getDataType())) { //局部示值误差 @@ -1710,11 +1714,11 @@ for (BigDecimal number : deltaMList) { sum = sum.add(number); } - BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP).stripTrailingZeros(); + BigDecimal deltaMAverage = sum.divide(BigDecimal.valueOf(deltaMList.size()), 4, RoundingMode.HALF_UP); measureData.setDeltaMAverage(String.valueOf(deltaMAverage)); //ms-Δm(单位固定mg)计算 BigDecimal mSValue = new BigDecimal(measureData.getMSValue()); - BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); + BigDecimal mReduceDeltaM = mSValue.subtract(deltaMAverage); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 BigDecimal sValue = BigDecimal.ZERO; @@ -1728,7 +1732,7 @@ BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); BigDecimal ums = mpesValue.divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); BigDecimal ub = new BigDecimal(measureData.getUBValue()); - BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)).stripTrailingZeros(); + BigDecimal usValue = (sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)).add(ums.multiply(ums)).add(ub.multiply(ub)), 4)).multiply(BigDecimal.valueOf(2)); measureData.setUSValue(String.valueOf(usValue)); } } @@ -2509,7 +2513,7 @@ BigDecimal tAverage = new BigDecimal(tSum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //y平均值 = yi和/n List collect = measureDataList.stream().filter(data -> - !"/".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); + !"/".equals(data.getDailyAgingRateTwo()) && !"".equals(data.getDailyAgingRateTwo()) && new BigDecimal(data.getCorrelationCoefficientOne()).compareTo(BigDecimal.valueOf(0.6)) > 0).collect(Collectors.toList()); Double ySum = collect.stream().map(BizBusinessDeviceMeasureDataCesiumAtom::getDailyAgingRateTwo).mapToDouble(i -> Double.parseDouble(i)).sum(); BigDecimal yAverage = new BigDecimal(ySum).divide(new BigDecimal(size), 4, RoundingMode.HALF_UP); //Sty = (ti - tAverage)*(yi - yAverage) 的和 @@ -2588,7 +2592,7 @@ measureData.setLowerIndex("/"); measureData.setUpperIndex("/"); } - if (StringUtils.isNotEmpty(measureData.getUpperThd())) { + if (StringUtils.isNotEmpty(measureData.getUpperThd()) && !"/".equals(measureData.getUpperThd())) { BigDecimal thd = new BigDecimal(measureData.getThd()); BigDecimal upperThd = new BigDecimal(measureData.getUpperThd()); if (thd.compareTo(upperThd) > 0) { @@ -3159,4 +3163,22 @@ return average; } + //科学计数法测试 + public static void main(String[] args) { + //当BigDecimal绝对值小于10^-7就会转科学计数法来表示，大于10^-7不会转，整数也不会转 + BigDecimal a = new BigDecimal("0.000001");//0.000001 + BigDecimal e = new BigDecimal("-0.0000001");//1E-7 + BigDecimal c = new BigDecimal("12345678"); + BigDecimal b = new BigDecimal("10000000000000063465347347634"); + //stripTrailingZeros()：去除小数尾部所有的0，并将10的倍数的数转为科学计数法 + String d = new BigDecimal("110").stripTrailingZeros().toString();//1.1E+2 + String f = new BigDecimal("10.4").stripTrailingZeros().toString();//10.4 + System.out.println(a); + System.out.println(b); + System.out.println(e); + System.out.println(c); + System.out.println(d); + System.out.println(f); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java index 8bb22d3..65b4af6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureItemFormulaCalculateUtil.java @@ -222,7 +222,10 @@ if (itemCategoryName.contains("电子式绝缘电阻表(指针式)") || itemCategoryName.contains("兆欧表")) { if (StringUtils.isNotEmpty(itemData.getMeasureIndicationValue()) && StringUtils.isNotEmpty(itemData.getAccuracyA())) { //最大允许误差= ±（准确度a*被检表示值） - BigDecimal maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + BigDecimal maximumError = BigDecimal.ZERO; + if (!"∞".equals(itemData.getMeasureIndicationValue())) { + maximumError = new BigDecimal(itemData.getAccuracyA()).multiply(new BigDecimal(itemData.getMeasureIndicationValue())); + } itemData.setMaximumError("±" + maximumError); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java index e5f8bd5..ff27f76 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/ZipUtils.java @@ -7,6 +7,8 @@ import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -103,17 +105,18 @@ * @param files * @param fileSaveRootPath * @param out + * @param parentDir * @return * @throws Exception */ - private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String dir) throws Exception { - //遍历jsonArray列表获取所有JSONObject对象 + private static void doCreateZipFile(File[] files, String fileSaveRootPath, ZipOutputStream out, String parentDir) throws Exception { for (int i = 0; i < files.length; i++) { - //以论文标题为每个文件命名 + String currentFilePath = fileSaveRootPath + File.separator + files[i].getName(); + if (files[i].isFile()) { - FileInputStream fis = new FileInputStream(fileSaveRootPath + File.separator + files[i].getName()); - out.putNextEntry(new ZipEntry(dir + files[i].getName())); - //写入压缩包 + FileInputStream fis = new FileInputStream(currentFilePath); + String entryName = parentDir + files[i].getName(); + out.putNextEntry(new ZipEntry(entryName)); int len; byte[] buffer = new byte[1024]; while ((len = fis.read(buffer)) > 0) { @@ -122,14 +125,13 @@ out.closeEntry(); fis.close(); } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 File[] childFiles = files[i].listFiles(); - // 需要保留原来的文件结构时,需要对空文件夹进行处理 - // 空文件夹的处理 - out.putNextEntry(new ZipEntry(files[i].getName() + "/")); - // 没有文件，不需要文件的copy - doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, files[i].getName() + File.separator); - out.closeEntry();//关闭当前zip条目读取下一条 + String dirName = parentDir + files[i].getName() + File.separator; + out.putNextEntry(new ZipEntry(dirName)); + out.closeEntry(); // 关闭空目录条目 + + // 递归处理子目录 + doCreateZipFile(childFiles, files[i].getAbsolutePath(), out, dirName); } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index f2a0562..753aab4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,6 +24,7 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); + List selectByUserId(@Param("userId") Long userId); List selectStaffAuthorizeList(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 56c7c0e..38499bc 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -98,11 +98,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} @@ -155,11 +164,20 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - - AND bo.require_over_time >= #{request.startTime} + + AND bbdmi.trace_date >= #{request.traceDateStart} - - AND bo.require_over_time <= #{request.endTime} + + AND bbdmi.trace_date <= #{request.traceDateEnd} + + + AND bbdmi.measure_valid_date >= #{request.measureValidDateStart} + + + AND bbdmi.measure_valid_date <= #{request.measureValidDateEnd} + + + AND bo.meter_identify = #{request.meterIdentify} AND bo.is_urgent = #{request.isUrgent} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index 69d6c4b..6476565 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -29,12 +29,13 @@ SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel, - besci.create_user_name AS checkUserName, besci.check_date + GROUP_CONCAT(bei.manufacture_no SEPARATOR ',') AS checkEquipmentManufactureNo, + besci.create_user_name AS checkUserName, besci.check_date, besci.data_no, beit.manufacture_no AS equipmentManufactureNo FROM biz_equipment_standard_check_record_approval bescra JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id @@ -61,6 +62,12 @@ and besci.create_user_name like concat('%',#{request.createUserName},'%') + + and besci.data_no like concat('%',#{request.dataNo},'%') + + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + and besci.check_date >= #{request.checkDateStart} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml index 7837047..a78cae4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardEquipmentRelationMapper.xml @@ -7,15 +7,18 @@ + + + - id, equipment_id, standard_id + id, equipment_id, standard_id, update_time, data_sync, sync_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + - SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, - bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment + SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, beit.manufacture_no AS equipmentManufactureNo, + bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment, bescra.id AS recordId, bescra.record_no, bescra.record_name FROM biz_equipment_standard_check_info besci JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id JOIN biz_equipment_info beit ON besci.equipment_id = beit.id LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id + LEFT JOIN biz_equipment_standard_check_record_approval bescra ON (bescra.data_id = besci.id AND bescra.approval_status != 5) WHERE 1=1 and besci.data_no like concat('%',#{request.dataNo},'%') @@ -48,6 +49,12 @@ and beit.model like concat('%', #{request.equipmentModel},'%') + + and beit.manufacture_no like concat('%',#{request.equipmentManufactureNo},'%') + + + and bescra.record_no like concat('%',#{request.recordNo},'%') + and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml index b070278..476c33d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml @@ -26,7 +26,8 @@ - SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName + SELECT bei.*, besi.id AS meterStandardId, besi.standard_name AS meterStandardName, beser.update_time AS itemUpdateTime, beser.data_sync, beser.sync_time FROM biz_equipment_standard_equipment_relation beser JOIN biz_equipment_info bei ON beser.equipment_id = bei.id JOIN biz_equipment_standard_info besi ON beser.standard_id = besi.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index 0011821..ed7cb81 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,6 +97,13 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml index dcfcb02..c357b85 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml @@ -36,19 +36,19 @@ and brsi.station like concat('%',#{request.station},'%') - and brsv.certType = #{request.certType} + and brsv.cert_type = #{request.certType} - and brsv.certNo like concat('%',#{request.certNo},'%') + and brsv.cert_no like concat('%',#{request.certNo},'%') - and brsv.certName like concat('%',#{request.certName},'%') + and brsv.cert_name like concat('%',#{request.certName},'%') - and brsv.beginTime >= #{request.beginTime} + and brsv.effective_date >= #{request.beginTime} - and brsv.endTime <= #{request.endTime} + and brsv.effective_date <= #{request.endTime} and brsv.id in diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + +