Merge branches 'develop' and 'huangyuan-user' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

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

@@ -1,8 +1,12 @@
 package cn.com.ty.lift.business.capital.controller;
 
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
-import cn.com.ty.lift.business.capital.dao.entity.model.CapitalRepairRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairAuditRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.request.SignInRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.response.SignInResponse;
 import cn.com.ty.lift.business.capital.service.CapitalRepairService;
+import cn.com.ty.lift.business.capital.service.SignInService;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -29,6 +33,9 @@ public class CapitalRepairController {
     @Resource
     private CapitalRepairService capitalRepairService;
 
+    @Resource
+    private SignInService signInService;
+
     /**
      * @param request 大修项目列表查询条件
      * @return RestResponse 结果集
@@ -88,4 +95,34 @@ public class CapitalRepairController {
         }
         return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
     }
+
+    /**
+     * @param request 是否通过
+     * @return Integer 成功1或失败0
+     * @description 大修审核
+     * @date 2020/2/4 12:46 下午
+     */
+    @PostMapping("audit")
+    public RestResponse audit(@RequestBody CapitalRepairAuditRequest request){
+        boolean result = capitalRepairService.audit(request);
+        if (result) {
+            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
+        }
+        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+    }
+
+    /**
+     * @param request 大修签到查询条件
+     * @return RestResponse 结果集
+     * @description 条件查询大修项目签到列表
+     * @date 2020/2/5 12:58 下午
+     */
+    @PostMapping("signIn/record")
+    public RestResponse signInRecord(@RequestBody SignInRequest request){
+        IPage<SignInResponse> page = signInService.list(request);
+        if (CollUtil.isEmpty(page.getRecords())) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
+    }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/CapitalRepair.java

@@ -1,8 +1,10 @@
 package cn.com.ty.lift.business.capital.dao.entity;
 
+import cn.com.ty.lift.business.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.time.LocalDate;
 
@@ -12,7 +14,8 @@ import java.time.LocalDate;
  * @description 大修
  */
 @Data
-public class CapitalRepair {
+@EqualsAndHashCode(callSuper = true)
+public class CapitalRepair extends BaseEntity {
     /**
      * 项目ID
      */
@@ -100,9 +103,9 @@ public class CapitalRepair {
     private LocalDate endDate;
 
     /**
-     * 状态 1:尚未开始;2:施工中;3:完成
+     * 状态 1:尚未开始;2:施工中;3:待审核;4:完成
      */
-    private String projectStatus;
+    private String status;
 
     /**
      * 是否开启消息推送 0否 1是

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/SignIn.java

@@ -0,0 +1,63 @@
+package cn.com.ty.lift.business.capital.dao.entity;
+
+import cn.com.ty.lift.business.common.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * @author bieao
+ * @date 2020/2/5
+ * @description 大修签到
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SignIn extends BaseEntity {
+
+    @TableId(value = "id",type = IdType.ID_WORKER)
+    private Long id;
+
+    /**
+     * 维保公司ID
+     */
+    private Long mtCompanyId;
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 经纬度
+     */
+    private String coordinate;
+
+    /**
+     * 签到地址
+     */
+    private String address;
+
+    /**
+     * 签到日期
+     */
+    private LocalDateTime sign_date;
+
+    /**
+     * 状态（是否迟到早退，0：否，1：是）
+     */
+    private Integer status;
+
+    /**
+     * 类型 1：上班打卡，2：下班打卡
+     */
+    private Integer type;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/model/CapitalDetailRequest.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.business.capital.dao.entity.model;
+package cn.com.ty.lift.business.capital.dao.entity.model.request;
 
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;

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

@@ -0,0 +1,22 @@
+package cn.com.ty.lift.business.capital.dao.entity.model.request;
+
+import lombok.Data;
+
+/**
+ * @author bieao
+ * @date 2020/2/4
+ * @description 大修审核
+ */
+@Data
+public class CapitalRepairAuditRequest {
+
+    /**
+     * 是否通过(0:不通过，1:通过)
+     */
+    private String pass;
+
+    /**
+     * 大修项目id
+     */
+    private Long id;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/model/CapitalRepairRequest.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.business.capital.dao.entity.model;
+package cn.com.ty.lift.business.capital.dao.entity.model.request;
 
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;

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

@@ -0,0 +1,11 @@
+package cn.com.ty.lift.business.capital.dao.entity.model.request;
+
+import cn.com.xwy.boot.controller.BaseRequestModel;
+
+/**
+ * @author bieao
+ * @date 2020/2/5
+ * @description
+ */
+public class SignInRequest extends BaseRequestModel {
+}

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

@@ -0,0 +1,9 @@
+package cn.com.ty.lift.business.capital.dao.entity.model.response;
+
+/**
+ * @author bieao
+ * @date 2020/2/5
+ * @description
+ */
+public class SignInResponse {
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/mapper/CapitalRepairMapper.java

@@ -1,7 +1,7 @@
 package cn.com.ty.lift.business.capital.dao.mapper;
 
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
-import cn.com.ty.lift.business.capital.dao.entity.model.CapitalRepairRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/mapper/SignInMapper.java

@@ -0,0 +1,19 @@
+package cn.com.ty.lift.business.capital.dao.mapper;
+
+import cn.com.ty.lift.business.capital.dao.entity.SignIn;
+import cn.com.ty.lift.business.capital.dao.entity.model.request.SignInRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.response.SignInResponse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author bieao
+ * @date 2020/2/5
+ * @description 大修签到数据层
+ */
+public interface SignInMapper extends BaseMapper<SignIn> {
+
+    IPage<SignInResponse> findByCondition(IPage<SignInResponse> page, @Param("request") SignInRequest request);
+
+}

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

@@ -1,15 +1,20 @@
 package cn.com.ty.lift.business.capital.service;
 
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
-import cn.com.ty.lift.business.capital.dao.entity.model.CapitalRepairRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairAuditRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairRequest;
 import cn.com.ty.lift.business.capital.dao.mapper.CapitalRepairMapper;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse;
+
+import static cn.com.ty.lift.common.constants.CommonEnum.CapitalRepairStatus;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @author bieao
@@ -50,7 +55,7 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
      * @date 2020/2/3 11:31 上午
      */
     public boolean add(CapitalRepair capitalRepair) {
-       return save(capitalRepair);
+        return save(capitalRepair);
     }
 
     /**
@@ -63,4 +68,18 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
         return updateById(capitalRepair);
     }
 
+    /**
+     * @param request 是否通过
+     * @return Integer 成功1或失败0
+     * @description 大修审核
+     * @date 2020/2/4 12:46 下午
+     */
+    public boolean audit(@RequestBody CapitalRepairAuditRequest request) {
+        CapitalRepair capitalRepair = new CapitalRepair();
+        capitalRepair.setId(request.getId());
+        capitalRepair.setStatus("0".equals(request.getPass()) ?
+                CapitalRepairStatus.ABUILDING.getCode() : CapitalRepairStatus.COMPLETE.getCode());
+        return updateById(capitalRepair);
+    }
+
 }

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

@@ -0,0 +1,41 @@
+package cn.com.ty.lift.business.capital.service;
+
+import cn.com.ty.lift.business.capital.dao.entity.SignIn;
+import cn.com.ty.lift.business.capital.dao.entity.model.request.SignInRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.response.SignInResponse;
+import cn.com.ty.lift.business.capital.dao.mapper.SignInMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author bieao
+ * @date 2020/2/5
+ * @description 大修签到业务层
+ */
+@Service
+public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
+
+
+    /**
+     * @param entry 用户签到信息
+     * @return 是否成功
+     * @description 大修签到
+     * @date 2020/2/5 12:42 下午
+     */
+    public boolean add(SignIn entry) {
+        return save(entry);
+    }
+
+    /**
+     * @param request 大修签到查询条件
+     * @return RestResponse 结果集
+     * @description 条件查询大修项目签到列表
+     * @date 2020/2/5 12:58 下午
+     */
+    public IPage<SignInResponse> list(SignInRequest request) {
+        IPage<SignInResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return baseMapper.findByCondition(page, request);
+    }
+}

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

@@ -1,5 +1,7 @@
 package cn.com.ty.lift.business.project.controller;
 
+import cn.com.ty.lift.business.capital.dao.entity.SignIn;
+import cn.com.ty.lift.business.capital.service.SignInService;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftExtensionRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceRecord;
@@ -33,7 +35,7 @@ import java.util.List;
 /**
  * @author bieao
  * @date 2019/12/31
- * @description app端项目管理控制层
+ * @description app端控制层(项目、电梯、维保、大修)
  */
 @RestController
 @RequestMapping("app")
@@ -45,6 +47,9 @@ public class ProjectAppController {
     @Resource
     private MaintenanceRecordService maintenanceRecordService;
 
+    @Resource
+    private SignInService signInService;
+
     /**
      * @param request 公司id
      * @return RestResponse 项目列表
@@ -187,4 +192,20 @@ public class ProjectAppController {
         }
         return RestResponse.success(response, MessageUtils.get("msg.query.detail.success"));
     }
+
+    /**
+     * @param entry 用户签到信息
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 大修签到
+     * @date 2020/2/5 12:45 下午
+     */
+    @PostMapping("capital/sign/in")
+    public RestResponse signIn(@RequestBody SignIn entry){
+        boolean result = signInService.add(entry);
+        if (result) {
+            return RestResponse.success(null, MessageUtils.get("msg.add.success"));
+        } else {
+            return RestResponse.fail(MessageUtils.get("msg.add.fail"));
+        }
+    }
 }

lift-common/src/main/java/cn.com.ty.lift.common/constants/CommonEnum.java

@@ -357,4 +357,51 @@ public class CommonEnum {
             return label;
         }
     }
+
+    /**
+     * 大修项目状态
+     */
+    public enum CapitalRepairStatus implements IEnum {
+
+        NO_START("未开始", "1"),
+        ABUILDING("施工中", "2"),
+        CHECK_PENDING("待审核", "3"),
+        COMPLETE("已完成", "4");
+
+        /**
+         * 值
+         */
+        private String label;
+
+        /**
+         * 键
+         */
+        private String code;
+
+        /**
+         * 构造函数
+         *
+         * @param label String
+         * @param code  String
+         */
+        CapitalRepairStatus(String label, String code) {
+            this.label = label;
+            this.code = code;
+        }
+
+        @Override
+        public String getEnumName() {
+            return "CapitalRepairStatus";
+        }
+
+        @Override
+        public String getCode() {
+            return code;
+        }
+
+        @Override
+        public String getLabel() {
+            return label;
+        }
+    }
 }