2023-11-17，设备和质量修改

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

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;

src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@@ -1050,8 +1050,6 @@ public interface EamMapper {
 
     List<EamAdminData> 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<EamAdminData> eamAdminSearch2(EamAdminData inData);
 
     void reportWorkOrder2(EamWorkOrderInData inData);
+
+    String getOrderNo(EamWorkOrderInData feedBackData);
+
+    void saveDefectRecordCount(EamDefectFeedBackData feedBackData);
+
+    void saveDefectRecordCount2(EamWorkOrderInData inData);
 }

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

src/main/resources/mapper/pms/EamMapper.xml

@@ -1669,13 +1669,6 @@
         VALUES (#{site}, #{orderNo}, #{functionType}, #{operator})
     </insert>
 
-    <!-- 查询工单号 -->
-    <select id="getOrderNo" resultType="string">
-        SELECT OrderNo
-        FROM eam_workOrder
-        WHERE site = #{site} AND PlanID = #{planID} AND FunctionType = #{functionType}
-    </select>
-
 <!--    AND Status = '已完工' AND PlanOperator is not null-->
 
     <!-- 查询实际维修人员 -->
@@ -1730,9 +1723,15 @@
     <!-- 生成新的维修工单 -->
     <insert id="saveDefectWorkOrder" parameterType="EamWorkOrderInData">
         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>
+
+    <!-- 创建count表 -->
+    <insert id="saveDefectRecordCount2" parameterType="EamWorkOrderInData">
+        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})
     </insert>
 
     <!-- 获取旧工单的基础信息 -->
@@ -2107,11 +2106,26 @@
         WHERE Site = #{site} AND FeedBackID = #{feedBackID}
     </update>
 
+    <!-- 查询工单号 -->
+    <select id="getOrderNo" resultType="string" parameterType="EamWorkOrderInData">
+        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'
+    </select>
+
     <!-- 创建维修工单 -->
     <insert id="saveWorkOrder" parameterType="EamDefectFeedBackData">
         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>
+
+    <!-- 创建维修count表数据 -->
+    <insert id="saveDefectRecordCount" parameterType="EamDefectFeedBackData">
+        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})
     </insert>
 
     <!-- 修改工单 -->