人员轨迹

lift-ud-service/src/main/java/cn/com/ty/lift/ud/motiontrail/controller/query/MotionTrailQuery.java

@@ -45,15 +45,11 @@ public final class MotionTrailQuery extends BasePageQuery {
     public Wrapper condition() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         QueryWrapper<MotionTrail> query = new QueryWrapper<>();
-        if (mtCompanyId != null && mtCompanyId != 10086) {
-            query.eq("mt_company_id", mtCompanyId);
-        }
         if(userId != null) {
             query.eq("user_id", userId);
         }
-        query.eq("mobile", mobile)
-            // 查询时间只精确到日期，不精确到时间
-            .eq("date(create_time)", sdf.format(createTime)).orderByAsc("create_time");
+        // 查询时间只精确到日期，不精确到时间
+        query.eq("date(create_time)", sdf.format(createTime)).orderByAsc("create_time");
 
         return query;
     }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/motiontrail/service/impl/MotionTrailServiceImpl.java

@@ -46,13 +46,10 @@ public class MotionTrailServiceImpl extends ServiceImpl<MotionTrailMapper, Motio
      */
     @Override
     public RestResponse queryTrail(MotionTrailQuery request) {
-        if (null == request.getMtCompanyId() && request.getUserId() == null) {
-            return RestResponse.fail("您未加入团队");
-        }
         if (null == request.getCreateTime()) {
             return RestResponse.fail("查询时间不能为空");
         }
-        if (null == request.getMobile() && request.getUserId() == null) {
+        if (request.getUserId() == null) {
             return RestResponse.fail("维保工不能为空");
         }
         /*if (null == request.getMtCompanyId()) {

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/controller/UserInfoController.java

@@ -236,4 +236,13 @@ public class UserInfoController {
         return userInfoService.getNewInfo(userId);
     }
     
+    @GetMapping("/getUserByCompanyId")
+    @ApiOperation(value = "查询团队下的用户")
+    public RestResponse getUserByCompanyId( Long companyId) {
+        if(companyId == null) {
+            return RestResponse.fail("您未加入团队");
+        }
+        return userInfoService.getUserByCompanyId(companyId);
+    }
+    
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/mapper/UserInfoMapper.java

@@ -257,4 +257,7 @@ public interface UserInfoMapper extends BaseMapper<UserInfoEntity> {
     
     @Update("UPDATE user_info SET average_score=#{avsore} where user_id=#{userId}")
     void updateAverageScore(@Param("userId")Long id,@Param("avsore")Integer avsore);
+    
+    @Select("select * from user_info where maintenance_company_id = #{companyId}")
+    List<UserInfoEntity>getUserByCompanyId(@Param("companyId")Long companyId);
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/service/IUserInfoService.java

@@ -91,4 +91,6 @@ public interface IUserInfoService extends IService<UserInfoEntity> {
      * @return
      */
     RestResponse getNewInfo(Long userId);
+    
+    RestResponse getUserByCompanyId(Long companyId);
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/service/impl/UserInfoServiceImpl.java

@@ -1074,5 +1074,11 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
         userInfoMapper.rechargePayBalance(userId, money);
         return RestResponse.success();
     }
+
+    @Override
+    public RestResponse getUserByCompanyId(Long companyId) {
+        List<UserInfoEntity> userByCompanyId = userInfoMapper.getUserByCompanyId(companyId);
+        return RestResponse.success(userByCompanyId,"查询成功");
+    }
     
 }