diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityDangerItemRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityDangerItemRecordController.java index 8f71512d3..891afd021 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityDangerItemRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityDangerItemRecordController.java @@ -21,7 +21,7 @@ import java.util.Map; /** * @Title: Controller - * @Description: 质量问题库—子项 + * @Description: 安全问题库—子项 * @author: pds * @date: 2020-10-21 * @version: V1.0 @@ -29,7 +29,7 @@ import java.util.Map; @RestController @RequestMapping("/xmgl/xzSecurityDangerItemRecord") @Slf4j -@Api(tags = "质量问题库—子项") +@Api(tags = "安全问题库—子项") public class XzSecurityDangerItemRecordController { @Autowired private IXzSecurityDangerItemRecordService dangerItemRecordService; @@ -39,10 +39,10 @@ public class XzSecurityDangerItemRecordController { * * @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"), }) @@ -57,9 +57,9 @@ public class XzSecurityDangerItemRecordController { * * @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") @@ -74,8 +74,8 @@ public class XzSecurityDangerItemRecordController { * @param xzSecurityDangerItemRecord * @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 XzSecurityDangerItemRecord xzSecurityDangerItemRecord) { Result result = new Result(); @@ -97,8 +97,8 @@ public class XzSecurityDangerItemRecordController { * @param xzSecurityDangerItemRecord * @return */ - @OperLog(operModul = "质量管理", operType = "编辑质量问题库—子项", operDesc = "编辑质量问题库—子项信息") - @ApiOperation(value = "编辑质量问题库—子项信息", notes = "编辑质量问题库—子项信息", httpMethod = "POST") + @OperLog(operModul = "安全管理", operType = "编辑安全问题库—子项", operDesc = "编辑安全问题库—子项信息") + @ApiOperation(value = "编辑安全问题库—子项信息", notes = "编辑安全问题库—子项信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody XzSecurityDangerItemRecord xzSecurityDangerItemRecord) { Result result = new Result(); @@ -122,9 +122,9 @@ public class XzSecurityDangerItemRecordController { * @param * @return */ - @OperLog(operModul = "质量管理", operType = "删除质量问题库—子项", operDesc = "删除质量问题库—子项信息") - @ApiOperation(value = "删除质量问题库—子项信息", notes = "删除质量问题库—子项信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "质量问题库—子项ID", paramType = "body", required = true, dataType = "Integer") + @OperLog(operModul = "安全管理", operType = "删除安全问题库—子项", operDesc = "删除安全问题库—子项信息") + @ApiOperation(value = "删除安全问题库—子项信息", notes = "删除安全问题库—子项信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "安全问题库—子项ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/delete") public Result delete(@RequestBody Map map) { Result result = new Result(); @@ -141,11 +141,11 @@ public class XzSecurityDangerItemRecordController { 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") diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityDangerTypeRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityDangerTypeRecordController.java index e9df236d7..e0c530cfd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityDangerTypeRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityDangerTypeRecordController.java @@ -29,7 +29,7 @@ import java.util.Map; /** * @Title: Controller - * @Description: 质量问题库 + * @Description: 安全问题库 * @author: pds * @date: 2020-10-21 * @version: V1.0 @@ -37,7 +37,7 @@ import java.util.Map; @RestController @RequestMapping("/xmgl/xzSecurityDangerTypeRecord") @Slf4j -@Api(tags = "质量问题库") +@Api(tags = "安全问题库") public class XzSecurityDangerTypeRecordController { @Autowired private IXzSecurityDangerTypeRecordService dangerTypeRecordService; @@ -49,20 +49,20 @@ public class XzSecurityDangerTypeRecordController { * * @return */ - @ApiOperation(value = "分组查询质量问题库信息", notes = "分组查询质量问题库信息", httpMethod = "POST") + @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) { return Result.success(dangerTypeRecordService.selectDangerTypeList(map)); } - @ApiOperation(value = "分组查询质量问题库以及子项", notes = "分组查询质量问题库以及子项", httpMethod = "POST") + @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) { @@ -70,7 +70,7 @@ public class XzSecurityDangerTypeRecordController { } - @ApiOperation(value = "质量管理——质量问题库,获取大项列表", notes = "质量管理——质量问题库,获取大项列表") + @ApiOperation(value = "安全管理——安全问题库,获取大项列表", notes = "安全管理——安全问题库,获取大项列表") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String") }) @@ -85,10 +85,10 @@ public class XzSecurityDangerTypeRecordController { * * @return */ - @ApiOperation(value = "企业分组查询质量问题库信息", notes = "企业分组查询质量问题库信息", httpMethod = "POST") + @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"), }) @PostMapping(value = "/selectCompanyDangerTypeList") public Result> selectCompanyDangerTypeList(@RequestBody Map map) { @@ -101,8 +101,8 @@ public class XzSecurityDangerTypeRecordController { * @param xzSecurityDangerTypeRecord * @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 XzSecurityDangerTypeRecord xzSecurityDangerTypeRecord) { Result result = new Result(); @@ -123,8 +123,8 @@ public class XzSecurityDangerTypeRecordController { * @param xzSecurityDangerTypeRecord * @return */ - @OperLog(operModul = "质量管理", operType = "编辑质量问题库信息", operDesc = "编辑质量问题库信息") - @ApiOperation(value = "编辑质量问题库信息", notes = "编辑质量问题库信息", httpMethod = "POST") + @OperLog(operModul = "安全管理", operType = "编辑安全问题库信息", operDesc = "编辑安全问题库信息") + @ApiOperation(value = "编辑安全问题库信息", notes = "编辑安全问题库信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody XzSecurityDangerTypeRecord xzSecurityDangerTypeRecord) { Result result = new Result(); @@ -142,11 +142,11 @@ public class XzSecurityDangerTypeRecordController { 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 = "id", value = "质量问题库ID", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "id", value = "安全问题库ID", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "recordStatus", value = "记录状态,0 启用,1禁用", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/updateDangerTypeRecordUsable") @@ -169,15 +169,15 @@ public class XzSecurityDangerTypeRecordController { return Result.ok(); } - @ApiOperation(value = "质量检查模板导入下载", notes = "质量检查模板导入下载") + @ApiOperation(value = "安全检查模板导入下载", notes = "安全检查模板导入下载") @GetMapping("/downloadDangerTypeRecordExcelTemplate") public void downloadDangerTypeRecordExcelTemplate(HttpServletResponse response) { try { OutputStream out = response.getOutputStream(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/vnd.ms-excel;charset=gb2312"); - response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("质量检查模板_导入模板.xlsx", "UTF-8")); - InputStream fis = new ClassPathResource("excel/质量检查模板_导入模板.xlsx").getInputStream(); + response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("安全检查模板_导入模板.xlsx", "UTF-8")); + InputStream fis = new ClassPathResource("excel/安全检查模板_导入模板.xlsx").getInputStream(); IOUtils.copy(fis, out); out.flush(); out.close(); @@ -187,7 +187,7 @@ public class XzSecurityDangerTypeRecordController { } - @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/xz.security/controller/XzSecurityQualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java index ec729f8ad..45ca355e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java @@ -28,7 +28,7 @@ import java.util.Map; /** * @Title: Controller - * @Description: 质量检查记录 + * @Description: 安全检查记录 * @author: pds * @date: 2020-10-22 * @version: V1.0 @@ -36,7 +36,7 @@ import java.util.Map; @RestController @RequestMapping("/xmgl/xzSecurityQualityInspectionRecord") @Slf4j -@Api(tags = "质量检查记录") +@Api(tags = "安全检查记录") public class XzSecurityQualityInspectionRecordController { @Autowired private IXzSecurityQualityInspectionRecordService qualityInspectionRecordService; @@ -46,7 +46,7 @@ public class XzSecurityQualityInspectionRecordController { * * @return */ - @ApiOperation(value = "分页列表查询质量检查记录信息", notes = "分页列表查询质量检查记录信息", httpMethod = "POST") + @ApiOperation(value = "分页列表查询安全检查记录信息", notes = "分页列表查询安全检查记录信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "regionId", value = "检查部位ID", paramType = "body", required = false, dataType = "String"), @@ -60,7 +60,7 @@ public class XzSecurityQualityInspectionRecordController { @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"), @@ -95,11 +95,11 @@ public class XzSecurityQualityInspectionRecordController { } /** - * 获取质量巡检今日和所有数据 + * 获取安全巡检今日和所有数据 * * @return */ - @ApiOperation(value = "获取质量巡检今日和所有数据", notes = "获取质量巡检今日和所有数据") + @ApiOperation(value = "获取安全巡检今日和所有数据", notes = "获取安全巡检今日和所有数据") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String") }) @@ -109,11 +109,11 @@ public class XzSecurityQualityInspectionRecordController { } /** - * 获取质量巡检本周和所有数据 + * 获取安全巡检本周和所有数据 * * @return */ - @ApiOperation(value = "获取质量巡检本周和所有数据") + @ApiOperation(value = "获取安全巡检本周和所有数据") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String") }) @@ -123,11 +123,11 @@ public class XzSecurityQualityInspectionRecordController { } /** - * 根据分部分项获取对应质量巡检 + * 根据分部分项获取对应安全巡检 * * @return */ - @ApiOperation(value = "根据分部分项获取对应质量巡检", notes = "根据分部分项获取对应质量巡检") + @ApiOperation(value = "根据分部分项获取对应安全巡检", notes = "根据分部分项获取对应安全巡检") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", required = true, paramType = "query", dataType = "String"), @ApiImplicitParam(name = "subsectionId", value = "分部工程id", paramType = "query", dataType = "String"), @@ -140,11 +140,11 @@ public class XzSecurityQualityInspectionRecordController { } /** - * 获取质量巡检本周和所有数据 + * 获取安全巡检本周和所有数据 * * @return */ - @ApiOperation(value = "获取质量巡检本周和所有数据", notes = "获取质量巡检本周和所有数据") + @ApiOperation(value = "获取安全巡检本周和所有数据", notes = "获取安全巡检本周和所有数据") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String") }) @@ -159,8 +159,8 @@ public class XzSecurityQualityInspectionRecordController { * @param xzSecurityQualityInspectionRecord * @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 XzSecurityQualityInspectionRecord xzSecurityQualityInspectionRecord) { qualityInspectionRecordService.saveQualityInspectionRecord(xzSecurityQualityInspectionRecord); @@ -173,8 +173,8 @@ public class XzSecurityQualityInspectionRecordController { * @param xzSecurityQualityInspectionRecord * @return */ - @OperLog(operModul = "质量管理", operType = "编辑质量检查记录信息", operDesc = "编辑质量检查记录信息") - @ApiOperation(value = "编辑质量检查记录信息", notes = "编辑质量检查记录信息", httpMethod = "POST") + @OperLog(operModul = "安全管理", operType = "编辑安全检查记录信息", operDesc = "编辑安全检查记录信息") + @ApiOperation(value = "编辑安全检查记录信息", notes = "编辑安全检查记录信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody XzSecurityQualityInspectionRecord xzSecurityQualityInspectionRecord) { Result result = new Result(); @@ -198,9 +198,9 @@ public class XzSecurityQualityInspectionRecordController { * @param * @return */ - @OperLog(operModul = "质量管理", operType = "删除质量检查记录信息", operDesc = "删除质量检查记录信息") - @ApiOperation(value = "删除质量检查记录信息", notes = "删除质量检查记录信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "质量检查记录ID", paramType = "body", required = true, dataType = "Integer") + @OperLog(operModul = "安全管理", operType = "删除安全检查记录信息", operDesc = "删除安全检查记录信息") + @ApiOperation(value = "删除安全检查记录信息", notes = "删除安全检查记录信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "安全检查记录ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/delete") public Result delete(@RequestBody Map map) { qualityInspectionRecordService.deleteQualityInspectionRecord(MapUtils.getString(map, "id")); @@ -214,16 +214,16 @@ public class XzSecurityQualityInspectionRecordController { * @param * @return */ - @ApiOperation(value = "通过id查询质量检查记录信息", notes = "通过id查询质量检查记录信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "质量检查记录ID", paramType = "body", required = true, dataType = "Integer") + @ApiOperation(value = "通过id查询安全检查记录信息", notes = "通过id查询安全检查记录信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "安全检查记录ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/selectQualityInspectionRecordById") public Result selectQualityInspectionRecordById(@RequestBody Map map) { return Result.success(qualityInspectionRecordService.selectQualityInspectionRecordById(map)); } - @OperLog(operModul = "质量管理", operType = "废弃质量检查记录", operDesc = "废弃质量检查记录") - @ApiOperation(value = "废弃质量检查记录", notes = "废弃质量检查记录", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "质量检查记录ID", paramType = "body", required = true, dataType = "Integer") + @OperLog(operModul = "安全管理", operType = "废弃安全检查记录", operDesc = "废弃安全检查记录") + @ApiOperation(value = "废弃安全检查记录", notes = "废弃安全检查记录", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "安全检查记录ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/updaetRecordAbandon") public Result updaetRecordAbandon(@RequestBody Map map) { Result result = new Result(); @@ -241,7 +241,7 @@ public class XzSecurityQualityInspectionRecordController { } - @ApiOperation(value = "质量问题统计", notes = "质量问题统计", httpMethod = "POST") + @ApiOperation(value = "安全问题统计", notes = "安全问题统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), }) @@ -250,7 +250,7 @@ public class XzSecurityQualityInspectionRecordController { 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 = "opType", value = "操作类型,1问题类型,2频发问题", paramType = "body", required = true, dataType = "String"), @@ -261,7 +261,7 @@ public class XzSecurityQualityInspectionRecordController { 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"), }) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityRectifyRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityRectifyRecordController.java index 26fe1c2ae..044e7d031 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityRectifyRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityRectifyRecordController.java @@ -19,7 +19,7 @@ import java.util.Map; /** * @Title: Controller - * @Description: 质量检查-整改记录 + * @Description: 安全检查-整改记录 * @author: pds * @date: 2021-06-17 * @version: V1.0 @@ -27,7 +27,7 @@ import java.util.Map; @RestController @RequestMapping("/xmgl/xzSecurityQualityRectifyRecord") @Slf4j -@Api(tags = "质量检查-整改记录") +@Api(tags = "安全检查-整改记录") public class XzSecurityQualityRectifyRecordController { @Autowired private IXzSecurityQualityRectifyRecordService qualityRectifyRecordService; @@ -37,8 +37,8 @@ public class XzSecurityQualityRectifyRecordController { * * @return */ - @ApiOperation(value = "列表查询质量检查-整改/复查记录信息", notes = "列表查询质量检查-整改/复查记录信息", httpMethod = "POST") - @ApiImplicitParam(name = "qualityId", value = "质量检查记录ID", paramType = "body", required = true, dataType = "Integer") + @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) { return Result.success(qualityRectifyRecordService.selectRectifyRecordList(map)); @@ -50,15 +50,15 @@ public class XzSecurityQualityRectifyRecordController { * @param xzSecurityQualityRectifyRecord * @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 XzSecurityQualityRectifyRecord xzSecurityQualityRectifyRecord) { qualityRectifyRecordService.saveQualityRectifyRecord(xzSecurityQualityRectifyRecord); 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/xz.security/entity/XzSecurityDangerItemRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityDangerItemRecord.java index 43128f971..c68a1e5aa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityDangerItemRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityDangerItemRecord.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; /** - * @Description: 质量问题库—子项 + * @Description: 安全问题库—子项 * @author: pds * @date: 2020-10-21 * @version: V1.0 @@ -31,10 +31,10 @@ public class XzSecurityDangerItemRecord implements Serializable { @ApiModelProperty(value = "id") private Long id; /** - * 质量问题库ID + * 安全问题库ID */ - @Excel(name = "质量问题库ID", width = 15) - @ApiModelProperty(value = "质量问题库ID") + @Excel(name = "安全问题库ID", width = 15) + @ApiModelProperty(value = "安全问题库ID") private Long dangerTypeId; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityDangerTypeRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityDangerTypeRecord.java index b235bf4bf..cd8edf8bd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityDangerTypeRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityDangerTypeRecord.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; /** - * @Description: 质量问题库 + * @Description: 安全问题库 * @author: pds * @date: 2020-10-21 * @version: V1.0 @@ -31,10 +31,10 @@ public class XzSecurityDangerTypeRecord implements Serializable { @ApiModelProperty(value = "id") private Long id; /** - * 质量问题名称 + * 安全问题名称 */ - @Excel(name = "质量问题名称", width = 15) - @ApiModelProperty(value = "质量问题名称") + @Excel(name = "安全问题名称", width = 15) + @ApiModelProperty(value = "安全问题名称") private String dangerName; @Excel(name = "层级名称", width = 15) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityInspectTaskRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityInspectTaskRecord.java index a72086148..d2bc8dab3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityInspectTaskRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityInspectTaskRecord.java @@ -104,10 +104,10 @@ public class XzSecurityInspectTaskRecord implements Serializable { @ApiModelProperty(value = "检查人员userId") private String inspectUser; /** - * 1:安全;2:质量 + * 1:安全;2:安全 */ - @Excel(name = "1:安全;2:质量", width = 15) - @ApiModelProperty(value = "1:安全;2:质量") + @Excel(name = "1:安全;2:安全", width = 15) + @ApiModelProperty(value = "1:安全;2:安全") private Integer type; @ApiModelProperty(value = "合作单位id") diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityProjectDangerTypeDisable.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityProjectDangerTypeDisable.java index a90f21796..a4313ac6f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityProjectDangerTypeDisable.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityProjectDangerTypeDisable.java @@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; /** - * @Description: 质量问题库—大项子项禁用记录 + * @Description: 安全问题库—大项子项禁用记录 * @author: pds * @date: 2020-10-21 * @version: V1.0 @@ -41,10 +41,10 @@ public class XzSecurityProjectDangerTypeDisable implements Serializable { @ApiModelProperty(value = "类型,1大项,2子项") private Integer type; /** - * 质量问题库id或子项ID + * 安全问题库id或子项ID */ - @Excel(name = "质量问题库id或子项ID", width = 15) - @ApiModelProperty(value = "质量问题库id或子项ID") + @Excel(name = "安全问题库id或子项ID", width = 15) + @ApiModelProperty(value = "安全问题库id或子项ID") private Long dangerTypeId; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityInspectionRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityInspectionRecord.java index 3439f73b7..947af3f2b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityInspectionRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityInspectionRecord.java @@ -12,7 +12,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; /** - * @Description: 质量检查记录 + * @Description: 安全检查记录 * @author: pds * @date: 2020-10-22 * @version: V1.0 @@ -159,10 +159,10 @@ public class XzSecurityQualityInspectionRecord implements Serializable { @ApiModelProperty(value = "检查时间") private String inspectTime; /** - * 类型,1质量问题,2排查记录 + * 类型,1安全问题,2排查记录 */ - @Excel(name = "类型,1质量问题,2排查记录", width = 15) - @ApiModelProperty(value = "类型,1质量问题,2排查记录") + @Excel(name = "类型,1安全问题,2排查记录", width = 15) + @ApiModelProperty(value = "类型,1安全问题,2排查记录") private Integer recordType; /** * 分包单位SN diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityRectifyRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityRectifyRecord.java index 461bd59ac..578438064 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityRectifyRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityRectifyRecord.java @@ -12,7 +12,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; /** - * @Description: 质量检查-整改记录 + * @Description: 安全检查-整改记录 * @author: pds * @date: 2021-06-17 * @version: V1.0 @@ -30,10 +30,10 @@ public class XzSecurityQualityRectifyRecord implements Serializable { @ApiModelProperty(value = "id") private Long id; /** - * 质量检查记录ID + * 安全检查记录ID */ - @Excel(name = "质量检查记录ID", width = 15) - @ApiModelProperty(value = "质量检查记录ID") + @Excel(name = "安全检查记录ID", width = 15) + @ApiModelProperty(value = "安全检查记录ID") private Long qualityId; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityAllAndWeekDataVO.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityAllAndWeekDataVO.java index 387b19e44..1a9cd9a95 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityAllAndWeekDataVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityAllAndWeekDataVO.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "AllAndWeekDataVO对象", description = "质量巡检本周和所有数据") +@ApiModel(value = "AllAndWeekDataVO对象", description = "安全巡检本周和所有数据") @NoArgsConstructor @AllArgsConstructor public class XzSecurityAllAndWeekDataVO extends XzSecurityAllDataVO { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityAllDataVO.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityAllDataVO.java index db04a62ec..df1188e8a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityAllDataVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityAllDataVO.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; * @Version 1.0 */ @Data -@ApiModel(value = "AllDataVO对象", description = "质量巡检所有数据") +@ApiModel(value = "AllDataVO对象", description = "安全巡检所有数据") @NoArgsConstructor @AllArgsConstructor public class XzSecurityAllDataVO { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityXzSecurityAllAndThisWeekDataVO.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityXzSecurityAllAndThisWeekDataVO.java index 792560bed..3d316cb4f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityXzSecurityAllAndThisWeekDataVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityXzSecurityAllAndThisWeekDataVO.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "AllAndWeekDataVO对象", description = "质量巡检本周和所有数据") +@ApiModel(value = "AllAndWeekDataVO对象", description = "安全巡检本周和所有数据") @NoArgsConstructor @AllArgsConstructor public class XzSecurityXzSecurityAllAndThisWeekDataVO extends XzSecurityAllDataVO { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityXzSecurityAllAndTodayDataVO.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityXzSecurityAllAndTodayDataVO.java index fd5ee498f..fdee1f160 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityXzSecurityAllAndTodayDataVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityXzSecurityAllAndTodayDataVO.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "AllAndTodayDataVO对象", description = "质量巡检今日和所有数据") +@ApiModel(value = "AllAndTodayDataVO对象", description = "安全巡检今日和所有数据") @NoArgsConstructor @AllArgsConstructor public class XzSecurityXzSecurityAllAndTodayDataVO extends XzSecurityAllDataVO { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityDangerItemRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityDangerItemRecordMapper.java index 5d1884f12..d5b77ec2d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityDangerItemRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityDangerItemRecordMapper.java @@ -8,7 +8,7 @@ import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerItemRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 质量问题库—子项 + * @Description: 安全问题库—子项 * @author: pds * @date: 2020-10-21 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityDangerTypeRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityDangerTypeRecordMapper.java index 099e27175..53858887a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityDangerTypeRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityDangerTypeRecordMapper.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 质量问题库 + * @Description: 安全问题库 * @author: pds * @date: 2020-10-21 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityProjectDangerTypeDisableMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityProjectDangerTypeDisableMapper.java index dfa126ad4..f85ce16a4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityProjectDangerTypeDisableMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityProjectDangerTypeDisableMapper.java @@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 质量问题库—大项子项禁用记录 + * @Description: 安全问题库—大项子项禁用记录 * @author: pds * @date: 2020-10-21 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java index b4f3c27af..738a68d87 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 质量检查记录 + * @Description: 安全检查记录 * @author: pds * @date: 2020-10-22 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityRectifyRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityRectifyRecordMapper.java index e4b2364e9..b8e0b8a9e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityRectifyRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityRectifyRecordMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 质量检查-整改记录 + * @Description: 安全检查-整改记录 * @author: pds * @date: 2021-06-17 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityDangerItemRecordService.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityDangerItemRecordService.java index 93ce7e27e..1e615b41d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityDangerItemRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityDangerItemRecordService.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 质量问题库—子项 + * @Description: 安全问题库—子项 * @author: pds * @date: 2020-10-21 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityDangerTypeRecordService.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityDangerTypeRecordService.java index 539598ee3..2932b4c16 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityDangerTypeRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityDangerTypeRecordService.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 质量问题库 + * @Description: 安全问题库 * @author: pds * @date: 2020-10-21 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityProjectDangerTypeDisableService.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityProjectDangerTypeDisableService.java index 384978fa1..627bbf8db 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityProjectDangerTypeDisableService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityProjectDangerTypeDisableService.java @@ -4,7 +4,7 @@ import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityProjectDangerTypeDisab import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 质量问题库—大项子项禁用记录 + * @Description: 安全问题库—大项子项禁用记录 * @author: pds * @date: 2020-10-21 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java index 7564c805a..a6a8ed438 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 质量检查记录 + * @Description: 安全检查记录 * @author: pds * @date: 2020-10-22 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityRectifyRecordService.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityRectifyRecordService.java index 0bcc09dfc..dd823f3e2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityRectifyRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityRectifyRecordService.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 质量检查-整改记录 + * @Description: 安全检查-整改记录 * @author: pds * @date: 2021-06-17 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityDangerItemRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityDangerItemRecordServiceImpl.java index fd7cb9110..3e27ae0f9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityDangerItemRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityDangerItemRecordServiceImpl.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @Description: 质量问题库—子项 + * @Description: 安全问题库—子项 * @author: pds * @date: 2020-10-21 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityDangerTypeRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityDangerTypeRecordServiceImpl.java index ee5cbd44d..b4bc6d38d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityDangerTypeRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityDangerTypeRecordServiceImpl.java @@ -28,7 +28,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 质量问题库 + * @Description: 安全问题库 * @author: pds * @date: 2020-10-21 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityProjectDangerTypeDisableServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityProjectDangerTypeDisableServiceImpl.java index 07655d130..8b12a01dc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityProjectDangerTypeDisableServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityProjectDangerTypeDisableServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 质量问题库—大项子项禁用记录 + * @Description: 安全问题库—大项子项禁用记录 * @author: pds * @date: 2020-10-21 * @version: V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java index 9a38a9188..464998f4c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java @@ -52,7 +52,7 @@ import java.text.SimpleDateFormat; import java.util.*; /** - * @Description: 质量检查记录 + * @Description: 安全检查记录 * @author: pds * @date: 2020-10-22 * @version: V1.0 @@ -261,7 +261,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv } xzSecurityQualityInspectionRecordMapper.insert(xzSecurityQualityInspectionRecord); if (xzSecurityQualityInspectionRecord.getRecordType() == 1 && xzSecurityQualityInspectionRecord.getStatus() == 2) { - noticeService.addUserNotice(xzSecurityQualityInspectionRecord.getChangeId(), "您有一条质量检查待整改,问题:" + xzSecurityQualityInspectionRecord.getDangerItemContent(), "质量管理待整改", "11"); + noticeService.addUserNotice(xzSecurityQualityInspectionRecord.getChangeId(), "您有一条安全检查待整改,问题:" + xzSecurityQualityInspectionRecord.getDangerItemContent(), "安全管理待整改", "11"); } deductScoreIf(xzSecurityQualityInspectionRecord); @@ -308,7 +308,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv vo.setType(1); vo.setCreateDate(new Date()); vo.setCurScore(workerInfo.getSafeScore() - item.getDeductScore()); - 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())); xzDeductScoreRecordMapper.insert(vo); } @@ -370,7 +370,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv 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); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityRectifyRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityRectifyRecordServiceImpl.java index fb204ff24..7fc8ae067 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityRectifyRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityRectifyRecordServiceImpl.java @@ -41,7 +41,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 质量检查-整改记录 + * @Description: 安全检查-整改记录 * @author: pds * @date: 2021-06-17 * @version: V1.0 @@ -79,7 +79,7 @@ public class XzSecurityXzSecurityQualityRectifyRecordServiceImpl extends Service //已整改时候需要复查 if (xzSecurityQualityRectifyRecord.getStatus() == 2) { xzSecurityQualityInspectionRecord.setStatus(3); - noticeService.addUserNotice(tempXzSecurityQualityInspectionRecord.getReviewId(), "您有一条质量检查的整改结果需要复查,请及时查看。", "质量管理整改结果待复查", "11"); + noticeService.addUserNotice(tempXzSecurityQualityInspectionRecord.getReviewId(), "您有一条安全检查的整改结果需要复查,请及时查看。", "安全管理整改结果待复查", "11"); } else { xzSecurityQualityInspectionRecord.setStatus(2); } @@ -87,19 +87,19 @@ public class XzSecurityXzSecurityQualityRectifyRecordServiceImpl extends Service //复查合格时候需要核验 if (xzSecurityQualityRectifyRecord.getStatus() == 2) { xzSecurityQualityInspectionRecord.setStatus(4); - noticeService.addUserNotice(tempXzSecurityQualityInspectionRecord.getVerifyManId(), "您有一条质量检查的整改结果需要核验,请及时查看。", "质量管理整改结果核验通知", "11"); + noticeService.addUserNotice(tempXzSecurityQualityInspectionRecord.getVerifyManId(), "您有一条安全检查的整改结果需要核验,请及时查看。", "安全管理整改结果核验通知", "11"); } else { xzSecurityQualityInspectionRecord.setStatus(2); - noticeService.addUserNotice(tempXzSecurityQualityInspectionRecord.getChangeId(), "您提交的质量检查的整改结果复查不通过,请及时重新整改。", "质量管理整改结果复查通知", "11"); + noticeService.addUserNotice(tempXzSecurityQualityInspectionRecord.getChangeId(), "您提交的安全检查的整改结果复查不通过,请及时重新整改。", "安全管理整改结果复查通知", "11"); } } else { //核验合格时候则该记录合格 if (xzSecurityQualityRectifyRecord.getStatus() == 2) { xzSecurityQualityInspectionRecord.setStatus(5); - noticeService.addUserNotice(tempXzSecurityQualityInspectionRecord.getChangeId(), "您提交的质量检查的整改结果已通过核验。", "质量管理整改结果核验通知", "11"); + noticeService.addUserNotice(tempXzSecurityQualityInspectionRecord.getChangeId(), "您提交的安全检查的整改结果已通过核验。", "安全管理整改结果核验通知", "11"); } else { xzSecurityQualityInspectionRecord.setStatus(2); - noticeService.addUserNotice(tempXzSecurityQualityInspectionRecord.getChangeId(), "您提交的质量检查的整改结果核验不通过,请及时重新整改。", "质量管理整改结果核验通知", "11"); + noticeService.addUserNotice(tempXzSecurityQualityInspectionRecord.getChangeId(), "您提交的安全检查的整改结果核验不通过,请及时重新整改。", "安全管理整改结果核验通知", "11"); } } xzSecurityQualityInspectionRecordMapper.updateById(xzSecurityQualityInspectionRecord); @@ -129,7 +129,7 @@ public class XzSecurityXzSecurityQualityRectifyRecordServiceImpl extends Service response.setCharacterEncoding("UTF-8"); //这后面可以设置导出Excel的名称,此例中名为student.xls - response.setHeader("Content-disposition", "attachment;filename=" + new String("质量检查记录导出".getBytes(StandardCharsets.UTF_8), "ISO8859-1") + ".xls"); + response.setHeader("Content-disposition", "attachment;filename=" + new String("安全检查记录导出".getBytes(StandardCharsets.UTF_8), "ISO8859-1") + ".xls"); //刷新缓冲 response.flushBuffer(); diff --git a/src/main/resources/excel/安全检查模板_导入模板.xlsx b/src/main/resources/excel/安全检查模板_导入模板.xlsx new file mode 100644 index 000000000..085a8136f Binary files /dev/null and b/src/main/resources/excel/安全检查模板_导入模板.xlsx differ