From 3607c4e4904f22a47e658d513f6dabc4aad674ed Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 21 Nov 2023 09:36:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87-=E7=BB=B4=E4=BF=AE-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/device/domain/EquRepairWorkOrder.java | 11 +++++++ .../device/mapper/EquOrderStandardMapper.java | 5 +++ .../com/op/device/mapper/EquTeamMapper.java | 2 +- .../impl/EquOutsourceWorkServiceImpl.java | 1 + .../impl/EquRepairOrderServiceImpl.java | 2 ++ .../impl/EquRepairWorkOrderServiceImpl.java | 33 +++++++++++++++++++ .../service/impl/EquTeamServiceImpl.java | 10 +++--- .../mapper/device/EquOrderStandardMapper.xml | 12 +++++++ .../mapper/device/EquOutsourceWorkMapper.xml | 2 +- .../resources/mapper/device/EquTeamMapper.xml | 11 +++++++ .../mapper/device/EquTeamUserMapper.xml | 13 ++------ 11 files changed, 84 insertions(+), 18 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java index 17e53d243..4d3f743cf 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -234,6 +234,9 @@ public class EquRepairWorkOrder extends BaseEntity { //申领单列表 private List applyList; + //检查项列表 + private List standardList; + //维修前 维修后 public String getAfterRepairFile() { return afterRepairFile; @@ -690,6 +693,14 @@ public class EquRepairWorkOrder extends BaseEntity { this.files = files; } + //标准列表 + public List getStandardList() { + return standardList; + } + public void setStandardList(List standardList) { + this.standardList = standardList; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java index 87cf3a264..e1f82f44e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java @@ -91,4 +91,9 @@ public interface EquOrderStandardMapper { public List selectPdaEquOrderList(EquOrder equOrder); int insertEquOrderStandards(@Param("list") List standards); + + /** + * 更新维修后标准 + */ + void updateStandardAfterRepair(EquOrderStandard equOrderStandard); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java index a70eb5ee6..23f9d2229 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java @@ -73,6 +73,6 @@ public interface EquTeamMapper { public List selectTeamMembers(EquTeamUser equTeamUser); //查询特定人员 - @DS("master") + @DS("#master") public EquTeamUser selectTeamMember(EquTeamUser equTeamUser); } 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 index 324cd1fab..0c2d537e9 100644 --- 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 @@ -63,6 +63,7 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { @Override @DS("#header.poolName") public int insertEquOutsourceWork(EquOutsourceWork equOutsourceWork) { + //新增的委外工单，不用报修单号、维修单号拼接 equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID()); String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber()); String equipmentCode = equOutsourceWork.getEquipmentCode(); 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 48a1a3ce8..4cb8f1748 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 @@ -239,6 +239,8 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { equOutsourceWork.setWorkOutsourcingUnit(equRepairOrder.getWorkOutsourcingUnit()); equOutsourceWork.setWorkPerson(equRepairOrder.getOutSourcePerson()); equOutsourceWork.setWorkReason(equRepairOrder.getOutSourceReason()); + //委外类型 维修委外 + equOutsourceWork.setWorkType("0"); equOutsourceWork.setCreateBy(SecurityUtils.getUsername()); equOutsourceWork.setCreateTime(DateUtils.getNowDate()); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index 6cb2f0d8d..272525d5b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -1,11 +1,14 @@ package com.op.device.service.impl; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.domain.BaseFileData; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; import com.op.device.domain.*; @@ -153,6 +156,34 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService } equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); + + //先删除每个维修工单对应图片 + equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId()); + if (StringUtils.isNotEmpty(equRepairWorkOrder.getAfterRepairFile())) { + String[] ids = equRepairWorkOrder.getAfterRepairFile().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id.split("&fileName=")[1]); + file.setFileAddress(id); + file.setSourceId(equRepairWorkOrder.getWorkId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + //维修后 + file.setImageType("4"); + files.add(file); + } + equRepairWorkOrderMapper.insertBaseFileBatch(files); + } + + //更新标准表 + for(EquOrderStandard equOrderStandard:equRepairWorkOrder.getStandardList()){ + equOrderStandard.setUpdateBy(SecurityUtils.getUsername()); + equOrderStandard.setUpdateTime(DateUtils.getNowDate()); + equOrderStandardMapper.updateStandardAfterRepair(equOrderStandard); + } return equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); } @@ -204,6 +235,8 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService equOutsourceWork.setWorkPerson(equRepairWorkOrder.getOutSourcePerson()); equOutsourceWork.setWorkOutsourcingUnit(equRepairWorkOrder.getWorkOutsourcingUnit()); equOutsourceWork.setWorkConnection(equRepairWorkOrder.getWorkConnection()); + //委外类型 维修委外 + equOutsourceWork.setWorkType("0"); equOutsourceWork.setCreateTime(DateUtils.getNowDate()); equOutsourceWork.setCreateBy(SecurityUtils.getUsername()); if(equRepairWorkOrder.getWorkId()!= null){ diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java index df8779159..f27fa2eb3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java @@ -52,7 +52,7 @@ public class EquTeamServiceImpl implements IEquTeamService { List equTeamUser1 = equTeamUserMapper.selectEquTeamUserList(equTeamUser); EquTeam equTeam = equTeamMapper.selectEquTeamById(id); equTeam.setSelectedData(equTeamUser1); - return equTeamMapper.selectEquTeamById(id); + return equTeam; } /** @@ -99,9 +99,9 @@ public class EquTeamServiceImpl implements IEquTeamService { list = equTeam.getRightData(); String userId = list.get(i); equTeamUser.setUserId(userId); - EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser); - equTeamUser.setUserName(memberList.getUserName()); - equTeamUser.setNickName(memberList.getNickName()); +// EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser); +// equTeamUser.setUserName(memberList.getUserName()); +// equTeamUser.setNickName(memberList.getNickName()); equTeamUserMapper.insertEquTeamUser(equTeamUser); } return success("新增设备班组成功！"); @@ -123,6 +123,7 @@ public class EquTeamServiceImpl implements IEquTeamService { try{ equTeam.setUpdateTime(DateUtils.getNowDate()); equTeam.setUpdateBy(SecurityUtils.getUsername()); + equTeamUserMapper.deleteEquTeamUserByTeamId(equTeam.getId()); equTeamMapper.updateEquTeam(equTeam); for(int i = 0;i + + update equ_order_standard + + update_by = #{updateBy}, + update_time = #{updateTime}, + repair_reach = #{repairReach}, + repair_value = #{repairValue}, + + where id = #{id} + and del_flag = '0' + + \ No newline at end of file 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 index c127939ae..e23f21818 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml @@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and work_type = #{workType} and equipment_code like concat('%', #{equipmentCode}, '%') and work_cost like concat('%', #{workCost}, '%') - and work_cost_time = #{workCostTime} + and work_cost_time like concat('%', #{workCostTime}, '%') and attr1 = #{attr1} and attr2 = #{attr2} and attr3 = #{attr3} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml index b21528abe..e88125bb2 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml @@ -129,4 +129,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag = '0' + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml index dae6a04cd..af5cc8bb4 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml @@ -21,13 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"