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

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

@@ -1,6 +1,7 @@
 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.request.CapitalDetailRequest;
 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;
@@ -8,7 +9,6 @@ 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;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -43,8 +43,8 @@ public class CapitalRepairController {
      * @date 2020/2/3 11:38 上午
      */
     @PostMapping("list")
-    public RestResponse list(@Valid @RequestBody CapitalRepairRequest request) {
-        IPage<ProjectResponse> page = capitalRepairService.list(request);
+    public RestResponse list(@RequestBody CapitalRepairRequest request) {
+        IPage<CapitalRepair> page = capitalRepairService.list(request);
         if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
@@ -58,7 +58,7 @@ public class CapitalRepairController {
      * @date 2020/2/3 11:31 上午
      */
     @PostMapping("detail")
-    public RestResponse detail(@Valid @RequestBody CapitalRepairRequest request) {
+    public RestResponse detail(@Valid @RequestBody CapitalDetailRequest request) {
         CapitalRepair capitalRepair = capitalRepairService.detail(request.getId());
         if (ObjectUtil.isEmpty(capitalRepair)) {
             return RestResponse.success();
@@ -103,7 +103,7 @@ public class CapitalRepairController {
      * @date 2020/2/4 12:46 下午
      */
     @PostMapping("audit")
-    public RestResponse audit(@RequestBody CapitalRepairAuditRequest request){
+    public RestResponse audit(@Valid @RequestBody CapitalRepairAuditRequest request){
         boolean result = capitalRepairService.audit(request);
         if (result) {
             return RestResponse.success(null, MessageUtils.get("msg.modify.success"));

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

@@ -40,12 +40,12 @@ public class CapitalRepair extends BaseEntity {
     /**
      * 项目编号
      */
-    private String projectCode;
+    private String code;
 
     /**
      * 项目名称
      */
-    private String projectName;
+    private String name;
 
     /**
      * 省编码
@@ -110,7 +110,7 @@ public class CapitalRepair extends BaseEntity {
     /**
      * 是否开启消息推送 0否 1是
      */
-    private Integer pushFlag;
+    private String pushFlag;
 
     /**
      * 区域ID

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

@@ -2,6 +2,9 @@ package cn.com.ty.lift.business.capital.dao.entity.model.request;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author bieao
  * @date 2020/2/4
@@ -13,10 +16,12 @@ public class CapitalRepairAuditRequest {
     /**
      * 是否通过(0:不通过，1:通过)
      */
+    @NotEmpty(message = "notEmpty")
     private String pass;
 
     /**
      * 大修项目id
      */
+    @NotNull(message = "notEmpty")
     private Long id;
 }

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

@@ -4,7 +4,6 @@ import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotNull;
 
 /**
  * @author bieao
@@ -15,8 +14,15 @@ import javax.validation.constraints.NotNull;
 @EqualsAndHashCode(callSuper = true)
 public class CapitalRepairRequest extends BaseRequestModel {
     /**
-     * 项目ID
+     * 项目名称
      */
-    @NotNull(message = "notEmpty")
-    private Long id;
+    private String name;
+    /**
+     * 项目名称
+     */
+    private String code;
+    /**
+     * 项目状态
+     */
+    private String status;
 }

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

@@ -2,7 +2,6 @@ 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.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;
 import org.apache.ibatis.annotations.Param;
@@ -14,6 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface CapitalRepairMapper extends BaseMapper<CapitalRepair> {
 
-    IPage<ProjectResponse> findByCondition(IPage<ProjectResponse> page, @Param("request") CapitalRepairRequest request);
+    IPage<CapitalRepair> findByCondition(IPage<CapitalRepair> page, @Param("request") CapitalRepairRequest request);
 
 }

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

@@ -4,17 +4,15 @@ import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
 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 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;
-import org.springframework.web.bind.annotation.RequestBody;
+
+import static cn.com.ty.lift.common.constants.CommonEnum.CapitalRepairStatus;
 
 /**
  * @author bieao
@@ -30,8 +28,14 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
      * @description 条件查询大修项目列表
      * @date 2020/2/3 11:38 上午
      */
-    public IPage<ProjectResponse> list(CapitalRepairRequest request) {
-        IPage<ProjectResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
+    public IPage<CapitalRepair> list(CapitalRepairRequest request) {
+        IPage<CapitalRepair> page = new Page<>(request.getPageNum(), request.getPageSize());
+        if (StrUtil.isNotEmpty(request.getName())) {
+            request.setName(StrUtil.format("%{}%", request.getName()));
+        }
+        if (StrUtil.isNotEmpty(request.getCode())) {
+            request.setCode(StrUtil.format("%{}%", request.getCode()));
+        }
         return baseMapper.findByCondition(page, request);
     }
 
@@ -74,7 +78,7 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
      * @description 大修审核
      * @date 2020/2/4 12:46 下午
      */
-    public boolean audit(@RequestBody CapitalRepairAuditRequest request) {
+    public boolean audit(CapitalRepairAuditRequest request) {
         CapitalRepair capitalRepair = new CapitalRepair();
         capitalRepair.setId(request.getId());
         capitalRepair.setStatus("0".equals(request.getPass()) ?

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/MetaHandler.java

@@ -54,7 +54,7 @@ public class MetaHandler implements MetaObjectHandler {
         if (ObjectUtil.isNotEmpty(userId)) {
             return Long.parseLong(Objects.toString(userId));
         }
-        return null;
+        return 10000L;
     }
 
     /**

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

@@ -0,0 +1,53 @@
+<?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.CapitalRepairMapper" >
+    <resultMap id="BaseResultMap" type="cn.com.ty.lift.business.capital.dao.entity.CapitalRepair" >
+        <id column="id" property="id" jdbcType="BIGINT" />
+        <result column="mt_company_id" property="mtCompanyId" jdbcType="BIGINT" />
+        <result column="pp_company_id" property="ppCompanyId" jdbcType="BIGINT" />
+        <result column="pp_contact_id" property="ppContactId" jdbcType="BIGINT" />
+        <result column="code" property="code" jdbcType="CHAR" />
+        <result column="name" property="name" jdbcType="VARCHAR" />
+        <result column="province_code" property="provinceCode" jdbcType="CHAR" />
+        <result column="province" property="province" jdbcType="VARCHAR" />
+        <result column="city_code" property="cityCode" jdbcType="CHAR" />
+        <result column="city" property="city" jdbcType="VARCHAR" />
+        <result column="district_code" property="districtCode" jdbcType="CHAR" />
+        <result column="district" property="district" jdbcType="VARCHAR" />
+        <result column="address" property="address" jdbcType="VARCHAR" />
+        <result column="num" property="num" jdbcType="INTEGER" />
+        <result column="actual_num" property="actualNum" jdbcType="INTEGER" />
+        <result column="start_date" property="startDate" jdbcType="DATE" />
+        <result column="end_date" property="endDate" jdbcType="DATE" />
+        <result column="status" property="status" jdbcType="TINYINT" />
+        <result column="push_flag" property="pushFlag" jdbcType="VARCHAR" />
+        <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" />
+        <result column="region_id" property="regionId" jdbcType="BIGINT" />
+    </resultMap>
+
+    <sql id="Base_Column_List" >
+        id, mt_company_id, pp_company_id, pp_contact_id, code, name, province_code, province,
+		city_code, city, district_code, district, address, num, actual_num, start_date, end_date,
+		status, push_flag, creator_id, create_date, update_id, update_date, region_id
+    </sql>
+
+    <select id="findByCondition" resultMap="BaseResultMap"
+            parameterType="cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairRequest" >
+        select
+        <include refid="Base_Column_List" />
+        from capital_repair
+        WHERE 1=1
+        <if test="request.status!=null and request.status!=''">
+            AND status = #{request.status,jdbcType=VARCHAR}
+        </if>
+        <if test="request.code!=null and request.code!=''">
+            AND code LIKE #{request.code,jdbcType=VARCHAR}
+        </if>
+        <if test="request.name!=null and request.name!=''">
+            AND name LIKE #{request.name,jdbcType=VARCHAR}
+        </if>
+    </select>
+</mapper>