EOEG SAI - 修改员工表引用

master/src/main/java/com/ruoyi/project/production/controller/TEoegSaiApplyController.java

@@ -24,6 +24,9 @@ import com.ruoyi.framework.web.page.PageDomain;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.framework.web.page.TableSupport;
 import com.ruoyi.project.approve.damain.DevTask;
+import com.ruoyi.project.eoeg.domain.TEoegStaffmgr;
+import com.ruoyi.project.eoeg.mapper.TEoegStaffmgrMapper;
+import com.ruoyi.project.eoeg.service.ITEoegStaffmgrService;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.plant.mapper.TStaffmgrMapper;
 import com.ruoyi.project.plant.service.ITStaffmgrService;
@@ -104,10 +107,10 @@ public class TEoegSaiApplyController extends BaseController
     private ITEoegSaiApproveFileService saiApproveFileService;
 
     @Autowired
-    private ITStaffmgrService staffmgrService;
+    private ITEoegStaffmgrService staffmgrService;
 
     @Autowired
-    private TStaffmgrMapper staffmgrMapper;
+    private TEoegStaffmgrMapper staffmgrMapper;
 
     @Autowired
     private ISysMessageService sysMessageService;
@@ -451,9 +454,9 @@ public class TEoegSaiApplyController extends BaseController
         date.setDate(date.getDate() + 7);
         tSaiApply.setEstimateFinishDate(date);
         // 查询四个班长
-        List<TStaffmgr> tStaffmgrs = staffmgrMapper.selectSaiAssessor();
+        List<TEoegStaffmgr> tStaffmgrs = staffmgrMapper.selectSaiAssessor();
         List<String> monitorList = new ArrayList<>();
-        for (TStaffmgr tStaffmgr : tStaffmgrs) {
+        for (TEoegStaffmgr tStaffmgr : tStaffmgrs) {
             String userId1 = tStaffmgr.getUserId();
             monitorList.add(userId1);
         }
@@ -604,7 +607,7 @@ public class TEoegSaiApplyController extends BaseController
                 SysUser sysUser = userService.selectUserById(Long.parseLong(split[i]));
                 String staffId = sysUser.getStaffId();
                 String loginName = sysUser.getUserName();
-                TStaffmgr staffmgr = staffmgrService.selectTStaffmgrByStaffId(staffId);
+                TEoegStaffmgr staffmgr = staffmgrService.selectTStaffmgrByStaffId(staffId);
                 String staffName = staffmgr.getName();
                 String email = sysUser.getEmail();
                 if (email != null) {

master/src/main/java/com/ruoyi/project/production/controller/TEoegSaiController.java

@@ -11,6 +11,8 @@ import java.util.List;
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.project.eoeg.domain.TEoegStaffmgr;
+import com.ruoyi.project.eoeg.service.ITEoegStaffmgrService;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.plant.service.ITStaffmgrService;
 import com.ruoyi.project.production.controller.vo.EoegSaiExportVO;
@@ -73,7 +75,7 @@ public class TEoegSaiController extends BaseController
     private ITEoegSaiCategoryService saiCategoryService;
 
     @Autowired
-    private ITStaffmgrService staffmgrService;
+    private ITEoegStaffmgrService staffmgrService;
 
     /**
      * 计算CTS扣分 / 装置人均扣分
@@ -121,9 +123,9 @@ public class TEoegSaiController extends BaseController
                 }
             }
         }
-        TStaffmgr staffmgr = new TStaffmgr();
+        TEoegStaffmgr staffmgr = new TEoegStaffmgr();
         staffmgr.setDeptId(103L);
-        List<TStaffmgr> tStaffmgrs = staffmgrService.selectTStaffmgrList(staffmgr);
+        List<TEoegStaffmgr> tStaffmgrs = staffmgrService.selectTStaffmgrList(staffmgr);
         int num = tStaffmgrs.size();
         if (sum.compareTo(BigDecimal.ZERO) != 0 && num != 0 && sum2.compareTo(BigDecimal.ZERO) != 0) {
             avg = sum.divide(new BigDecimal(num), 3, RoundingMode.HALF_UP);
@@ -162,9 +164,9 @@ public class TEoegSaiController extends BaseController
                 }
             }
         }
-        TStaffmgr staffmgr = new TStaffmgr();
+        TEoegStaffmgr staffmgr = new TEoegStaffmgr();
         staffmgr.setDeptId(103L);
-        List<TStaffmgr> tStaffmgrs = staffmgrService.selectTStaffmgrList(staffmgr);
+        List<TEoegStaffmgr> tStaffmgrs = staffmgrService.selectTStaffmgrList(staffmgr);
         int num = tStaffmgrs.size();
         if (sum.compareTo(BigDecimal.ZERO) != 0 && num != 0) {
             avg = sum.divide(new BigDecimal(num), 2, RoundingMode.HALF_UP);