diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsFaultInstanceController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsFaultInstanceController.java new file mode 100644 index 00000000..8b7effef --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsFaultInstanceController.java @@ -0,0 +1,105 @@ +package com.hw.dms.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +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.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.dms.domain.DmsBillsFaultInstance; +import com.hw.dms.service.IDmsBillsFaultInstanceService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 检修工单Controller + * + * @author Open Platform + * @date 2024-01-23 + */ +@RestController +@RequestMapping("/dmsBillsFaultInstance") +public class DmsBillsFaultInstanceController extends BaseController +{ + @Autowired + private IDmsBillsFaultInstanceService dmsBillsFaultInstanceService; + + /** + * 查询检修工单列表 + */ + @RequiresPermissions("dms:dmsBillsFaultInstance:list") + @GetMapping("/list") + public TableDataInfo list(DmsBillsFaultInstance dmsBillsFaultInstance) + { + startPage(); + List list = dmsBillsFaultInstanceService.selectDmsBillsFaultInstanceList(dmsBillsFaultInstance); + return getDataTable(list); + } + + /** + * 导出检修工单列表 + */ + @RequiresPermissions("dms:dmsBillsFaultInstance:export") + @Log(title = "检修工单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DmsBillsFaultInstance dmsBillsFaultInstance) + { + List list = dmsBillsFaultInstanceService.selectDmsBillsFaultInstanceList(dmsBillsFaultInstance); + ExcelUtil util = new ExcelUtil(DmsBillsFaultInstance.class); + util.exportExcel(response, list, "检修工单数据"); + } + + /** + * 获取检修工单详细信息 + */ + @RequiresPermissions("dms:dmsBillsFaultInstance:query") + @GetMapping(value = "/{repairInstanceId}") + public AjaxResult getInfo(@PathVariable("repairInstanceId") Long repairInstanceId) + { + return success(dmsBillsFaultInstanceService.selectDmsBillsFaultInstanceByRepairInstanceId(repairInstanceId)); + } + + /** + * 新增检修工单 + */ + @RequiresPermissions("dms:dmsBillsFaultInstance:add") + @Log(title = "检修工单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmsBillsFaultInstance dmsBillsFaultInstance) + { + return toAjax(dmsBillsFaultInstanceService.insertDmsBillsFaultInstance(dmsBillsFaultInstance)); + } + + /** + * 修改检修工单 + */ + @RequiresPermissions("dms:dmsBillsFaultInstance:edit") + @Log(title = "检修工单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmsBillsFaultInstance dmsBillsFaultInstance) + { + return toAjax(dmsBillsFaultInstanceService.updateDmsBillsFaultInstance(dmsBillsFaultInstance)); + } + + /** + * 删除检修工单 + */ + @RequiresPermissions("dms:dmsBillsFaultInstance:remove") + @Log(title = "检修工单", businessType = BusinessType.DELETE) + @DeleteMapping("/{repairInstanceIds}") + public AjaxResult remove(@PathVariable Long[] repairInstanceIds) + { + return toAjax(dmsBillsFaultInstanceService.deleteDmsBillsFaultInstanceByRepairInstanceIds(repairInstanceIds)); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java new file mode 100644 index 00000000..8aedbf2d --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java @@ -0,0 +1,105 @@ +package com.hw.dms.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +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.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.dms.domain.DmsBillsInspectInstanceActivity; +import com.hw.dms.service.IDmsBillsInspectInstanceActivityService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 点巡检工单实例节点Controller + * + * @author Open Platform + * @date 2024-01-23 + */ +@RestController +@RequestMapping("/dmsBillsInspectActivity") +public class DmsBillsInspectInstanceActivityController extends BaseController +{ + @Autowired + private IDmsBillsInspectInstanceActivityService dmsBillsInspectInstanceActivityService; + + /** + * 查询点巡检工单实例节点列表 + */ + @RequiresPermissions("dms:dmsBillsInspectActivity:list") + @GetMapping("/list") + public TableDataInfo list(DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity) + { + startPage(); + List list = dmsBillsInspectInstanceActivityService.selectDmsBillsInspectInstanceActivityList(dmsBillsInspectInstanceActivity); + return getDataTable(list); + } + + /** + * 导出点巡检工单实例节点列表 + */ + @RequiresPermissions("dms:dmsBillsInspectActivity:export") + @Log(title = "点巡检工单实例节点", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity) + { + List list = dmsBillsInspectInstanceActivityService.selectDmsBillsInspectInstanceActivityList(dmsBillsInspectInstanceActivity); + ExcelUtil util = new ExcelUtil(DmsBillsInspectInstanceActivity.class); + util.exportExcel(response, list, "点巡检工单实例节点数据"); + } + + /** + * 获取点巡检工单实例节点详细信息 + */ + @RequiresPermissions("dms:dmsBillsInspectActivity:query") + @GetMapping(value = "/{instanceActivityId}") + public AjaxResult getInfo(@PathVariable("instanceActivityId") Long instanceActivityId) + { + return success(dmsBillsInspectInstanceActivityService.selectDmsBillsInspectInstanceActivityByInstanceActivityId(instanceActivityId)); + } + + /** + * 新增点巡检工单实例节点 + */ + @RequiresPermissions("dms:dmsBillsInspectActivity:add") + @Log(title = "点巡检工单实例节点", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity) + { + return toAjax(dmsBillsInspectInstanceActivityService.insertDmsBillsInspectInstanceActivity(dmsBillsInspectInstanceActivity)); + } + + /** + * 修改点巡检工单实例节点 + */ + @RequiresPermissions("dms:dmsBillsInspectActivity:edit") + @Log(title = "点巡检工单实例节点", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity) + { + return toAjax(dmsBillsInspectInstanceActivityService.updateDmsBillsInspectInstanceActivity(dmsBillsInspectInstanceActivity)); + } + + /** + * 删除点巡检工单实例节点 + */ + @RequiresPermissions("dms:dmsBillsInspectActivity:remove") + @Log(title = "点巡检工单实例节点", businessType = BusinessType.DELETE) + @DeleteMapping("/{instanceActivityIds}") + public AjaxResult remove(@PathVariable Long[] instanceActivityIds) + { + return toAjax(dmsBillsInspectInstanceActivityService.deleteDmsBillsInspectInstanceActivityByInstanceActivityIds(instanceActivityIds)); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceController.java new file mode 100644 index 00000000..5e4e60a5 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceController.java @@ -0,0 +1,105 @@ +package com.hw.dms.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +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.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.dms.domain.DmsBillsInspectInstance; +import com.hw.dms.service.IDmsBillsInspectInstanceService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 巡检工单Controller + * + * @author Open Platform + * @date 2024-01-23 + */ +@RestController +@RequestMapping("/dmsBillsInstance") +public class DmsBillsInspectInstanceController extends BaseController +{ + @Autowired + private IDmsBillsInspectInstanceService dmsBillsInspectInstanceService; + + /** + * 查询巡检工单列表 + */ + @RequiresPermissions("dms:dmsBillsInstance:list") + @GetMapping("/list") + public TableDataInfo list(DmsBillsInspectInstance dmsBillsInspectInstance) + { + startPage(); + List list = dmsBillsInspectInstanceService.selectDmsBillsInspectInstanceList(dmsBillsInspectInstance); + return getDataTable(list); + } + + /** + * 导出巡检工单列表 + */ + @RequiresPermissions("dms:dmsBillsInstance:export") + @Log(title = "巡检工单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DmsBillsInspectInstance dmsBillsInspectInstance) + { + List list = dmsBillsInspectInstanceService.selectDmsBillsInspectInstanceList(dmsBillsInspectInstance); + ExcelUtil util = new ExcelUtil(DmsBillsInspectInstance.class); + util.exportExcel(response, list, "巡检工单数据"); + } + + /** + * 获取巡检工单详细信息 + */ + @RequiresPermissions("dms:dmsBillsInstance:query") + @GetMapping(value = "/{inspectInstanceId}") + public AjaxResult getInfo(@PathVariable("inspectInstanceId") Long inspectInstanceId) + { + return success(dmsBillsInspectInstanceService.selectDmsBillsInspectInstanceByInspectInstanceId(inspectInstanceId)); + } + + /** + * 新增巡检工单 + */ + @RequiresPermissions("dms:dmsBillsInstance:add") + @Log(title = "巡检工单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmsBillsInspectInstance dmsBillsInspectInstance) + { + return toAjax(dmsBillsInspectInstanceService.insertDmsBillsInspectInstance(dmsBillsInspectInstance)); + } + + /** + * 修改巡检工单 + */ + @RequiresPermissions("dms:dmsBillsInstance:edit") + @Log(title = "巡检工单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmsBillsInspectInstance dmsBillsInspectInstance) + { + return toAjax(dmsBillsInspectInstanceService.updateDmsBillsInspectInstance(dmsBillsInspectInstance)); + } + + /** + * 删除巡检工单 + */ + @RequiresPermissions("dms:dmsBillsInstance:remove") + @Log(title = "巡检工单", businessType = BusinessType.DELETE) + @DeleteMapping("/{inspectInstanceIds}") + public AjaxResult remove(@PathVariable Long[] inspectInstanceIds) + { + return toAjax(dmsBillsInspectInstanceService.deleteDmsBillsInspectInstanceByInspectInstanceIds(inspectInstanceIds)); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java new file mode 100644 index 00000000..0a7f7efc --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java @@ -0,0 +1,216 @@ +package com.hw.dms.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 检修工单对象 dms_bills_fault_instance + * + * @author Open Platform + * @date 2024-01-23 + */ +public class DmsBillsFaultInstance extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识;此表不会长期保存 */ + private Long repairInstanceId; + + /** 报修来源类型(1检修，2点检，3巡检，9其他) */ + @Excel(name = "报修来源类型(1检修，2点检，3巡检，9其他)") + private String faultSourceType; + + /** 报修来源ID，根据报修来源类型关联来源主键 */ + @Excel(name = "报修来源ID，根据报修来源类型关联来源主键") + private Long faultSourceId; + + /** 工单流程ID，关联wf_process的wf_process_id */ + @Excel(name = "工单流程ID，关联wf_process的wf_process_id") + private Long wfProcessId; + + /** 工单编号 */ + @Excel(name = "工单编号") + private String billsFaultCode; + + /** 工单状态：0-待维修，1-维修中，2-维修完成，3-待检修，4-检修中，5-检修完成 */ + @Excel(name = "工单状态：0-待维修，1-维修中，2-维修完成，3-待检修，4-检修中，5-检修完成") + private String billsStatus; + + /** 申请人 */ + @Excel(name = "申请人") + private String applyUser; + + /** 申请时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date applyTime; + + /** 实际开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date realBeginTime; + + /** 实际完成时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际完成时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date realEndTime; + + /** 要求完成时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "要求完成时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date requireEndTime; + + /** 工单类型（1手工创建,2自动创建） */ + @Excel(name = "工单类型", readConverterExp = "1=手工创建,2自动创建") + private String instanceType; + + /** 是否标识：1-是；0-否 */ + @Excel(name = "是否标识：1-是；0-否") + private String isFlag; + + public void setRepairInstanceId(Long repairInstanceId) + { + this.repairInstanceId = repairInstanceId; + } + + public Long getRepairInstanceId() + { + return repairInstanceId; + } + public void setFaultSourceType(String faultSourceType) + { + this.faultSourceType = faultSourceType; + } + + public String getFaultSourceType() + { + return faultSourceType; + } + public void setFaultSourceId(Long faultSourceId) + { + this.faultSourceId = faultSourceId; + } + + public Long getFaultSourceId() + { + return faultSourceId; + } + public void setWfProcessId(Long wfProcessId) + { + this.wfProcessId = wfProcessId; + } + + public Long getWfProcessId() + { + return wfProcessId; + } + public void setBillsFaultCode(String billsFaultCode) + { + this.billsFaultCode = billsFaultCode; + } + + public String getBillsFaultCode() + { + return billsFaultCode; + } + public void setBillsStatus(String billsStatus) + { + this.billsStatus = billsStatus; + } + + public String getBillsStatus() + { + return billsStatus; + } + public void setApplyUser(String applyUser) + { + this.applyUser = applyUser; + } + + public String getApplyUser() + { + return applyUser; + } + public void setApplyTime(Date applyTime) + { + this.applyTime = applyTime; + } + + public Date getApplyTime() + { + return applyTime; + } + public void setRealBeginTime(Date realBeginTime) + { + this.realBeginTime = realBeginTime; + } + + public Date getRealBeginTime() + { + return realBeginTime; + } + public void setRealEndTime(Date realEndTime) + { + this.realEndTime = realEndTime; + } + + public Date getRealEndTime() + { + return realEndTime; + } + public void setRequireEndTime(Date requireEndTime) + { + this.requireEndTime = requireEndTime; + } + + public Date getRequireEndTime() + { + return requireEndTime; + } + public void setInstanceType(String instanceType) + { + this.instanceType = instanceType; + } + + public String getInstanceType() + { + return instanceType; + } + public void setIsFlag(String isFlag) + { + this.isFlag = isFlag; + } + + public String getIsFlag() + { + return isFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("repairInstanceId", getRepairInstanceId()) + .append("faultSourceType", getFaultSourceType()) + .append("faultSourceId", getFaultSourceId()) + .append("wfProcessId", getWfProcessId()) + .append("billsFaultCode", getBillsFaultCode()) + .append("billsStatus", getBillsStatus()) + .append("applyUser", getApplyUser()) + .append("applyTime", getApplyTime()) + .append("realBeginTime", getRealBeginTime()) + .append("realEndTime", getRealEndTime()) + .append("requireEndTime", getRequireEndTime()) + .append("instanceType", getInstanceType()) + .append("isFlag", getIsFlag()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java new file mode 100644 index 00000000..2507c542 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java @@ -0,0 +1,222 @@ +package com.hw.dms.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 巡检工单对象 dms_bills_inspect_instance + * + * @author Open Platform + * @date 2024-01-23 + */ +public class DmsBillsInspectInstance extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long inspectInstanceId; + + /** 计划ID,关联dms_plan_inspect的plan_inspect_id */ + @Excel(name = "计划ID,关联dms_plan_inspect的plan_inspect_id") + private Long planInspectId; + + /** 工单流程ID，关联wf_process的wf_process_id */ + @Excel(name = "工单流程ID，关联wf_process的wf_process_id") + private Long wfProcessId; + + /** 检查类型(1巡检,2点检) */ + @Excel(name = "检查类型(1巡检,2点检)") + private String inspectType; + + /** 巡检编号 */ + @Excel(name = "巡检编号") + private String billsInspectCode; + + /** 巡检线路,关联dms_base_inspect_route的inspect_route_id */ + @Excel(name = "巡检线路,关联dms_base_inspect_route的inspect_route_id") + private Long inspectRouteId; + + /** 设备总数 */ + @Excel(name = "设备总数") + private Long deviceAmount; + + /** 计划巡检时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划巡检时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date planBeginTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划巡检时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date planEndTime; + + /** 实际开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date realBeginTime; + + /** 实际结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date realEndTime; + + /** 执行人员 */ + @Excel(name = "执行人员") + private String performer; + + /** 巡检状态：1-待巡检；2-巡检中；3-完成 */ + @Excel(name = "巡检状态：1-待巡检；2-巡检中；3-完成") + private String inspectStatus; + + /** 是否标识：1-是；0-否 */ + @Excel(name = "是否标识：1-是；0-否") + private String isFlag; + + public void setInspectInstanceId(Long inspectInstanceId) + { + this.inspectInstanceId = inspectInstanceId; + } + + public Long getInspectInstanceId() + { + return inspectInstanceId; + } + public void setPlanInspectId(Long planInspectId) + { + this.planInspectId = planInspectId; + } + + public Long getPlanInspectId() + { + return planInspectId; + } + public void setWfProcessId(Long wfProcessId) + { + this.wfProcessId = wfProcessId; + } + + public Long getWfProcessId() + { + return wfProcessId; + } + public void setInspectType(String inspectType) + { + this.inspectType = inspectType; + } + + public String getInspectType() + { + return inspectType; + } + public void setBillsInspectCode(String billsInspectCode) + { + this.billsInspectCode = billsInspectCode; + } + + public String getBillsInspectCode() + { + return billsInspectCode; + } + public void setInspectRouteId(Long inspectRouteId) + { + this.inspectRouteId = inspectRouteId; + } + + public Long getInspectRouteId() + { + return inspectRouteId; + } + public void setDeviceAmount(Long deviceAmount) + { + this.deviceAmount = deviceAmount; + } + + public Long getDeviceAmount() + { + return deviceAmount; + } + + public Date getPlanBeginTime() { + return planBeginTime; + } + + public void setPlanBeginTime(Date planBeginTime) { + this.planBeginTime = planBeginTime; + } + + public Date getPlanEndTime() { + return planEndTime; + } + + public void setPlanEndTime(Date planEndTime) { + this.planEndTime = planEndTime; + } + + public void setRealBeginTime(Date realBeginTime) + { + this.realBeginTime = realBeginTime; + } + + public Date getRealBeginTime() + { + return realBeginTime; + } + public void setRealEndTime(Date realEndTime) + { + this.realEndTime = realEndTime; + } + + public Date getRealEndTime() + { + return realEndTime; + } + public void setPerformer(String performer) + { + this.performer = performer; + } + + public String getPerformer() + { + return performer; + } + public void setInspectStatus(String inspectStatus) + { + this.inspectStatus = inspectStatus; + } + + public String getInspectStatus() + { + return inspectStatus; + } + public void setIsFlag(String isFlag) + { + this.isFlag = isFlag; + } + + public String getIsFlag() + { + return isFlag; + } + + @Override + public String toString() { + return "DmsBillsInspectInstance{" + + "inspectInstanceId=" + inspectInstanceId + + ", planInspectId=" + planInspectId + + ", wfProcessId=" + wfProcessId + + ", inspectType='" + inspectType + '\'' + + ", billsInspectCode='" + billsInspectCode + '\'' + + ", inspectRouteId=" + inspectRouteId + + ", deviceAmount=" + deviceAmount + + ", planBeginTime=" + planBeginTime + + ", planEndTime=" + planEndTime + + ", realBeginTime=" + realBeginTime + + ", realEndTime=" + realEndTime + + ", performer='" + performer + '\'' + + ", inspectStatus='" + inspectStatus + '\'' + + ", isFlag='" + isFlag + '\'' + + '}'; + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstanceActivity.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstanceActivity.java new file mode 100644 index 00000000..f3579ecc --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstanceActivity.java @@ -0,0 +1,255 @@ +package com.hw.dms.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 点巡检工单实例节点对象 dms_bills_inspect_instance_activity + * + * @author Open Platform + * @date 2024-01-23 + */ +public class DmsBillsInspectInstanceActivity extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡检工单实例节点ID */ + private Long instanceActivityId; + + /** 巡检工单实例ID，关联dms_bills_inspect_instance的inspect_instance_id */ + @Excel(name = "巡检工单实例ID，关联dms_bills_inspect_instance的inspect_instance_id") + private Long inspectInstanceId; + + /** 工单流程节点ID（关联wf_process_activity的process_activity_id） */ + @Excel(name = "工单流程节点ID", readConverterExp = "关=联wf_process_activity的process_activity_id") + private Long processActivityId; + + /** 巡检线路,关联dms_base_inspect_route的inspect_route_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 */ + @Excel(name = "巡检线路,关联dms_base_inspect_route的inspect_route_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private Long inspectRouteId; + + /** 设备总数;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 */ + @Excel(name = "设备总数;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private Long deviceAmount; + + /** 执行人员;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 */ + @Excel(name = "执行人员;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private String performer; + + /** 处理意见;第一步不显示，从第2步开始只显示此字段 */ + @Excel(name = "处理意见;第一步不显示，从第2步开始只显示此字段") + private String processHandleResolution; + + /** 状态(0已结束，1执行中，2、待接取，3、已转发） */ + @Excel(name = "状态(0已结束，1执行中，2、待接取，3、已转发）") + private String processHandleStatus; + + /** 工单流程步骤顺序 */ + @Excel(name = "工单流程步骤顺序") + private Long processStepOrder; + + /** 执行开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "执行开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** 执行结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "执行结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + /** 处理人ID（关联sys_user的user_id) */ + @Excel(name = "处理人ID", readConverterExp = "处理人ID（关联sys_user的user_id)") + private Long handleUserId; + + /** 处理人 */ + @Excel(name = "处理人") + private String handleBy; + + /** 处理时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date handleTime; + + /** 转单人用户id或转发协助用户id;1、在转发时，生成新的工单节点实例，执行人id为转发的用户，而转单人是刚才转发给此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束2、在添加协助时，生成新的工单节点实例，执行人id为添加协助的用户，而转单人是刚才添加协助此用户的用户id，是否协助工单为1，并且转发后当前工单的状态仍为执行中 */ + @Excel(name = "转单人用户id或转发协助用户id;1、在转发时，生成新的工单节点实例，执行人id为转发的用户，而转单人是刚才转发给此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束2、在添加协助时，生成新的工单节点实例，执行人id为添加协助的用户，而转单人是刚才添加协助此用户的用户id，是否协助工单为1，并且转发后当前工单的状态仍为执行中") + private Long transferUserId; + + /** 用户预留1 */ + @Excel(name = "用户预留1") + private String attr1; + + public void setInstanceActivityId(Long instanceActivityId) + { + this.instanceActivityId = instanceActivityId; + } + + public Long getInstanceActivityId() + { + return instanceActivityId; + } + public void setInspectInstanceId(Long inspectInstanceId) + { + this.inspectInstanceId = inspectInstanceId; + } + + public Long getInspectInstanceId() + { + return inspectInstanceId; + } + public void setProcessActivityId(Long processActivityId) + { + this.processActivityId = processActivityId; + } + + public Long getProcessActivityId() + { + return processActivityId; + } + public void setInspectRouteId(Long inspectRouteId) + { + this.inspectRouteId = inspectRouteId; + } + + public Long getInspectRouteId() + { + return inspectRouteId; + } + public void setDeviceAmount(Long deviceAmount) + { + this.deviceAmount = deviceAmount; + } + + public Long getDeviceAmount() + { + return deviceAmount; + } + public void setPerformer(String performer) + { + this.performer = performer; + } + + public String getPerformer() + { + return performer; + } + public void setProcessHandleResolution(String processHandleResolution) + { + this.processHandleResolution = processHandleResolution; + } + + public String getProcessHandleResolution() + { + return processHandleResolution; + } + public void setProcessHandleStatus(String processHandleStatus) + { + this.processHandleStatus = processHandleStatus; + } + + public String getProcessHandleStatus() + { + return processHandleStatus; + } + public void setProcessStepOrder(Long processStepOrder) + { + this.processStepOrder = processStepOrder; + } + + public Long getProcessStepOrder() + { + return processStepOrder; + } + public void setStartTime(Date startTime) + { + this.startTime = startTime; + } + + public Date getStartTime() + { + return startTime; + } + public void setEndTime(Date endTime) + { + this.endTime = endTime; + } + + public Date getEndTime() + { + return endTime; + } + public void setHandleUserId(Long handleUserId) + { + this.handleUserId = handleUserId; + } + + public Long getHandleUserId() + { + return handleUserId; + } + public void setHandleBy(String handleBy) + { + this.handleBy = handleBy; + } + + public String getHandleBy() + { + return handleBy; + } + public void setHandleTime(Date handleTime) + { + this.handleTime = handleTime; + } + + public Date getHandleTime() + { + return handleTime; + } + public void setTransferUserId(Long transferUserId) + { + this.transferUserId = transferUserId; + } + + public Long getTransferUserId() + { + return transferUserId; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("instanceActivityId", getInstanceActivityId()) + .append("inspectInstanceId", getInspectInstanceId()) + .append("processActivityId", getProcessActivityId()) + .append("inspectRouteId", getInspectRouteId()) + .append("deviceAmount", getDeviceAmount()) + .append("performer", getPerformer()) + .append("processHandleResolution", getProcessHandleResolution()) + .append("remark", getRemark()) + .append("processHandleStatus", getProcessHandleStatus()) + .append("processStepOrder", getProcessStepOrder()) + .append("startTime", getStartTime()) + .append("endTime", getEndTime()) + .append("handleUserId", getHandleUserId()) + .append("handleBy", getHandleBy()) + .append("handleTime", getHandleTime()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("transferUserId", getTransferUserId()) + .append("attr1", getAttr1()) + .toString(); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java new file mode 100644 index 00000000..5b37e760 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java @@ -0,0 +1,61 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsBillsFaultInstance; + +/** + * 检修工单Mapper接口 + * + * @author Open Platform + * @date 2024-01-23 + */ +public interface DmsBillsFaultInstanceMapper +{ + /** + * 查询检修工单 + * + * @param repairInstanceId 检修工单主键 + * @return 检修工单 + */ + public DmsBillsFaultInstance selectDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId); + + /** + * 查询检修工单列表 + * + * @param dmsBillsFaultInstance 检修工单 + * @return 检修工单集合 + */ + public List selectDmsBillsFaultInstanceList(DmsBillsFaultInstance dmsBillsFaultInstance); + + /** + * 新增检修工单 + * + * @param dmsBillsFaultInstance 检修工单 + * @return 结果 + */ + public int insertDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance); + + /** + * 修改检修工单 + * + * @param dmsBillsFaultInstance 检修工单 + * @return 结果 + */ + public int updateDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance); + + /** + * 删除检修工单 + * + * @param repairInstanceId 检修工单主键 + * @return 结果 + */ + public int deleteDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId); + + /** + * 批量删除检修工单 + * + * @param repairInstanceIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsBillsFaultInstanceByRepairInstanceIds(Long[] repairInstanceIds); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceActivityMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceActivityMapper.java new file mode 100644 index 00000000..b60c9839 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceActivityMapper.java @@ -0,0 +1,61 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsBillsInspectInstanceActivity; + +/** + * 点巡检工单实例节点Mapper接口 + * + * @author Open Platform + * @date 2024-01-23 + */ +public interface DmsBillsInspectInstanceActivityMapper +{ + /** + * 查询点巡检工单实例节点 + * + * @param instanceActivityId 点巡检工单实例节点主键 + * @return 点巡检工单实例节点 + */ + public DmsBillsInspectInstanceActivity selectDmsBillsInspectInstanceActivityByInstanceActivityId(Long instanceActivityId); + + /** + * 查询点巡检工单实例节点列表 + * + * @param dmsBillsInspectInstanceActivity 点巡检工单实例节点 + * @return 点巡检工单实例节点集合 + */ + public List selectDmsBillsInspectInstanceActivityList(DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity); + + /** + * 新增点巡检工单实例节点 + * + * @param dmsBillsInspectInstanceActivity 点巡检工单实例节点 + * @return 结果 + */ + public int insertDmsBillsInspectInstanceActivity(DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity); + + /** + * 修改点巡检工单实例节点 + * + * @param dmsBillsInspectInstanceActivity 点巡检工单实例节点 + * @return 结果 + */ + public int updateDmsBillsInspectInstanceActivity(DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity); + + /** + * 删除点巡检工单实例节点 + * + * @param instanceActivityId 点巡检工单实例节点主键 + * @return 结果 + */ + public int deleteDmsBillsInspectInstanceActivityByInstanceActivityId(Long instanceActivityId); + + /** + * 批量删除点巡检工单实例节点 + * + * @param instanceActivityIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsBillsInspectInstanceActivityByInstanceActivityIds(Long[] instanceActivityIds); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java new file mode 100644 index 00000000..ff493aef --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java @@ -0,0 +1,61 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsBillsInspectInstance; + +/** + * 巡检工单Mapper接口 + * + * @author Open Platform + * @date 2024-01-23 + */ +public interface DmsBillsInspectInstanceMapper +{ + /** + * 查询巡检工单 + * + * @param inspectInstanceId 巡检工单主键 + * @return 巡检工单 + */ + public DmsBillsInspectInstance selectDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId); + + /** + * 查询巡检工单列表 + * + * @param dmsBillsInspectInstance 巡检工单 + * @return 巡检工单集合 + */ + public List selectDmsBillsInspectInstanceList(DmsBillsInspectInstance dmsBillsInspectInstance); + + /** + * 新增巡检工单 + * + * @param dmsBillsInspectInstance 巡检工单 + * @return 结果 + */ + public int insertDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance); + + /** + * 修改巡检工单 + * + * @param dmsBillsInspectInstance 巡检工单 + * @return 结果 + */ + public int updateDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance); + + /** + * 删除巡检工单 + * + * @param inspectInstanceId 巡检工单主键 + * @return 结果 + */ + public int deleteDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId); + + /** + * 批量删除巡检工单 + * + * @param inspectInstanceIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsBillsInspectInstanceByInspectInstanceIds(Long[] inspectInstanceIds); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java new file mode 100644 index 00000000..e17b3a57 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java @@ -0,0 +1,61 @@ +package com.hw.dms.service; + +import java.util.List; +import com.hw.dms.domain.DmsBillsFaultInstance; + +/** + * 检修工单Service接口 + * + * @author Open Platform + * @date 2024-01-23 + */ +public interface IDmsBillsFaultInstanceService +{ + /** + * 查询检修工单 + * + * @param repairInstanceId 检修工单主键 + * @return 检修工单 + */ + public DmsBillsFaultInstance selectDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId); + + /** + * 查询检修工单列表 + * + * @param dmsBillsFaultInstance 检修工单 + * @return 检修工单集合 + */ + public List selectDmsBillsFaultInstanceList(DmsBillsFaultInstance dmsBillsFaultInstance); + + /** + * 新增检修工单 + * + * @param dmsBillsFaultInstance 检修工单 + * @return 结果 + */ + public int insertDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance); + + /** + * 修改检修工单 + * + * @param dmsBillsFaultInstance 检修工单 + * @return 结果 + */ + public int updateDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance); + + /** + * 批量删除检修工单 + * + * @param repairInstanceIds 需要删除的检修工单主键集合 + * @return 结果 + */ + public int deleteDmsBillsFaultInstanceByRepairInstanceIds(Long[] repairInstanceIds); + + /** + * 删除检修工单信息 + * + * @param repairInstanceId 检修工单主键 + * @return 结果 + */ + public int deleteDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceActivityService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceActivityService.java new file mode 100644 index 00000000..3f8f8b84 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceActivityService.java @@ -0,0 +1,61 @@ +package com.hw.dms.service; + +import java.util.List; +import com.hw.dms.domain.DmsBillsInspectInstanceActivity; + +/** + * 点巡检工单实例节点Service接口 + * + * @author Open Platform + * @date 2024-01-23 + */ +public interface IDmsBillsInspectInstanceActivityService +{ + /** + * 查询点巡检工单实例节点 + * + * @param instanceActivityId 点巡检工单实例节点主键 + * @return 点巡检工单实例节点 + */ + public DmsBillsInspectInstanceActivity selectDmsBillsInspectInstanceActivityByInstanceActivityId(Long instanceActivityId); + + /** + * 查询点巡检工单实例节点列表 + * + * @param dmsBillsInspectInstanceActivity 点巡检工单实例节点 + * @return 点巡检工单实例节点集合 + */ + public List selectDmsBillsInspectInstanceActivityList(DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity); + + /** + * 新增点巡检工单实例节点 + * + * @param dmsBillsInspectInstanceActivity 点巡检工单实例节点 + * @return 结果 + */ + public int insertDmsBillsInspectInstanceActivity(DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity); + + /** + * 修改点巡检工单实例节点 + * + * @param dmsBillsInspectInstanceActivity 点巡检工单实例节点 + * @return 结果 + */ + public int updateDmsBillsInspectInstanceActivity(DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity); + + /** + * 批量删除点巡检工单实例节点 + * + * @param instanceActivityIds 需要删除的点巡检工单实例节点主键集合 + * @return 结果 + */ + public int deleteDmsBillsInspectInstanceActivityByInstanceActivityIds(Long[] instanceActivityIds); + + /** + * 删除点巡检工单实例节点信息 + * + * @param instanceActivityId 点巡检工单实例节点主键 + * @return 结果 + */ + public int deleteDmsBillsInspectInstanceActivityByInstanceActivityId(Long instanceActivityId); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java new file mode 100644 index 00000000..3ce80e59 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java @@ -0,0 +1,61 @@ +package com.hw.dms.service; + +import java.util.List; +import com.hw.dms.domain.DmsBillsInspectInstance; + +/** + * 巡检工单Service接口 + * + * @author Open Platform + * @date 2024-01-23 + */ +public interface IDmsBillsInspectInstanceService +{ + /** + * 查询巡检工单 + * + * @param inspectInstanceId 巡检工单主键 + * @return 巡检工单 + */ + public DmsBillsInspectInstance selectDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId); + + /** + * 查询巡检工单列表 + * + * @param dmsBillsInspectInstance 巡检工单 + * @return 巡检工单集合 + */ + public List selectDmsBillsInspectInstanceList(DmsBillsInspectInstance dmsBillsInspectInstance); + + /** + * 新增巡检工单 + * + * @param dmsBillsInspectInstance 巡检工单 + * @return 结果 + */ + public int insertDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance); + + /** + * 修改巡检工单 + * + * @param dmsBillsInspectInstance 巡检工单 + * @return 结果 + */ + public int updateDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance); + + /** + * 批量删除巡检工单 + * + * @param inspectInstanceIds 需要删除的巡检工单主键集合 + * @return 结果 + */ + public int deleteDmsBillsInspectInstanceByInspectInstanceIds(Long[] inspectInstanceIds); + + /** + * 删除巡检工单信息 + * + * @param inspectInstanceId 巡检工单主键 + * @return 结果 + */ + public int deleteDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java new file mode 100644 index 00000000..9ca4c793 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java @@ -0,0 +1,118 @@ +package com.hw.dms.service.impl; + +import java.util.List; +import com.hw.common.core.utils.DateUtils; +import com.hw.dms.domain.DmsRepairInstanceActivity; +import com.hw.dms.mapper.DmsRepairInstanceActivityMapper; +import com.hw.dms.service.IDmsRepairInstanceActivityService; +import com.hw.system.api.model.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.dms.mapper.DmsBillsFaultInstanceMapper; +import com.hw.dms.domain.DmsBillsFaultInstance; +import com.hw.dms.service.IDmsBillsFaultInstanceService; + +/** + * 报修工单Service业务层处理 + * + * @author Open Platform + * @date 2024-01-23 + */ +@Service +public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceService +{ + @Autowired + private DmsBillsFaultInstanceMapper dmsBillsFaultInstanceMapper; + @Autowired + private DmsRepairInstanceActivityMapper dmsRepairInstanceActivityMapper; + + /** + * 查询报修工单 + * + * @param repairInstanceId 报修工单主键 + * @return 报修工单 + */ + @Override + public DmsBillsFaultInstance selectDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId) + { + return dmsBillsFaultInstanceMapper.selectDmsBillsFaultInstanceByRepairInstanceId(repairInstanceId); + } + + /** + * 查询报修工单列表 + * + * @param dmsBillsFaultInstance 报修工单 + * @return 报修工单 + */ + @Override + public List selectDmsBillsFaultInstanceList(DmsBillsFaultInstance dmsBillsFaultInstance) + { + return dmsBillsFaultInstanceMapper.selectDmsBillsFaultInstanceList(dmsBillsFaultInstance); + } + + /** + * 新增报修工单 + * + * @param dmsBillsFaultInstance 报修工单 + * @return 结果 + */ + @Override + public int insertDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) + { + LoginUser user = new LoginUser(); + int flag = dmsBillsFaultInstanceMapper.insertDmsBillsFaultInstance(dmsBillsFaultInstance); + //新增报修工单时创建工单实例节点 + DmsRepairInstanceActivity dmsRepairInstanceActivity = new DmsRepairInstanceActivity(); + dmsRepairInstanceActivity.setRepairInstanceId(dmsBillsFaultInstance.getRepairInstanceId()); + //先写死只有两步/三步，后期进行更改 + dmsRepairInstanceActivity.setProcessActivityId(1l); + dmsRepairInstanceActivity.setProcessHandleStatus("1"); + dmsRepairInstanceActivity.setProcessStepOrder(1l); + dmsRepairInstanceActivity.setCreateBy(user.getUsername()); + dmsRepairInstanceActivity.setCreateTime(DateUtils.getNowDate()); + + dmsRepairInstanceActivityMapper.insertDmsRepairInstanceActivity(dmsRepairInstanceActivity); + + dmsBillsFaultInstance.setCreateTime(DateUtils.getNowDate()); + + + return flag; + } + + /** + * 修改报修工单 + * + * @param dmsBillsFaultInstance 报修工单 + * @return 结果 + */ + @Override + public int updateDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) + { + dmsBillsFaultInstance.setUpdateTime(DateUtils.getNowDate()); + return dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance); + } + + /** + * 批量删除报修工单 + * + * @param repairInstanceIds 需要删除的报修工单主键 + * @return 结果 + */ + @Override + public int deleteDmsBillsFaultInstanceByRepairInstanceIds(Long[] repairInstanceIds) + { + return dmsBillsFaultInstanceMapper.deleteDmsBillsFaultInstanceByRepairInstanceIds(repairInstanceIds); + } + + /** + * 删除报修工单信息 + * + * @param repairInstanceId 报修工单主键 + * @return 结果 + */ + @Override + public int deleteDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId) + { + return dmsBillsFaultInstanceMapper.deleteDmsBillsFaultInstanceByRepairInstanceId(repairInstanceId); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceActivityServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceActivityServiceImpl.java new file mode 100644 index 00000000..b2c8bf4d --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceActivityServiceImpl.java @@ -0,0 +1,95 @@ +package com.hw.dms.service.impl; + +import java.util.List; +import com.hw.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.dms.mapper.DmsBillsInspectInstanceActivityMapper; +import com.hw.dms.domain.DmsBillsInspectInstanceActivity; +import com.hw.dms.service.IDmsBillsInspectInstanceActivityService; + +/** + * 点巡检工单实例节点Service业务层处理 + * + * @author Open Platform + * @date 2024-01-23 + */ +@Service +public class DmsBillsInspectInstanceActivityServiceImpl implements IDmsBillsInspectInstanceActivityService +{ + @Autowired + private DmsBillsInspectInstanceActivityMapper dmsBillsInspectInstanceActivityMapper; + + /** + * 查询点巡检工单实例节点 + * + * @param instanceActivityId 点巡检工单实例节点主键 + * @return 点巡检工单实例节点 + */ + @Override + public DmsBillsInspectInstanceActivity selectDmsBillsInspectInstanceActivityByInstanceActivityId(Long instanceActivityId) + { + return dmsBillsInspectInstanceActivityMapper.selectDmsBillsInspectInstanceActivityByInstanceActivityId(instanceActivityId); + } + + /** + * 查询点巡检工单实例节点列表 + * + * @param dmsBillsInspectInstanceActivity 点巡检工单实例节点 + * @return 点巡检工单实例节点 + */ + @Override + public List selectDmsBillsInspectInstanceActivityList(DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity) + { + return dmsBillsInspectInstanceActivityMapper.selectDmsBillsInspectInstanceActivityList(dmsBillsInspectInstanceActivity); + } + + /** + * 新增点巡检工单实例节点 + * + * @param dmsBillsInspectInstanceActivity 点巡检工单实例节点 + * @return 结果 + */ + @Override + public int insertDmsBillsInspectInstanceActivity(DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity) + { + dmsBillsInspectInstanceActivity.setCreateTime(DateUtils.getNowDate()); + return dmsBillsInspectInstanceActivityMapper.insertDmsBillsInspectInstanceActivity(dmsBillsInspectInstanceActivity); + } + + /** + * 修改点巡检工单实例节点 + * + * @param dmsBillsInspectInstanceActivity 点巡检工单实例节点 + * @return 结果 + */ + @Override + public int updateDmsBillsInspectInstanceActivity(DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity) + { + return dmsBillsInspectInstanceActivityMapper.updateDmsBillsInspectInstanceActivity(dmsBillsInspectInstanceActivity); + } + + /** + * 批量删除点巡检工单实例节点 + * + * @param instanceActivityIds 需要删除的点巡检工单实例节点主键 + * @return 结果 + */ + @Override + public int deleteDmsBillsInspectInstanceActivityByInstanceActivityIds(Long[] instanceActivityIds) + { + return dmsBillsInspectInstanceActivityMapper.deleteDmsBillsInspectInstanceActivityByInstanceActivityIds(instanceActivityIds); + } + + /** + * 删除点巡检工单实例节点信息 + * + * @param instanceActivityId 点巡检工单实例节点主键 + * @return 结果 + */ + @Override + public int deleteDmsBillsInspectInstanceActivityByInstanceActivityId(Long instanceActivityId) + { + return dmsBillsInspectInstanceActivityMapper.deleteDmsBillsInspectInstanceActivityByInstanceActivityId(instanceActivityId); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java new file mode 100644 index 00000000..131ab7e2 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java @@ -0,0 +1,96 @@ +package com.hw.dms.service.impl; + +import java.util.List; +import com.hw.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.dms.mapper.DmsBillsInspectInstanceMapper; +import com.hw.dms.domain.DmsBillsInspectInstance; +import com.hw.dms.service.IDmsBillsInspectInstanceService; + +/** + * 巡检工单Service业务层处理 + * + * @author Open Platform + * @date 2024-01-23 + */ +@Service +public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInstanceService +{ + @Autowired + private DmsBillsInspectInstanceMapper dmsBillsInspectInstanceMapper; + + /** + * 查询巡检工单 + * + * @param inspectInstanceId 巡检工单主键 + * @return 巡检工单 + */ + @Override + public DmsBillsInspectInstance selectDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId) + { + return dmsBillsInspectInstanceMapper.selectDmsBillsInspectInstanceByInspectInstanceId(inspectInstanceId); + } + + /** + * 查询巡检工单列表 + * + * @param dmsBillsInspectInstance 巡检工单 + * @return 巡检工单 + */ + @Override + public List selectDmsBillsInspectInstanceList(DmsBillsInspectInstance dmsBillsInspectInstance) + { + return dmsBillsInspectInstanceMapper.selectDmsBillsInspectInstanceList(dmsBillsInspectInstance); + } + + /** + * 新增巡检工单 + * + * @param dmsBillsInspectInstance 巡检工单 + * @return 结果 + */ + @Override + public int insertDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) + { + dmsBillsInspectInstance.setCreateTime(DateUtils.getNowDate()); + return dmsBillsInspectInstanceMapper.insertDmsBillsInspectInstance(dmsBillsInspectInstance); + } + + /** + * 修改巡检工单 + * + * @param dmsBillsInspectInstance 巡检工单 + * @return 结果 + */ + @Override + public int updateDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) + { + dmsBillsInspectInstance.setUpdateTime(DateUtils.getNowDate()); + return dmsBillsInspectInstanceMapper.updateDmsBillsInspectInstance(dmsBillsInspectInstance); + } + + /** + * 批量删除巡检工单 + * + * @param inspectInstanceIds 需要删除的巡检工单主键 + * @return 结果 + */ + @Override + public int deleteDmsBillsInspectInstanceByInspectInstanceIds(Long[] inspectInstanceIds) + { + return dmsBillsInspectInstanceMapper.deleteDmsBillsInspectInstanceByInspectInstanceIds(inspectInstanceIds); + } + + /** + * 删除巡检工单信息 + * + * @param inspectInstanceId 巡检工单主键 + * @return 结果 + */ + @Override + public int deleteDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId) + { + return dmsBillsInspectInstanceMapper.deleteDmsBillsInspectInstanceByInspectInstanceId(inspectInstanceId); + } +} diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml new file mode 100644 index 00000000..d8980ace --- /dev/null +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select repair_instance_id, fault_source_type, fault_source_id, wf_process_id, bills_fault_code, bills_status, apply_user, apply_time, real_begin_time, real_end_time, require_end_time, instance_type, is_flag, remark, create_by, create_time, update_by, update_time from dms_bills_fault_instance + + + + + + + + insert into dms_bills_fault_instance + + fault_source_type, + fault_source_id, + wf_process_id, + bills_fault_code, + bills_status, + apply_user, + apply_time, + real_begin_time, + real_end_time, + require_end_time, + instance_type, + is_flag, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{faultSourceType}, + #{faultSourceId}, + #{wfProcessId}, + #{billsFaultCode}, + #{billsStatus}, + #{applyUser}, + #{applyTime}, + #{realBeginTime}, + #{realEndTime}, + #{requireEndTime}, + #{instanceType}, + #{isFlag}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dms_bills_fault_instance + + fault_source_type = #{faultSourceType}, + fault_source_id = #{faultSourceId}, + wf_process_id = #{wfProcessId}, + bills_fault_code = #{billsFaultCode}, + bills_status = #{billsStatus}, + apply_user = #{applyUser}, + apply_time = #{applyTime}, + real_begin_time = #{realBeginTime}, + real_end_time = #{realEndTime}, + require_end_time = #{requireEndTime}, + instance_type = #{instanceType}, + is_flag = #{isFlag}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where repair_instance_id = #{repairInstanceId} + + + + delete from dms_bills_fault_instance where repair_instance_id = #{repairInstanceId} + + + + delete from dms_bills_fault_instance where repair_instance_id in + + #{repairInstanceId} + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml new file mode 100644 index 00000000..30d70084 --- /dev/null +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select instance_activity_id, inspect_instance_id, process_activity_id, inspect_route_id, device_amount, performer, process_handle_resolution, remark, process_handle_status, process_step_order, start_time, end_time, handle_user_id, handle_by, handle_time, create_by, create_time, transfer_user_id, attr1 from dms_bills_inspect_instance_activity + + + + + + + + insert into dms_bills_inspect_instance_activity + + inspect_instance_id, + process_activity_id, + inspect_route_id, + device_amount, + performer, + process_handle_resolution, + remark, + process_handle_status, + process_step_order, + start_time, + end_time, + handle_user_id, + handle_by, + handle_time, + create_by, + create_time, + transfer_user_id, + attr1, + + + #{inspectInstanceId}, + #{processActivityId}, + #{inspectRouteId}, + #{deviceAmount}, + #{performer}, + #{processHandleResolution}, + #{remark}, + #{processHandleStatus}, + #{processStepOrder}, + #{startTime}, + #{endTime}, + #{handleUserId}, + #{handleBy}, + #{handleTime}, + #{createBy}, + #{createTime}, + #{transferUserId}, + #{attr1}, + + + + + update dms_bills_inspect_instance_activity + + inspect_instance_id = #{inspectInstanceId}, + process_activity_id = #{processActivityId}, + inspect_route_id = #{inspectRouteId}, + device_amount = #{deviceAmount}, + performer = #{performer}, + process_handle_resolution = #{processHandleResolution}, + remark = #{remark}, + process_handle_status = #{processHandleStatus}, + process_step_order = #{processStepOrder}, + start_time = #{startTime}, + end_time = #{endTime}, + handle_user_id = #{handleUserId}, + handle_by = #{handleBy}, + handle_time = #{handleTime}, + create_by = #{createBy}, + create_time = #{createTime}, + transfer_user_id = #{transferUserId}, + attr1 = #{attr1}, + + where instance_activity_id = #{instanceActivityId} + + + + delete from dms_bills_inspect_instance_activity where instance_activity_id = #{instanceActivityId} + + + + delete from dms_bills_inspect_instance_activity where instance_activity_id in + + #{instanceActivityId} + + + \ No newline at end of file diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml new file mode 100644 index 00000000..95d7dacf --- /dev/null +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select inspect_instance_id, plan_inspect_id, wf_process_id, inspect_type, bills_inspect_code, plan_begin_time,plan_end_time, real_begin_time, real_end_time, inspect_status, is_flag, remark, create_by, create_time, update_by, update_time from dms_bills_inspect_instance + + + + + + + + insert into dms_bills_inspect_instance + + plan_inspect_id, + wf_process_id, + inspect_type, + bills_inspect_code, + device_amount, + plan_begin_time, + plan_end_time, + real_begin_time, + real_end_time, + performer, + inspect_status, + is_flag, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{planInspectId}, + #{wfProcessId}, + #{inspectType}, + #{billsInspectCode}, + #{deviceAmount}, + #{planBeginTime}, + #{planEndTime}, + #{realBeginTime}, + #{realEndTime}, + #{performer}, + #{inspectStatus}, + #{isFlag}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dms_bills_inspect_instance + + plan_inspect_id = #{planInspectId}, + wf_process_id = #{wfProcessId}, + inspect_type = #{inspectType}, + bills_inspect_code = #{billsInspectCode}, + device_amount = #{deviceAmount}, + plan_begin_time = #{planBeginTime}, + plan_end_time = #{planEndTime}, + real_begin_time = #{realBeginTime}, + real_end_time = #{realEndTime}, + performer = #{performer}, + inspect_status = #{inspectStatus}, + is_flag = #{isFlag}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where inspect_instance_id = #{inspectInstanceId} + + + + delete from dms_bills_inspect_instance where inspect_instance_id = #{inspectInstanceId} + + + + delete from dms_bills_inspect_instance where inspect_instance_id in + + #{inspectInstanceId} + + + diff --git a/hw-ui/src/api/dms/dmsBillsFaultInstance.js b/hw-ui/src/api/dms/dmsBillsFaultInstance.js new file mode 100644 index 00000000..7bf4957b --- /dev/null +++ b/hw-ui/src/api/dms/dmsBillsFaultInstance.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询检修工单列表 +export function listDmsBillsFaultInstance(query) { + return request({ + url: '/dms/dmsBillsFaultInstance/list', + method: 'get', + params: query + }) +} + +// 查询检修工单详细 +export function getDmsBillsFaultInstance(repairInstanceId) { + return request({ + url: '/dms/dmsBillsFaultInstance/' + repairInstanceId, + method: 'get' + }) +} + +// 新增检修工单 +export function addDmsBillsFaultInstance(data) { + return request({ + url: '/dms/dmsBillsFaultInstance', + method: 'post', + data: data + }) +} + +// 修改检修工单 +export function updateDmsBillsFaultInstance(data) { + return request({ + url: '/dms/dmsBillsFaultInstance', + method: 'put', + data: data + }) +} + +// 删除检修工单 +export function delDmsBillsFaultInstance(repairInstanceId) { + return request({ + url: '/dms/dmsBillsFaultInstance/' + repairInstanceId, + method: 'delete' + }) +} diff --git a/hw-ui/src/api/dms/dmsBillsInspectActivity.js b/hw-ui/src/api/dms/dmsBillsInspectActivity.js new file mode 100644 index 00000000..f7cb364a --- /dev/null +++ b/hw-ui/src/api/dms/dmsBillsInspectActivity.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询点巡检工单实例节点列表 +export function listDmsBillsInspectActivity(query) { + return request({ + url: '/dms/dmsBillsInspectActivity/list', + method: 'get', + params: query + }) +} + +// 查询点巡检工单实例节点详细 +export function getDmsBillsInspectActivity(instanceActivityId) { + return request({ + url: '/dms/dmsBillsInspectActivity/' + instanceActivityId, + method: 'get' + }) +} + +// 新增点巡检工单实例节点 +export function addDmsBillsInspectActivity(data) { + return request({ + url: '/dms/dmsBillsInspectActivity', + method: 'post', + data: data + }) +} + +// 修改点巡检工单实例节点 +export function updateDmsBillsInspectActivity(data) { + return request({ + url: '/dms/dmsBillsInspectActivity', + method: 'put', + data: data + }) +} + +// 删除点巡检工单实例节点 +export function delDmsBillsInspectActivity(instanceActivityId) { + return request({ + url: '/dms/dmsBillsInspectActivity/' + instanceActivityId, + method: 'delete' + }) +} diff --git a/hw-ui/src/api/dms/dmsBillsInstance.js b/hw-ui/src/api/dms/dmsBillsInstance.js new file mode 100644 index 00000000..1e0f366a --- /dev/null +++ b/hw-ui/src/api/dms/dmsBillsInstance.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询巡检工单列表 +export function listDmsBillsInstance(query) { + return request({ + url: '/dms/dmsBillsInstance/list', + method: 'get', + params: query + }) +} + +// 查询巡检工单详细 +export function getDmsBillsInstance(inspectInstanceId) { + return request({ + url: '/dms/dmsBillsInstance/' + inspectInstanceId, + method: 'get' + }) +} + +// 新增巡检工单 +export function addDmsBillsInstance(data) { + return request({ + url: '/dms/dmsBillsInstance', + method: 'post', + data: data + }) +} + +// 修改巡检工单 +export function updateDmsBillsInstance(data) { + return request({ + url: '/dms/dmsBillsInstance', + method: 'put', + data: data + }) +} + +// 删除巡检工单 +export function delDmsBillsInstance(inspectInstanceId) { + return request({ + url: '/dms/dmsBillsInstance/' + inspectInstanceId, + method: 'delete' + }) +} diff --git a/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue b/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue new file mode 100644 index 00000000..03055890 --- /dev/null +++ b/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue @@ -0,0 +1,484 @@ + + + diff --git a/hw-ui/src/views/dms/dmsBillsInspectActivity/index.vue b/hw-ui/src/views/dms/dmsBillsInspectActivity/index.vue new file mode 100644 index 00000000..2b43a170 --- /dev/null +++ b/hw-ui/src/views/dms/dmsBillsInspectActivity/index.vue @@ -0,0 +1,470 @@ + + + diff --git a/hw-ui/src/views/dms/dmsBillsInstance/index.vue b/hw-ui/src/views/dms/dmsBillsInstance/index.vue new file mode 100644 index 00000000..6fc06259 --- /dev/null +++ b/hw-ui/src/views/dms/dmsBillsInstance/index.vue @@ -0,0 +1,499 @@ + + +