[chg] 签到打卡属性设置

lift-business-service/src/main/java/cn/com/ty/lift/business/common/Judge.java

@@ -3,6 +3,9 @@ package cn.com.ty.lift.business.common;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * @author wcz
  * @Description: 条件判断，如果符合条件，返回异常
@@ -20,6 +23,19 @@ public interface Judge {
         }
     }
 
+    /**
+     * 判断多个id有效，ids为空，或者出现id <= 0，抛出异常
+     * @param ids
+     */
+    static void ids(Long... ids){
+        notNull(ids,"标识ID无效");
+        isTrue(ids.length > 0,"标识ID无效");
+        List<Long> list = Arrays.asList(ids);
+        list.forEach(id -> {
+            id(id);
+        });
+    }
+
     /**
      * 判断对象object是否为空，如果不为空,直接抛出异常，返回message
      * @param object

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java

@@ -174,14 +174,11 @@ public class EmergencyRepairController {
     public RestResponse transfer(@RequestBody RepairRequest request){
         Long id = request.getId();
         Long workerId = request.getWorkerId();
-        Judge.id(id);
-        Judge.id(workerId);
+        Judge.ids(id,workerId);
         EmergencyRepair entity = emergencyRepairService.getById(id);
         Judge.notNull(entity);
         //如果已经接单，在急修中了不能被转派
-        if (Values.erStatusRepairing(entity.getStatus())) {
-            return RestResponse.fail("急修已经接单，不能转派");
-        }
+        Judge.notTrue(Values.erStatusRepairing(entity.getStatus()),"急修已经接单，不能转派");
         //本急修单的负责维保工
         entity.setWorkerId1(workerId);
         boolean result = emergencyRepairService.saveOrUpdate(entity);

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/service/EmergencyRepairService.java

@@ -110,14 +110,14 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     }
     /**
      * 根据维保公司和电梯id查找急修
-     * @param mtCompany
+     * @param mtCompanyId
      * @param liftId
      * @return
      */
