复运是否终评判断、检修人员添加是否负责人

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtRepairOrderServiceImpl.java

@@ -740,6 +740,12 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
                         }
                         if(sysUser == null) continue;
                         person.setUserId(sysUser.getUserId());
+                        if (sysUser.getUserId() == gxtRepairOrder.getTeamLeaderId()) {
+                            person.setIsLeader(1);
+                        } else {
+                            person.setIsLeader(0);
+                        }
+                        person.setUserId(sysUser.getUserId());
                         person.setOrderId(gxtRepairOrder.getId());
                         person.setOrderCode(gxtRepairOrder.getWorkOrderProjectNo());
                         person.setStatus(1);
@@ -774,6 +780,12 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
                             }
                             GxtRepairOrderPerson person = new GxtRepairOrderPerson();
                             person.setUserId(sysUser.getUserId());
+                            if (sysUser.getUserId() == gxtRepairOrder.getTeamLeaderId()) {
+                                person.setIsLeader(1);
+                            } else {
+                                person.setIsLeader(0);
+                            }
+                            person.setUserId(sysUser.getUserId());
                             person.setNickName(sysUser.getNickName());
                             person.setOrderId(gxtRepairOrder.getId());
                             person.setOrderCode(gxtRepairOrder.getWorkOrderProjectNo());
@@ -815,7 +827,13 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
         /*if (gxtRepairOrder.getScore() != null) {
             gxtRepairOrder.setWorkOrderStatus("to_archive");
         }*/
-        gxtRepairOrder.setWorkOrderStatus("to_archive");
+        // 检查是否终评
+        if ("to_archive".equals(oldOrder.getScoringStatus()))
+        {
+            // 已终评：工单状态改变为已归档
+            gxtRepairOrder.setWorkOrderStatus("archived");
+            gxtRepairOrder.setScoringStatus("archived");
+        }
         gxtRepairOrder.setUpdateBy(SecurityUtils.getUsername());
         gxtRepairOrder.setUpdateTime(DateUtils.getNowDate());
         int result = gxtRepairOrderMapper.updateGxtRepairOrder(gxtRepairOrder);

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtWorkOrderServiceImpl.java

@@ -737,6 +737,11 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
                     }
                     if(sysUser == null) continue;
                     person.setUserId(sysUser.getUserId());
+                    if (sysUser.getUserId() == order.getTeamLeaderId()) {
+                        person.setIsLeader(1);
+                    } else {
+                        person.setIsLeader(0);
+                    }
                     person.setOrderId(id);
                     person.setOrderCode(order.getWorkOrderProjectNo());
                     person.setStatus(1);
@@ -791,11 +796,12 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
             String oldStatus = order.getWorkOrderStatus();
             order.setRestartTime(gxtWorkOrder.getRestartTime());
             order.setUpdateTime(DateUtils.getNowDate());
-            // 检查 restart_time 是否有值（判断是否已复运）
-            if (order.getScore() != null)
+            // 检查是否终评
+            if ("to_archive".equals(order.getScoringStatus()))
             {
-                // 已复运：工单状态改变为待归档
-                order.setWorkOrderStatus("to_archive");
+                // 已终评：工单状态改变为已归档
+                order.setWorkOrderStatus("archived");
+                order.setScoringStatus("archived");
             }
             int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 

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

@@ -244,10 +244,10 @@
             <i class="fa fa-check"></i>结单
           </el-button>
 
-          <!-- 已完成状态：显示评分按钮 -->
-          <el-button link type="warning" @click="handleRate(scope.row)" v-if="scope.row.workOrderStatus === 'completed' && scope.row.score === null" v-hasPermi="['gxt:maintenance:order:rating']">
-            <i class="fa fa-star"></i>评分
-          </el-button>
+<!--          &lt;!&ndash; 已完成状态：显示评分按钮 &ndash;&gt;-->
+<!--          <el-button link type="warning" @click="handleRate(scope.row)" v-if="scope.row.workOrderStatus === 'completed' && scope.row.score === null" v-hasPermi="['gxt:maintenance:order:rating']">-->
+<!--            <i class="fa fa-star"></i>评分-->
+<!--          </el-button>-->
 
           <!-- 已完成状态：显示复运按钮 -->
           <el-button link type="info" @click="handleRestart(scope.row)" v-if="scope.row.workOrderStatus === 'completed' && scope.row.restartTime === null" v-hasPermi="['gxt:maintenance:order:restart']">
@@ -814,20 +814,20 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="评分" prop="score">
-                <el-input v-model="restartForm.score" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="点评" prop="reviewContent">
-                <el-input v-model="restartForm.reviewContent" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
+<!--          <el-row>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="评分" prop="score">-->
+<!--                <el-input v-model="restartForm.score" disabled />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
+<!--          <el-row>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="点评" prop="reviewContent">-->
+<!--                <el-input v-model="restartForm.reviewContent" disabled />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
           <!-- 复运信息 -->
           <el-row>
             <el-col :span="12">
@@ -950,12 +950,12 @@
             </el-col>
           </el-row>
         <!-- 评分表单 -->
-<!--          <el-form-item label="评分" prop="score" required>-->
-<!--            <div class="flex items-center">-->
-<!--              <el-rate v-model="rateForm.score" allow-half show-score text-color="#ff9900" />-->
-<!--              <span class="ml-2 text-gray-500">/ 10分</span>-->
-<!--            </div>-->
-<!--          </el-form-item>-->
+          <el-form-item label="评分" prop="score" required>
+            <div class="flex items-center">
+              <el-rate v-model="rateForm.score" allow-half show-score text-color="#ff9900" />
+              <span class="ml-2 text-gray-500">/ 10分</span>
+            </div>
+          </el-form-item>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="评分" prop="score">

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

@@ -254,13 +254,13 @@
                       link
                       @click="handleResume(scope.row)"
                     >恢复</el-button>-->
-          <el-button
-              v-if="scope.row.workOrderStatus === 'completed' && !scope.row.score"
-              type="warning"
-              link
-              @click="handleRating(scope.row)"
-              v-hasPermi="['gxt:repairOrder:rating']"
-          ><i class="fa fa-star"></i>评分</el-button>
+<!--          <el-button-->
+<!--              v-if="scope.row.workOrderStatus === 'completed' && !scope.row.score"-->
+<!--              type="warning"-->
+<!--              link-->
+<!--              @click="handleRating(scope.row)"-->
+<!--              v-hasPermi="['gxt:repairOrder:rating']"-->
+<!--          ><i class="fa fa-star"></i>评分</el-button>-->
           <el-button
               v-if="scope.row.workOrderStatus === 'completed' && !scope.row.restartTime"
               type="success"