Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/SignInService.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -73,11 +74,11 @@ public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
                 //今日已签到
                 return RestResponse.success(null, MessageUtils.get("msg.sign.limit"));
             }
-            signIn.setLeavingTime(LocalTime.now().toString());
+            signIn.setLeavingTime(LocalTime.now().withNano(0).toString());
             saveOrUpdate(signIn);
         } else {
             entry.setSignDate(LocalDate.now());
-            entry.setApproachTime(LocalTime.now().toString());
+            entry.setApproachTime(LocalTime.now().withNano(0).toString());
             save(entry);
         }
         return  RestResponse.success(null, MessageUtils.get("msg.sign.success"));

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -104,10 +104,11 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
      * @description 根据计划id和公司id查询是否有保养记录
      * @date 2020/1/20 2:41 下午
      */
-    public boolean count(Long planId, Long mtCompanyId) {
+    public boolean count(Long planId, Long mtCompanyId, Long workerId) {
         LambdaQueryWrapper<MaintenanceRecord> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(MaintenanceRecord::getMtPlanId, planId);
         lambdaQueryWrapper.eq(MaintenanceRecord::getMtCompanyId, mtCompanyId);
+        lambdaQueryWrapper.eq(MaintenanceRecord::getWorkerId, workerId);
         return count(lambdaQueryWrapper) > 0;
     }
 
@@ -121,10 +122,11 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         MaintenanceRecord record = request.getRecord();
         Long planId = record.getMtPlanId();
         Long mtCompanyId = record.getMtCompanyId();
+        Long workerId = record.getWorkerId();
         String liftCoordinate = getCoordinate(record.getLiftId());
         if (StrUtil.isEmpty(liftCoordinate)) return RestResponse.fail(MessageUtils.get("msg.lift.not.position"));
-        boolean count = count(planId,mtCompanyId);
-        if (count) return  RestResponse.fail(MessageUtils.get("msg.exist.record"));
+        boolean count = count(planId, mtCompanyId, workerId);
+        if (count) return RestResponse.fail(MessageUtils.get("msg.exist.record"));
         boolean result = calc(liftCoordinate, request.getCoordinate());
         if (result) return RestResponse.fail(MessageUtils.get("msg.error.person.scope"));
         Long liftId = record.getLiftId();