diff --git a/xinda-admin/src/main/java/com/xinda/web/controller/system/SysLoginController.java b/xinda-admin/src/main/java/com/xinda/web/controller/system/SysLoginController.java index a1c501c..f6f815e 100644 --- a/xinda-admin/src/main/java/com/xinda/web/controller/system/SysLoginController.java +++ b/xinda-admin/src/main/java/com/xinda/web/controller/system/SysLoginController.java @@ -101,11 +101,13 @@ public class SysLoginController Set roles = permissionService.getRolePermission(user); // 权限集合 Set permissions = permissionService.getMenuPermission(user); + Set fpermissions = permissionService.getMenuPermissionF(user); AppPreferences appPreferences = appPreferencesService.selectAppPreferencesByUserId(user.getUserId()); AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); ajax.put("roles", roles); ajax.put("permissions", permissions); + ajax.put("fpermissions", fpermissions); ajax.put("mqtt",enabled); ajax.put("language", appPreferences.getLanguage()); return ajax; diff --git a/xinda-admin/src/main/java/com/xinda/web/controller/system/SysNoticeController.java b/xinda-admin/src/main/java/com/xinda/web/controller/system/SysNoticeController.java index 9d56325..5f9e161 100644 --- a/xinda-admin/src/main/java/com/xinda/web/controller/system/SysNoticeController.java +++ b/xinda-admin/src/main/java/com/xinda/web/controller/system/SysNoticeController.java @@ -55,7 +55,7 @@ public class SysNoticeController extends BaseController { notice.setDeptId(getDeptId()); startPage(); - List list = noticeService.selectNoticeList(notice); + List list = noticeService.selectNoticeIndexList(notice); return getDataTable(list); } diff --git a/xinda-framework/src/main/java/com/xinda/framework/web/service/SysPermissionService.java b/xinda-framework/src/main/java/com/xinda/framework/web/service/SysPermissionService.java index 406498b..8171628 100644 --- a/xinda-framework/src/main/java/com/xinda/framework/web/service/SysPermissionService.java +++ b/xinda-framework/src/main/java/com/xinda/framework/web/service/SysPermissionService.java @@ -76,4 +76,36 @@ public class SysPermissionService } return perms; } + + /** + * 获取菜单数据权限 + * + * @param user 用户信息 + * @return 菜单权限信息 + */ + public Set getMenuPermissionF(SysUser user) + { + Set perms = new HashSet(); + // 管理员拥有所有权限 + if (user.isAdmin()) { + perms.add("*:*:*"); + } else { + List roles = user.getRoles(); + if (!roles.isEmpty() && roles.size() > 1) + { + // 多角色设置permissions属性，以便数据权限匹配权限 + for (SysRole role : roles) + { + Set rolePerms = menuService.selectMenuPermsByRoleIdF(role.getRoleId()); + role.setPermissions(rolePerms); + perms.addAll(rolePerms); + } + } + else + { + perms.addAll(menuService.selectMenuPermsByUserIdF(user.getUserId())); + } + } + return perms; + } } 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 new file mode 100644 index 0000000..56374c0 --- /dev/null +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyRecordController.java @@ -0,0 +1,125 @@ +package com.xinda.itsm.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.xinda.common.core.domain.entity.SysUser; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.xinda.common.annotation.Log; +import com.xinda.common.core.controller.BaseController; +import com.xinda.common.core.domain.AjaxResult; +import com.xinda.common.enums.BusinessType; +import com.xinda.itsm.domain.DutyRecord; +import com.xinda.itsm.service.IDutyRecordService; +import com.xinda.common.utils.poi.ExcelUtil; +import com.xinda.common.core.page.TableDataInfo; + +/** + * 交班记录Controller + * + * @author kerwincui + * @date 2025-07-21 + */ +@RestController +@RequestMapping("/itsm/dutyRecord") +@Api(tags = "交班记录") +public class DutyRecordController extends BaseController +{ + @Autowired + private IDutyRecordService dutyRecordService; + +/** + * 查询交班记录列表 + */ +@PreAuthorize("@ss.hasPermi('itsm:dutyRecord:list')") +@GetMapping("/list") +@ApiOperation("查询交班记录列表") + public TableDataInfo list(DutyRecord dutyRecord) + { + SysUser user = getLoginUser().getUser(); + dutyRecord.setTenantId(user.getDeptId()); + startPage(); + List list = dutyRecordService.selectDutyRecordList(dutyRecord); + return getDataTable(list); + } + + /** + * 导出交班记录列表 + */ + @ApiOperation("导出交班记录列表") + @PreAuthorize("@ss.hasPermi('itsm:dutyRecord:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, DutyRecord dutyRecord) + { + List list = dutyRecordService.selectDutyRecordList(dutyRecord); + ExcelUtil util = new ExcelUtil(DutyRecord.class); + util.exportExcel(response, list, "交班记录数据"); + } + + /** + * 获取交班记录详细信息 + */ + @GetMapping(value = "/lastInfo") + @ApiOperation("获取交班记录详细信息") + public AjaxResult lastInfo() + { + DutyRecord dutyRecord = new DutyRecord(); + SysUser user = getLoginUser().getUser(); +// dutyRecord.setTenantId(user.getDeptId()); + dutyRecord.setReId(user.getUserId()); + return success(dutyRecordService.selectLastDutyRecord(dutyRecord)); + } + + @GetMapping(value = "/{dutyId}") + @ApiOperation("获取交班记录详细信息") + public AjaxResult getInfo(@PathVariable("dutyId") Long dutyId) + { + return success(dutyRecordService.selectDutyRecordByDutyId(dutyId)); + } + + /** + * 新增交班记录 + */ + @PreAuthorize("@ss.hasPermi('itsm:dutyRecord:add')") + @PostMapping + @ApiOperation("新增交班记录") + public AjaxResult add(@RequestBody DutyRecord dutyRecord) + { + SysUser user = getLoginUser().getUser(); + dutyRecord.setTenantId(user.getDeptId()); + return toAjax(dutyRecordService.insertDutyRecord(dutyRecord)); + } + + /** + * 修改交班记录 + */ + @PreAuthorize("@ss.hasPermi('itsm:dutyRecord:edit')") + @PutMapping + @ApiOperation("修改交班记录") + public AjaxResult edit(@RequestBody DutyRecord dutyRecord) + { + return toAjax(dutyRecordService.updateDutyRecord(dutyRecord)); + } + + /** + * 删除交班记录 + */ + @PreAuthorize("@ss.hasPermi('itsm:dutyRecord:remove')") + @DeleteMapping("/{dutyIds}") + @ApiOperation("删除交班记录") + public AjaxResult remove(@PathVariable Long[] dutyIds) + { + return toAjax(dutyRecordService.deleteDutyRecordByDutyIds(dutyIds)); + } +} 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 new file mode 100644 index 0000000..ffdc180 --- /dev/null +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/DutyRecord.java @@ -0,0 +1,77 @@ +package com.xinda.itsm.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.xinda.common.annotation.Excel; +import com.xinda.common.core.domain.BaseEntity; + +/** + * 交班记录对象 duty_record + * + * @author kerwincui + * @date 2025-07-21 + */ +@ApiModel(value = "DutyRecord",description = "交班记录 duty_record") +@Data +public class DutyRecord extends BaseEntity + { +private static final long serialVersionUID = 1L; + + /** 值班id */ + private Long dutyId; + + /** 值班日期 */ + @Excel(name = "值班日期") + @ApiModelProperty("值班日期") + private String dutyDate; + + /** 值班人员id */ + @Excel(name = "值班人员id") + @ApiModelProperty("值班人员id") + private Long onId; + + /** 值班人员 */ + @Excel(name = "值班人员") + @ApiModelProperty("值班人员") + private String onDuty; + + /** 值班时间段 */ + @Excel(name = "值班时间段") + @ApiModelProperty("值班时间段") + private String dutyPeriod; + + + /** 替班id */ + @Excel(name = "替班id") + @ApiModelProperty("替班id") + private Long reId; + /** 替班人员 */ + @Excel(name = "替班人员") + @ApiModelProperty("替班人员") + private String relief; + + @Excel(name = "本班情况") + @ApiModelProperty("本班情况") + private String situation; + + + + /** 值班类型 */ + @Excel(name = "值班类型") + @ApiModelProperty("值班类型") + private String type; + + /** 值班状态 */ + @Excel(name = "值班状态") + @ApiModelProperty("值班状态") + private String status; + + /** 机构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 99e195c..3546128 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 @@ -69,4 +69,12 @@ private static final long serialVersionUID = 1L; /** 租户id */ @Excel(name = "租户id") private Long tenantId; + + @Excel(name = "批阅状态", readConverterExp = "0=待批阅,1=已通过,2=未通过") + @ApiModelProperty("批阅状态") + private String reviewStatus; + + @Excel(name = "批阅回复") + @ApiModelProperty("批阅回复") + private String reviewReply; } 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 726345e..bf798e1 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 @@ -84,4 +84,7 @@ private static final long serialVersionUID = 1L; /** 租户id */ @Excel(name = "租户id") private Long tenantId; + + @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 5479512..fcdfa15 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 @@ -46,13 +46,13 @@ private static final long serialVersionUID = 1L; private String projectName; /** 计划巡检时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Excel(name = "计划巡检时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("计划巡检时间") private Date planTime; /** 实际巡检时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Excel(name = "实际巡检时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("实际巡检时间") private Date inspectionTime; @@ -90,4 +90,6 @@ private static final long serialVersionUID = 1L; /** 租户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 ee8aaff..115dfc4 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 @@ -60,4 +60,8 @@ private static final long serialVersionUID = 1L; /** 租户id */ @Excel(name = "租户id") private Long tenantId; + /** 预案关键词 */ + @Excel(name = "docOssId") + @ApiModelProperty("docOssId") + private String docOssId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/mapper/DutyRecordMapper.java b/xinda-itsm/src/main/java/com/xinda/itsm/mapper/DutyRecordMapper.java new file mode 100644 index 0000000..4b81668 --- /dev/null +++ b/xinda-itsm/src/main/java/com/xinda/itsm/mapper/DutyRecordMapper.java @@ -0,0 +1,63 @@ +package com.xinda.itsm.mapper; + +import java.util.List; +import com.xinda.itsm.domain.DutyRecord; + +/** + * 交班记录Mapper接口 + * + * @author kerwincui + * @date 2025-07-21 + */ +public interface DutyRecordMapper +{ + /** + * 查询交班记录 + * + * @param dutyId 交班记录主键 + * @return 交班记录 + */ + public DutyRecord selectDutyRecordByDutyId(Long dutyId); + + /** + * 查询交班记录列表 + * + * @param dutyRecord 交班记录 + * @return 交班记录集合 + */ + public List selectDutyRecordList(DutyRecord dutyRecord); + + /** + * 新增交班记录 + * + * @param dutyRecord 交班记录 + * @return 结果 + */ + public int insertDutyRecord(DutyRecord dutyRecord); + + /** + * 修改交班记录 + * + * @param dutyRecord 交班记录 + * @return 结果 + */ + public int updateDutyRecord(DutyRecord dutyRecord); + + /** + * 删除交班记录 + * + * @param dutyId 交班记录主键 + * @return 结果 + */ + public int deleteDutyRecordByDutyId(Long dutyId); + + /** + * 批量删除交班记录 + * + * @param dutyIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDutyRecordByDutyIds(Long[] dutyIds); + + DutyRecord selectLastDutyRecord(DutyRecord dutyRecord); +} diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/service/IDutyRecordService.java b/xinda-itsm/src/main/java/com/xinda/itsm/service/IDutyRecordService.java new file mode 100644 index 0000000..3110a76 --- /dev/null +++ b/xinda-itsm/src/main/java/com/xinda/itsm/service/IDutyRecordService.java @@ -0,0 +1,63 @@ +package com.xinda.itsm.service; + +import java.util.List; +import com.xinda.itsm.domain.DutyRecord; + +/** + * 交班记录Service接口 + * + * @author kerwincui + * @date 2025-07-21 + */ +public interface IDutyRecordService +{ + /** + * 查询交班记录 + * + * @param dutyId 交班记录主键 + * @return 交班记录 + */ + public DutyRecord selectDutyRecordByDutyId(Long dutyId); + + public DutyRecord selectLastDutyRecord(DutyRecord dutyRecord); + + /** + * 查询交班记录列表 + * + * @param dutyRecord 交班记录 + * @return 交班记录集合 + */ + public List selectDutyRecordList(DutyRecord dutyRecord); + + /** + * 新增交班记录 + * + * @param dutyRecord 交班记录 + * @return 结果 + */ + public int insertDutyRecord(DutyRecord dutyRecord); + + /** + * 修改交班记录 + * + * @param dutyRecord 交班记录 + * @return 结果 + */ + public int updateDutyRecord(DutyRecord dutyRecord); + + /** + * 批量删除交班记录 + * + * @param dutyIds 需要删除的交班记录主键集合 + * @return 结果 + */ + public int deleteDutyRecordByDutyIds(Long[] dutyIds); + + /** + * 删除交班记录信息 + * + * @param dutyId 交班记录主键 + * @return 结果 + */ + public int deleteDutyRecordByDutyId(Long dutyId); +} diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/DutyRecordServiceImpl.java b/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/DutyRecordServiceImpl.java new file mode 100644 index 0000000..043a218 --- /dev/null +++ b/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/DutyRecordServiceImpl.java @@ -0,0 +1,101 @@ +package com.xinda.itsm.service.impl; + +import java.util.List; +import com.xinda.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.xinda.itsm.mapper.DutyRecordMapper; +import com.xinda.itsm.domain.DutyRecord; +import com.xinda.itsm.service.IDutyRecordService; + +/** + * 交班记录Service业务层处理 + * + * @author kerwincui + * @date 2025-07-21 + */ +@Service +public class DutyRecordServiceImpl implements IDutyRecordService +{ + @Autowired + private DutyRecordMapper dutyRecordMapper; + + /** + * 查询交班记录 + * + * @param dutyId 交班记录主键 + * @return 交班记录 + */ + @Override + public DutyRecord selectDutyRecordByDutyId(Long dutyId) + { + return dutyRecordMapper.selectDutyRecordByDutyId(dutyId); + } + + @Override + public DutyRecord selectLastDutyRecord(DutyRecord dutyRecord) { + return dutyRecordMapper.selectLastDutyRecord(dutyRecord); + } + + /** + * 查询交班记录列表 + * + * @param dutyRecord 交班记录 + * @return 交班记录 + */ + @Override + public List selectDutyRecordList(DutyRecord dutyRecord) + { + return dutyRecordMapper.selectDutyRecordList(dutyRecord); + } + + /** + * 新增交班记录 + * + * @param dutyRecord 交班记录 + * @return 结果 + */ + @Override + public int insertDutyRecord(DutyRecord dutyRecord) + { + dutyRecord.setCreateTime(DateUtils.getNowDate()); + return dutyRecordMapper.insertDutyRecord(dutyRecord); + } + + /** + * 修改交班记录 + * + * @param dutyRecord 交班记录 + * @return 结果 + */ + @Override + public int updateDutyRecord(DutyRecord dutyRecord) + { + dutyRecord.setUpdateTime(DateUtils.getNowDate()); + return dutyRecordMapper.updateDutyRecord(dutyRecord); + } + + /** + * 批量删除交班记录 + * + * @param dutyIds 需要删除的交班记录主键 + * @return 结果 + */ + @Override + public int deleteDutyRecordByDutyIds(Long[] dutyIds) + { + return dutyRecordMapper.deleteDutyRecordByDutyIds(dutyIds); + } + + /** + * 删除交班记录信息 + * + * @param dutyId 交班记录主键 + * @return 结果 + */ + @Override + public int deleteDutyRecordByDutyId(Long dutyId) + { + return dutyRecordMapper.deleteDutyRecordByDutyId(dutyId); + } +} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/DutyRecordMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/DutyRecordMapper.xml new file mode 100644 index 0000000..d4366cc --- /dev/null +++ b/xinda-itsm/src/main/resources/mapper/itsm/DutyRecordMapper.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select duty_id, duty_date, on_id, on_duty, duty_period, relief, re_id, type, status, situation,remark, create_by, create_time, update_by, update_time, tenant_id from duty_record + + + + + + + + + + + + insert into duty_record + + duty_date, + on_id, + on_duty, + duty_period, + relief, + re_id, + type, + status, + situation, + remark, + create_by, + create_time, + update_by, + update_time, + tenant_id, + + + #{dutyDate}, + #{onId}, + #{onDuty}, + #{dutyPeriod}, + #{relief}, + #{reId}, + #{type}, + #{status}, + #{situation}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{tenantId}, + + + + + update duty_record + + duty_date = #{dutyDate}, + on_id = #{onId}, + on_duty = #{onDuty}, + duty_period = #{dutyPeriod}, + relief = #{relief}, + re_id = #{reId}, + type = #{type}, + status = #{status}, + remark = #{situation}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + tenant_id = #{tenantId}, + + where duty_id = #{dutyId} + + + + delete from duty_record where duty_id = #{dutyId} + + + + delete from duty_record where duty_id in + + #{dutyId} + + + \ No newline at end of file diff --git a/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml index 634294c..5158551 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml @@ -19,10 +19,12 @@ 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 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 from example_report @@ -66,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" start_date, end_date, tenant_id, + review_status, + review_reply, #{exampleReportId}, @@ -82,6 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{startDate}, #{endDate}, #{tenantId}, + #{reviewStatus}, + #{reviewReply}, @@ -100,7 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, start_date = #{startDate}, end_date = #{endDate}, - tenant_id = #{tenantId}, + review_status = #{reviewStatus}, + review_reply = #{reviewReply}, where example_report_id = #{exampleReportId} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/InspectionPlanMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/InspectionPlanMapper.xml index f0216de..8220b67 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/InspectionPlanMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/InspectionPlanMapper.xml @@ -23,10 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, plan_name, plan_content, project_name, start_date, end_date, inspection_cycle, inspection_person,inspection, user_id, set_date, set_time, status, create_by, create_time, update_by, update_time,tenant_id from inspection_plan + select id, plan_name, plan_content, project_name, start_date, end_date, inspection_cycle, inspection_person,inspection, user_id, set_date, set_time, status, create_by, create_time, update_by, update_time,tenant_id,img_url from inspection_plan @@ -78,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, tenant_id, + img_url, #{id}, @@ -98,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{tenantId}, + #{imgUrl}, @@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, tenant_id = #{tenantId}, + img_url = #{imgUrl}, where id = #{id} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/PrePlanMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/PrePlanMapper.xml index 3b5a2b8..d49b76f 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/PrePlanMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/PrePlanMapper.xml @@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select pre_plan_id, number, type, station, device, content, prepared_by, keywords, create_by, create_time, update_by, update_time,tenant_id from pre_plan + select pre_plan_id, number, type, station, device, content, prepared_by, keywords, create_by, create_time, update_by, update_time,tenant_id,doc_oss_id from pre_plan + + + - + insert into sys_notice ( dept_id,