feat: 维修工管理

admin/src/main/java/com/onsiteservice/admin/controller/service/dto/PageServiceWorkerDTO.java

@@ -14,5 +14,5 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class PageServiceWorkerDTO extends PageParams {
-
+    private String name;
 }

admin/src/main/java/com/onsiteservice/admin/service/service/ServiceWorkerService.java

@@ -21,6 +21,7 @@ import com.onsiteservice.dao.common.page.PageInfoVO;
 import com.onsiteservice.dao.mapper.service.ServiceWorkerAssignMapper;
 import com.onsiteservice.dao.mapper.service.ServiceWorkerMapper;
 import com.onsiteservice.dao.mapper.user.UserMapper;
+import com.onsiteservice.entity.service.ServiceValuatorAssign;
 import com.onsiteservice.entity.service.ServiceWorker;
 import com.onsiteservice.entity.service.ServiceWorkerAssign;
 import com.onsiteservice.entity.user.User;
@@ -102,8 +103,12 @@ public class ServiceWorkerService extends AbstractMapper<ServiceWorker> {
     public int delete(Long id, Long userId) {
         log.info("worker delete id: {}, userId: {}", id, userId);
 
-        // checkAuth(userId);
-
+        var  condition = new ServiceWorkerAssign();
+        condition.setWorkerId(id);
+        int assignCount = serviceWorkerAssignMapper.selectCount(condition);
+        if(assignCount > 0) {
+            throw new ServiceException("不允许删除已经指派过的维修工");
+        }
         return this.deleteByPrimaryKey(id);
     }
 

admin/src/main/resources/mapper/service/ServiceWorkerBizMapper.xml

@@ -4,7 +4,13 @@
 
 
     <select id="selectServiceWorkerPage" resultType="com.onsiteservice.entity.service.ServiceWorker">
-        select * from service_worker order by create_time asc
+        select * from service_worker
+        <where>
+            <if test="name != null">
+                and name like "%"#{name}"%"
+            </if>
+        </where>
+        order by create_time asc
     </select>
 
 </mapper>