admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

安全、质量bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-12-11 16:28:00 +08:00
parent 3098077f06
commit e7202983b2
17 changed files with 99 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerItemRecordController.java
View File

@ -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<DangerItemRecord> 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<DangerItemRecord> 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<String, Object> paramMap) {
String ids = MapUtils.getString(paramMap, "ids");

20
src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java
View File

@ -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<List<EntityMap>> selectDangerTypeList(@RequestBody Map<String, Object> 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<List<EntityMap>> selectDangerTypeAndItemList(@RequestBody Map<String, Object> 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<DangerTypeRecord> 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<DangerTypeRecord> 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"),

32
src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java
View File

@ -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<QualityInspectionRecord> 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<QualityInspectionRecord> 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"),

8
src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRectifyRecordController.java
View File

@ -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<List<QualityRectifyRecord>> selectRectifyRecordList(@RequestBody Map<String, Object> 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<QualityRectifyRecord> 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<String, Object> map, HttpServletResponse response) throws IOException {
qualityRectifyRecordService.qualityInspectionRecordRectifyExportExcel(map, response);

2
src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRectifyRecord.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/quality/mapper/DangerTypeRecordMapper.java
View File

@ -67,7 +67,7 @@ public interface DangerTypeRecordMapper extends BaseMapper<DangerTypeRecord> {
void updateDangerTypeRecordFullName(@Param("oldFullName") String oldFullName, @Param("newFullName") String fullName, @Param("sn") String sn);
/**
* 查询顶级的建筑施工安全检查标准类型
* 查询顶级的建筑施工质量检查标准类型
*
* @param topCodes
* @return

10
src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java
View File

@ -50,7 +50,7 @@ public interface QualityInspectionRecordMapper extends BaseMapper<QualityInspect
List<QualityInspectionRecordVo> selectQualityInspectionRecordPage(Page<QualityInspectionRecordVo> page, @Param("param") Map<String, Object> map);
/**
* 统计安全检查数量
* 统计质量检查数量
*
* @param map
* @return
@ -58,7 +58,7 @@ public interface QualityInspectionRecordMapper extends BaseMapper<QualityInspect
QualityInspectionRecordTotalVo selectQualityInspectionRecordPageTotal(@Param("param") Map<String, Object> map);
/**
* 统计安全检查数量
* 统计质量检查数量
*
* @param map
* @param rtList
@ -75,7 +75,7 @@ public interface QualityInspectionRecordMapper extends BaseMapper<QualityInspect
List<QualityInspectionRecordTotalVo> riskChart(@Param("param") Map<String, Object> map);
/**
* 统计每天的统计安全检查数量
* 统计每天的统计质量检查数量
*
* @param map
* @return
@ -83,7 +83,7 @@ public interface QualityInspectionRecordMapper extends BaseMapper<QualityInspect
List<Map<String, Object>> selectQualityInspectionRecordCountByDay(Map<String, Object> map);
/**
* 安全问题类型或频发问题统计
* 质量问题类型或频发问题统计
*
* @param map
* @return
@ -107,7 +107,7 @@ public interface QualityInspectionRecordMapper extends BaseMapper<QualityInspect
Map<String, Object> selectDangerInspectCountByTask(@Param("taskId") Long taskId);
/**
* 安全问题各负责人检查数
* 质量问题各负责人检查数
*
* @param map
* @return

2
src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRectifyRecordMapper.java
View File

@ -16,7 +16,7 @@ import java.util.Map;
@Mapper
public interface QualityRectifyRecordMapper extends BaseMapper<QualityRectifyRecord> {
/**
* 列表查询安全检查-整改/复查记录信息
* 列表查询质量检查-整改/复查记录信息
*
* @param map
* @return

4
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
View File

@ -665,7 +665,7 @@
and t.record_type = 1
<include refid="whereCondition">
</include>
group by t.region_id
group by r.region_id
order by y desc
</select>
@ -740,7 +740,7 @@
and project_sn = #{param.projectSn}
<include refid="whereCondition">
</include>
group by t.enterprise_id
group by pe.enterprise_id
order by rectifiedNum desc) t
</select>

2
src/main/java/com/zhgd/xmgl/modules/quality/service/IDangerTypeRecordCollectService.java
View File

@ -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

6
src/main/java/com/zhgd/xmgl/modules/quality/service/IDangerTypeRecordService.java
View File

@ -47,7 +47,7 @@ public interface IDangerTypeRecordService extends IService<DangerTypeRecord> {
List<EntityMap> selectDangerTypeAndItemList(Map<String, Object> map);
/**
* 安全管理——质量问题库，获取大项列表
* 质量管理——质量问题库，获取大项列表
*
* @param projectSn
* @return
@ -70,7 +70,7 @@ public interface IDangerTypeRecordService extends IService<DangerTypeRecord> {
void deleteRecordById(Long id);
/**
* 安全检查模板导入
* 质量检查模板导入
*
* @param excelFile
* @param sn
@ -79,7 +79,7 @@ public interface IDangerTypeRecordService extends IService<DangerTypeRecord> {
void importDangerTypeRecordExcelTemplate(MultipartFile excelFile, String sn) throws Exception;
/**
* 查询顶级的建筑施工安全检查标准类型
* 查询顶级的建筑施工质量检查标准类型
*
* @param topCodes
* @return

10
src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java
View File

@ -40,7 +40,7 @@ public interface IQualityInspectionRecordService extends IService<QualityInspect
RecordVo selectQualityInspectionRecordPage(Map<String, Object> map);
/**
* 安全问题统计
* 质量问题统计
*
* @param map
* @return
@ -48,7 +48,7 @@ public interface IQualityInspectionRecordService extends IService<QualityInspect
SelectQualityStatisticsVo selectQualityStatistics(Map<String, Object> map);
/**
* 安全问题类型或频发问题统计
* 质量问题类型或频发问题统计
*
* @param map
* @return
@ -87,7 +87,7 @@ public interface IQualityInspectionRecordService extends IService<QualityInspect
Map<String, Object> selectDangerInspectCountByItemTask(Long itemId);
/**
* 安全问题各负责人检查数
* 质量问题各负责人检查数
*
* @param map
* @return
@ -207,7 +207,7 @@ public interface IQualityInspectionRecordService extends IService<QualityInspect
void edit(QualityInspectionRecord qualityInspectionRecord);
/**
* 安全问题统计具体数量
* 质量问题统计具体数量
*
* @param map
* @return
@ -215,7 +215,7 @@ public interface IQualityInspectionRecordService extends IService<QualityInspect
QualityInspectionRecordTotalVo selectQualityStatisticsNum(Map<String, Object> map);
/**
* 安全问题统计具体数量列表
* 质量问题统计具体数量列表
*
* @param map
* @return

6
src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRectifyRecordService.java
View File

@ -16,7 +16,7 @@ import java.util.Map;
*/
public interface IQualityRectifyRecordService extends IService<QualityRectifyRecord> {
/**
* 列表查询安全检查-整改/复查记录信息
* 列表查询质量检查-整改/复查记录信息
*
* @param map
* @return
@ -24,14 +24,14 @@ public interface IQualityRectifyRecordService extends IService<QualityRectifyRec
List<QualityRectifyRecord> selectRectifyRecordList(Map<String, Object> map);
/**
* 添加安全检查-整改/复查记录信息
* 添加质量检查-整改/复查记录信息
*
* @param qualityRectifyRecord
*/
void saveQualityRectifyRecord(QualityRectifyRecord qualityRectifyRecord);
/**
* 导出安全问题和整改记录excel
* 导出质量问题和整改记录excel
*
* @param map
* @param response

5
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordCollectServiceImpl.java
View File

@ -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

41
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
View File

@ -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 ServiceImpl<QualityInspe
}
saveBindData(record);
if (Objects.equals(record.getRecordType(), QualityInspectionRecordRecordTypeEnum.DANGER.getValue()) && Objects.equals(record.getStatus(), QualityInspectionRecordStatusEnum.NOT_RECTIFIED.getValue())) {
noticeService.addUserNoticeAndApp(record.getChangeId(), "安全管理待整改", "您有一条安全检查待整改，问题：" + record.getDangerItemContent(), "10",
noticeService.addUserNoticeAndApp(record.getChangeId(), "质量管理待整改", "您有一条质量检查待整改，问题：" + record.getDangerItemContent(), "10",
PushPayloads.buildPushPayload(10, record));
noticeService.addProjectLevelNoticeAndApp(record.getProjectSn(), "安全管理待整改", systemUserService.getFrameUserNames(String.valueOf(record.getChangeId())) + "有一条安全检查待整改，问题：" + record.getDangerItemContent(), "10",
noticeService.addProjectLevelNoticeAndApp(record.getProjectSn(), "质量管理待整改", systemUserService.getFrameUserNames(String.valueOf(record.getChangeId())) + "有一条质量检查待整改，问题：" + record.getDangerItemContent(), "10",
PushPayloads.buildPushPayload(10, record));
if (Objects.equals(record.getType(), 1)) {
DangerousEngineeringRecord d = dangerousEngineeringRecordMapper.selectById(record.getEngineeringId());
noticeBigScreen("32", record, record.getInspectTime(), StrUtil.format("{}的{}的{}发现一条{}，请注意监督整改！",
enterpriseNames, d.getEngineeringName(), record.getRegionName(), record.getDangerItemContent()));
} else {
noticeBigScreen("31", record, record.getInspectTime(), StrUtil.format("{}检查到一条{}的{}安全隐患问题，请注意监督整改！",
noticeBigScreen("31", record, record.getInspectTime(), StrUtil.format("{}检查到一条{}的{}质量隐患问题，请注意监督整改！",
record.getRegionName(), enterpriseNames, StrUtil.subAfter(record.getDangerItemContent(), "/", true)));
}
// Integer count = qualityInspectionRecordMapper.selectCount(Wrappers.<QualityInspectionRecord>lambdaQuery()
// .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<QualityInspe
noticeBigScreen("32", record, record.getInspectTime(), StrUtil.format("{}的{}的{}今日排查暂无隐患",
enterpriseNames, d.getEngineeringName(), record.getRegionName()));
} else {
noticeBigScreen("31", record, record.getInspectTime(), StrUtil.format("{}已排查了{}的安全隐患问题，今日排查暂无安全隐患！",
noticeBigScreen("31", record, record.getInspectTime(), StrUtil.format("{}已排查了{}的质量隐患问题，今日排查暂无质量隐患！",
record.getRegionName(), StrUtil.subAfter(record.getDangerItemContent(), "/", true)));
}
}
@ -665,7 +660,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
String[] heads = {"检查结果", "检查人", "检查时间", "检查部位", "问题描述", "补充说明", "整改要求", "问题等级", "紧急程度", "整改人", "整改时限", "复查人", "核验人"};
String[] headsStr = {"statusname", "inspectManName", "inspectTime", "regionName", "dangerItemContent", "dangerDesc", "remark", "levelname",
"urgentlevelname", "changeName", "changeLimitTime", "reviewName", "verifyManName"};
JxlExcelUtils.excelExport("安全检查列表", heads, headsStr, list, response);
JxlExcelUtils.excelExport("质量检查列表", heads, headsStr, list, response);
} catch (Exception e) {
log.error("error：", e);
@ -909,22 +904,22 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
throw new OpenAlertException("数据不存在");
}
if (Objects.equals(qualityInspectionRecord.getStatus(), QualityInspectionRecordStatusEnum.NOT_RECTIFIED.getValue())) {
noticeService.addUserNoticeAndApp(qualityInspectionRecord.getChangeId(), "安全管理待整改", "您有一条安全检查待整改，问题：" + qualityInspectionRecord.getDangerItemContent(), "10",
noticeService.addUserNoticeAndApp(qualityInspectionRecord.getChangeId(), "质量管理待整改", "您有一条质量检查待整改，问题：" + qualityInspectionRecord.getDangerItemContent(), "10",
PushPayloads.buildPushPayload(10, qualityInspectionRecord));
noticeService.addProjectLevelNoticeAndApp(qualityInspectionRecord.getProjectSn(), "安全管理待整改", systemUserService.getFrameUserNames(String.valueOf(qualityInspectionRecord.getChangeId())) + "有一条安全检查待整改，问题：" + qualityInspectionRecord.getDangerItemContent(), "10",
noticeService.addProjectLevelNoticeAndApp(qualityInspectionRecord.getProjectSn(), "质量管理待整改", systemUserService.getFrameUserNames(String.valueOf(qualityInspectionRecord.getChangeId())) + "有一条质量检查待整改，问题：" + qualityInspectionRecord.getDangerItemContent(), "10",
PushPayloads.buildPushPayload(10, qualityInspectionRecord));
} else if (Objects.equals(qualityInspectionRecord.getStatus(), QualityInspectionRecordStatusEnum.NOT_REVIEWED.getValue())) {
for (String rid : StrUtil.split(qualityInspectionRecord.getReviewIds(), ",")) {
noticeService.addUserNoticeAndApp(Long.valueOf(rid), "安全管理整改结果待复查", "您有一条安全检查的整改结果需要复查，请及时查看。", "10",
noticeService.addUserNoticeAndApp(Long.valueOf(rid), "质量管理整改结果待复查", "您有一条质量检查的整改结果需要复查，请及时查看。", "10",
PushPayloads.buildPushPayload(10, qualityInspectionRecord));
noticeService.addProjectLevelNoticeAndApp(qualityInspectionRecord.getProjectSn(), "安全管理整改结果待复查", systemUserService.getFrameUserNames(rid) + "有一条安全检查的整改结果需要复查，请及时查看。", "10",
noticeService.addProjectLevelNoticeAndApp(qualityInspectionRecord.getProjectSn(), "质量管理整改结果待复查", systemUserService.getFrameUserNames(rid) + "有一条质量检查的整改结果需要复查，请及时查看。", "10",
PushPayloads.buildPushPayload(10, qualityInspectionRecord));
}
} else if (Objects.equals(qualityInspectionRecord.getStatus(), QualityInspectionRecordStatusEnum.NOT_VERIFIED.getValue())) {
for (String vid : StrUtil.split(qualityInspectionRecord.getVerifyManIds(), ",")) {
noticeService.addUserNoticeAndApp(Long.valueOf(vid), "安全管理整改结果核验通知", "您有一条安全检查的整改结果需要核验，请及时查看。", "10",
noticeService.addUserNoticeAndApp(Long.valueOf(vid), "质量管理整改结果核验通知", "您有一条质量检查的整改结果需要核验，请及时查看。", "10",
PushPayloads.buildPushPayload(10, qualityInspectionRecord));
noticeService.addProjectLevelNoticeAndApp(qualityInspectionRecord.getProjectSn(), "安全管理整改结果核验通知", systemUserService.getFrameUserNames(vid) + "有一条安全检查的整改结果需要核验，请及时查看。", "10",
noticeService.addProjectLevelNoticeAndApp(qualityInspectionRecord.getProjectSn(), "质量管理整改结果核验通知", systemUserService.getFrameUserNames(vid) + "有一条质量检查的整改结果需要核验，请及时查看。", "10",
PushPayloads.buildPushPayload(10, qualityInspectionRecord));
}
}

28
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRectifyRecordServiceImpl.java
View File

@ -166,12 +166,12 @@ public class QualityRectifyRecordServiceImpl extends ServiceImpl<QualityRectifyR
if (Objects.equals(recordTypeEnum.getValue(), QualityRectifyRecordTypeEnum.REVIEW.getValue())) {
tempRecord.setStatus(3);
for (String rid : StrUtil.split(tempRecord.getReviewIds(), ",")) {
noticeService.addUserNoticeAndApp(Long.valueOf(rid), "安全管理整改结果待复查", "您有一条安全检查的整改结果需要复查，请及时查看。", "10",
noticeService.addUserNoticeAndApp(Long.valueOf(rid), "质量管理整改结果待复查", "您有一条质量检查的整改结果需要复查，请及时查看。", "10",
PushPayloads.buildPushPayload(10, tempRecord));
noticeService.addProjectLevelNoticeAndApp(tempRecord.getProjectSn(), "安全管理整改结果待复查", systemUserService.getFrameUserNames(rid) + "有一条安全检查的整改结果需要复查，请及时查看。", "10",
noticeService.addProjectLevelNoticeAndApp(tempRecord.getProjectSn(), "质量管理整改结果待复查", systemUserService.getFrameUserNames(rid) + "有一条质量检查的整改结果需要复查，请及时查看。", "10",
PushPayloads.buildPushPayload(10, tempRecord));
}
qualityInspectionRecordService.noticeBigScreen("31", tempRecord, record.getRectifyTime(), StrUtil.format("{}整改了{}的一条{}安全隐患问题，请注意监督复查！",
qualityInspectionRecordService.noticeBigScreen("31", tempRecord, record.getRectifyTime(), StrUtil.format("{}整改了{}的一条{}质量隐患问题，请注意监督复查！",
enterpriseNames, tempRecord.getRegionName(), StrUtil.subAfter(tempRecord.getDangerItemContent(), "/", true)));
} else {
goToVerify(tempRecord, enterpriseNames, record.getRectifyTime(), "整改");
@ -193,9 +193,9 @@ public class QualityRectifyRecordServiceImpl extends ServiceImpl<QualityRectifyR
}
} else {
tempRecord.setStatus(2);
noticeService.addUserNoticeAndApp(tempRecord.getChangeId(), "安全管理整改结果复查通知", "您提交的安全检查的整改结果复查不通过，请及时重新整改。", "10",
noticeService.addUserNoticeAndApp(tempRecord.getChangeId(), "质量管理整改结果复查通知", "您提交的质量检查的整改结果复查不通过，请及时重新整改。", "10",
PushPayloads.buildPushPayload(10, tempRecord));
noticeService.addProjectLevelNoticeAndApp(tempRecord.getProjectSn(), "安全管理整改结果复查通知", systemUserService.getFrameUserNames(String.valueOf(tempRecord.getChangeId())) + "提交的安全检查的整改结果复查不通过，请及时重新整改。", "10",
noticeService.addProjectLevelNoticeAndApp(tempRecord.getProjectSn(), "质量管理整改结果复查通知", systemUserService.getFrameUserNames(String.valueOf(tempRecord.getChangeId())) + "提交的质量检查的整改结果复查不通过，请及时重新整改。", "10",
PushPayloads.buildPushPayload(10, tempRecord));
}
} else {
@ -204,9 +204,9 @@ public class QualityRectifyRecordServiceImpl extends ServiceImpl<QualityRectifyR
goToPass(record, tempRecord, enterpriseNames, "核验");
} else {
tempRecord.setStatus(2);
noticeService.addUserNoticeAndApp(tempRecord.getChangeId(), "安全管理整改结果核验通知", "您提交的安全检查的整改结果核验不通过，请及时重新整改。", "10",
noticeService.addUserNoticeAndApp(tempRecord.getChangeId(), "质量管理整改结果核验通知", "您提交的质量检查的整改结果核验不通过，请及时重新整改。", "10",
PushPayloads.buildPushPayload(10, tempRecord));
noticeService.addProjectLevelNoticeAndApp(tempRecord.getProjectSn(), "安全管理整改结果核验通知", systemUserService.getFrameUserNames(String.valueOf(tempRecord.getChangeId())) + "提交的安全检查的整改结果核验不通过，请及时重新整改。", "10",
noticeService.addProjectLevelNoticeAndApp(tempRecord.getProjectSn(), "质量管理整改结果核验通知", systemUserService.getFrameUserNames(String.valueOf(tempRecord.getChangeId())) + "提交的质量检查的整改结果核验不通过，请及时重新整改。", "10",
PushPayloads.buildPushPayload(10, tempRecord));
}
}
@ -224,11 +224,11 @@ public class QualityRectifyRecordServiceImpl extends ServiceImpl<QualityRectifyR
*/
private void goToPass(QualityRectifyRecord record, QualityInspectionRecordVo tempRecord, String enterpriseNames, String action) {
tempRecord.setStatus(5);
noticeService.addUserNoticeAndApp(tempRecord.getChangeId(), "安全管理整改结果" + action + "通知", "您提交的安全检查的整改结果已通过" + action + "。", "10",
noticeService.addUserNoticeAndApp(tempRecord.getChangeId(), "质量管理整改结果" + action + "通知", "您提交的质量检查的整改结果已通过" + action + "。", "10",
PushPayloads.buildPushPayload(10, tempRecord));
noticeService.addProjectLevelNoticeAndApp(tempRecord.getProjectSn(), "安全管理整改结果" + action + "通知", systemUserService.getFrameUserNames(String.valueOf(tempRecord.getChangeId())) + "提交的安全检查的整改结果已通过" + action + "。", "10",
noticeService.addProjectLevelNoticeAndApp(tempRecord.getProjectSn(), "质量管理整改结果" + action + "通知", systemUserService.getFrameUserNames(String.valueOf(tempRecord.getChangeId())) + "提交的质量检查的整改结果已通过" + action + "。", "10",
PushPayloads.buildPushPayload(10, tempRecord));
qualityInspectionRecordService.noticeBigScreen("31", tempRecord, record.getRectifyTime(), StrUtil.format("{}" + action + "了{}的一条{}安全隐患问题，请注意查看！",
qualityInspectionRecordService.noticeBigScreen("31", tempRecord, record.getRectifyTime(), StrUtil.format("{}" + action + "了{}的一条{}质量隐患问题，请注意查看！",
enterpriseNames, tempRecord.getRegionName(), StrUtil.subAfter(tempRecord.getDangerItemContent(), "/", true)));
this.deductScoreIf(record);
}
@ -244,12 +244,12 @@ public class QualityRectifyRecordServiceImpl extends ServiceImpl<QualityRectifyR
private void goToVerify(QualityInspectionRecordVo tempRecord, String enterpriseNames, String rectifyTime, String action) {
tempRecord.setStatus(4);
for (String vid : StrUtil.split(tempRecord.getVerifyManIds(), ",")) {
noticeService.addUserNoticeAndApp(Long.valueOf(vid), "安全管理整改结果核验通知", "您有一条安全检查的整改结果需要核验，请及时查看。", "10",
noticeService.addUserNoticeAndApp(Long.valueOf(vid), "质量管理整改结果核验通知", "您有一条质量检查的整改结果需要核验，请及时查看。", "10",
PushPayloads.buildPushPayload(10, tempRecord));
noticeService.addProjectLevelNoticeAndApp(tempRecord.getProjectSn(), "安全管理整改结果核验通知", systemUserService.getFrameUserNames(vid) + "有一条安全检查的整改结果需要核验，请及时查看。", "10",
noticeService.addProjectLevelNoticeAndApp(tempRecord.getProjectSn(), "质量管理整改结果核验通知", systemUserService.getFrameUserNames(vid) + "有一条质量检查的整改结果需要核验，请及时查看。", "10",
PushPayloads.buildPushPayload(10, tempRecord));
}
qualityInspectionRecordService.noticeBigScreen("31", tempRecord, rectifyTime, StrUtil.format("{}" + action + "了{}的一条{}安全隐患问题，请注意监督复核！",
qualityInspectionRecordService.noticeBigScreen("31", tempRecord, rectifyTime, StrUtil.format("{}" + action + "了{}的一条{}质量隐患问题，请注意监督复核！",
enterpriseNames, tempRecord.getRegionName(), StrUtil.subAfter(tempRecord.getDangerItemContent(), "/", true)));
}
@ -293,7 +293,7 @@ public class QualityRectifyRecordServiceImpl extends ServiceImpl<QualityRectifyR
vo.setType(1);
vo.setCreateDate(new Date());
vo.setCurScore(workerInfo.getSafeScore() - item.getDeductScore() >= 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);
}

4
src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
View File

@ -665,7 +665,7 @@
and t.record_type = 1
<include refid="whereCondition">
</include>
group by t.region_id
group by r.region_id
order by y desc
</select>
@ -740,7 +740,7 @@
and project_sn = #{param.projectSn}
<include refid="whereCondition">
</include>
group by t.enterprise_id
group by pe.enterprise_id
order by rectifiedNum desc) t
</select>