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

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

@@ -119,7 +119,7 @@ public class EmergencyRepairController {
         Long mtCompanyId = entity.getMtCompanyId();
         Long liftId = entity.getLiftId();
         int repairing = emergencyRepairService.countRepairing(mtCompanyId,liftId);
-        Judge.notTrue(repairing > 0,Values.Er.haveUnfinisedRepair);
+        Judge.lt0(repairing,Values.Er.haveUnfinisedRepair);
 
         //派单时间 急修单创建时间
         entity.setHasEvaluate(0);
@@ -452,6 +452,9 @@ public class EmergencyRepairController {
         entity.setLiftId(repair.getLiftId());
         entity.setPostDate(LocalDateTime.now());
 
+        //设置评价状态
+        repair.setHasEvaluate(1);
+
         boolean result = emergencyRepairService.evaluate(repair,entity);
         return RestResponse.success(result);
     }

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

@@ -47,7 +47,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 分页查询急修中的急修记录
      *
      * @param request
-     * @return
+     * @return IPage<RepairResponse>
      */
     public IPage<RepairResponse> pageByRepairing(RepairRequest request) {
         long pageSize = request.getPageSize();
@@ -60,7 +60,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 根据条件分页查询急修记录
      *
      * @param request
-     * @return
+     * @return IPage<RepairResponse>
      */
     public IPage<RepairResponse> pageByCondition(RepairRequest request) {
         long pageNum = request.getPageNum();
@@ -73,7 +73,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 根据条件统计急修记录总条数
      *
      * @param request
-     * @return
+     * @return long
      */
     public long countByCondition(RepairRequest request) {
         return baseMapper.countByCondition(request);
@@ -83,7 +83,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 根据id查询急修记录，带关联信息
      *
      * @param request
-     * @return
+     * @return RepairResponse
      */
     public RepairResponse selectByIdWithInfo(RepairRequest request) {
         return baseMapper.selectByIdWithInfo(request);
@@ -93,7 +93,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 根据用户id查询关联的急修
      *
      * @param request
-     * @return
+     * @return IPage<RepairResponse>
      */
     public IPage<RepairResponse> pageByUser(RepairRequest request) {
         long pageNum = request.getPageNum();
@@ -106,7 +106,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 急修接单，修改急修为修理中，修改电梯的业务状态为急修中
      *
      * @param entity
-     * @return
+     * @return boolean
      */
     @Transactional
     public boolean taking(EmergencyRepair entity) {
@@ -135,7 +135,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      *
      * @param mtCompanyId
      * @param liftId
-     * @return
+     * @return EmergencyRepair
      */
     public EmergencyRepair findByMtCompanyAndLift(Long mtCompanyId, Long liftId) {
         QueryWrapper<EmergencyRepair> queryWrapper = new QueryWrapper<>();
@@ -151,7 +151,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 电梯管理中根据电梯，维保公司和项目查询急修记录
      *
      * @param request
-     * @return
+     * @return IPage<RepairResponse>
      */
     public IPage<RepairResponse> pageByCompanyLiftProject(RepairRequest request) {
         long pageSize = request.getPageSize();
@@ -165,7 +165,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      *
      * @param mtCompanyId
      * @param liftId
-     * @return
+     * @return int
      */
     public int countRepairing(Long mtCompanyId, Long liftId) {
         QueryWrapper<EmergencyRepair> queryWrapper = new QueryWrapper<>();
@@ -182,7 +182,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      *
      * @param mtCompanyId
      * @param liftId
-     * @return
+     * @return boolean
      */
     @Transactional
     public boolean startMaintenance(Long mtCompanyId, Long liftId) {
@@ -191,30 +191,30 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         if (null == emergencyRepair) {
             return true;
         }
-        // 如果存在，并且急修中
-        if (Values.Er.statusRepairing(emergencyRepair.getStatus())) {
-            //急修改成暂停中
-            emergencyRepair.setStatus(Values.Er.STATUS_STOPING);
-            boolean er = updateById(emergencyRepair);
-            if (!er) {
-                return false;
-            }
-            PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
-            if (null == relevance) {
-                return false;
-            }
-            //电梯业务状态改成维保中
-            relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.MAINTENANCE.getCode());
-            boolean re = platformCompanyLiftRelevanceService.updateById(relevance);
-            if (re) {
-                return true;
-            } else {
-                //强制手动事务回滚
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return false;
-            }
+        //如果存在，不在急修中
+        if (!Values.Er.statusRepairing(emergencyRepair.getStatus())) {
+            return true;
+        }
+        // 如果存在，并且急修中,急修改成暂停中
+        emergencyRepair.setStatus(Values.Er.STATUS_STOPING);
+        boolean er = updateById(emergencyRepair);
+        if (!er) {
+            return false;
+        }
+        PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
+        if (null == relevance) {
+            return false;
+        }
+        //电梯业务状态改成维保中
+        relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.MAINTENANCE.getCode());
+        boolean re = platformCompanyLiftRelevanceService.updateById(relevance);
+        if (re) {
+            return true;
+        } else {
+            //强制手动事务回滚
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
         }
-        return true;
     }
 
     /**
@@ -222,7 +222,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      *
      * @param mtCompanyId
      * @param liftId
-     * @return
+     * @return boolean
      */
     public boolean stopMaintenance(Long mtCompanyId, Long liftId) {
         //如果急修单不存在，直接返回，
@@ -230,29 +230,30 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         if (null == emergencyRepair) {
             return true;
         }
-        if (Values.Er.statusStoping(emergencyRepair.getStatus())) {
-            //恢复暂停中的急修为急修中
-            emergencyRepair.setStatus(Values.Er.STATUS_REPAIRING);
-            boolean er = updateById(emergencyRepair);
-            if (!er) {
-                return false;
-            }
-            PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
-            if (null == relevance) {
-                return false;
-            }
-            //电梯业务状态改成急修中
-            relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode());
-            boolean re = platformCompanyLiftRelevanceService.updateById(relevance);
-            if (re) {
-                return true;
-            } else {
-                //强制手动事务回滚
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return false;
-            }
+        //如果急修单不在暂停中，直接返回true
+        if (!Values.Er.statusStoping(emergencyRepair.getStatus())) {
+            return true;
+        }
+        //恢复暂停中的急修为急修中
+        emergencyRepair.setStatus(Values.Er.STATUS_REPAIRING);
+        boolean er = updateById(emergencyRepair);
+        if (!er) {
+            return false;
+        }
+        PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
+        if (null == relevance) {
+            return false;
+        }
+        //电梯业务状态改成急修中
+        relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode());
+        boolean re = platformCompanyLiftRelevanceService.updateById(relevance);
+        if (re) {
+            return true;
+        } else {
+            //强制手动事务回滚
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
         }
-        return true;
     }
 
     /**
@@ -260,7 +261,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      *
      * @param repair
      * @param erRecordImgs
-     * @return
+     * @return boolean
      */
     @Transactional
     public boolean repairOrder(EmergencyRepair repair, List<ErRecordImg> erRecordImgs) {
@@ -285,7 +286,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      *
      * @param repair
      * @param erRecordCosts
-     * @return
+     * @return boolean
      */
     @Transactional
     public boolean costAdd(EmergencyRepair repair, List<ErRecordCost> erRecordCosts) {
@@ -308,7 +309,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      *
      * @param repair
      * @param erRecordCosts
-     * @return
+     * @return boolean
      */
     @Transactional
     public boolean costModify(EmergencyRepair repair, List<ErRecordCost> erRecordCosts) {
@@ -331,7 +332,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      *
      * @param repair
      * @param erRecordCost
-     * @return
+     * @return boolean
      */
     @Transactional
     public boolean costDelete(EmergencyRepair repair, ErRecordCost erRecordCost) {
@@ -354,7 +355,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      *
      * @param repair
      * @param entity
-     * @return
+     * @return boolean
      */
     @Transactional
     public boolean evaluate(EmergencyRepair repair, Evaluation entity) {
@@ -362,8 +363,6 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         if (!ev) {
             return false;
         }
-        //设置评价状态
-        repair.setHasEvaluate(1);
         boolean re = updateById(repair);
         if (re) {
             return true;

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

@@ -29,6 +29,7 @@ public class LiftFaultService extends ServiceImpl<LiftFaultMapper, LiftFault> {
     public List<LiftFault> listByLiftCategory(Integer liftCategory) {
         QueryWrapper<LiftFault> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<LiftFault> lambdaQueryWrapper = queryWrapper.lambda();
+        // 0 公共故障项
         lambdaQueryWrapper.in(LiftFault::getLiftCategory,Arrays.asList(0,liftCategory));
         return list(lambdaQueryWrapper);
     }

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

@@ -3,14 +3,18 @@ package cn.com.ty.lift.business.maintenance.controller;
 import cn.com.ty.lift.business.common.CountPage;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceOption;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceRecord;
+import cn.com.ty.lift.business.maintenance.dao.entity.MtRecordImg;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MtPlanRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MtRecordRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtOptionTree;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtPlanResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtRecordResponse;
 import cn.com.ty.lift.business.maintenance.service.*;
+import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
+import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.common.utils.Judge;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.base.Splitter;
@@ -22,6 +26,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -43,7 +50,10 @@ public class MaintenanceRecordController {
     private MtRecordCostService mtRecordCostService;
     private MaintenanceOptionService maintenanceOptionService;
     private MtRecordImgService mtRecordImgService;
+    private ProjectLiftRelevanceService projectLiftRelevanceService;
 
+    //法规维保间隔15天
+    private final int maintenance_interval = 15;
     /**
      * 根据条件分页查询维保-日常保养
      * @param request
@@ -72,6 +82,26 @@ public class MaintenanceRecordController {
         IPage<MtPlanResponse> pages = maintenancePlanService.pagePlanByCondition(request);
         Judge.notNull(pages);
         long count = maintenancePlanService.countPlanByCondition(request);
+        List<MtPlanResponse> records = pages.getRecords();
+        if(IterUtil.isNotEmpty(records)){
+            List<ProjectLiftRelevance> relevances = projectLiftRelevanceService.listByMtCompany(mtCompanyId);
+            records.forEach(record -> {
+                Optional<ProjectLiftRelevance> liftRelevance = relevances.stream().filter(r -> (
+                        r.getLiftId().equals(record.getLiftId()) &&
+                        r.getProjectId().equals(record.getProjectId()))).findFirst();
+                if(liftRelevance.isPresent()){
+                    ProjectLiftRelevance relevance = liftRelevance.get();
+                    log.info("PlanDate: {}",record.getPlanDate());
+                    LocalDate deadline = record.getPlanDate().plusDays(maintenance_interval - relevance.getPlanInterval());
+                    log.info("deadline: {}",deadline);
+                    //如果超过法规15天，法规超期LocalDate.now() < deadline
+                    LocalDateTime max = LocalDateTime.of(deadline,LocalTime.MAX);
+                    log.info("maxtime: {}",max);
+                    record.setOverdue(LocalDateTime.now().isBefore(max) ? 1 : 2);
+                    log.info("overdue: {}",record.getOverdue());
+                }
+            });
+        }
         CountPage<MtPlanResponse> countPage = new CountPage<>(count,pages);
         return RestResponse.success(countPage);
     }
@@ -121,7 +151,8 @@ public class MaintenanceRecordController {
         Integer type = request.getType();
         Integer liftType = request.getLiftType();
         Long mtCompanyId = request.getMtCompanyId();
-        Judge.gt0(type,liftType,mtCompanyId);
+        Judge.id(mtCompanyId);
+        Judge.gt0(type,liftType);
         List<MaintenanceOption> optionList = maintenanceOptionService.listByTypeAndLiftType(type,liftType,mtCompanyId);
         Judge.notNull(optionList);
         //按照sort groupby
@@ -144,7 +175,8 @@ public class MaintenanceRecordController {
         Integer type = request.getType();
         Integer liftType = request.getLiftType();
         Long mtCompanyId = request.getMtCompanyId();
-        Judge.gt0(type,liftType,mtCompanyId);
+        Judge.id(mtCompanyId);
+        Judge.gt0(type,liftType);
         List<MaintenanceOption> optionList = maintenanceOptionService.listByTypeAndLiftType(type,liftType,mtCompanyId);
         return RestResponse.success(optionList);
     }
@@ -154,29 +186,41 @@ public class MaintenanceRecordController {
      * @return RestResponse
      */
     @PostMapping("tofill")
-    public RestResponse tofill(@RequestBody MaintenanceRecord entity){
+    public RestResponse tofill(@Valid @RequestBody MaintenanceRecord entity){
         //补录
         entity.setIsRepair(1);
-        boolean result = maintenanceRecordService.tofill(entity);
-        return RestResponse.success(result);
+        maintenanceRecordService.tofill(entity);
+        return RestResponse.success(entity.getId());
     }
 
     /**
      * 填写保养单-确认，带维保项和现场图片 ，修改record
-     * @param entity
+     * @param request
      * @return RestResponse
      */
     @PostMapping("fill")
-    public RestResponse fill(@RequestBody MaintenanceRecord entity){
-        Long id = entity.getId();
+    public RestResponse fill(@RequestBody MtRecordRequest request){
+        Long id = request.getId();
         Judge.id(id);
         //维保项不能为空
-        String maintenanceOption = entity.getMaintenanceOption();
+        String maintenanceOption = request.getMaintenanceOption();
         Judge.notNull(maintenanceOption,"维保项不能为空");
-        List<String> imgs = entity.getImgs();
+
+        List<String> imgs = request.getImgs();
         Judge.notNull(imgs,"维保图片不能为空");
 
-        boolean result = maintenanceRecordService.fill(entity);
+        List<MtRecordImg> mtRecordImgs = new ArrayList<>();
+        for (int i = 0; i < imgs.size(); i++) {
+            MtRecordImg mri = new MtRecordImg();
+            mri.setMtRecordId(id);
+            mri.setImgUrl(imgs.get(i));
+            mri.setSort(i);
+            mtRecordImgs.add(mri);
+        }
+        MaintenanceRecord entity = maintenanceRecordService.getById(id);
+        Judge.notNull(entity);
+        entity.setMaintenanceOption(maintenanceOption);
+        boolean result = maintenanceRecordService.fill(entity,mtRecordImgs);
         return RestResponse.success(result);
     }
     /**
@@ -186,7 +230,6 @@ public class MaintenanceRecordController {
      */
     @PostMapping("workOrder")
     public RestResponse workOrder(@Valid @RequestBody MaintenanceRecord entity){
-
         boolean result = maintenanceRecordService.tofill(entity);
         return RestResponse.success(result);
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MaintenanceRecord.java

@@ -176,7 +176,4 @@ public class MaintenanceRecord extends BaseEntity {
 
 	@TableField(exist = false)
 	private List<MtRecordCost> mtRecordCosts;
-
-    @TableField(exist = false)
-	private List<String> imgs;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MtRecordRequest.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author wcz
@@ -58,4 +59,8 @@ public class MtRecordRequest extends BaseRequestModel {
      * 保养类型 1.半月，2.季度，3.半年，4.全年
      */
     private Integer type;
+
+    private String maintenanceOption;
+
+    private List<String> imgs;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/MtPlanResponse.java

@@ -13,6 +13,10 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class MtPlanResponse extends MaintenancePlan {
 
+    /**
+     * 电梯类型 1直梯，2扶梯
+     */
+    private Integer liftType;
     /**
      * 单位设备编号
      */
@@ -36,4 +40,9 @@ public class MtPlanResponse extends MaintenancePlan {
      * 电梯主要负责人
      */
     private String workerName;
+
+    /**
+     * 超期类型，1计划超期，2法规超期
+     */
+    private Integer overdue;
 }

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

@@ -29,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -224,23 +223,14 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
      * @return boolean
      */
     @Transactional
-    public boolean fill(MaintenanceRecord entity){
+    public boolean fill(MaintenanceRecord entity,List<MtRecordImg> mtRecordImgs){
         boolean mr = saveOrUpdate(entity);
         if(!mr){
             return false;
         }
-        List<String> imgs = entity.getImgs();
-        if(IterUtil.isEmpty(imgs)){
+        if(IterUtil.isEmpty(mtRecordImgs)){
             return true;
         }
-        List<MtRecordImg> mtRecordImgs = new ArrayList<>();
-        for (int i = 0; i < imgs.size(); i++) {
-            MtRecordImg mri = new MtRecordImg();
-            mri.setMtRecordId(entity.getId());
-            mri.setImgUrl(imgs.get(i));
-            mri.setSort(i);
-            mtRecordImgs.add(mri);
-        }
         boolean mi = mtRecordImgService.saveBatch(mtRecordImgs,mtRecordImgs.size());
         if(mi){
             return true;

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -223,4 +223,12 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         IPage<ProjectRelevanceResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
         return baseMapper.selectListByUserId(page, request);
     }
+
+
+    public List<ProjectLiftRelevance> listByMtCompany(Long mtCompanyId){
+        QueryWrapper<ProjectLiftRelevance> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<ProjectLiftRelevance> lambdaQueryWrapper = queryWrapper.lambda();
+        lambdaQueryWrapper.eq(ProjectLiftRelevance::getMtCompanyId,mtCompanyId);
+        return list(lambdaQueryWrapper);
+    }
 }

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -18,6 +18,7 @@
 		<result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
         <result column="demand" property="demand" jdbcType="VARCHAR" />
 
+		<result column="lift_type" property="liftType" jdbcType="INTEGER" />
 		<result column="project_name" property="projectName" jdbcType="VARCHAR" />
 		<result column="use_company_code" property="useCompanyCode" jdbcType="VARCHAR" />
 		<result column="registration_code" property="registrationCode" jdbcType="VARCHAR" />
@@ -125,6 +126,7 @@
             li.use_company_code,
             li.device_position,
             li.registration_code,
+            li.lift_type,
             pr.project_name,
             ui.`name` AS worker_name
         FROM

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

@@ -32,6 +32,24 @@ public interface Judge {
         }
     }
 
+    static void gt0(Number value,String message){
+        if(null == value){
+            throw new JudgeException(message);
+        }
+        if(value instanceof Long && value.longValue() <= 0){
+            throw new JudgeException(message);
+        }
+        if(value instanceof Integer && value.intValue() <= 0){
+            throw new JudgeException(message);
+        }
+        if(value instanceof Float && value.floatValue() <= 0){
+            throw new JudgeException(message);
+        }
+        if(value instanceof Double && value.doubleValue() <= 0){
+            throw new JudgeException(message);
+        }
+    }
+
     /**
      * 判断是否大于0，为null或者<= 0 抛出异常
      * @param values
@@ -39,62 +57,56 @@ public interface Judge {
     static void gt0(Number... values){
         notNull(values,MUST_GT0);
         for (Number value : values) {
-            if(null == value){
-                throw new JudgeException(MUST_GT0);
-            }
-            if(value instanceof Long && value.longValue() <= 0){
-                throw new JudgeException(MUST_GT0);
-            }
-            if(value instanceof Integer && value.intValue() <= 0){
-                throw new JudgeException(MUST_GT0);
-            }
-            if(value instanceof Float && value.floatValue() <= 0){
-                throw new JudgeException(MUST_GT0);
-            }
-            if(value instanceof Double && value.doubleValue() <= 0){
-                throw new JudgeException(MUST_GT0);
-            }
+            gt0(value,MUST_GT0);
+        }
+    }
+
+    static void lt0(Number value,String message){
+        if(null == value){
+            throw new JudgeException(message);
+        }
+        if(value instanceof Long && value.longValue() > 0){
+            throw new JudgeException(message);
+        }
+        if(value instanceof Integer && value.intValue() > 0){
+            throw new JudgeException(message);
+        }
+        if(value instanceof Float && value.floatValue() > 0){
+            throw new JudgeException(message);
+        }
+        if(value instanceof Double && value.doubleValue() > 0){
+            throw new JudgeException(message);
         }
     }
 
     static void lt0(Number... values){
         notNull(values,MUST_LT0);
         for (Number value : values) {
-            if(null == value){
-                throw new JudgeException(MUST_LT0);
-            }
-            if(value instanceof Long && value.longValue() >= 0){
-                throw new JudgeException(MUST_LT0);
-            }
-            if(value instanceof Integer && value.intValue() >= 0){
-                throw new JudgeException(MUST_LT0);
-            }
-            if(value instanceof Float && value.floatValue() >= 0){
-                throw new JudgeException(MUST_LT0);
-            }
-            if(value instanceof Double && value.doubleValue() >= 0){
-                throw new JudgeException(MUST_LT0);
-            }
+           lt0(value,MUST_LT0);
+        }
+    }
+
+    static void  eq0(Number value,String message){
+        if(null == value){
+            throw new JudgeException(MUST_EQ0);
+        }
+        if(value instanceof Long && value.longValue() == 0){
+            throw new JudgeException(MUST_EQ0);
+        }
+        if(value instanceof Integer && value.intValue() == 0){
+            throw new JudgeException(MUST_EQ0);
+        }
+        if(value instanceof Float && value.floatValue() == 0){
+            throw new JudgeException(MUST_EQ0);
+        }
+        if(value instanceof Double && value.doubleValue() == 0){
+            throw new JudgeException(MUST_EQ0);
         }
     }
     static void eq0(Number... values){
         notNull(values,MUST_EQ0);
         for (Number value : values) {
-            if(null == value){
-                throw new JudgeException(MUST_EQ0);
-            }
-            if(value instanceof Long && value.longValue() == 0){
-                throw new JudgeException(MUST_EQ0);
-            }
-            if(value instanceof Integer && value.intValue() == 0){
-                throw new JudgeException(MUST_EQ0);
-            }
-            if(value instanceof Float && value.floatValue() == 0){
-                throw new JudgeException(MUST_EQ0);
-            }
-            if(value instanceof Double && value.doubleValue() == 0){
-                throw new JudgeException(MUST_EQ0);
-            }
+            eq0(value,MUST_EQ0);
         }
     }
     /**

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

@@ -38,10 +38,9 @@ public class AnnouncementController {
     private AnnouncementImgService announcementImgService;
 
     /**
-     * @param
+     * 根据id查找公告
+     * @param request
      * @return
-     * @description 根据id查找公告
-     * @date 2019/12/6 9:24
      */
     @PostMapping("findOne")
     public RestResponse findOne(@RequestBody AnnouncementRequest request) {
@@ -54,10 +53,9 @@ public class AnnouncementController {
     }
 
     /**
-     * @param
+     * 根据条件分页查找公告
+     * @param request
      * @return
-     * @description 根据条件查找公告
-     * @date 2019/12/6 9:24
      */
     @PostMapping("list")
     public RestResponse list(@RequestBody AnnouncementRequest request) {
@@ -69,10 +67,9 @@ public class AnnouncementController {
     }
 
     /**
-     * @param
+     * 添加公告
+     * @param entity
      * @return
-     * @description 添加公告
-     * @date 2019/12/6 9:25
      */
     @PostMapping("add")
     public RestResponse add(@Valid @RequestBody Announcement entity) {
@@ -81,10 +78,9 @@ public class AnnouncementController {
     }
 
     /**
-     * @param
+     * 根据id删除公告
+     * @param request
      * @return
-     * @description 根据id删除公告
-     * @date 2019/12/6 9:25
      */
     @PostMapping("delete")
     public RestResponse delete(@RequestBody AnnouncementRequest request) {

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

@@ -42,10 +42,9 @@ public class AttendanceController {
     private AttendanceImgService attendanceImgService;
 
     /**
-     * @param
+     * 根据id查找
+     * @param request
      * @return
-     * @description 根据id查找
-     * @date 2019/12/6 9:44
      */
     @PostMapping("findOne")
     public RestResponse findOne(@RequestBody AttendanceRequest request) {
@@ -58,10 +57,9 @@ public class AttendanceController {
     }
 
     /**
-     * @param
+     * 根据条件查询
+     * @param request
      * @return
-     * @description 根据条件查询
-     * @date 2019/12/6 9:44
      */
     @PostMapping("list")
     public RestResponse list(@RequestBody AttendanceRequest request) {
@@ -73,10 +71,9 @@ public class AttendanceController {
     }
 
     /**
-     * @param
+     * 设置打卡时间
+     * @param request
      * @return
-     * @description 设置打卡时间
-     * @date 2019/12/20 16:30
      */
     @PostMapping("setupTime")
     public RestResponse setupTime(@RequestBody AttendanceRequest request) {
@@ -127,7 +124,7 @@ public class AttendanceController {
         Integer type = entity.getType();
 
         int count = attendanceService.countByUserAndType(mtCompanyId,userId,type);
-        Judge.notTrue(count > 0,Values.At.hadClock);
+        Judge.lt0(count,Values.At.hadClock);
         MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(mtCompanyId);
         Judge.notNull(maintenanceCompany);
 
@@ -181,7 +178,6 @@ public class AttendanceController {
 
     /**
      * 返回维保公司打卡时间信息
-     *
      * @param request
      * @return
      */

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

@@ -36,10 +36,9 @@ public class LiftCertificateController {
     private LiftCertificateService liftCertificateService;
 
     /**
-     * @param
+     * 根据id查找
+     * @param request
      * @return
-     * @description 根据id查找
-     * @date 2019/12/6 9:45
      */
     @PostMapping("findOne")
     public RestResponse findOne(@RequestBody LiftCertificateRequest request) {
@@ -50,26 +49,23 @@ public class LiftCertificateController {
     }
 
     /**
-     * @param
+     * 根据条件查询
+     * @param request
      * @return
-     * @description 根据条件查询
-     * @date 2019/12/6 9:45
      */
     @PostMapping("list")
     public RestResponse list(@RequestBody LiftCertificateRequest request) {
-        long count = liftCertificateService.countByCondition(request);
-        Judge.isTrue(count > 0);
         IPage<LiftCertificateResponse> pages = liftCertificateService.pageByCondition(request);
         Judge.notNull(pages);
+        long count = liftCertificateService.countByCondition(request);
         CountPage<LiftCertificateResponse> countPage = new CountPage<>(count, pages);
         return RestResponse.success(countPage);
     }
 
     /**
-     * @param
+     * 更新操作证信息
+     * @param entity
      * @return
-     * @description 更新操作证信息
-     * @date 2019/12/4 10:32
      */
     @PostMapping("modify")
     public RestResponse modify(@RequestBody LiftCertificate entity) {
@@ -84,10 +80,9 @@ public class LiftCertificateController {
     }
 
     /**
-     * @param
+     * 操作证审核
+     * @param request
      * @return
-     * @description 操作证审核
-     * @date 2019/12/4 10:32
      */
     @PostMapping("audit")
     public RestResponse audit(@RequestBody LiftCertificateRequest request) {
@@ -104,10 +99,9 @@ public class LiftCertificateController {
     }
 
     /**
-     * @param
+     * 新增操作证
+     * @param entity
      * @return
-     * @description 新增操作证
-     * @date 2019/12/4 10:31
      */
     @PostMapping("add")
     public RestResponse add(@Valid @RequestBody LiftCertificate entity) {
@@ -115,7 +109,7 @@ public class LiftCertificateController {
         Long mtCompanyId = entity.getMtCompanyId();
 
         int count = liftCertificateService.countByUserAndMtCompany(ownerId, mtCompanyId);
-        Judge.notTrue(count > 0, Values.Lc.CertHadExist);
+        Judge.lt0(count, Values.Lc.CertHadExist);
 
         entity.setStatus(Values.Lc.Status_ToAudit);