From 6bc5fcb2aa0705e28cbb3a3f9bffed43604b8eca Mon Sep 17 00:00:00 2001 From: 15666619788 <11841994@qq.com> Date: Sat, 2 Aug 2025 11:31:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=B0=E5=A4=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 + .../xinda/itsm/controller/DutyController.java | 2 + .../itsm/controller/DutyRecordController.java | 4 +- .../controller/ExampleReportController.java | 2 + .../controller/InspectionPlanController.java | 2 + .../InspectionRecordController.java | 2 + .../itsm/controller/PrePlanController.java | 2 + .../controller/ProcessInfoController.java | 2 + .../controller/RegulationInfoController.java | 2 + .../controller/RepairOrderController.java | 2 + .../itsm/controller/ScheduleController.java | 2 + .../controller/StandardInfoController.java | 2 + .../main/java/com/xinda/itsm/domain/Duty.java | 2 +- .../com/xinda/itsm/domain/DutyRecord.java | 6 +- .../com/xinda/itsm/domain/ExampleReport.java | 7 +- .../com/xinda/itsm/domain/InspectionPlan.java | 6 +- .../xinda/itsm/domain/InspectionRecord.java | 6 +- .../java/com/xinda/itsm/domain/PrePlan.java | 4 +- .../com/xinda/itsm/domain/ProcessInfo.java | 2 +- .../com/xinda/itsm/domain/RegulationInfo.java | 2 +- .../com/xinda/itsm/domain/RepairOrder.java | 4 +- .../java/com/xinda/itsm/domain/Schedule.java | 2 +- .../com/xinda/itsm/domain/StandardInfo.java | 2 +- .../impl/InspectionPlanServiceImpl.java | 1 + .../mapper/itsm/ExampleReportMapper.xml | 6 +- .../datacenter/DataCenterController.java | 141 +++++++++++++++++- .../datacenter/DeviceHistoryData.java | 14 -- .../datacenter/DeviceHistoryExcel.java | 31 ++++ .../java/com/xinda/iot/domain/AlertLog.java | 2 + .../service/impl/DataCenterServiceImpl.java | 2 + .../resources/mapper/iot/AlertLogMapper.xml | 14 +- 31 files changed, 237 insertions(+), 46 deletions(-) delete mode 100644 xinda-open-api/src/main/java/com/xinda/data/controller/datacenter/DeviceHistoryData.java create mode 100644 xinda-open-api/src/main/java/com/xinda/data/controller/datacenter/DeviceHistoryExcel.java diff --git a/pom.xml b/pom.xml index e1476e9..388ff4a 100644 --- a/pom.xml +++ b/pom.xml @@ -149,6 +149,11 @@ + + org.apache.poi + poi + ${poi.version} + org.apache.poi poi-ooxml diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyController.java index 572f59b..b58db94 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyController.java @@ -62,6 +62,8 @@ public class DutyController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, Duty duty) { + SysUser user = getLoginUser().getUser(); + duty.setTenantId(user.getDeptId()); List list = dutyService.selectDutyList(duty); ExcelUtil util = new ExcelUtil(Duty.class); util.exportExcel(response, list, "值班管理数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyRecordController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyRecordController.java index 56374c0..c9711b3 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyRecordController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyRecordController.java @@ -42,7 +42,7 @@ public class DutyRecordController extends BaseController /** * 查询交班记录列表 */ -@PreAuthorize("@ss.hasPermi('itsm:dutyRecord:list')") +//@PreAuthorize("@ss.hasPermi('itsm:dutyRecord:list')") @GetMapping("/list") @ApiOperation("查询交班记录列表") public TableDataInfo list(DutyRecord dutyRecord) @@ -62,6 +62,8 @@ public class DutyRecordController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, DutyRecord dutyRecord) { + SysUser user = getLoginUser().getUser(); + dutyRecord.setTenantId(user.getDeptId()); List list = dutyRecordService.selectDutyRecordList(dutyRecord); ExcelUtil util = new ExcelUtil(DutyRecord.class); util.exportExcel(response, list, "交班记录数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ExampleReportController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ExampleReportController.java index fd926b9..f4d6918 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ExampleReportController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ExampleReportController.java @@ -60,6 +60,8 @@ public class ExampleReportController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, ExampleReport exampleReport) { + SysUser user = getLoginUser().getUser(); + exampleReport.setTenantId(user.getDeptId()); List list = exampleReportService.selectExampleReportList(exampleReport); ExcelUtil util = new ExcelUtil(ExampleReport.class); util.exportExcel(response, list, "例报管理数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionPlanController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionPlanController.java index 5c20709..0030122 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionPlanController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionPlanController.java @@ -62,6 +62,8 @@ public class InspectionPlanController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, InspectionPlan inspectionPlan) { + SysUser user = getLoginUser().getUser(); + inspectionPlan.setTenantId(user.getDeptId()); List list = inspectionPlanService.selectInspectionPlanList(inspectionPlan); ExcelUtil util = new ExcelUtil(InspectionPlan.class); util.exportExcel(response, list, "巡检计划数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionRecordController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionRecordController.java index bde1995..04cc890 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionRecordController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionRecordController.java @@ -62,6 +62,8 @@ public class InspectionRecordController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, InspectionRecord inspectionRecord) { + SysUser user = getLoginUser().getUser(); + inspectionRecord.setTenantId(user.getDeptId()); List list = inspectionRecordService.selectInspectionRecordList(inspectionRecord); ExcelUtil util = new ExcelUtil(InspectionRecord.class); util.exportExcel(response, list, "巡检记录数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/PrePlanController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/PrePlanController.java index e825ee0..90d2bd8 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/PrePlanController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/PrePlanController.java @@ -62,6 +62,8 @@ public class PrePlanController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, PrePlan prePlan) { + SysUser user = getLoginUser().getUser(); + prePlan.setTenantId(user.getDeptId()); List list = prePlanService.selectPrePlanList(prePlan); ExcelUtil util = new ExcelUtil(PrePlan.class); util.exportExcel(response, list, "预案管理数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ProcessInfoController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ProcessInfoController.java index 440d87a..f47734b 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ProcessInfoController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ProcessInfoController.java @@ -62,6 +62,8 @@ public class ProcessInfoController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, ProcessInfo processInfo) { + SysUser user = getLoginUser().getUser(); + processInfo.setTenantId(user.getDeptId()); List list = processInfoService.selectProcessInfoList(processInfo); ExcelUtil util = new ExcelUtil(ProcessInfo.class); util.exportExcel(response, list, "流程管理数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/RegulationInfoController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/RegulationInfoController.java index 5260011..3302170 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/RegulationInfoController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/RegulationInfoController.java @@ -62,6 +62,8 @@ public class RegulationInfoController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, RegulationInfo regulationInfo) { + SysUser user = getLoginUser().getUser(); + regulationInfo.setTenantId(user.getDeptId()); List list = regulationInfoService.selectRegulationInfoList(regulationInfo); ExcelUtil util = new ExcelUtil(RegulationInfo.class); util.exportExcel(response, list, "制度管理数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/RepairOrderController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/RepairOrderController.java index a562abf..41c744b 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/RepairOrderController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/RepairOrderController.java @@ -62,6 +62,8 @@ public class RepairOrderController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, RepairOrder repairOrder) { + SysUser user = getLoginUser().getUser(); + repairOrder.setTenantId(user.getDeptId()); List list = repairOrderService.selectRepairOrderList(repairOrder); ExcelUtil util = new ExcelUtil(RepairOrder.class); util.exportExcel(response, list, "维修工单数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ScheduleController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ScheduleController.java index 257a15a..552a517 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ScheduleController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ScheduleController.java @@ -62,6 +62,8 @@ public class ScheduleController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, Schedule schedule) { + SysUser user = getLoginUser().getUser(); + schedule.setTenantId(user.getDeptId()); List list = scheduleService.selectScheduleList(schedule); ExcelUtil util = new ExcelUtil(Schedule.class); util.exportExcel(response, list, "调度计划管理数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/StandardInfoController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/StandardInfoController.java index 0e2f8b3..9dccbef 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/StandardInfoController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/StandardInfoController.java @@ -62,6 +62,8 @@ public class StandardInfoController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, StandardInfo standardInfo) { + SysUser user = getLoginUser().getUser(); + standardInfo.setTenantId(user.getDeptId()); List list = standardInfoService.selectStandardInfoList(standardInfo); ExcelUtil util = new ExcelUtil(StandardInfo.class); util.exportExcel(response, list, "作业规范数据"); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/Duty.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/Duty.java index f294f7e..ada49b6 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/Duty.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/Duty.java @@ -53,6 +53,6 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("替班人员") private String relief; /** 租户id */ - @Excel(name = "租户id") +// @Excel(name = "租户id") private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/DutyRecord.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/DutyRecord.java index ffdc180..ccd33fa 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/DutyRecord.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/DutyRecord.java @@ -29,7 +29,7 @@ private static final long serialVersionUID = 1L; private String dutyDate; /** 值班人员id */ - @Excel(name = "值班人员id") +// @Excel(name = "值班人员id") @ApiModelProperty("值班人员id") private Long onId; @@ -45,7 +45,7 @@ private static final long serialVersionUID = 1L; /** 替班id */ - @Excel(name = "替班id") +// @Excel(name = "替班id") @ApiModelProperty("替班id") private Long reId; /** 替班人员 */ @@ -70,7 +70,7 @@ private static final long serialVersionUID = 1L; private String status; /** 机构id */ - @Excel(name = "机构id") +// @Excel(name = "机构id") @ApiModelProperty("机构id") private Long tenantId; diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/ExampleReport.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/ExampleReport.java index 3546128..9c1acac 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/ExampleReport.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/ExampleReport.java @@ -46,7 +46,7 @@ private static final long serialVersionUID = 1L; private String pushMethod; /** 接收人id */ - @Excel(name = "接收人id") +// @Excel(name = "接收人id") @ApiModelProperty("接收人id") private String userId; @@ -67,7 +67,7 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("结束日期") private Date endDate; /** 租户id */ - @Excel(name = "租户id") +// @Excel(name = "租户id") private Long tenantId; @Excel(name = "批阅状态", readConverterExp = "0=待批阅,1=已通过,2=未通过") @@ -77,4 +77,7 @@ private static final long serialVersionUID = 1L; @Excel(name = "批阅回复") @ApiModelProperty("批阅回复") private String reviewReply; + + @ApiModelProperty("附件") + private String fileUrl; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionPlan.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionPlan.java index bf798e1..9e1d152 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionPlan.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionPlan.java @@ -63,7 +63,7 @@ private static final long serialVersionUID = 1L; private String inspectionPerson; private String inspection; /** 巡检人id */ - @Excel(name = "巡检人id") +// @Excel(name = "巡检人id") @ApiModelProperty("巡检人id") private String userId; @@ -82,9 +82,9 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("状态") private String status; /** 租户id */ - @Excel(name = "租户id") +// @Excel(name = "租户id") private Long tenantId; - @ApiModelProperty("图片") +// @ApiModelProperty("图片") private String imgUrl; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionRecord.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionRecord.java index fcdfa15..30ce9cb 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionRecord.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionRecord.java @@ -26,7 +26,7 @@ private static final long serialVersionUID = 1L; private Long id; /** 计划id */ - @Excel(name = "计划id") +// @Excel(name = "计划id") @ApiModelProperty("计划id") private Long planId; @@ -63,7 +63,7 @@ private static final long serialVersionUID = 1L; private String inspectionPerson; /** 巡检人id */ - @Excel(name = "巡检人id") +// @Excel(name = "巡检人id") @ApiModelProperty("巡检人id") private String userId; @@ -88,7 +88,7 @@ private static final long serialVersionUID = 1L; private String inspectionRemark; /** 租户id */ - @Excel(name = "租户id") +// @Excel(name = "租户id") private Long tenantId; @ApiModelProperty("图片") private String imgUrl; diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/PrePlan.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/PrePlan.java index 115dfc4..fee4e89 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/PrePlan.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/PrePlan.java @@ -58,10 +58,10 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("预案关键词") private String keywords; /** 租户id */ - @Excel(name = "租户id") +// @Excel(name = "租户id") private Long tenantId; /** 预案关键词 */ - @Excel(name = "docOssId") +// @Excel(name = "docOssId") @ApiModelProperty("docOssId") private String docOssId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/ProcessInfo.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/ProcessInfo.java index 67aec2f..a8b512d 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/ProcessInfo.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/ProcessInfo.java @@ -51,6 +51,6 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("处理人") private Long handlePerson; /** 租户id */ - @Excel(name = "租户id") +// @Excel(name = "租户id") private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/RegulationInfo.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/RegulationInfo.java index f8bcbe7..1abc78e 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/RegulationInfo.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/RegulationInfo.java @@ -56,6 +56,6 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("上传时间") private Date uploadTime; /** 租户id */ - @Excel(name = "租户id") +// @Excel(name = "租户id") private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/RepairOrder.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/RepairOrder.java index 57a75a9..7d61a47 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/RepairOrder.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/RepairOrder.java @@ -65,7 +65,7 @@ private static final long serialVersionUID = 1L; private String annex; /** 完成人id */ - @Excel(name = "完成人id") +// @Excel(name = "完成人id") @ApiModelProperty("完成人id") private Long userId; @@ -79,6 +79,6 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("工单备注") private String orderRemark; /** 租户id */ - @Excel(name = "租户id") +// @Excel(name = "租户id") private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/Schedule.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/Schedule.java index e2d17f4..03051f0 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/Schedule.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/Schedule.java @@ -129,6 +129,6 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("负责人") private String head; /** 租户id */ - @Excel(name = "租户id") +// @Excel(name = "租户id") private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/StandardInfo.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/StandardInfo.java index 810b1ef..76bcb3d 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/StandardInfo.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/StandardInfo.java @@ -43,6 +43,6 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("规范文件") private String docOssId; /** 租户id */ - @Excel(name = "租户id") +// @Excel(name = "租户id") private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/InspectionPlanServiceImpl.java b/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/InspectionPlanServiceImpl.java index b813191..b063fb0 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/InspectionPlanServiceImpl.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/InspectionPlanServiceImpl.java @@ -77,6 +77,7 @@ public class InspectionPlanServiceImpl implements IInspectionPlanService inspectionRecord.setTenantId(inspectionPlan.getTenantId()); inspectionRecord.setCreateTime(DateUtils.getNowDate()); inspectionRecord.setCreateBy(loginUser.getUsername()); + inspectionRecord.setInspectionPerson(inspectionPlan.getInspectionPerson()); inspectionRecordMapper.insertInspectionRecord(inspectionRecord); } return num; diff --git a/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml index 5158551..1da2a39 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml @@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select example_report_id, type, cycle, content, push_method, user_id, receiver, create_by, create_time, update_by, update_time, start_date, end_date,review_status,review_reply from example_report + select example_report_id, type, cycle, content, push_method, user_id, receiver, create_by, create_time, update_by, update_time, start_date, end_date,review_status,review_reply , file_url from example_report - select distinct al.alert_log_id, al.alert_name, al.alert_level, al.status, al.product_id, al.detail, al.serial_number, al.create_time, al.remark, al.device_name, al.user_id,al.enable,al.order_id + select distinct al.alert_log_id, al.alert_name, al.alert_level, al.status, al.product_id, al.detail, al.serial_number, al.create_time, al.remark, al.device_name, al.user_id,al.enable,al.order_id,al.resp_person_id,al.proc_person_name from iot_alert_log al and al.alert_name like concat('%', #{alertName}, '%') @@ -51,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and al.user_id = #{userId} and al.create_by = #{createBy} and al.remark = #{remark} + and al.resp_person_id = #{respPersonId} + and al.proc_person_name = #{procPersonName} order by al.create_time desc @@ -191,6 +195,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, user_id, device_name, + resp_person_id, + proc_person_name, #{alertName}, @@ -206,6 +212,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{remark}, #{userId}, #{deviceName}, + #{respPersonId}, + #{procPersonName}, @@ -243,6 +251,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark = #{remark}, enable =#{enable}, orderId =#{orderId}, + resp_person_id =#{respPersonId}, + proc_person_name, where alert_log_id = #{alertLogId}