Merge remote-tracking branch 'origin/master'

highway
wws 1 year ago
commit fc69128a8c

@ -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<EquOutsourceWork> 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<EquOutsourceWork> list = equOutsourceWorkService.selectEquOutsourceWorkList(equOutsourceWork);
ExcelUtil<EquOutsourceWork> util = new ExcelUtil<EquOutsourceWork>(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));
}
}

@ -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<EquEquipment> list = equRepairOrderService.getPersonList(equEquipment);
return getDataTable(list);
}
}

@ -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();
}
}

@ -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();
}
}

@ -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;
}

@ -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<EquOutsourceWork> 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);
}

@ -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<EquEquipment> getPersonList(EquEquipment equEquipment);
}

@ -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<EquOutsourceWork> 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);
}

@ -75,4 +75,7 @@ public interface IEquRepairOrderService {
//审核
public int checkEquRepairOrder(EquRepairOrder equRepairOrder);
//查询报修人员列表
List<EquEquipment> getPersonList(EquEquipment equEquipment);
}

@ -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<EquOutsourceWork> 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);
}
}

@ -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<EquEquipment> getEquipmentTypeList(EquEquipment equEquipment) {
return equEquipmentMapper.getEquipmentTypeList(equEquipment);
}
/**
*
*
* @param equEquipment
* @return
*/
@Override
@DS("#header.poolName")
public List<EquEquipment> getPersonList(EquEquipment equEquipment) {
return equRepairOrderMapper.getPersonList(equEquipment);
}
}

@ -0,0 +1,138 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.device.mapper.EquOutsourceWorkMapper">
<resultMap type="EquOutsourceWork" id="EquOutsourceWorkResult">
<result property="workId" column="work_id" />
<result property="workCode" column="work_code" />
<result property="workPerson" column="work_person" />
<result property="workOutsourcingUnit" column="work_outsourcing_unit" />
<result property="workConnection" column="work_connection" />
<result property="workReason" column="work_reason" />
<result property="workType" column="work_type" />
<result property="managementCode" column="management_code" />
<result property="workCost" column="work_cost" />
<result property="workCostTime" column="work_cost_time" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="factoryCode" column="factory_code" />
</resultMap>
<sql id="selectEquOutsourceWorkVo">
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
</sql>
<select id="selectEquOutsourceWorkList" parameterType="EquOutsourceWork" resultMap="EquOutsourceWorkResult">
<include refid="selectEquOutsourceWorkVo"/>
<where>
<if test="workCode != null and workCode != ''"> and work_code = #{workCode}</if>
<if test="workPerson != null and workPerson != ''"> and work_person = #{workPerson}</if>
<if test="workOutsourcingUnit != null and workOutsourcingUnit != ''"> and work_outsourcing_unit = #{workOutsourcingUnit}</if>
<if test="workConnection != null and workConnection != ''"> and work_connection = #{workConnection}</if>
<if test="workReason != null and workReason != ''"> and work_reason = #{workReason}</if>
<if test="workType != null and workType != ''"> and work_type = #{workType}</if>
<if test="managementCode != null and managementCode != ''"> and management_code = #{managementCode}</if>
<if test="workCost != null and workCost != ''"> and work_cost = #{workCost}</if>
<if test="workCostTime != null and workCostTime != ''"> and work_cost_time = #{workCostTime}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
</where>
</select>
<select id="selectEquOutsourceWorkByWorkId" parameterType="String" resultMap="EquOutsourceWorkResult">
<include refid="selectEquOutsourceWorkVo"/>
where work_id = #{workId}
</select>
<insert id="insertEquOutsourceWork" parameterType="EquOutsourceWork">
insert into equ_outsource_work
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="workId != null">work_id,</if>
<if test="workCode != null">work_code,</if>
<if test="workPerson != null">work_person,</if>
<if test="workOutsourcingUnit != null">work_outsourcing_unit,</if>
<if test="workConnection != null">work_connection,</if>
<if test="workReason != null">work_reason,</if>
<if test="workType != null">work_type,</if>
<if test="managementCode != null">management_code,</if>
<if test="workCost != null">work_cost,</if>
<if test="workCostTime != null">work_cost_time,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="delFlag != null">del_flag,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="factoryCode != null">factory_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="workId != null">#{workId},</if>
<if test="workCode != null">#{workCode},</if>
<if test="workPerson != null">#{workPerson},</if>
<if test="workOutsourcingUnit != null">#{workOutsourcingUnit},</if>
<if test="workConnection != null">#{workConnection},</if>
<if test="workReason != null">#{workReason},</if>
<if test="workType != null">#{workType},</if>
<if test="managementCode != null">#{managementCode},</if>
<if test="workCost != null">#{workCost},</if>
<if test="workCostTime != null">#{workCostTime},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="factoryCode != null">#{factoryCode},</if>
</trim>
</insert>
<update id="updateEquOutsourceWork" parameterType="EquOutsourceWork">
update equ_outsource_work
<trim prefix="SET" suffixOverrides=",">
<if test="workCode != null">work_code = #{workCode},</if>
<if test="workPerson != null">work_person = #{workPerson},</if>
<if test="workOutsourcingUnit != null">work_outsourcing_unit = #{workOutsourcingUnit},</if>
<if test="workConnection != null">work_connection = #{workConnection},</if>
<if test="workReason != null">work_reason = #{workReason},</if>
<if test="workType != null">work_type = #{workType},</if>
<if test="managementCode != null">management_code = #{managementCode},</if>
<if test="workCost != null">work_cost = #{workCost},</if>
<if test="workCostTime != null">work_cost_time = #{workCostTime},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
</trim>
where work_id = #{workId}
</update>
<delete id="deleteEquOutsourceWorkByWorkId" parameterType="String">
delete from equ_outsource_work where work_id = #{workId}
</delete>
<delete id="deleteEquOutsourceWorkByWorkIds" parameterType="String">
delete from equ_outsource_work where work_id in
<foreach item="workId" collection="array" open="(" separator="," close=")">
#{workId}
</foreach>
</delete>
</mapper>

