大修签到列表接口

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

@@ -10,6 +10,7 @@ import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -129,10 +130,10 @@ public class CapitalRepairController {
      */
     @PostMapping("signIn/record")
     public RestResponse signInRecord(@RequestBody SignInRequest request) {
-        IPage<SignInResponse> page = signInService.list(request);
-        if (CollUtil.isEmpty(page.getRecords())) {
+        SignInResponse response = signInService.list(request);
+        if (ObjectUtil.isEmpty(response)) {
             return RestResponse.success();
         }
-        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
+        return RestResponse.success(response, MessageUtils.get("msg.query.success"));
     }
 }

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

@@ -1,6 +1,6 @@
 package cn.com.ty.lift.business.capital.dao.entity.model.request;
 
-import cn.com.xwy.boot.controller.BaseRequestModel;
+import cn.com.ty.lift.common.model.PageRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CapitalRepairRequest extends BaseRequestModel {
+public class CapitalRepairRequest extends PageRequest {
     /**
      * 公司ID
      */

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

@@ -1,11 +1,40 @@
 package cn.com.ty.lift.business.capital.dao.entity.model.request;
 
-import cn.com.xwy.boot.controller.BaseRequestModel;
+import cn.com.ty.lift.common.model.PageRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
 
 /**
  * @author bieao
  * @date 2020/2/5
- * @description
+ * @description 签到记录查询请求
  */
-public class SignInRequest extends BaseRequestModel {
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SignInRequest extends PageRequest {
+
+    /**
+     * 公司id
+     */
+    @NotNull(message = "notEmpty")
+    private Long mtCompanyId;
+
+    /**
+     * 大修项目id
+     */
+    @NotNull(message = "notEmpty")
+    private Long projectId;
+
+    /**
+     * 签到日期
+     */
+    private LocalDate signDate;
+
+    /**
+     * 维保工id
+     */
+    private Long userId;
 }

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

@@ -1,9 +1,24 @@
 package cn.com.ty.lift.business.capital.dao.entity.model.response;
 
+import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
+import lombok.Data;
+
+import java.util.List;
+
 /**
  * @author bieao
  * @date 2020/2/5
- * @description
+ * @description 大修签到列表
  */
+@Data
 public class SignInResponse {
+
+    /**
+     * 大修项目详情
+     */
+    private CapitalRepair capitalRepair;
+    /**
+     * 签到记录列表
+     */
+    private List<SignRecord> signRecordList;
 }

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

@@ -0,0 +1,31 @@
+package cn.com.ty.lift.business.capital.dao.entity.model.response;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+/**
+ * @author bieao
+ * @date 2020/4/17
+ * @description 签到记录
+ */
+@Data
+public class SignRecord {
+    /**
+     * 签到时间
+     */
+    private LocalDate signDate;
+    /**
+     * 进场时间
+     */
+    private LocalTime approachTime;
+    /**
+     * 离场时间
+     */
+    private LocalTime leavingTime;
+    /**
+     * 用户姓名
+     */
+    private String userName;
+}

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

@@ -2,7 +2,7 @@ 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 cn.com.ty.lift.business.capital.dao.entity.model.response.SignRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
@@ -14,6 +14,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface SignInMapper extends BaseMapper<SignIn> {
 
-    IPage<SignInResponse> findByCondition(IPage<SignInResponse> page, @Param("request") SignInRequest request);
+    IPage<SignRecord> findByCondition(IPage<SignRecord> page, @Param("request") SignInRequest request);
 
 }

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

@@ -48,8 +48,7 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
      * @date 2020/2/3 11:38 上午
      */
     public IPage<CapitalRepairResponse> list(CapitalRepairRequest request) {
-        IPage<CapitalRepairResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return baseMapper.findByCondition(page, request);
+        return baseMapper.findByCondition(request.getPage(), request);
     }
 
     /**

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

@@ -1,18 +1,18 @@
 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.SignIn;
 import cn.com.ty.lift.business.capital.dao.entity.model.request.AttendanceListRequest;
 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.entity.model.response.SignRecord;
 import cn.com.ty.lift.business.capital.dao.mapper.SignInMapper;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.ty.lift.common.constants.CommonEnum;
-import cn.hutool.core.util.StrUtil;
 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;
 
@@ -32,6 +32,10 @@ public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
 
      @Resource
      private ProjectUserService projectUserService;
+
+     @Resource
+     private CapitalRepairService capitalRepairService;
+
     /**
      * @param entry 用户签到信息
      * @return 是否成功
@@ -92,8 +96,12 @@ public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
      * @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);
+    public SignInResponse list(SignInRequest request) {
+        CapitalRepair capital = capitalRepairService.getOne(request.getProjectId());
+        SignInResponse response = new SignInResponse();
+        response.setCapitalRepair(capital);
+        IPage<SignRecord> signRecord = baseMapper.findByCondition(request.getPage(), request);
+        response.setSignRecordList(signRecord.getRecords());
+        return response;
     }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/Payment.java

@@ -46,7 +46,7 @@ public class Payment extends BaseEntity {
 	private BigDecimal planMoney;
 
 	/**
-	 * 已收金额
+	 * 实收金额
 	 */
 	private BigDecimal workMoney;
 
@@ -56,7 +56,7 @@ public class Payment extends BaseEntity {
 	private LocalDate planDate;
 
 	/**
-	 * 已收时间
+	 * 实收时间
 	 */
 	private LocalDate workDate;
 

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

@@ -1,6 +1,6 @@
 package cn.com.ty.lift.business.project.dao.entity.model.request;
 
-import cn.com.xwy.boot.controller.BaseRequestModel;
+import cn.com.ty.lift.common.model.PageRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProjectLiftRelevanceRequest extends BaseRequestModel {
+public class ProjectLiftRelevanceRequest extends PageRequest {
 
     /**
      * 用户id

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

@@ -221,8 +221,7 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
      * @date 2019/12/26 4:27 PM
      */
     public IPage<ProjectRelevanceResponse> relevanceList(ProjectLiftRelevanceRequest request) {
-        IPage<ProjectRelevanceResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return baseMapper.selectListByUserId(page, request);
+        return baseMapper.selectListByUserId(request.getPage(), request);
     }
 
 

lift-business-service/src/main/resources/mapper/capital/CapitalRepairMapper.xml

@@ -19,6 +19,10 @@
         <result column="coordinate" property="coordinate" jdbcType="VARCHAR" />
         <result column="start_date" property="startDate" jdbcType="DATE" />
         <result column="end_date" property="endDate" jdbcType="DATE" />
+        <result column="delay_time" property="delayTime" jdbcType="DATE" />
+        <result column="overdue_date" property="overdueDate" jdbcType="DATE" />
+        <result column="overdue_reason" property="overdueReason" jdbcType="VARCHAR" />
+        <result column="overdue_flag" property="overdueFlag" jdbcType="VARCHAR" />
         <result column="project_status" property="projectStatus" jdbcType="INTEGER" />
         <result column="push_flag" property="pushFlag" jdbcType="VARCHAR" />
         <result column="creator_id" property="creatorId" jdbcType="BIGINT" />
@@ -31,7 +35,8 @@
     <sql id="Base_Column_List" >
         id, mt_company_id, pp_company_id, pp_contact_id, project_code, project_name, province_code, province,
 		city_code, city, district_code, district, project_address, project_usage, coordinate, start_date, end_date,
-		project_status, push_flag, creator_id, create_date, update_id, update_date, region_id
+        delay_time, overdue_date, overdue_reason, overdue_flag, project_status, push_flag, creator_id, create_date,
+        update_id, update_date, region_id
     </sql>
 
     <select id="findByCondition" resultType="cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairResponse"

lift-business-service/src/main/resources/mapper/capital/SignInMapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.com.ty.lift.business.capital.dao.mapper.SignInMapper" >
+    <resultMap id="BaseResultMap" type="cn.com.ty.lift.business.capital.dao.entity.SignIn" >
+        <id column="id" property="id" jdbcType="BIGINT" />
+        <result column="mt_company_id" property="mtCompanyId" jdbcType="BIGINT" />
+        <result column="project_id" property="projectId" jdbcType="BIGINT" />
+        <result column="user_id" property="userId" jdbcType="BIGINT" />
+        <result column="coordinate" property="coordinate" jdbcType="VARCHAR" />
+        <result column="address" property="address" jdbcType="VARCHAR" />
+        <result column="approach_time" property="approachTime" jdbcType="DATE" />
+        <result column="leaving_time" property="leavingTime" jdbcType="DATE" />
+        <result column="creator_id" property="creatorId" jdbcType="BIGINT" />
+        <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+        <result column="update_id" property="updateId" jdbcType="TIMESTAMP" />
+        <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    </resultMap>
+
+    <sql id="Base_Column_List" >
+        id, mt_company_id, project_id, user_id, coordinate, address, approach_time, leaving_time,
+		creator_id, create_date, update_id, update_date, region_id
+    </sql>
+
+    <select id="findByCondition" resultType="cn.com.ty.lift.business.capital.dao.entity.model.response.SignRecord"
+            parameterType="cn.com.ty.lift.business.capital.dao.entity.model.request.SignInRequest" >
+        SELECT
+               sign_date     AS signDate,
+               approach_time AS approachTime,
+               leaving_time  AS leavingTime,
+               ui.name       AS userName
+        FROM sign_in si
+        LEFT JOIN user_info ui ON si.user_id = ui.user_id
+        WHERE si.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
+        <if test="request.signDate!=null and request.signDate!=''">
+            AND si.sign_date = #{request.signDate,jdbcType=DATE}
+        </if>
+        <if test="request.userId!=null and request.userId!=''">
+            AND si.user_id = #{request.userId,jdbcType=BIGINT}
+        </if>
+    </select>
+</mapper>