工单评分修改

ygtx-gxt/src/main/resources/mapper/gxt/GxtOrderScoreMapper.xml

@@ -112,7 +112,7 @@
                 update_time as update_time
             FROM gxt_repair_order t
             <where>
-                <if test="repairOrder.workOrderProjectNo != null and repairOrder.workOrderProjectNo != ''"> and work_order_project_no = #{repairOrder.workOrderProjectNo}</if>
+                <if test="repairOrder.workOrderProjectNo != null and repairOrder.workOrderProjectNo != ''"> and work_order_project_no like concat('%', #{repairOrder.workOrderProjectNo}, '%')</if>
                 <if test="repairOrder.workOrderStatus != null and repairOrder.workOrderStatus != ''"> and work_order_status = #{repairOrder.workOrderStatus}</if>
                 <if test="repairOrder.gxtCenterId != null"> and gxt_center_id = #{repairOrder.gxtCenterId}</if>
                 <if test="repairOrder.gxtCenter != null and repairOrder.gxtCenter != ''"> and gxt_center = #{repairOrder.gxtCenter}</if>
@@ -122,6 +122,7 @@
                 <if test="repairOrder.pcsDeviceName != null and repairOrder.pcsDeviceName != ''"> and pcs_device_name like concat('%', #{repairOrder.pcsDeviceName}, '%')</if>
                 <if test="repairOrder.teamLeaderName != null and repairOrder.teamLeaderName != ''"> and team_leader_name like concat('%', #{repairOrder.teamLeaderName}, '%')</if>
                 <if test="repairOrder.scoringStatus != null"> and scoring_status = #{repairOrder.scoringStatus}</if>
+                <if test="repairOrder.orderType != null and repairOrder.orderType != ''"> and 1 = #{repairOrder.orderType}</if>
                 and NULLIF(scoring_status, '') IS NOT NULL
                 <!-- 业务特定数据权限过滤条件 -->
                 <if test="repairOrder.params.businessDataScope != null and repairOrder.params.businessDataScope != ''">
@@ -193,6 +194,7 @@
                 <if test="workOrder.pcsDeviceName != null and workOrder.pcsDeviceName != ''"> and pcs_device_name like concat('%', #{workOrder.pcsDeviceName}, '%')</if>
                 <if test="workOrder.teamLeaderName != null and workOrder.teamLeaderName != ''"> and team_leader_name like concat('%', #{workOrder.teamLeaderName}, '%')</if>
                 <if test="workOrder.scoringStatus != null"> and scoring_status = #{workOrder.scoringStatus}</if>
+                <if test="workOrder.orderType != null and workOrder.orderType != ''"> and 2 = #{workOrder.orderType}</if>
                 and NULLIF(scoring_status, '') IS NOT NULL
                 <!-- 业务特定数据权限过滤条件 -->
                 <if test="workOrder.params.businessDataScope != null and workOrder.params.businessDataScope != ''">
@@ -269,6 +271,7 @@
             <if test="repairOrder.pcsDeviceName != null and repairOrder.pcsDeviceName != ''"> and pcs_device_name like concat('%', #{repairOrder.pcsDeviceName}, '%')</if>
             <if test="repairOrder.teamLeaderName != null and repairOrder.teamLeaderName != ''"> and team_leader_name like concat('%', #{repairOrder.teamLeaderName}, '%')</if>
             <if test="repairOrder.scoringStatus != null"> and scoring_status = #{repairOrder.scoringStatus}</if>
+            <if test="repairOrder.orderType != null and repairOrder.orderType != ''"> and 1 = #{repairOrder.orderType}</if>
             <!-- 业务特定数据权限过滤条件 -->
             <if test="repairOrder.params.businessDataScope != null and repairOrder.params.businessDataScope != ''">
                 ${repairOrder.params.businessDataScope}
@@ -342,6 +345,7 @@
             <if test="workOrder.pcsDeviceName != null and workOrder.pcsDeviceName != ''"> and pcs_device_name like concat('%', #{workOrder.pcsDeviceName}, '%')</if>
             <if test="workOrder.teamLeaderName != null and workOrder.teamLeaderName != ''"> and team_leader_name like concat('%', #{workOrder.teamLeaderName}, '%')</if>
             <if test="workOrder.scoringStatus != null"> and scoring_status = #{workOrder.scoringStatus}</if>
+            <if test="workOrder.orderType != null and workOrder.orderType != ''"> and 2 = #{workOrder.orderType}</if>
             <!-- 业务特定数据权限过滤条件 -->
             <if test="workOrder.params.businessDataScope != null and workOrder.params.businessDataScope != ''">
                 ${workOrder.params.businessDataScope}

ygtx-ui/src/views/gxt/orderScore/index.vue

@@ -56,12 +56,16 @@
           </el-option>
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="工单类型" prop="orderType">
+      <el-form-item label="工单类型" prop="orderType">
         <el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable>
-          <el-option label="维修工单" value="1" />
-          <el-option label="维保工单" value="2" />
+          <el-option
+            v-for="dict in gxt_order_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
-      </el-form-item>-->
+      </el-form-item>
       <el-form-item label="状态" prop="scoringStatus">
         <el-select v-model="queryParams.scoringStatus" placeholder="请选择状态" clearable>
           <el-option
@@ -860,6 +864,7 @@ const queryParams = ref({
   pcsStationName: null,
   orderType: null,
   scoringStatus: null,
+  gxtCenter: null
 });
 
 // 表单验证规则
@@ -955,6 +960,11 @@ function getList() {
     workOrderParams.pcsStationName = queryParams.value.pcsStationName;
   }
 
+  if (queryParams.value.gxtCenter) {
+    repairOrderParams.gxtCenter = queryParams.value.gxtCenter;
+    workOrderParams.gxtCenter = queryParams.value.gxtCenter;
+  }
+
   if (queryParams.value.scoringStatus) {
     repairOrderParams.scoringStatus = queryParams.value.scoringStatus;
     workOrderParams.scoringStatus = queryParams.value.scoringStatus;
@@ -964,10 +974,12 @@ function getList() {
   if (queryParams.value.orderType) {
     if (queryParams.value.orderType === '1') {
       // 只查询维修工单
-      repairOrderParams.workOrderProjectNo = "NO_DATA"; // 设置一个不可能匹配的条件
+      repairOrderParams.orderType = queryParams.value.orderType;
+      workOrderParams.id = -1; // 设置一个不可能匹配的条件
     } else if (queryParams.value.orderType === '2') {
       // 只查询维保工单
-      workOrderParams.workOrderProjectNo = "NO_DATA"; // 设置一个不可能匹配的条件
+      workOrderParams.orderType = queryParams.value.orderType;
+      repairOrderParams.id = -1; // 设置一个不可能匹配的条件
     }
   }