1.维保工单增加退回功能

2.维保执行增加 是否退回字段过滤

src/main/java/com/xujie/sys/modules/pms/controller/EamController.java

@@ -1936,6 +1936,14 @@ public class EamController {
         eamService.checkWorkOrder(data);
         return R.ok();
     }
+    /**
+     * 点检工单退回
+     **/
+    @PostMapping("/returnWorkOrder")
+    public R returnWorkOrder(@RequestBody EamWorkOrderInData data){
+        eamService.returnWorkOrder(data);
+        return R.ok();
+    }
 
     /**
      * 批量审核工单

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

@@ -503,4 +503,8 @@ public interface EamMapper {
     List<EamAdminData> getConfirmButtonOperator();
 
     void cancelDefectOrder(EamWorkOrderInData inData);
+
+    void returnWorkOrder(EamWorkOrderInData data);
+
+    void updateIsReturn2(EamWorkOrderInData inData);
 }

src/main/java/com/xujie/sys/modules/pms/service/EamService.java

@@ -1196,4 +1196,6 @@ public interface EamService {
     List<EamAdminData> getConfirmButtonOperator();
 
     void cancelDefectOrder(EamWorkOrderInData inData);
+
+    void returnWorkOrder(EamWorkOrderInData data);
 }

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

@@ -1846,7 +1846,10 @@ public class EamServiceImpl implements EamService {
             inData.getItemList().get(i).setPlanID(inData.getPlanID());
             inData.getItemList().get(i).setCreatedBy(inData.getMesUser());
             inData.getItemList().get(i).setFinishFlag("Y");
+            if (inData.getIsReturn().equals("N")){
                 eamMapper.saveWorkOrderItem(inData.getItemList().get(i));
+            }
+
 
             // 如果点检结果不合格，则根据不合格项目生成维修反馈
             if ("不合格".equals(inData.getItemList().get(i).getItemResult()) && "A".equals(inData.getFunctionType())) {
@@ -1977,6 +1980,8 @@ public class EamServiceImpl implements EamService {
                 }
             }
         }
+        //更新退回状态
+        eamMapper.updateIsReturn2(inData);
        // eamMapper.closePlanWithCheck(inData);
         if ("B".equals(inData.getFunctionType()) || "A".equals(inData.getFunctionType())) {
             // 添加维保协同人员
@@ -3972,6 +3977,11 @@ public class EamServiceImpl implements EamService {
         eamMapper.cancelDefectOrder(inData);
     }
 
+    @Override
+    public void returnWorkOrder(EamWorkOrderInData data) {
+        eamMapper.returnWorkOrder(data);
+    }
+
     /**
      * 员工考勤vs报工工时
      */

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

@@ -765,7 +765,8 @@
             CASE WHEN (DATEDIFF(SECOND, a.CreateDate, a.reach_date) <![CDATA[<]]> 60)  THEN DATEDIFF(SECOND, a.CreateDate, a.reach_date) / 60.0
             ELSE DATEDIFF(MINUTE, a.CreateDate, a.reach_date)
             END AS responseTime,
-            a.check_type
+            a.check_type,
+            a.is_return
         FROM eam_workOrder a
         left join eam_object as eo on eo.site  = a.site and eo.ObjectID = a.ObjectID and eo.bu_no = a.bu_no
         left join sys_department as sd ON eo.site = sd.site and eo.dept_id = sd.department_id and eo.bu_no = sd.bu_no
@@ -781,6 +782,9 @@
             <if test="query.buDesc != null and query.buDesc != ''">
                 AND dbo.get_bu_desc (a.site, a.bu_no) = #{query.buDesc}
             </if>
+            <if test="query.isReturn != null and query.isReturn != ''">
+                AND a.is_return = #{query.isReturn}
+            </if>
             <if test="query.orderNo != null and query.orderNo != ''">
                 AND a.OrderNo like '%' + #{query.orderNo} + '%'
             </if>
@@ -3718,6 +3722,11 @@
         SET is_return = 'Y'
         WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo}
     </update>
+    <update id="updateIsReturn2">
+        UPDATE eam_workOrder
+        SET is_return = 'N'
+        WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo}
+    </update>
     <update id="reportWorkOrderForIsReturn">
         update eam_workOrder
         set Remark = #{remark},
@@ -3733,6 +3742,12 @@
         set PlanOperator = #{planOperator}
         where site = #{site} and bu_no = #{buNo} and feedBackID = #{feedBackID}
     </update>
+    <update id="returnWorkOrder">
+        UPDATE eam_workOrder
+        SET Status = '已到达',
+            is_return = 'Y'
+        WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo}
+    </update>
     <select id="getUpItemdataEam" resultType="com.xujie.sys.modules.pms.data.EamPropertiesModelDetailData">
         select
             top 1