[chg]项目查询列表查询sql和返回字段修改

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractService.java

@@ -9,15 +9,14 @@ import cn.com.ty.lift.business.contract.dao.mapper.ContractsMapper;
 import cn.com.ty.lift.business.framework.BusinessBasicException;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -79,7 +78,7 @@ public class ContractService {
     public RestResponse add(Contracts contracts) {
         if (contracts.getNextId() == null) {
             //按当前日期时间戳自动生成合同编号
-            String contractId = DateUtil.format(new Date(), "yyyyMMddHHmmssSSS");
+            String contractId = DateUtils.generateCode();
             contracts.setNextId(Long.parseLong(contractId));
         }
         int result = contractsMapper.insert(contracts);

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -19,7 +19,6 @@ import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -149,8 +148,9 @@ public class LiftService {
             return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));*/
         //新增电梯表
         Lift lift = request.getLift();
-        //生成电梯编号
-        lift.setLiftCode(IdWorker.getIdStr());
+        //按当前日期时间戳自动生成电梯编号
+        String liftCode = DateUtils.generateCode();
+        lift.setLiftCode("DT" + liftCode);
         int liftResult = liftMapper.insert(lift);
         if (liftResult == 0) {
             return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));

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

@@ -25,6 +25,10 @@ public class ProjectRequest {
      * 区域id
      */
     private Long regionId;
+    /**
+     * 区域主管
+     */
+    private Long userId;
     /**
      * 项目名称、项目编号、甲方名称、项目地址
      */

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

@@ -2,8 +2,6 @@ package cn.com.ty.lift.business.project.dao.entity.model;
 
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @author bieao
  * @date 2019/11/29
@@ -40,21 +38,38 @@ public class ProjectResponse {
      */
     private Integer num;
     /**
-     * 系统台量
+     * 系统台量（实际台量）
      */
     private Integer actualNum;
     /**
      * 项目地址
      */
     private String address;
+    /**
+     * 项目用途
+     */
+    private String projectUsage;
+    /**
+     * 区域名称
+     */
+    private String regionName;
+    /**
+     * 区域主管
+     */
+    private String userName;
     /**
      * 开始时间
      */
-    private Date startDate;
+    private String startDate;
     /**
      * 结束时间
      */
-    private Date endDate;
+    private String endDate;
+
+    /**
+     * 甲方公司名称
+     */
+    private String companyName;
 
     /**
      * 联系人姓名

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

@@ -16,10 +16,10 @@ import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.RedisConstants;
 import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.ty.lift.common.model.AreaCode;
+import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -163,7 +163,9 @@ public class ProjectService {
      * @date 2019/11/27 2:22 PM
      */
     public RestResponse add(Project project) {
-        project.setProjectCode(IdWorker.getIdStr());
+        //按当前日期时间戳自动生成项目编号
+        String projectCode = DateUtils.generateCode();
+        project.setProjectCode("XM" + projectCode);
         int result = projectMapper.insert(project);
         if (result > 0) {
             return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.add.success"));

lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -41,20 +41,27 @@
 
 	<!-- 根据省，市，区，区域，区域主管，项目名称、项目编号、甲方名称、项目地址查询项目管理列表-->
 	<select id="findByCondition" resultType="cn.com.ty.lift.business.project.dao.entity.model.ProjectResponse" parameterType="cn.com.ty.lift.business.project.dao.entity.model.ProjectRequest" >
-		SELECT
-		id as projectId,
-		project_code as projectCode,
-		project_name as projectName,
-		province as province,
-		city as city,
-		district as district,
-		num as num,
-		actual_num as actualNum,
-		address as address,
-		start_date as startDate,
-		end_date as endDate
-		FROM project
-		WHERE 1=1
+        SELECT
+        p.id            as projectId,
+        p.project_code  as projectCode,
+        p.project_name  as projectName,
+        p.project_usage as projectUsage,
+        p.province      as province,
+        p.city          as city,
+        p.district      as district,
+        p.num           as num,
+        p.actual_num    as actualNum,
+        p.address       as address,
+        p.start_date    as startDate,
+        p.end_date      as endDate,
+        r.area_name     as regionName,
+        ui.name         as userName,
+        pc.name         as companyName
+        FROM project p
+        LEFT JOIN region r ON p.region_id = r.id
+        LEFT JOIN user_info ui ON r.user_id = ui.user_id
+        LEFT JOIN property_company pc ON p.pp_company_id = pc.id
+        WHERE 1 = 1
 		<if test="request.provinceCode!=null and request.provinceCode!=''">
 			and province_code= #{request.provinceCode,jdbcType=VARCHAR}
 		</if>
@@ -65,8 +72,11 @@
 			and district_code = #{request.districtCode,jdbcType=VARCHAR}
 		</if>
 		<if test="request.regionId!=null and request.regionId!=''">
-			and region_id = #{request.regionId,jdbcType=VARCHAR}
+			and region_id = #{request.regionId,jdbcType=BIGINT}
 		</if>
+        <if test="request.userId!=null and request.userId!=''">
+            and r.user_id = #{request.userId,jdbcType=BIGINT}
+        </if>
 		<if test="request.condition!=null and request.condition!=''">
 			and (project_name like #{request.condition,jdbcType=VARCHAR}
 			or project_code like #{request.condition,jdbcType=VARCHAR}

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

@@ -1,6 +1,8 @@
 package cn.com.ty.lift.common.utils;
 
 
+import cn.hutool.core.date.DateUtil;
+
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -21,4 +23,13 @@ public class DateUtils {
         ZonedDateTime zonedDateTime = localDate.atStartOfDay(ZoneId.systemDefault());
         return Date.from(zonedDateTime.toInstant());
     }
+
+    /**
+     * 生成当前时间的年月日时分秒毫秒微秒
+     *
+     * @return
+     */
+    public static String generateCode() {
+        return DateUtil.format(new Date(), "yyyyMMddHHmmssSSS");
+    }
 }