2023-12-08 设备和质量提交2

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -2224,7 +2224,7 @@ public class EamServiceImpl implements EamService {
     @Transactional
     public void updateWorkOrder(EamWorkOrderInData inData) {
         List<EamWorkOrderInData> checkOrderStatus = eamMapper.checkEamOrderStatus(inData);
-        if(checkOrderStatus.size() == 0) {
+        if(checkOrderStatus.isEmpty()) {
             throw new RuntimeException("该工单已不存在请刷新界面");
         }
         // 修改工单

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

@@ -778,7 +778,9 @@
             ELSE DATEDIFF(MINUTE, b.CreatedDate, a.reach_date)
             END AS responseTime,
             b.FeedBackDesc,
-            dbo.joint_name(a.Site,a.OrderNo,a.FunctionType) as actualOperatorName
+            dbo.joint_name(a.Site,a.OrderNo,a.FunctionType) as actualOperatorName,
+            a.fault_reason,
+            a.preventive_measure
         FROM eam_workOrder a
         left join eam_defect_feedBack b on a.site = b.site and a.PlanID = b.feedBackID
         left join eam_defect c on b.DefectID = c.DefectID
@@ -2161,8 +2163,13 @@
             <if test='functionType == "B"'>
                 reach_date = #{reachDate},
                 ActualDate = #{actualDate},
+                WorkTime = CASE WHEN (DATEDIFF(SECOND, #{reachDate}, #{actualDate}) <![CDATA[<]]> 60) THEN DATEDIFF(SECOND, #{reachDate}, #{actualDate}) / 60.0
+                ELSE ceiling(floor(DATEDIFF(SECOND, #{reachDate}, #{actualDate}) / 30) / 2)
+                END,
+            </if>
+            <if test='functionType == "A"'>
+                WorkTime = #{workTime},
             </if>
-            WorkTime = #{workTime},
             <if test='functionType == "B" and checkResult == "合格"'>
                 disposal_measures = '',
             </if>
@@ -2170,9 +2177,10 @@
                 disposal_measures = #{disposalMeasures},
             </if>
             checkResult = #{checkResult},
-            check_remark = #{checkRemark}
-        where site = #{site}
-        and orderNo = #{orderNo}
+            check_remark = #{checkRemark},
+            fault_reason = #{faultReason},
+            preventive_measure = #{preventiveMeasure}
+        where site = #{site} and orderNo = #{orderNo}
     </update>
 
     <!-- 修改工单项目 -->
@@ -2299,9 +2307,13 @@
         update eam_workOrder
         set ActualDate = #{actualDate},
             reach_date = #{reachDate},
+            fault_reason = #{faultReason},
+            handling_method = #{handlingMethod},
+            preventive_measure = #{preventiveMeasure},
+            Remark = #{remark},
             WorkTime = CASE
                            WHEN (DATEDIFF(SECOND, #{reachDate}, #{actualDate}) <![CDATA[<]]> 60) THEN DATEDIFF(SECOND, #{reachDate}, #{actualDate}) / 60.0
-                           ELSE DATEDIFF(MINUTE, #{reachDate}, #{actualDate})
+                           ELSE ceiling(floor(DATEDIFF(SECOND, #{reachDate}, #{actualDate}) / 30) / 2)
                         END
         where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType}
     </update>