From 9dd30078ed7c2cabfca32bc80f002cd95c226ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Fri, 17 Nov 2023 10:27:22 +0800 Subject: [PATCH] =?UTF-8?q?2023-11-17=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/exception/XJExceptionHandler.java | 2 +- .../pms/data/EamDefectFeedBackData.java | 10 ++++++ .../sys/modules/pms/mapper/EamMapper.java | 8 +++-- .../pms/service/Impl/EamServiceImpl.java | 13 ++++++- src/main/resources/mapper/pms/EamMapper.xml | 36 +++++++++++++------ 5 files changed, 54 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/xujie/sys/common/exception/XJExceptionHandler.java b/src/main/java/com/xujie/sys/common/exception/XJExceptionHandler.java index 7414c875..0840ad0a 100644 --- a/src/main/java/com/xujie/sys/common/exception/XJExceptionHandler.java +++ b/src/main/java/com/xujie/sys/common/exception/XJExceptionHandler.java @@ -42,7 +42,7 @@ public class XJExceptionHandler { public R handleDuplicateKeyException(DuplicateKeyException e) { //logger.error(e.getMessage(), e); String message = ""; - message = "数据库存已在该记录!"; + message = "数据库已存在该记录!"; return R.error(message); } diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamDefectFeedBackData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamDefectFeedBackData.java index 6771b5d3..1f0d19ac 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamDefectFeedBackData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamDefectFeedBackData.java @@ -37,6 +37,16 @@ public class EamDefectFeedBackData extends QueryPage { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date defectDate; + // 工单号 + private String orderNo; + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } public String getUrgency() { return urgency; diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java index 97985d74..8fdf56d4 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java @@ -1050,8 +1050,6 @@ public interface EamMapper { List getActualOperatorList2(String site, String planID, String functionType); - String getOrderNo(String site, String planID, String functionType); - String selectDeptByObjectID(String site, String objectID); String selectAdminIdByUserName(String site, String username); @@ -1165,4 +1163,10 @@ public interface EamMapper { List eamAdminSearch2(EamAdminData inData); void reportWorkOrder2(EamWorkOrderInData inData); + + String getOrderNo(EamWorkOrderInData feedBackData); + + void saveDefectRecordCount(EamDefectFeedBackData feedBackData); + + void saveDefectRecordCount2(EamWorkOrderInData inData); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 358beb7c..124c1464 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -1548,8 +1548,13 @@ public class EamServiceImpl implements EamService { if (controlData.get(0).getBaseData().equals("控制")){ // 修改反馈状态为已下达 eamMapper.updateDefectFeedBackStatus(feedBackData); + // 获取orderNo + String orderNo = eamMapper.getOrderNo(inData); + feedBackData.setOrderNo(orderNo); // 创建维修工单 eamMapper.saveWorkOrder(feedBackData); + // 创建count表 + eamMapper.saveDefectRecordCount(feedBackData); } } } @@ -1638,8 +1643,14 @@ public class EamServiceImpl implements EamService { eamMapper.saveOperator(inData); } // 如果维修失败则重新生成工单 - if ("维修失败".equals(inData.getResult())){ + if ("维修失败".equals(inData.getResult())) { + // 获取工单号 + String orderNo = eamMapper.getOrderNo(inData); + inData.setOrderNo(orderNo); + // 创建工单 eamMapper.saveDefectWorkOrder(inData); + // 创建count表 + eamMapper.saveDefectRecordCount2(inData); } } diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index cb3989fa..7b3baa31 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -1669,13 +1669,6 @@ VALUES (#{site}, #{orderNo}, #{functionType}, #{operator}) - - - @@ -1730,9 +1723,15 @@ INSERT INTO eam_workOrder - (Site, OrderNo, PlanID, PropertiesCode, ObjectID, Status, PlanDate, FunctionType, CreateDate, CreateBy, check_work_plan_id, check_item_no) - VALUES (#{site}, (select 'X' + Right('0000000000'+ convert(VARCHAR(10),isnull(max(convert(INT,SUBSTRING(OrderNo,3,10))),0)+1),8) from eam_workOrder where site = #{site} and FunctionType = 'C'), - #{planID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createBy}, #{checkWorkPlanId}, #{checkItemNo}) + (Site, OrderNo, PlanID, PropertiesCode, ObjectID, Status, PlanDate, FunctionType, CreateDate, CreateBy, check_work_plan_id, check_item_no) + VALUES (#{site}, #{orderNo}, #{planID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createBy}, #{checkWorkPlanId}, #{checkItemNo}) + + + + + INSERT INTO eam_workOrder_count + (Site, OrderNo, PlanID, PropertiesCode, ObjectID, Status, PlanDate, FunctionType, CreateDate, CreateBy, check_work_plan_id, check_item_no) + VALUES (#{site}, #{orderNo}, #{planID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createBy}, #{checkWorkPlanId}, #{checkItemNo}) @@ -2107,11 +2106,26 @@ WHERE Site = #{site} AND FeedBackID = #{feedBackID} + + + INSERT INTO eam_workOrder (Site, OrderNo, PlanID, PropertiesCode, ObjectID, Status, PlanDate, FunctionType, CreateDate, CreateBy, PlanDesc) - VALUES (#{site}, (select 'X'+ Right( '0000000000'+ convert(VARCHAR(10),isnull(max(convert(INT,SUBSTRING(OrderNo,3,10))),0)+1),8) from eam_workOrder where site = #{site} and FunctionType='C'), #{feedBackID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createdBy}, #{feedBackDesc}) + VALUES (#{site}, #{orderNo}, #{feedBackID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createdBy}, #{feedBackDesc}) + + + + + INSERT INTO eam_workOrder_count + (Site, OrderNo, PlanID, PropertiesCode, ObjectID, Status, PlanDate, FunctionType, CreateDate, CreateBy, PlanDesc) + VALUES (#{site}, #{orderNo}, #{feedBackID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createdBy}, #{feedBackDesc})