diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerItemRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerItemRecordController.java index ec324dbd0..d8d3aebe5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerItemRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerItemRecordController.java @@ -2,7 +2,6 @@ package com.zhgd.xmgl.modules.quality.controller; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.modules.quality.service.IDangerItemRecordService; import com.zhgd.xmgl.modules.quality.entity.DangerItemRecord; import com.zhgd.xmgl.modules.quality.entity.vo.DangerItemRecordVo; import com.zhgd.xmgl.modules.quality.service.IDangerItemRecordService; @@ -40,10 +39,10 @@ public class DangerItemRecordController { * * @return */ - @ApiOperation(value = "列表查询安全问题库的子项信息", notes = "列表查询安全问题库的子项信息—子项信息", httpMethod = "POST") + @ApiOperation(value = "列表查询质量问题库的子项信息", notes = "列表查询质量问题库的子项信息—子项信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目唯一标识", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "dangerTypeId", value = "安全问题库ID", paramType = "安全问题库ID", required = true, dataType = "String"), + @ApiImplicitParam(name = "dangerTypeId", value = "质量问题库ID", paramType = "质量问题库ID", required = true, dataType = "String"), @ApiImplicitParam(name = "content", value = "内容内容", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "recordStatus", value = "是否仅显示启用的,1是,0否", paramType = "body", required = false, dataType = "String"), }) @@ -58,9 +57,9 @@ public class DangerItemRecordController { * * @return */ - @ApiOperation(value = "总公司列表查询安全问题库的子项信息", notes = "总公司列表查询安全问题库的子项信息", httpMethod = "POST") + @ApiOperation(value = "总公司列表查询质量问题库的子项信息", notes = "总公司列表查询质量问题库的子项信息", httpMethod = "POST") @ApiImplicitParams({ - @ApiImplicitParam(name = "dangerTypeId", value = "安全问题库ID", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "dangerTypeId", value = "质量问题库ID", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "content", value = "内容内容", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/selectCompanyDangerItemRecordList") @@ -75,7 +74,7 @@ public class DangerItemRecordController { * @param xzSecurityDangerItemRecord * @return */ - @OperLog(operModul = "安全管理", operType = "添加质量问题库—子项", operDesc = "添加质量问题库—子项信息") + @OperLog(operModul = "质量管理", operType = "添加质量问题库—子项", operDesc = "添加质量问题库—子项信息") @ApiOperation(value = "添加质量问题库—子项信息", notes = "添加质量问题库—子项信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody DangerItemRecord xzSecurityDangerItemRecord) { @@ -98,7 +97,7 @@ public class DangerItemRecordController { * @param xzSecurityDangerItemRecord * @return */ - @OperLog(operModul = "安全管理", operType = "编辑质量问题库—子项", operDesc = "编辑质量问题库—子项信息") + @OperLog(operModul = "质量管理", operType = "编辑质量问题库—子项", operDesc = "编辑质量问题库—子项信息") @ApiOperation(value = "编辑质量问题库—子项信息", notes = "编辑质量问题库—子项信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody DangerItemRecord xzSecurityDangerItemRecord) { @@ -123,7 +122,7 @@ public class DangerItemRecordController { * @param * @return */ - @OperLog(operModul = "安全管理", operType = "删除质量问题库—子项", operDesc = "删除质量问题库—子项信息") + @OperLog(operModul = "质量管理", operType = "删除质量问题库—子项", operDesc = "删除质量问题库—子项信息") @ApiOperation(value = "删除质量问题库—子项信息", notes = "删除质量问题库—子项信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "质量问题库—子项ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/delete") @@ -142,11 +141,11 @@ public class DangerItemRecordController { return result; } - @OperLog(operModul = "安全管理", operType = "批量修改安全问题库的子项启用禁用", operDesc = "批量修改安全问题库的子项启用禁用") - @ApiOperation(value = "批量修改安全问题库的子项启用禁用", notes = "批量修改安全问题库的子项启用禁用", httpMethod = "POST") + @OperLog(operModul = "质量管理", operType = "批量修改质量问题库的子项启用禁用", operDesc = "批量修改质量问题库的子项启用禁用") + @ApiOperation(value = "批量修改质量问题库的子项启用禁用", notes = "批量修改质量问题库的子项启用禁用", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目唯一标识", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "idStr", value = "安全问题库子项ID组成字符串", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "idStr", value = "质量问题库子项ID组成字符串", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "recordStatus", value = "记录状态,0 启用,1禁用", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/updateDangerItemRecordUsable") @@ -155,8 +154,8 @@ public class DangerItemRecordController { return Result.ok(); } - @ApiOperation(value = "批量删除安全问题库的子项", notes = "批量删除安全问题库的子项", httpMethod = "POST") - @ApiImplicitParam(name = "ids", value = "安全问题库的子项ID字符串(多个以,分割)", paramType = "body", required = true, dataType = "String") + @ApiOperation(value = "批量删除质量问题库的子项", notes = "批量删除质量问题库的子项", httpMethod = "POST") + @ApiImplicitParam(name = "ids", value = "质量问题库的子项ID字符串(多个以,分割)", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/deleteBatch") public Result deleteBatch(@ApiIgnore @RequestBody HashMap paramMap) { String ids = MapUtils.getString(paramMap, "ids"); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java index add742da8..751894cba 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java @@ -86,7 +86,7 @@ public class DangerTypeRecordController { @ApiOperation(value = "分组查询质量问题库信息", notes = "分组查询质量问题库信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目唯一标识", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "dangerName", value = "安全问题名称", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "dangerName", value = "质量问题名称", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/list") public Result> selectDangerTypeList(@RequestBody Map map) { @@ -96,14 +96,14 @@ public class DangerTypeRecordController { @ApiOperation(value = "分组查询质量问题库以及子项", notes = "分组查询质量问题库以及子项", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目唯一标识", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "dangerName", value = "安全问题名称", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "dangerName", value = "质量问题名称", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/selectDangerTypeAndItemList") public Result> selectDangerTypeAndItemList(@RequestBody Map map) { return Result.success(dangerTypeRecordService.selectDangerTypeAndItemList(map)); } - @ApiOperation(value = "安全管理——质量问题库,获取大项列表", notes = "安全管理——质量问题库,获取大项列表") + @ApiOperation(value = "质量管理——质量问题库,获取大项列表", notes = "质量管理——质量问题库,获取大项列表") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String") }) @@ -112,7 +112,7 @@ public class DangerTypeRecordController { return Result.success(dangerTypeRecordService.getBigList(projectSn)); } - @ApiOperation(value = "安全管理——质量问题库,获取小项列表", notes = "安全管理——质量问题库,获取小项列表") + @ApiOperation(value = "质量管理——质量问题库,获取小项列表", notes = "质量管理——质量问题库,获取小项列表") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "recordStatus", value = "记录状态,0 启用,1禁用", paramType = "body", required = false, dataType = "String"), @@ -130,7 +130,7 @@ public class DangerTypeRecordController { @ApiOperation(value = "企业分组查询质量问题库信息", notes = "企业分组查询质量问题库信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "sn", value = "总公司企业sn", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "dangerName", value = "安全问题名称", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "dangerName", value = "质量问题名称", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "projectClassify", value = "工程类别(字典值)", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/selectCompanyDangerTypeList") @@ -144,7 +144,7 @@ public class DangerTypeRecordController { * @param dangerTypeRecord * @return */ - @OperLog(operModul = "安全管理", operType = "添加质量问题库信息", operDesc = "添加质量问题库信息") + @OperLog(operModul = "质量管理", operType = "添加质量问题库信息", operDesc = "添加质量问题库信息") @ApiOperation(value = "添加质量问题库信息", notes = "添加质量问题库信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody DangerTypeRecord dangerTypeRecord) { @@ -158,7 +158,7 @@ public class DangerTypeRecordController { * @param dangerTypeRecord * @return */ - @OperLog(operModul = "安全管理", operType = "编辑质量问题库信息", operDesc = "编辑质量问题库信息") + @OperLog(operModul = "质量管理", operType = "编辑质量问题库信息", operDesc = "编辑质量问题库信息") @ApiOperation(value = "编辑质量问题库信息", notes = "编辑质量问题库信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody DangerTypeRecord dangerTypeRecord) { @@ -177,7 +177,7 @@ public class DangerTypeRecordController { return result; } - @OperLog(operModul = "安全管理", operType = "修改质量问题库大项启用禁用", operDesc = "修改质量问题库大项启用禁用") + @OperLog(operModul = "质量管理", operType = "修改质量问题库大项启用禁用", operDesc = "修改质量问题库大项启用禁用") @ApiOperation(value = "修改质量问题库大项启用禁用", notes = "修改质量问题库大项启用禁用", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目唯一标识", paramType = "body", required = true, dataType = "String"), @@ -221,7 +221,7 @@ public class DangerTypeRecordController { return Result.ok(); } - @ApiOperation(value = "安全检查模板导入下载", notes = "安全检查模板导入下载") + @ApiOperation(value = "质量检查模板导入下载", notes = "质量检查模板导入下载") @GetMapping("/downloadDangerTypeRecordExcelTemplate") public void downloadDangerTypeRecordExcelTemplate(HttpServletResponse response) { ClassPathResource classPathResource = new ClassPathResource("excel/安全检查模板_导入模板ag.xlsx"); @@ -259,7 +259,7 @@ public class DangerTypeRecordController { } } - @ApiOperation(value = "安全检查模板导入", notes = "安全检查模板导入") + @ApiOperation(value = "质量检查模板导入", notes = "质量检查模板导入") @ApiImplicitParams({ @ApiImplicitParam(name = "sn", value = "公司sn", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "excelFile", value = "导入文件", paramType = "query", required = true, dataType = "String"), diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java index 3635ba78e..bb5baa341 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java @@ -117,7 +117,7 @@ public class QualityInspectionRecordController { @ApiImplicitParam(name = "reviewId", value = "复查人", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "verifyManId", value = "核验人", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "inspectManId", value = "检查人", paramType = "body", required = false, dataType = "String"), - @ApiImplicitParam(name = "recordType", value = "类型1安全问题,2排查记录", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "recordType", value = "类型1质量问题,2排查记录", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "operatorId", value = "操作人待办(整改、复查、核验:changeId、reviewId、verifyManId)", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "inspectStartTime", value = "检查开始时间", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "inspectEndTime", value = "检查结束时间", paramType = "body", required = false, dataType = "String"), @@ -226,7 +226,7 @@ public class QualityInspectionRecordController { * @param qualityInspectionRecord * @return */ - @OperLog(operModul = "安全管理", operType = "添加质量检查记录信息", operDesc = "添加质量检查记录信息") + @OperLog(operModul = "质量管理", operType = "添加质量检查记录信息", operDesc = "添加质量检查记录信息") @ApiOperation(value = "添加质量检查记录信息", notes = "添加质量检查记录信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody QualityInspectionRecord qualityInspectionRecord) { @@ -248,7 +248,7 @@ public class QualityInspectionRecordController { * @param qualityInspectionRecord * @return */ - @OperLog(operModul = "安全管理", operType = "编辑质量检查记录信息", operDesc = "编辑质量检查记录信息") + @OperLog(operModul = "质量管理", operType = "编辑质量检查记录信息", operDesc = "编辑质量检查记录信息") @ApiOperation(value = "编辑质量检查记录信息", notes = "编辑质量检查记录信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody QualityInspectionRecord qualityInspectionRecord) { @@ -262,7 +262,7 @@ public class QualityInspectionRecordController { * @param * @return */ - @OperLog(operModul = "安全管理", operType = "删除质量检查记录信息", operDesc = "删除质量检查记录信息") + @OperLog(operModul = "质量管理", operType = "删除质量检查记录信息", operDesc = "删除质量检查记录信息") @ApiOperation(value = "删除质量检查记录信息", notes = "删除质量检查记录信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "质量检查记录ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/delete") @@ -284,7 +284,7 @@ public class QualityInspectionRecordController { return Result.success(qualityInspectionRecordService.selectQualityInspectionRecordById(map)); } - @OperLog(operModul = "安全管理", operType = "废弃质量检查记录", operDesc = "废弃质量检查记录") + @OperLog(operModul = "质量管理", operType = "废弃质量检查记录", operDesc = "废弃质量检查记录") @ApiOperation(value = "废弃质量检查记录", notes = "废弃质量检查记录", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "质量检查记录ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/updaetRecordAbandon") @@ -303,7 +303,7 @@ public class QualityInspectionRecordController { return result; } - @ApiOperation(value = "安全问题统计", notes = "安全问题统计", httpMethod = "POST") + @ApiOperation(value = "质量问题统计", notes = "质量问题统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), }) @@ -312,7 +312,7 @@ public class QualityInspectionRecordController { return Result.success(qualityInspectionRecordService.selectQualityStatistics(map)); } - @ApiOperation(value = "安全问题统计具体数量", notes = "安全问题统计具体数量", httpMethod = "POST") + @ApiOperation(value = "质量问题统计具体数量", notes = "质量问题统计具体数量", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "inspectStartTime", value = "检查开始时间", paramType = "body", required = false, dataType = "String"), @@ -323,7 +323,7 @@ public class QualityInspectionRecordController { return Result.success(qualityInspectionRecordService.selectQualityStatisticsNum(map)); } - @ApiOperation(value = "安全问题统计我的待办", notes = "安全问题统计我的待办", httpMethod = "POST") + @ApiOperation(value = "质量问题统计我的待办", notes = "质量问题统计我的待办", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), }) @@ -332,7 +332,7 @@ public class QualityInspectionRecordController { return Result.success(qualityInspectionRecordService.countMyTodo(map)); } - @ApiOperation(value = "安全问题统计具体数量列表", notes = "安全问题统计具体数量列表", httpMethod = "POST") + @ApiOperation(value = "质量问题统计具体数量列表", notes = "质量问题统计具体数量列表", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "inspectStartTime", value = "检查开始时间", paramType = "body", required = false, dataType = "String"), @@ -344,7 +344,7 @@ public class QualityInspectionRecordController { return Result.success(qualityInspectionRecordService.selectQualityStatisticsNumList(map)); } - @ApiOperation(value = "安全问题类型或频发问题统计", notes = "安全问题类型或频发问题统计", httpMethod = "POST") + @ApiOperation(value = "质量问题类型或频发问题统计", notes = "质量问题类型或频发问题统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "opType", value = "操作类型,1问题类型,2频发问题", paramType = "body", required = true, dataType = "String"), @@ -355,7 +355,7 @@ public class QualityInspectionRecordController { return Result.success(qualityInspectionRecordService.selectDangerTypeQualityCount(map)); } - @ApiOperation(value = "安全问题各负责人检查数", notes = "安全问题各负责人检查数", httpMethod = "POST") + @ApiOperation(value = "质量问题各负责人检查数", notes = "质量问题各负责人检查数", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), }) @@ -567,7 +567,7 @@ public class QualityInspectionRecordController { return Result.success(qualityInspectionRecordService.querySpecialPage(map)); } - @OperLog(operModul = "安全管理", operType = "补录质量检查记录信息", operDesc = "补录质量检查记录信息") + @OperLog(operModul = "质量管理", operType = "补录质量检查记录信息", operDesc = "补录质量检查记录信息") @ApiOperation(value = "补录质量检查记录信息", notes = "补录质量检查记录信息", httpMethod = "POST") @PostMapping(value = "/backAdd") public Result backAdd(@RequestBody QualityInspectionRecord qualityInspectionRecord) { @@ -575,7 +575,7 @@ public class QualityInspectionRecordController { return Result.ok(); } - @OperLog(operModul = "安全管理", operType = "", operDesc = "危险源添加多个安全记录") + @OperLog(operModul = "质量管理", operType = "", operDesc = "危险源添加多个安全记录") @ApiOperation(value = "危险源添加多个安全记录", notes = "危险源添加多个安全记录", httpMethod = "POST") @PostMapping(value = "/addSecurityRecords") @Transactional(rollbackFor = Exception.class) @@ -607,7 +607,7 @@ public class QualityInspectionRecordController { return Result.ok(); } - @OperLog(operModul = "安全管理", operType = "", operDesc = "移交整改人") + @OperLog(operModul = "质量管理", operType = "", operDesc = "移交整改人") @ApiOperation(value = "移交整改人", notes = "移交整改人", httpMethod = "POST") @PostMapping(value = "/updateChangeId") public Result updateChangeId(@RequestBody UpdateChangeIdDto dto) { @@ -616,7 +616,7 @@ public class QualityInspectionRecordController { return Result.ok(); } - @OperLog(operModul = "安全管理", operType = "", operDesc = "移交核验人") + @OperLog(operModul = "质量管理", operType = "", operDesc = "移交核验人") @ApiOperation(value = "移交核验人", notes = "移交核验人", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "质量检查记录id", paramType = "body", required = true, dataType = "String"), @@ -642,7 +642,7 @@ public class QualityInspectionRecordController { return Result.ok(); } - @OperLog(operModul = "安全管理", operType = "", operDesc = "移交复查人") + @OperLog(operModul = "质量管理", operType = "", operDesc = "移交复查人") @ApiOperation(value = "移交复查人", notes = "移交复查人", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "质量检查记录id", paramType = "body", required = true, dataType = "String"), diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRectifyRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRectifyRecordController.java index 1bd98a97c..3cf79513a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRectifyRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRectifyRecordController.java @@ -37,7 +37,7 @@ public class QualityRectifyRecordController { * * @return */ - @ApiOperation(value = "列表查询安全检查-整改/复查记录信息", notes = "列表查询安全检查-整改/复查记录信息", httpMethod = "POST") + @ApiOperation(value = "列表查询质量检查-整改/复查记录信息", notes = "列表查询质量检查-整改/复查记录信息", httpMethod = "POST") @ApiImplicitParam(name = "qualityId", value = "质量检查记录ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/selectRectifyRecordList") public Result> selectRectifyRecordList(@RequestBody Map map) { @@ -50,15 +50,15 @@ public class QualityRectifyRecordController { * @param qualityRectifyRecord * @return */ - @OperLog(operModul = "安全管理", operType = "添加安全检查整改/复查/核验记录信息", operDesc = "添加安全检查整改/复查/核验记录信息") - @ApiOperation(value = "添加安全检查-整改/复查记录信息", notes = "添加安全检查-整改/复查记录信息", httpMethod = "POST") + @OperLog(operModul = "质量管理", operType = "添加质量检查整改/复查/核验记录信息", operDesc = "添加质量检查整改/复查/核验记录信息") + @ApiOperation(value = "添加质量检查-整改/复查记录信息", notes = "添加质量检查-整改/复查记录信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody QualityRectifyRecord qualityRectifyRecord) { qualityRectifyRecordService.saveQualityRectifyRecord(qualityRectifyRecord); return Result.ok(); } - @ApiOperation(value = "中建五局导出安全问题和整改记录excel", notes = "中建五局导出安全问题和整改记录excel", httpMethod = "GET") + @ApiOperation(value = "中建五局导出质量问题和整改记录excel", notes = "中建五局导出质量问题和整改记录excel", httpMethod = "GET") @GetMapping(value = "/recordRectify/excel/export") public void qualityInspectionRecordRectifyExportExcel(@RequestParam(required = false) Map map, HttpServletResponse response) throws IOException { qualityRectifyRecordService.qualityInspectionRecordRectifyExportExcel(map, response); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRectifyRecord.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRectifyRecord.java index c2848a999..27ae2135b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRectifyRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRectifyRecord.java @@ -27,7 +27,7 @@ public class QualityRectifyRecord implements Serializable { * id */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "安全检查整改记录id") + @ApiModelProperty(value = "质量检查整改记录id") private Long id; /** * 质量检查记录ID diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/DangerTypeRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/DangerTypeRecordMapper.java index 833ce1b21..9038f9f3f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/DangerTypeRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/DangerTypeRecordMapper.java @@ -67,7 +67,7 @@ public interface DangerTypeRecordMapper extends BaseMapper { void updateDangerTypeRecordFullName(@Param("oldFullName") String oldFullName, @Param("newFullName") String fullName, @Param("sn") String sn); /** - * 查询顶级的建筑施工安全检查标准类型 + * 查询顶级的建筑施工质量检查标准类型 * * @param topCodes * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java index c27edb314..ab5b69b79 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java @@ -50,7 +50,7 @@ public interface QualityInspectionRecordMapper extends BaseMapper selectQualityInspectionRecordPage(Page page, @Param("param") Map map); /** - * 统计安全检查数量 + * 统计质量检查数量 * * @param map * @return @@ -58,7 +58,7 @@ public interface QualityInspectionRecordMapper extends BaseMapper map); /** - * 统计安全检查数量 + * 统计质量检查数量 * * @param map * @param rtList @@ -75,7 +75,7 @@ public interface QualityInspectionRecordMapper extends BaseMapper riskChart(@Param("param") Map map); /** - * 统计每天的统计安全检查数量 + * 统计每天的统计质量检查数量 * * @param map * @return @@ -83,7 +83,7 @@ public interface QualityInspectionRecordMapper extends BaseMapper> selectQualityInspectionRecordCountByDay(Map map); /** - * 安全问题类型或频发问题统计 + * 质量问题类型或频发问题统计 * * @param map * @return @@ -107,7 +107,7 @@ public interface QualityInspectionRecordMapper extends BaseMapper selectDangerInspectCountByTask(@Param("taskId") Long taskId); /** - * 安全问题各负责人检查数 + * 质量问题各负责人检查数 * * @param map * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRectifyRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRectifyRecordMapper.java index a70de94e1..3f7e4e219 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRectifyRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRectifyRecordMapper.java @@ -16,7 +16,7 @@ import java.util.Map; @Mapper public interface QualityRectifyRecordMapper extends BaseMapper { /** - * 列表查询安全检查-整改/复查记录信息 + * 列表查询质量检查-整改/复查记录信息 * * @param map * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml index 0b59c848f..b5786a5fc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml @@ -665,7 +665,7 @@ and t.record_type = 1 - group by t.region_id + group by r.region_id order by y desc @@ -740,7 +740,7 @@ and project_sn = #{param.projectSn} - group by t.enterprise_id + group by pe.enterprise_id order by rectifiedNum desc) t diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IDangerTypeRecordCollectService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IDangerTypeRecordCollectService.java index 14d3e0b30..d8ac215d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IDangerTypeRecordCollectService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IDangerTypeRecordCollectService.java @@ -5,7 +5,7 @@ import com.zhgd.xmgl.modules.quality.entity.DangerTypeRecordCollect; import com.zhgd.xmgl.modules.quality.entity.DangerTypeRecordCollect; /** - * @Description: 安全问题库收藏 + * @Description: 质量问题库收藏 * @author: pds * @date: 2025-08-14 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IDangerTypeRecordService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IDangerTypeRecordService.java index 63f2f9d40..993ff0c54 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IDangerTypeRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IDangerTypeRecordService.java @@ -47,7 +47,7 @@ public interface IDangerTypeRecordService extends IService { List selectDangerTypeAndItemList(Map map); /** - * 安全管理——质量问题库,获取大项列表 + * 质量管理——质量问题库,获取大项列表 * * @param projectSn * @return @@ -70,7 +70,7 @@ public interface IDangerTypeRecordService extends IService { void deleteRecordById(Long id); /** - * 安全检查模板导入 + * 质量检查模板导入 * * @param excelFile * @param sn @@ -79,7 +79,7 @@ public interface IDangerTypeRecordService extends IService { void importDangerTypeRecordExcelTemplate(MultipartFile excelFile, String sn) throws Exception; /** - * 查询顶级的建筑施工安全检查标准类型 + * 查询顶级的建筑施工质量检查标准类型 * * @param topCodes * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java index 714a70c84..26cff9322 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java @@ -40,7 +40,7 @@ public interface IQualityInspectionRecordService extends IService map); /** - * 安全问题统计 + * 质量问题统计 * * @param map * @return @@ -48,7 +48,7 @@ public interface IQualityInspectionRecordService extends IService map); /** - * 安全问题类型或频发问题统计 + * 质量问题类型或频发问题统计 * * @param map * @return @@ -87,7 +87,7 @@ public interface IQualityInspectionRecordService extends IService selectDangerInspectCountByItemTask(Long itemId); /** - * 安全问题各负责人检查数 + * 质量问题各负责人检查数 * * @param map * @return @@ -207,7 +207,7 @@ public interface IQualityInspectionRecordService extends IService map); /** - * 安全问题统计具体数量列表 + * 质量问题统计具体数量列表 * * @param map * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRectifyRecordService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRectifyRecordService.java index d29d6ff80..65085dd89 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRectifyRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRectifyRecordService.java @@ -16,7 +16,7 @@ import java.util.Map; */ public interface IQualityRectifyRecordService extends IService { /** - * 列表查询安全检查-整改/复查记录信息 + * 列表查询质量检查-整改/复查记录信息 * * @param map * @return @@ -24,14 +24,14 @@ public interface IQualityRectifyRecordService extends IService selectRectifyRecordList(Map map); /** - * 添加安全检查-整改/复查记录信息 + * 添加质量检查-整改/复查记录信息 * * @param qualityRectifyRecord */ void saveQualityRectifyRecord(QualityRectifyRecord qualityRectifyRecord); /** - * 导出安全问题和整改记录excel + * 导出质量问题和整改记录excel * * @param map * @param response diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordCollectServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordCollectServiceImpl.java index aea13da09..739592e9a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordCollectServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordCollectServiceImpl.java @@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.modules.quality.entity.DangerTypeRecordCollect; import com.zhgd.xmgl.modules.quality.mapper.DangerTypeRecordCollectMapper; import com.zhgd.xmgl.modules.quality.service.IDangerTypeRecordCollectService; -import com.zhgd.xmgl.modules.quality.entity.DangerTypeRecordCollect; -import com.zhgd.xmgl.modules.quality.mapper.DangerTypeRecordCollectMapper; -import com.zhgd.xmgl.modules.quality.service.IDangerTypeRecordCollectService; import org.springframework.stereotype.Service; /** - * @Description: 安全问题库收藏 + * @Description: 质量问题库收藏 * @author: pds * @date: 2025-08-14 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java index 11f770e6d..4e346b0ff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java @@ -42,13 +42,16 @@ import com.zhgd.xmgl.modules.inspection.entity.InspectTaskItemRecord; import com.zhgd.xmgl.modules.inspection.entity.InspectTaskRecord; import com.zhgd.xmgl.modules.inspection.service.IInspectTaskItemRecordService; import com.zhgd.xmgl.modules.inspection.service.IInspectTaskRecordService; -import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; -import com.zhgd.xmgl.modules.quality.entity.QualityRegion; +import com.zhgd.xmgl.modules.quality.entity.*; +import com.zhgd.xmgl.modules.quality.entity.dto.DepartmentRectifiedRankDto; +import com.zhgd.xmgl.modules.quality.entity.vo.*; import com.zhgd.xmgl.modules.quality.enums.QualityInspectionRecordRecordTypeEnum; import com.zhgd.xmgl.modules.quality.enums.QualityInspectionRecordStatusEnum; +import com.zhgd.xmgl.modules.quality.mapper.DangerItemRecordMapper; import com.zhgd.xmgl.modules.quality.mapper.QualityInspectionRecordMapper; +import com.zhgd.xmgl.modules.quality.mapper.QualityRectifyRecordMapper; import com.zhgd.xmgl.modules.quality.mapper.QualityRegionMapper; -import com.zhgd.xmgl.modules.quality.service.IQualityRegionService; +import com.zhgd.xmgl.modules.quality.service.*; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper; import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; @@ -64,14 +67,6 @@ import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; import com.zhgd.xmgl.modules.xz.enums.XzDangerousEngineeringAcceptanceTypeEnum; import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper; import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressContentMapper; -import com.zhgd.xmgl.modules.quality.entity.*; -import com.zhgd.xmgl.modules.quality.entity.dto.DepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.quality.entity.vo.*; -import com.zhgd.xmgl.modules.quality.enums.QualityInspectionRecordRecordTypeEnum; -import com.zhgd.xmgl.modules.quality.enums.QualityInspectionRecordStatusEnum; -import com.zhgd.xmgl.modules.quality.mapper.DangerItemRecordMapper; -import com.zhgd.xmgl.modules.quality.mapper.QualityRectifyRecordMapper; -import com.zhgd.xmgl.modules.quality.service.*; import com.zhgd.xmgl.modules.xz.service.IXzWorkerSafeWatchConfigService; import com.zhgd.xmgl.modules.xz.special.service.CountApiService; import com.zhgd.xmgl.push.config.PushPayloads; @@ -506,23 +501,23 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpllambdaQuery() // .eq(QualityInspectionRecord::getRecordType, 1) // .eq(QualityInspectionRecord::getEnterpriseSn, record.getEnterpriseSn()) // .eq(QualityInspectionRecord::getDangerItemId, record.getDangerItemId())); - //安全履职记录 + //质量履职记录 // xzWorkerSafeWatchConfigService.saveInfo(record.getProjectSn(), 5, count, record.getChangeId().toString(), record.getDangerItemContent()); } else if (Objects.equals(record.getRecordType(), QualityInspectionRecordRecordTypeEnum.RECORD.getValue())) { DangerItemRecord dangerItemRecord = dangerItemRecordMapper.selectById(record.getDangerItemId()); @@ -534,7 +529,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl= 0 ? workerInfo.getSafeScore() - item.getDeductScore() : 0); - vo.setDeductReason(StrUtil.format("您在{}发现安全隐患({}-{})扣{}分", DateUtil.format(vo.getCreateDate(), "yyyy年MM月dd日HH:mm:ss"), "安全检査", vo.getTypeName() == null ? "无" : vo.getTypeName(), item.getDeductScore())); + vo.setDeductReason(StrUtil.format("您在{}发现质量隐患({}-{})扣{}分", DateUtil.format(vo.getCreateDate(), "yyyy年MM月dd日HH:mm:ss"), "质量检査", vo.getTypeName() == null ? "无" : vo.getTypeName(), item.getDeductScore())); vo.setTypeTableId(hiddenDangerInspectRecord.getId()); xzDeductScoreRecordMapper.insert(vo); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml index 013e08111..b8f85a95c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml @@ -665,7 +665,7 @@ and t.record_type = 1 - group by t.region_id + group by r.region_id order by y desc @@ -740,7 +740,7 @@ and project_sn = #{param.projectSn} - group by t.enterprise_id + group by pe.enterprise_id order by rectifiedNum desc) t