From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-community/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java |   50 ++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 6b5bfc7..730650c
--- a/service-community/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java
@@ -1,12 +1,12 @@
 package com.java110.community.smo.impl;
 
-
 import com.java110.community.dao.IRepairServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.community.IRepairInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.repair.RepairDto;
+import com.java110.intf.community.IRepairInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.owner.RepairPoolPo;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,27 +33,57 @@
 
     @Override
     public List<RepairDto> queryRepairs(@RequestBody RepairDto repairDto) {
-
         //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
-
         int page = repairDto.getPage();
-
         if (page != PageDto.DEFAULT_PAGE) {
             repairDto.setPage((page - 1) * repairDto.getRow());
         }
-
         List<RepairDto> repairs = BeanConvertUtil.covertBeanList(repairServiceDaoImpl.getRepairInfo(BeanConvertUtil.beanCovertMap(repairDto)), RepairDto.class);
-
-
         return repairs;
     }
-
 
     @Override
     public int queryRepairsCount(@RequestBody RepairDto repairDto) {
         return repairServiceDaoImpl.queryRepairsCount(BeanConvertUtil.beanCovertMap(repairDto));
     }
 
+    @Override
+    public List<RepairDto> queryStaffRepairs(@RequestBody RepairDto repairDto) {
+        //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+        int page = repairDto.getPage();
+        if (page != PageDto.DEFAULT_PAGE) {
+            repairDto.setPage((page - 1) * repairDto.getRow());
+        }
+        List<RepairDto> repairs = BeanConvertUtil.covertBeanList(repairServiceDaoImpl.getStaffRepairInfo(BeanConvertUtil.beanCovertMap(repairDto)), RepairDto.class);
+        return repairs;
+    }
+
+    @Override
+    public int queryStaffRepairsCount(@RequestBody RepairDto repairDto) {
+        return repairServiceDaoImpl.queryStaffRepairsCount(BeanConvertUtil.beanCovertMap(repairDto));
+    }
+
+    @Override
+    public List<RepairDto> queryStaffFinishRepairs(@RequestBody RepairDto repairDto) {
+        int page = repairDto.getPage();
+        if (page != PageDto.DEFAULT_PAGE) {
+            repairDto.setPage((page - 1) * repairDto.getRow());
+        }
+        List<RepairDto> repairs = BeanConvertUtil.covertBeanList(repairServiceDaoImpl.getStaffFinishRepairInfo(BeanConvertUtil.beanCovertMap(repairDto)), RepairDto.class);
+        return repairs;
+    }
+
+    @Override
+    public int queryStaffFinishRepairsCount(@RequestBody RepairDto repairDto) {
+        return repairServiceDaoImpl.queryStaffFinishRepairsCount(BeanConvertUtil.beanCovertMap(repairDto));
+    }
+
+    @Override
+    public int updateRepair(@RequestBody RepairPoolPo repairPoolPo) {
+        repairServiceDaoImpl.updateRepairInfoInstance(BeanConvertUtil.beanCovertMap(repairPoolPo));
+        return 1;
+    }
+
     public IRepairServiceDao getRepairServiceDaoImpl() {
         return repairServiceDaoImpl;
     }

--
Gitblit v1.8.0