Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/LiftDataService.java

@@ -63,8 +63,7 @@ public class LiftDataService {
         Map<Integer, List<Long>> liftStatusToNums = initLiftStatusToNums(liftDataRequest);
         //从redis中获取当前公司总的电梯信息
         List<LiftDataModel> companyTotalLiftDataList = getLiftDataModels(liftDataRequest);
-        //设置时间段
-        DataStatisticsUtil.setBeginYearToNow(liftDataRequest);
+        System.out.println(liftDataRequest.getStartTimeDate());
         //从redis中获取当前公司时间段之内的电梯信息
         List<LiftDataModel> liftDataModelList = getNewLiftData(companyTotalLiftDataList, liftDataRequest);
         if ((companyTotalLiftDataList != null && companyTotalLiftDataList.size() > 0)) {

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/util/DataStatisticsUtil.java

@@ -57,6 +57,26 @@ public class DataStatisticsUtil {
         return LocalDateTime.of(LocalDateTime.now().getYear(), 1, 1, 0, 0, 0);
     }
 
+    /**
+     * @param
+     * @return
+     * @description 获取当前年份的最开始的时间
+     * @date 2020/2/4 3:37 下午
+     */
+    public static LocalDateTime getYearFirstTime(int year) {
+        return LocalDateTime.of(year, 1, 1, 0, 0, 0);
+    }
+
+    /**
+     * @param
+     * @return
+     * @description 获取指定年的最后一天
+     * @date 2020/5/25 11:13 上午
+     */
+    public static LocalDateTime getYearLastTime(int year) {
+        return LocalDateTime.of(year, 12, 31, 0, 0, 0);
+    }
+
     /**
      * @param localDateTime 时间数据
      * @return
@@ -129,6 +149,19 @@ public class DataStatisticsUtil {
         commonRequest.setEndTimeDate(LocalDateTime.now());
     }
 
+    /**
+     * @param
+     * @return
+     * @description 给请求类设置年初到现在的时间
+     * @date 2020/2/7 3:51 下午
+     */
+    public static void setBeginYearToNow(int year, CommonRequest commonRequest) {
+        //年初时间
+        commonRequest.setStartTimeDate(getYearFirstTime(year));
+        //当前时间
+        commonRequest.setEndTimeDate(LocalDateTime.now());
+    }
+
     /**
      * @param bigDecimalValue
      * @return

lift-batch-service/src/main/resources/mapper/LiftDataMapper.xml

@@ -34,9 +34,6 @@
             true
         and
             pclr.mt_company_id = #{mtCompanyId}
-        <if test="startTimeDate != null and startTimeDate != ''">
-
-        </if>
     </select>
 
 </mapper>

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

@@ -11,7 +11,7 @@ import org.springframework.web.filter.CorsFilter;
  * @date 2019-12-10
  * @description
  */
-@Configuration
+//@Configuration
 public class CustomCORSConfiguration {
     private CorsConfiguration buildConfig(){
         CorsConfiguration corsConfiguration = new CorsConfiguration();
@@ -26,7 +26,7 @@ public class CustomCORSConfiguration {
     }
 
     // 添加CorsFilter拦截器，对任意的请求使用
-    @Bean
+    //@Bean
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", buildConfig());

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

@@ -1,5 +1,7 @@
 package cn.com.ty.lift.common.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.List;
 import java.util.Map;
 
@@ -68,6 +70,20 @@ public class MybatisSqlUtils {
         return sql.toString();
     }
 
+    /**
+     * @param
+     * @return
+     * @description 申请公司列表
+     * @date 2020/5/25 2:59 下午
+     */
+    public String getApplyCompanyList(Map<String, Object> params) {
+        int isCertificated = (int) params.get("isCertificated");
+        return "select mc.name as companyName, mc.id as companyId " +
+                "from maintenance_company mc left join mt_company_attestation mca " +
+                "on mc.id = mca.mt_company_id " +
+                "where mca.is_certificated = " + isCertificated;
+    }
+
     /**
      * @param list 要拼接的list
      * @description 拼接语句

lift-system-service/src/main/java/cn/com/ty/lift/system/SystemApplication.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 @EnableFeignClients
 @MapperScan("cn.com.ty.**.mapper")
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})
-@CrossOrigin
+//@CrossOrigin
 @EnableRedisHttpSession
 @EnableRedisRepositories
 public class SystemApplication {

lift-system-service/src/main/java/cn/com/ty/lift/system/config/CustomCORSConfiguration.java

@@ -11,7 +11,7 @@ import org.springframework.web.filter.CorsFilter;
  * @date 2019-12-10
  * @description
  */
-@Configuration
+//@Configuration
 public class CustomCORSConfiguration {
     private CorsConfiguration buildConfig(){
         CorsConfiguration corsConfiguration = new CorsConfiguration();
@@ -23,7 +23,7 @@ public class CustomCORSConfiguration {
     }
 
     // 添加CorsFilter拦截器，对任意的请求使用
-    @Bean
+    //@Bean
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", buildConfig());

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/controller/CompanyAttestationController.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.system.settings.controller;
 
 import cn.com.ty.lift.system.settings.dao.entity.model.CompanyAttestationRequest;
+import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
 import cn.com.ty.lift.system.settings.service.IMtCompanyAttestationService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +23,17 @@ public class CompanyAttestationController {
     @Resource
     private IMtCompanyAttestationService companyAttestationService;
 
+    /**
+     * @param
+     * @return
+     * @description 获取认证公司数据
+     * @date 2020/5/25 2:28 下午
+     */
+    @RequestMapping("/applyCompanyList")
+    public RestResponse applyCompanyList(@RequestBody MaintenanceCompanyRequest maintenanceCompanyRequest) {
+        return companyAttestationService.applyCompanyList(maintenanceCompanyRequest);
+    }
+
     /**
      * @param
      * @return
@@ -68,7 +80,7 @@ public class CompanyAttestationController {
 
     /**
      * @param companyAttestationRequest id:认证信息id，mtCompanyId:企业id
-     * @return
+     * @returnØ
      * @description 认证不通过
      * @date 2019-12-12 15:25
      */

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/CompanyAttestationRequest.java

@@ -19,6 +19,10 @@ public class CompanyAttestationRequest {
      * 团队编号
      */
     private Long mtCompanyId;
+    /**
+     * 查找团队id
+     */
+    private Long queryCompanyId;
     /**
      * 用户id
      */

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/MaintenanceCompanyRequest.java

@@ -26,6 +26,7 @@ public class MaintenanceCompanyRequest {
     private String userName;//用户名称
     private String menuIds;//菜单id集合
     private String provinceCode;//省份编码
+    private Integer isCertificated;
     private int pageSize;//每页的条数
     private int pageNum;//第几页
 

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/MaintenanceCompanyResponse.java

@@ -1,9 +1,20 @@
 package cn.com.ty.lift.system.settings.dao.entity.model;
 
+import lombok.Data;
+
 /**
  * @author huangyuan
  * @date 2019-12-11
  * @description 维保公司相应类
  */
+@Data
 public class MaintenanceCompanyResponse {
+    /**
+     * 公司id
+     */
+    private String companyId;
+    /**
+     * 公司名称
+     */
+    private String companyName;
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/mapper/MtCompanyAttestationMapper.java

@@ -1,7 +1,15 @@
 package cn.com.ty.lift.system.settings.dao.mapper;
 
+import cn.com.ty.lift.common.utils.MybatisSqlUtils;
 import cn.com.ty.lift.system.settings.dao.entity.MtCompanyAttestation;
+import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
+import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +20,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2019-12-12
  */
 public interface MtCompanyAttestationMapper extends BaseMapper<MtCompanyAttestation> {
-
+    /**
+     * @param
+     * @return
+     * @description 获取认证公司信息
+     * @date 2020/5/25 2:39 下午
+     */
+    @SelectProvider(type = MybatisSqlUtils.class, method = "getApplyCompanyList")
+    List<MaintenanceCompanyResponse> applyCompanyList(@Param("isCertificated") int isCertificated);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/IMtCompanyAttestationService.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.system.settings.service;
 
 import cn.com.ty.lift.system.settings.dao.entity.MtCompanyAttestation;
 import cn.com.ty.lift.system.settings.dao.entity.model.CompanyAttestationRequest;
+import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -67,4 +68,12 @@ public interface IMtCompanyAttestationService extends IService<MtCompanyAttestat
      * @date 2020/2/19 2:15 下午
      */
     Map<Long, LocalDateTime> getMtCompanyIdToDealTime(List<Long> companyIdList);
+
+    /**
+     * @param
+     * @return
+     * @description
+     * @date 2020/5/25 2:29 下午
+     */
+    RestResponse applyCompanyList(MaintenanceCompanyRequest maintenanceCompanyRequest);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MtCompanyAttestationServiceImpl.java

@@ -10,6 +10,8 @@ import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.dao.entity.MtCompanyAttestation;
 import cn.com.ty.lift.system.settings.dao.entity.model.CompanyAttestationRequest;
 import cn.com.ty.lift.system.settings.dao.entity.model.CompanyAttestationResponse;
+import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
+import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyResponse;
 import cn.com.ty.lift.system.settings.dao.mapper.MtCompanyAttestationMapper;
 import cn.com.ty.lift.system.settings.service.GlobalSetService;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
@@ -48,6 +50,9 @@ import java.util.Map;
 @Service
 public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttestationMapper, MtCompanyAttestation> implements IMtCompanyAttestationService {
 
+    @Resource
+    private MtCompanyAttestationMapper mtCompanyAttestationMapper;
+
     @Resource
     private IMaintenanceCompanyService maintenanceCompanyService;
 
@@ -57,9 +62,6 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
     @Resource
     private IMenuService menuService;
 
-    @Resource
-    private IRoleMenuService roleMenuService;
-
     @Resource
     private GlobalSetService globalSetService;
 
@@ -201,6 +203,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
                 .eq(currentUserId != null, "customer_manager_id", currentUserId)
                 //通过审核状态筛选申请信息
                 .eq("is_certificated", companyAttestationRequest.getIsCertificated())
+                .eq(companyAttestationRequest.getQueryCompanyId() != null, "mt_company_id", companyAttestationRequest.getQueryCompanyId())
                 .and(StringUtils.isNotBlank(companyAttestationRequest.getQueryCondition()), i -> i
                         .like("contacts_name", companyAttestationRequest.getQueryCondition())
                         .or()
@@ -274,6 +277,13 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
         return companyIdToDealTime;
     }
 
+    @Override
+    public RestResponse applyCompanyList(MaintenanceCompanyRequest maintenanceCompanyRequest) {
+        List<MaintenanceCompanyResponse> maintenanceCompanyResponseList = mtCompanyAttestationMapper
+                .applyCompanyList(maintenanceCompanyRequest.getIsCertificated());
+        return RestResponse.success(maintenanceCompanyResponseList, ApiConstants.RESULT_SUCCESS, "获取成功");
+    }
+
     /**
      * @param
      * @return

lift-system-service/src/main/resources/mapper/UserAccountMapper.xml

@@ -73,13 +73,14 @@
     </sql>
 
     <!-- 查询物业用户列表 -->
-    <select id="getProjectUserList" parameterType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUser"
+    <select id="getProjectUserList" parameterType="cn.com.ty.lift.system.user.dao.entity.model.PropertyUserRequest"
             resultType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUser">
         select
         project_id as projectId,
         user_id as userId,
         user_role as userRole
         <include refid="projectUserQueryCondition"/>
+        limit #{pageNum}, #{pageSize}
     </select>
 
     <!-- 查询物业用户条数 -->