diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquOutsourceWorkController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquOutsourceWorkController.java new file mode 100644 index 00000000..462aef1c --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquOutsourceWorkController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.EquOutsourceWork; +import com.op.device.service.IEquOutsourceWorkService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 委外工单Controller + * + * @author Open Platform + * @date 2023-10-23 + */ +@RestController +@RequestMapping("/outsourceWorkOrder") +public class EquOutsourceWorkController extends BaseController { + @Autowired + private IEquOutsourceWorkService equOutsourceWorkService; + + /** + * 查询委外工单列表 + */ + @RequiresPermissions("device:outsourceWorkOrder:list") + @GetMapping("/list") + public TableDataInfo list(EquOutsourceWork equOutsourceWork) { + startPage(); + List list = equOutsourceWorkService.selectEquOutsourceWorkList(equOutsourceWork); + return getDataTable(list); + } + + /** + * 导出委外工单列表 + */ + @RequiresPermissions("device:outsourceWorkOrder:export") + @Log(title = "委外工单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquOutsourceWork equOutsourceWork) { + List list = equOutsourceWorkService.selectEquOutsourceWorkList(equOutsourceWork); + ExcelUtil util = new ExcelUtil(EquOutsourceWork.class); + util.exportExcel(response, list, "委外工单数据"); + } + + /** + * 获取委外工单详细信息 + */ + @RequiresPermissions("device:outsourceWorkOrder:query") + @GetMapping(value = "/{workId}") + public AjaxResult getInfo(@PathVariable("workId") String workId) { + return success(equOutsourceWorkService.selectEquOutsourceWorkByWorkId(workId)); + } + + /** + * 新增委外工单 + */ + @RequiresPermissions("device:outsourceWorkOrder:add") + @Log(title = "委外工单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquOutsourceWork equOutsourceWork) { + return toAjax(equOutsourceWorkService.insertEquOutsourceWork(equOutsourceWork)); + } + + /** + * 修改委外工单 + */ + @RequiresPermissions("device:outsourceWorkOrder:edit") + @Log(title = "委外工单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquOutsourceWork equOutsourceWork) { + return toAjax(equOutsourceWorkService.updateEquOutsourceWork(equOutsourceWork)); + } + + /** + * 删除委外工单 + */ + @RequiresPermissions("device:outsourceWorkOrder:remove") + @Log(title = "委外工单", businessType = BusinessType.DELETE) + @DeleteMapping("/{workIds}") + public AjaxResult remove(@PathVariable String[] workIds) { + return toAjax(equOutsourceWorkService.deleteEquOutsourceWorkByWorkIds(workIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java index 721d8669..641595a4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java @@ -88,7 +88,7 @@ public class EquRepairOrderController extends BaseController { } /** - * 审核维修工单 + * 审核报修单 */ @RequiresPermissions("device:faultReport:check") @PutMapping("/check") @@ -119,7 +119,6 @@ public class EquRepairOrderController extends BaseController { /** * 查询设备类型 */ - @GetMapping("/getEquipmentTypeList") public TableDataInfo getEquipmentTypeList(EquEquipment equEquipment) { startPage(); @@ -127,4 +126,14 @@ public class EquRepairOrderController extends BaseController { return getDataTable(list); } + /** + * 查询报修人员列表 + */ + @GetMapping("/getPersonList") + public TableDataInfo getPersonList(EquEquipment equEquipment) { + startPage(); + List list = equRepairOrderService.getPersonList(equEquipment); + return getDataTable(list); + } + } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java new file mode 100644 index 00000000..de9302fd --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java @@ -0,0 +1,205 @@ +package com.op.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 委外工单对象 equ_outsource_work + * + * @author Open Platform + * @date 2023-10-23 + */ +public class EquOutsourceWork extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String workId; + + /** 委外工单编码 */ + @Excel(name = "委外工单编码") + private String workCode; + + /** 维修人员 */ + @Excel(name = "维修人员") + private String workPerson; + + /** 委外单位 */ + @Excel(name = "委外单位") + private String workOutsourcingUnit; + + /** 联系方式 */ + @Excel(name = "联系方式") + private String workConnection; + + /** 原因 */ + @Excel(name = "原因") + private String workReason; + + /** 委外类型 */ + @Excel(name = "委外类型") + private String workType; + + /** 管理单号 */ + @Excel(name = "管理单号") + private String managementCode; + + /** 委外费用 */ + @Excel(name = "委外费用") + private String workCost; + + /** 委外用时 */ + @Excel(name = "委外用时") + private String workCostTime; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标识 */ + private String delFlag; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + public void setWorkId(String workId) { + this.workId = workId; + } + + public String getWorkId() { + return workId; + } + public void setWorkCode(String workCode) { + this.workCode = workCode; + } + + public String getWorkCode() { + return workCode; + } + public void setWorkPerson(String workPerson) { + this.workPerson = workPerson; + } + + public String getWorkPerson() { + return workPerson; + } + public void setWorkOutsourcingUnit(String workOutsourcingUnit) { + this.workOutsourcingUnit = workOutsourcingUnit; + } + + public String getWorkOutsourcingUnit() { + return workOutsourcingUnit; + } + public void setWorkConnection(String workConnection) { + this.workConnection = workConnection; + } + + public String getWorkConnection() { + return workConnection; + } + public void setWorkReason(String workReason) { + this.workReason = workReason; + } + + public String getWorkReason() { + return workReason; + } + public void setWorkType(String workType) { + this.workType = workType; + } + + public String getWorkType() { + return workType; + } + public void setManagementCode(String managementCode) { + this.managementCode = managementCode; + } + + public String getManagementCode() { + return managementCode; + } + public void setWorkCost(String workCost) { + this.workCost = workCost; + } + + public String getWorkCost() { + return workCost; + } + public void setWorkCostTime(String workCostTime) { + this.workCostTime = workCostTime; + } + + public String getWorkCostTime() { + return workCostTime; + } + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr2() { + return attr2; + } + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("workId", getWorkId()) + .append("workCode", getWorkCode()) + .append("workPerson", getWorkPerson()) + .append("workOutsourcingUnit", getWorkOutsourcingUnit()) + .append("workConnection", getWorkConnection()) + .append("workReason", getWorkReason()) + .append("workType", getWorkType()) + .append("managementCode", getManagementCode()) + .append("workCost", getWorkCost()) + .append("workCostTime", getWorkCostTime()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPerson.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPerson.java new file mode 100644 index 00000000..def20258 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPerson.java @@ -0,0 +1,107 @@ +package com.op.device.domain; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 班组人员对象 base_team_user + * + * @author Open Platform + * @date 2023-08-29 + */ +public class EquPerson extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 班组id */ + @Excel(name = "班组id") + private String teamId; + + /** 班组编码 */ + @Excel(name = "班组编码") + private String teamCode; + + /** 人员id */ + @Excel(name = "人员id") + private String userId; + + /** 人员名字编号 */ + @Excel(name = "人员名字") + private String userName; + + /** 人员名字 */ + @Excel(name = "人员名字") + private String nickName; + + /** 人员拼接名字 */ + @Excel(name = "人员拼接名字") + private String teamUserName; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setTeamId(String teamId) { + this.teamId = teamId; + } + + public String getTeamId() { + return teamId; + } + public void setTeamCode(String teamCode) { + this.teamCode = teamCode; + } + + public String getTeamCode() { + return teamCode; + } + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserId() { + return userId; + } + public void setUserName(String userName) { + this.userName = userName; + } + public String getUserName() { + return userName; + } + + public String getNickName() { + return nickName; + } + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getTeamUserName() { + return teamUserName; + } + public void setTeamUserName(String teamUserName) { + this.teamUserName = teamUserName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("teamId", getTeamId()) + .append("teamCode", getTeamCode()) + .append("userId", getUserId()) + .append("userName", getUserName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java index f0f43828..89665305 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java @@ -32,8 +32,8 @@ public class EquRepairOrder extends BaseEntity { private String orderDesc; /** 故障时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "故障时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "故障时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date orderBreakdownTime; /** 报修来源 */ @@ -41,8 +41,8 @@ public class EquRepairOrder extends BaseEntity { private String orderSource; /** 报修时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date orderTime; /** 是否立即处理 */ @@ -113,13 +113,13 @@ public class EquRepairOrder extends BaseEntity { private String repairDestination; /** 计划维修时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "计划维修时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "计划维修时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date workPlanTime; /** 计划停机时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "计划停机时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "计划停机时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date workPlanDownTime; /** 维修人员 */ @@ -130,6 +130,77 @@ public class EquRepairOrder extends BaseEntity { @Excel(name = "维修组") private String workTeam; + + //委外 + /** 主键 */ + private String workId; + + /** 委外工单编码 */ + @Excel(name = "委外工单编码") + private String workCode; + + /** 维修人员 */ + @Excel(name = "委外维修人员") + private String outSourcePerson; + + /** 委外单位 */ + @Excel(name = "委外单位") + private String workOutsourcingUnit; + + /** 联系方式 */ + @Excel(name = "联系方式") + private String workConnection; + + /** 原因 */ + @Excel(name = "原因") + private String outSourceReason; + + + //委外 + public void setWorkId(String workId) { + this.workId = workId; + } + + public String getWorkId() { + return workId; + } + public void setWorkCode(String workCode) { + this.workCode = workCode; + } + + public String getWorkCode() { + return workCode; + } + public void setOutSourcePerson(String outSourcePerson) { + this.outSourcePerson = outSourcePerson; + } + + public String getOutSourcePerson() { + return outSourcePerson; + } + public void setWorkOutsourcingUnit(String workOutsourcingUnit) { + this.workOutsourcingUnit = workOutsourcingUnit; + } + + public String getWorkOutsourcingUnit() { + return workOutsourcingUnit; + } + public void setWorkConnection(String workConnection) { + this.workConnection = workConnection; + } + + public String getWorkConnection() { + return workConnection; + } + public void setOutSourceReason(String outSourceReason) { + this.outSourceReason = outSourceReason; + } + + public String getOutSourceReason() { + return outSourceReason; + } + + public void setWorkPlanTime(Date workPlanTime) { this.workPlanTime = workPlanTime; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOutsourceWorkMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOutsourceWorkMapper.java new file mode 100644 index 00000000..dc94b988 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOutsourceWorkMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquOutsourceWork; + +/** + * 委外工单Mapper接口 + * + * @author Open Platform + * @date 2023-10-23 + */ +public interface EquOutsourceWorkMapper { + /** + * 查询委外工单 + * + * @param workId 委外工单主键 + * @return 委外工单 + */ + public EquOutsourceWork selectEquOutsourceWorkByWorkId(String workId); + + /** + * 查询委外工单列表 + * + * @param equOutsourceWork 委外工单 + * @return 委外工单集合 + */ + public List selectEquOutsourceWorkList(EquOutsourceWork equOutsourceWork); + + /** + * 新增委外工单 + * + * @param equOutsourceWork 委外工单 + * @return 结果 + */ + public int insertEquOutsourceWork(EquOutsourceWork equOutsourceWork); + + /** + * 修改委外工单 + * + * @param equOutsourceWork 委外工单 + * @return 结果 + */ + public int updateEquOutsourceWork(EquOutsourceWork equOutsourceWork); + + /** + * 删除委外工单 + * + * @param workId 委外工单主键 + * @return 结果 + */ + public int deleteEquOutsourceWorkByWorkId(String workId); + + /** + * 批量删除委外工单 + * + * @param workIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquOutsourceWorkByWorkIds(String[] workIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java index 7450e35d..47ced17d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java @@ -1,6 +1,9 @@ package com.op.device.mapper; import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.device.domain.EquEquipment; import com.op.device.domain.EquRepairOrder; /** @@ -63,4 +66,8 @@ public interface EquRepairOrderMapper { * @return */ int selectSerialNumber(); + + //查询报修人员列表 + @DS("master") + List getPersonList(EquEquipment equEquipment); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquOutsourceWorkService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquOutsourceWorkService.java new file mode 100644 index 00000000..762872ef --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquOutsourceWorkService.java @@ -0,0 +1,60 @@ +package com.op.device.service; + +import java.util.List; +import com.op.device.domain.EquOutsourceWork; + +/** + * 委外工单Service接口 + * + * @author Open Platform + * @date 2023-10-23 + */ +public interface IEquOutsourceWorkService { + /** + * 查询委外工单 + * + * @param workId 委外工单主键 + * @return 委外工单 + */ + public EquOutsourceWork selectEquOutsourceWorkByWorkId(String workId); + + /** + * 查询委外工单列表 + * + * @param equOutsourceWork 委外工单 + * @return 委外工单集合 + */ + public List selectEquOutsourceWorkList(EquOutsourceWork equOutsourceWork); + + /** + * 新增委外工单 + * + * @param equOutsourceWork 委外工单 + * @return 结果 + */ + public int insertEquOutsourceWork(EquOutsourceWork equOutsourceWork); + + /** + * 修改委外工单 + * + * @param equOutsourceWork 委外工单 + * @return 结果 + */ + public int updateEquOutsourceWork(EquOutsourceWork equOutsourceWork); + + /** + * 批量删除委外工单 + * + * @param workIds 需要删除的委外工单主键集合 + * @return 结果 + */ + public int deleteEquOutsourceWorkByWorkIds(String[] workIds); + + /** + * 删除委外工单信息 + * + * @param workId 委外工单主键 + * @return 结果 + */ + public int deleteEquOutsourceWorkByWorkId(String workId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java index b0b6a1f5..eae035c4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java @@ -75,4 +75,7 @@ public interface IEquRepairOrderService { //审核 public int checkEquRepairOrder(EquRepairOrder equRepairOrder); + + //查询报修人员列表 + List getPersonList(EquEquipment equEquipment); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java new file mode 100644 index 00000000..87890958 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java @@ -0,0 +1,97 @@ +package com.op.device.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquOutsourceWorkMapper; +import com.op.device.domain.EquOutsourceWork; +import com.op.device.service.IEquOutsourceWorkService; + +/** + * 委外工单Service业务层处理 + * + * @author Open Platform + * @date 2023-10-23 + */ +@Service +public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { + @Autowired + private EquOutsourceWorkMapper equOutsourceWorkMapper; + + /** + * 查询委外工单 + * + * @param workId 委外工单主键 + * @return 委外工单 + */ + @Override + @DS("#header.poolName") + public EquOutsourceWork selectEquOutsourceWorkByWorkId(String workId) { + return equOutsourceWorkMapper.selectEquOutsourceWorkByWorkId(workId); + } + + /** + * 查询委外工单列表 + * + * @param equOutsourceWork 委外工单 + * @return 委外工单 + */ + @Override + @DS("#header.poolName") + public List selectEquOutsourceWorkList(EquOutsourceWork equOutsourceWork) { + return equOutsourceWorkMapper.selectEquOutsourceWorkList(equOutsourceWork); + } + + /** + * 新增委外工单 + * + * @param equOutsourceWork 委外工单 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertEquOutsourceWork(EquOutsourceWork equOutsourceWork) { + equOutsourceWork.setCreateTime(DateUtils.getNowDate()); + return equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); + } + + /** + * 修改委外工单 + * + * @param equOutsourceWork 委外工单 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateEquOutsourceWork(EquOutsourceWork equOutsourceWork) { + equOutsourceWork.setUpdateTime(DateUtils.getNowDate()); + return equOutsourceWorkMapper.updateEquOutsourceWork(equOutsourceWork); + } + + /** + * 批量删除委外工单 + * + * @param workIds 需要删除的委外工单主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquOutsourceWorkByWorkIds(String[] workIds) { + return equOutsourceWorkMapper.deleteEquOutsourceWorkByWorkIds(workIds); + } + + /** + * 删除委外工单信息 + * + * @param workId 委外工单主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquOutsourceWorkByWorkId(String workId) { + return equOutsourceWorkMapper.deleteEquOutsourceWorkByWorkId(workId); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java index 507cf010..f744f186 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java @@ -7,8 +7,10 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; import com.op.device.domain.EquEquipment; +import com.op.device.domain.EquOutsourceWork; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.mapper.EquEquipmentMapper; +import com.op.device.mapper.EquOutsourceWorkMapper; import com.op.device.mapper.EquRepairWorkOrderMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,6 +35,8 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { @Autowired private EquRepairWorkOrderMapper equRepairWorkOrderMapper; + @Autowired + private EquOutsourceWorkMapper equOutsourceWorkMapper; /** * 查询故障报修 * @@ -109,6 +113,15 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { }else if(equRepairOrder.getRepairDestination().equals("不维修")){ equRepairOrder.setOrderStatus("驳回"); }else if(equRepairOrder.getRepairDestination().equals("委外维修")){ + EquOutsourceWork equOutsourceWork = new EquOutsourceWork(); + //委外工单编码、id、联系方式、委外单位、委外人员、委外原因 + equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID()); + equOutsourceWork.setWorkCode(equRepairOrder.getOrderCode()); + equOutsourceWork.setWorkConnection(equRepairOrder.getWorkConnection()); + equOutsourceWork.setWorkOutsourcingUnit(equRepairOrder.getWorkOutsourcingUnit()); + equOutsourceWork.setWorkPerson(equRepairOrder.getOutSourcePerson()); + equOutsourceWork.setWorkReason(equRepairOrder.getOutSourceReason()); + equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); equRepairOrder.setOrderStatus("审核通过"); }else if(equRepairOrder.getRepairDestination().equals("立即维修")){ //立即维修 @@ -180,4 +193,16 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { public List getEquipmentTypeList(EquEquipment equEquipment) { return equEquipmentMapper.getEquipmentTypeList(equEquipment); } + + /** + * 查询报修人员列表 + * + * @param equEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List getPersonList(EquEquipment equEquipment) { + return equRepairOrderMapper.getPersonList(equEquipment); + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml new file mode 100644 index 00000000..bf65d9a9 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select work_id, work_code, work_person, work_outsourcing_unit, work_connection, work_reason, work_type, management_code, work_cost, work_cost_time, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_outsource_work + + + + + + + + insert into equ_outsource_work + + work_id, + work_code, + work_person, + work_outsourcing_unit, + work_connection, + work_reason, + work_type, + management_code, + work_cost, + work_cost_time, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + factory_code, + + + #{workId}, + #{workCode}, + #{workPerson}, + #{workOutsourcingUnit}, + #{workConnection}, + #{workReason}, + #{workType}, + #{managementCode}, + #{workCost}, + #{workCostTime}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + + + + + update equ_outsource_work + + work_code = #{workCode}, + work_person = #{workPerson}, + work_outsourcing_unit = #{workOutsourcingUnit}, + work_connection = #{workConnection}, + work_reason = #{workReason}, + work_type = #{workType}, + management_code = #{managementCode}, + work_cost = #{workCost}, + work_cost_time = #{workCostTime}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + + where work_id = #{workId} + + + + delete from equ_outsource_work where work_id = #{workId} + + + + delete from equ_outsource_work where work_id in + + #{workId} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml index a1b9135f..a7bd58c7 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml @@ -27,12 +27,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + + + @@ -42,15 +51,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -192,4 +210,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and del_flag = '0' + + \ No newline at end of file