@ -27,12 +27,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="repairDestination" column="repair_destination" />
<!-- 设备 -->
<result property="equipmentTypeName" column="equipment_type_name" />
<result property="equipmentName" column="equipment_name" />
<result property="equipmentLocation" column="equipment_location" />
<result property="department" column="department" />
<result property="equipmentSpec" column="equipment_spec" />
<!-- 计划 -->
<result property="workPlanTime" column="work_plan_time" />
<result property="workPlanDownTime" column="work_plan_down_time" />
<result property="workTeam" column="work_team" />
<!-- 委外 -->
<result property="outSourcePerson" column="work_person" />
<result property="workOutsourcingUnit" column="work_outsourcing_unit" />
<result property="workConnection" column="work_connection" />
<result property="outSourceReason" column="work_reason" />
</resultMap>
<sql id="selectEquRepairOrderVo">
@ -42,15 +51,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEquRepairOrderList" parameterType="EquRepairOrder" resultMap="EquRepairOrderResult">
<include refid="selectEquRepairOrderVo"/>
<where>
<if test="orderCode != null and orderCode != ''"> and order_code = #{orderCode}</if>
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
<if test="orderDesc != null and orderDesc != ''"> and order_desc = #{orderDesc}</if>
<if test="orderCode != null and orderCode != ''"> and order_code like concat('%', #{orderCode}, '%')</if>
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code like concat('%', #{equipmentCode}, '%')</if>
<if test="orderDesc != null and orderDesc != ''"> and order_desc like concat('%', #{orderDesc}, '%')</if>
<if test="orderBreakdownTime != null "> and order_breakdown_time = #{orderBreakdownTime}</if>
<if test="orderSource != null and orderSource != ''"> and order_source = #{orderSource}</if>
<if test="orderSource != null and orderSource != ''"> and order_source like concat('%', #{orderSource}, '%')</if>
<if test="orderTime != null "> and order_time = #{orderTime}</if>
<if test="orderHandle != null and orderHandle != ''"> and order_handle = #{orderHandle}</if>
<if test="orderRepairman != null and orderRepairman != ''"> and order_repairman = #{orderRepairman}</if>
<if test="orderConnection != null and orderConnection != ''"> and order_connection = #{orderConnection}</if>
<if test="orderRepairman != null and orderRepairman != ''"> and order_repairman like concat('%', #{orderRepairman}, '%')</if>
<if test="orderConnection != null and orderConnection != ''"> and order_connection like concat('%', #{orderConnection}, '%')</if>
<if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
<if test="orderRelevance != null and orderRelevance != ''"> and order_relevance = #{orderRelevance}</if>
<if test="orderPicture != null and orderPicture != ''"> and order_picture = #{orderPicture}</if>
@ -87,9 +96,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
be.equipment_type_name,
be.equipment_spec,
be.department,
be.equipment_location
be.equipment_location,
rwo.work_plan_down_time,
rwo.work_plan_time,
rwo.work_team,
eow.work_person,
eow.work_outsourcing_unit,
eow.work_connection,
eow.work_reason
from equ_repair_order ero
left join base_equipment be on ero.equipment_code = be.equipment_code
left join equ_repair_work_order rwo on ero.order_code = rwo.order_code
left join equ_outsource_work eow on ero.order_code = eow.work_code
where ero.order_id = #{orderId}
and ero.del_flag = '0'
</select>
@ -192,4 +210,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and del_flag = '0'
</select>
<select id="getPersonList" parameterType="EquPerson" resultType="com.op.device.domain.EquPerson">
select
user_id AS userId,
user_name AS userName,
nick_name AS nickName,
CONCAT(nick_name,user_name) AS teamUserName
from sys_user
where del_flag = '0'
</select>
</mapper>
Loading…
Cancel
Save