修改考勤汇总查询

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java

 package com.mortals.xhx.busiz;
 
 
-import com.mortals.xhx.common.code.CommentTypeEnum;
-import com.mortals.xhx.common.code.ProcessStatusEnum;
 import lombok.Data;
 
 import java.io.Serializable;

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java

@@ -61,9 +61,6 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
     private WindowPerformService windowPerformService;
     @Autowired
     private WindowWorkmanPerformService windowWorkmanPerformService;
-
-    @Autowired
-    private UserService userService;
     @Autowired
     private IWorkmanFeign workmanFeign;
     @Autowired
@@ -89,7 +86,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
                 subList = respDataRest.getData().getData();
             }
 
-            if (!ObjectUtils.isEmpty(pdu.getStaffId())) {
+           /* if (!ObjectUtils.isEmpty(pdu.getStaffId())) {
                 //查询当前负责人负责的窗口
                 WindowOwnerDetailQuery detailQuery = new WindowOwnerDetailQuery();
                 detailQuery.setOwnerId(pdu.getStaffId());
@@ -105,7 +102,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
                         subTwoList = ownerRest.getData().getData();
                     }
                 }
-            }
+            }*/
         }else{
             if (pdu.getSiteId() == null) {
                 pdu.setSiteId(1l); //默认只查宜宾市民中心

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -15,6 +15,18 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 
+###登录
+POST http://10.233.82.175:11078/zwfw/login/login
+Content-Type: application/json
+
+{
+  "loginName": "xinhx",
+  "password": "xhxX123!@#",
+  "securityCode": "admin"
+}
+
+
+
 
 ###修改用户密码
 POST {{baseUrl}}/user/change/password

common-lib/src/main/java/com/mortals/xhx/common/pdu/window/WindowPdu.java

@@ -7,10 +7,6 @@ import java.util.List;
 
 @Data
 public class WindowPdu extends BaseEntityLong {
-    /**
-     * 窗口负责人ID
-     */
-    private Long staffId;
 
     /**
      * 站点ID