-    public EmergencyRepair findByMtCompanyAndLift(Long mtCompany,Long liftId){
+    public EmergencyRepair findByMtCompanyAndLift(Long mtCompanyId,Long liftId){
         QueryWrapper<EmergencyRepair> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<EmergencyRepair> lambdaQueryWrapper = queryWrapper.lambda();
-        lambdaQueryWrapper.eq(EmergencyRepair::getMtCompanyId, mtCompany);
+        lambdaQueryWrapper.eq(EmergencyRepair::getMtCompanyId, mtCompanyId);
         lambdaQueryWrapper.eq(EmergencyRepair::getLiftId,liftId);
         //只查询一条
         lambdaQueryWrapper.last("LIMIT 1");
@@ -126,14 +126,14 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
 
     /**
      * 统计维保公司和电梯下是否存在待急修和急修中的急修单
-     * @param mtCompany
+     * @param mtCompanyId
      * @param liftId
      * @return
      */
-    public int countRepairing(Long mtCompany,Long liftId){
+    public int countRepairing(Long mtCompanyId,Long liftId){
         QueryWrapper<EmergencyRepair> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<EmergencyRepair> lambdaQueryWrapper = queryWrapper.lambda();
-        lambdaQueryWrapper.eq(EmergencyRepair::getMtCompanyId, mtCompany);
+        lambdaQueryWrapper.eq(EmergencyRepair::getMtCompanyId, mtCompanyId);
         lambdaQueryWrapper.eq(EmergencyRepair::getLiftId,liftId);
         lambdaQueryWrapper.in(EmergencyRepair::getStatus,Arrays.asList(Values.ER_STATUS_TO_REPAIRED,Values.ER_STATUS_REPAIRING));
         return count(lambdaQueryWrapper);
@@ -141,14 +141,14 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     }
     /**
      * 开启维保，暂停急修，修改电梯业务状态为维保中
-     * @param mtCompany
+     * @param mtCompanyId
      * @param liftId
      * @return
      */
     @Transactional
-    public boolean startMaintenance(Long mtCompany,Long liftId){
+    public boolean startMaintenance(Long mtCompanyId,Long liftId){
         // 如果急修单不存在，直接返回，
-        EmergencyRepair emergencyRepair = findByMtCompanyAndLift(mtCompany,liftId);
+        EmergencyRepair emergencyRepair = findByMtCompanyAndLift(mtCompanyId,liftId);
         if(null == emergencyRepair){
             return true;
         }
@@ -159,7 +159,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             boolean er = updateById(emergencyRepair);
             boolean re = false;
             if(er){
-                PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompany,liftId);
+                PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId,liftId);
                 if(null != relevance){
                     //电梯业务状态改成维保中
                     relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.MAINTENANCE.getCode());
@@ -179,13 +179,13 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
 
     /**
      * 停止维保，恢复急修，修改电梯业务状态为急修中
-     * @param mtCompany
+     * @param mtCompanyId
      * @param liftId
      * @return
      */
-    public boolean stopMaintenance(Long mtCompany,Long liftId){
+    public boolean stopMaintenance(Long mtCompanyId,Long liftId){
         //如果急修单不存在，直接返回，
-        EmergencyRepair emergencyRepair = findByMtCompanyAndLift(mtCompany,liftId);
+        EmergencyRepair emergencyRepair = findByMtCompanyAndLift(mtCompanyId,liftId);
         if(null == emergencyRepair){
             return true;
         }
@@ -195,7 +195,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             boolean er = updateById(emergencyRepair);
             boolean re = false;
             if(er){
-                PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompany,liftId);
+                PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId,liftId);
                 if(null == relevance){
                     return false;
                 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/Judge.java

@@ -3,6 +3,9 @@ package cn.com.ty.lift.enterprise.common;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * @author wcz
  * @Description: 条件判断，如果符合条件，返回异常
@@ -20,6 +23,19 @@ public interface Judge {
         }
     }
 
+    /**
+     * 判断多个id有效，ids为空，或者出现id <= 0，抛出异常
+     * @param ids
+     */
+    static void ids(Long... ids){
+        notNull(ids,"标识ID无效");
+        isTrue(ids.length > 0,"标识ID无效");
+        List<Long> list = Arrays.asList(ids);
+        list.forEach(id -> {
+            id(id);
+        });
+    }
+
     /**
      * 判断对象object是否为空，如果不为空,直接抛出异常，返回message
      * @param object
@@ -36,7 +52,7 @@ public interface Judge {
      * @param object
      */
     static void isNull(Object object){
-        notNull(object,"缺少数据或数据有误");
+        isNull(object,"缺少数据或数据有误");
     }
     /**
      * 判断对象object是否为空，如果为真,直接抛出异常，返回message

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java

@@ -139,6 +139,7 @@ public class AttendanceController {
         attendance.setCreateDate(localDateTime);
         LocalTime now = localDateTime.toLocalTime();
         int type = request.getType();
+        attendance.setType(type);
         //状态（是否迟到早退，0：否，1：是）
         switch (type) {
             case 11:
@@ -146,37 +147,44 @@ public class AttendanceController {
                 Judge.notNull(topTime,"请先设置上午的上班时间");
                 //打卡时间比上班时间早-正常，否则迟到
                 attendance.setStatus(now.isBefore(topTime) ? 0 : 1);
+                attendance.setRemarks("上午上班打卡");
                 break;
             case 12:
                 LocalTime downTime = maintenanceCompany.getDownTime();
                 Judge.notNull(downTime,"请先设置上午的下班时间");
                 //打卡时间比下班时间晚-正常，否则早退
                 attendance.setStatus(now.isAfter(downTime) ? 0 : 1);
+                attendance.setRemarks("上午下班打卡");
                 break;
             case 21:
                 LocalTime topTimePm = maintenanceCompany.getTopTimePm();
                 Judge.notNull(topTimePm,"请先设置下午的上班时间");
                 attendance.setStatus(now.isBefore(topTimePm) ? 0 : 1);
+                attendance.setRemarks("下午上班打卡");
                 break;
             case 22:
                 LocalTime downTimePm = maintenanceCompany.getDownTimePm();
                 Judge.notNull(downTimePm,"请先设置下午的下班时间");
                 attendance.setStatus(now.isAfter(downTimePm) ? 0 : 1);
+                attendance.setRemarks("下午下班打卡");
                 break;
             case 31:
                 LocalTime topTimeOt = maintenanceCompany.getTopTimeOt();
                 Judge.notNull(topTimeOt,"请先设置加班的上班时间");
                 attendance.setStatus(now.isBefore(topTimeOt) ? 0 : 1);
+                attendance.setRemarks("加班上班打卡");
                 break;
             case 32:
                 LocalTime downTimeOt = maintenanceCompany.getDownTimeOt();
                 Judge.notNull(downTimeOt,"请先设置加班的下班时间");
                 attendance.setStatus(now.isAfter(downTimeOt) ? 0 : 1);
+                attendance.setRemarks("加班下班打卡");
                 break;
             default:
                 return RestResponse.failParam();
         }
-        return RestResponse.success("打卡成功");
+        boolean result = attendanceService.save(attendance);
+        return Judge.result(result);
     }
 
     /**

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/LiftCertificateController.java

@@ -110,7 +110,7 @@ public class LiftCertificateController {
     @PostMapping("add")
     public RestResponse add(@RequestBody LiftCertificate entity) {
         Judge.notTrue(StrUtil.hasEmpty(entity.getFirstImgUrl(),entity.getSecondImgUrl()),"请上传操作证图片");
-        boolean result = liftCertificateService.save(entity);
+        boolean result = liftCertificateService.saveOrUpdate(entity);
         return Judge.result(result);
 
     }