TPM维修审核功能：增加审核退回功能，增加字段isReturn

src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java

@@ -25,6 +25,16 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
     private String userId;
     private String planOperatorName;
     private String actualOperatorName;
+    private String isReturn;
+
+    public String getIsReturn() {
+        return isReturn;
+    }
+
+    public void setIsReturn(String isReturn) {
+        this.isReturn = isReturn;
+    }
+
     // 审核员名称
     private String checkerName;
     private String codeDesc;

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

@@ -491,4 +491,8 @@ public interface EamMapper {
     void updateMessageNotificationByParameter(@Param("site") String site,@Param("buNo") String buNo,@Param("planID") String planID,@Param("orderNo") String orderNo);
 
     List<PartSpareInData> getResourceSpare(EamWorkOrderCoreComponentsData inData);
+
+    void updateIsReturn(EamWorkOrderInData data);
+
+    void reportWorkOrderForIsReturn(EamWorkOrderInData inData);
 }

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

@@ -2052,6 +2052,10 @@ public class EamServiceImpl implements EamService {
         if (check.isEmpty()) {
             throw new RuntimeException("本账号不是机修人员，请切换账号或者检查机修人员设置！");
         }
+        if ("Y".equals(inData.getIsReturn())){
+            eamMapper.reportWorkOrderForIsReturn(inData);
+            return;
+        }
         inData.setActualOperator(inData.getOperator());
         // 获取当前时间为实际执行时间
         String dateNow = DateUtils.getStringNow();
@@ -2773,6 +2777,9 @@ public class EamServiceImpl implements EamService {
             } else {
                 eamMapper.updateKnowledgeRecordByOrderNo(data);
             }
+        }else if ("已到达".equals(data.getStatus())){
+            // 取消审核时，更新  是否退回字段 =>Y
+            eamMapper.updateIsReturn(data);
         }
     }
     @Override

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

@@ -874,7 +874,7 @@
         a.StartTime,
         a.EndTime,
         a.WorkTime,
-        a.PlanOperatorName,
+        dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) as PlanOperatorName,
         a.checkerName,
         dbo.eam_Get_eamAdminName(a.Site, a.ActualOperator) as actualOperatorName,
         eo.ObjectDesc as objectDesc,
@@ -903,6 +903,7 @@
         a.repair_reporting_type,
         a.repair_type,
         b.CreatedDate,
+        a.is_return as isReturn,
         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
@@ -1661,7 +1662,7 @@
             a.matter_tracking_flag
         from eam_defect_feedBack a
         left join eam_defect b on a.DefectID = b.DefectID
-        left join operator as c on a.site = c.site and a.CreatedBy = c.operator_id
+        left join operator as c on  a.CreatedBy = c.operator_id
         left join eam_object as e on a.site = e.site and a.ObjectID = e.ObjectID and e.Active = 'Y' and a.bu_no = e.bu_no
         left join sys_department as f on e.site = f.site and e.dept_id = f.department_id and e.bu_no = f.bu_no
         left join Access_dept as ead ON ead.site = f.site and ead.department_id = f.department_id and ead.bu_no = f.bu_no
@@ -2484,7 +2485,7 @@
             a.FeedBackDesc,
             a.ObjectID,
             a.Status,
-            c.public_facilities_flag
+            ISNULL(c.public_facilities_flag,'N') AS public_facilities_flag
         from eam_defect_feedBack a
         left join eam_defect b on a.DefectID = b.DefectID
         left join eam_object c on a.ObjectID = c.ObjectID and a.site = c.site and a.bu_no = c.bu_no
@@ -3675,6 +3676,21 @@
         set send_flag = 'N'
         WHERE SITE = #{site} AND bu_no = #{buNo} AND plan_no = #{planID} AND order_no = #{orderNo}
     </update>
+    <update id="updateIsReturn">
+        UPDATE eam_workOrder
+        SET is_return = 'Y'
+        WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo}
+    </update>
+    <update id="reportWorkOrderForIsReturn">
+        update eam_workOrder
+        set Remark = #{remark},
+            handling_method = #{handlingMethod},
+            fault_reason = #{faultReason},
+            preventive_measure = #{preventiveMeasure},
+            is_return = 'N',
+            status = '待审核'
+        where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType} and bu_no = #{buNo}
+    </update>
     <select id="getUpItemdataEam" resultType="com.xujie.sys.modules.pms.data.EamPropertiesModelDetailData">
         select
             top 1