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

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

@@ -83,4 +83,8 @@ public class MaintenanceAppResponse {
      * 保养状态
      */
     private String status;
+    /**
+     * 是否评价
+     */
+    private String hasEvaluate;
 }

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -144,7 +144,7 @@
 		</if>
 	</select>
 
-	<!--app端 保养任务列表 (0:待保养、-1:超期) -->
+	<!--app端 保养任务统计 (0:待保养、-1:超期) -->
 	<select id="countPlanByWorkerId" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenanceCount"
 			parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest">
 		SELECT t.plan_date,

lift-business-service/src/main/resources/mapper/maintenance/MaintenanceRecordMapper.xml

@@ -117,7 +117,8 @@
 		    mr.worker_id1       AS workerId1,
 			mr.plan_date        AS planDate,
 			mr.type             AS maintenanceType,
-			mr.status           AS status
+			mr.status           AS status,
+		    mr.has_evaluate     AS hasEvaluate
 		FROM maintenance_record mr
 		LEFT JOIN project p ON mr.project_id = p.id
 		LEFT JOIN lift l ON mr.lift_id = l.id
@@ -140,7 +141,7 @@
         </if>
 	</select>
 
-    <!--app端 保养任务列表 (1:保养中、2:已完成) -->
+    <!--app端 保养任务统计 (1:保养中、2:已完成) -->
     <select id="countRecordByWorkerId" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenanceCount"
             parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest">
         SELECT  t.plan_date,
@@ -152,7 +153,6 @@
                  count(1) total
         FROM maintenance_record mr
                 LEFT JOIN project p ON mr.project_id = p.id
-                LEFT JOIN project_user pu ON p.id = pu.project_id
                 LEFT JOIN lift l ON mr.lift_id = l.id
                 LEFT JOIN user_info ui ON mr.worker_id = ui.user_id
         WHERE mr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}

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

@@ -18,7 +18,7 @@ public class MybatisSqlUtils {
      */
     public String getPushUserInfoByUserId(Map<String, Object> params) {
         Long userId = (Long) params.get("userId");
-        StringBuilder sb = getPushUserInfoSql();
+        StringBuilder sb = getUserInfoOneSql();
         sb.append("and ua.user_id = ").append(userId);
         return sb.toString();
     }
@@ -101,7 +101,26 @@ public class MybatisSqlUtils {
         sql.append("left join user_info ui on ua.user_id = ui.user_id ");
         sql.append("left join user_role ur on ua.user_id = ur.user_id ");
         sql.append("left join role r on r.id = ur.role_id ");
-        sql.append("where 1 = 1 ");
+        sql.append("where true ");
+        return sql;
+    }
+
+    /**
+     * @param
+     * @return
+     * @description 获取单个用户信息sql
+     * @date 2020/5/4 10:49 上午
+     */
+    private static StringBuilder getUserInfoOneSql() {
+        StringBuilder sql = new StringBuilder();
+        sql.append("select ui.user_id as userId, ");
+        sql.append("ui.name as userName, ");
+        sql.append("ua.mobile as mobile, ");
+        sql.append("ua.device_model as deviceModel, ");
+        sql.append("ua.device_flag as deviceFlag ");
+        sql.append("from user_account ua ");
+        sql.append("left join user_info ui on ua.user_id = ui.user_id ");
+        sql.append("where true ");
         return sql;
     }
 

lift-push/src/main/java/cn/com/ty/lift/push/websocket/config/WebSocketConfig.java

@@ -33,7 +33,7 @@ public class WebSocketConfig implements WebSocketConfigurer {
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(new TimeyMessageHandler(timeyMessageService), "/myHandler")
+        registry.addHandler(new TimeyMessageHandler(timeyMessageService), "/myMessageHandler")
                 .setAllowedOrigins("*")
                 .addInterceptors(new WebSocketInterceptor());
     }

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

@@ -53,4 +53,9 @@ public class TeamInfoResponse {
      */
     private Integer userNum;
 
+    /**
+     * 团队管理者标识
+     */
+    private boolean managerFlag = false;
+
 }

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

@@ -266,6 +266,9 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         teamInfoResponse.setIsCertificated(maintenanceCompany.getIsCertificated());
         teamInfoResponse.setLogoImg(maintenanceCompany.getLogoImg());
         teamInfoResponse.setUserNum(maintenanceCompany.getUserNum());
+        if (maintenanceCompanyRequest.getUserId().equals(maintenanceCompany.getCreatorId())) {
+            teamInfoResponse.setManagerFlag(true);
+        }
         return RestResponse.success(teamInfoResponse, ApiConstants.RESULT_SUCCESS, "获取团队详情成功");
     }
 

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

@@ -76,6 +76,14 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
     @Transactional
     public RestResponse applyAudit(CompanyAttestationRequest companyAttestationRequest) {
         UserInfo userInfo = userInfoService.getByUserId(companyAttestationRequest.getUserId());
+        MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(companyAttestationRequest.getMtCompanyId());
+        if (maintenanceCompany == null) {
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "团队不存在不能发起认证");
+        }
+        //判断发起认证的人是否是团队创建者
+        if (!companyAttestationRequest.getUserId().equals(maintenanceCompany.getCreatorId())) {
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "当前用户不是团队管理者无法发起认证");
+        }
         MtCompanyAttestation mtCompanyAttestation = new MtCompanyAttestation(companyAttestationRequest);
         if (mtCompanyAttestation.getId() != null) {
             //如果用户是重新认证，获取认证对象
@@ -96,12 +104,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
                 mtCompanyAttestation.setCreateUser(userInfo.getName());
             }
         }
-
-        //获取公司信息，将公司信息设置为审核中状态
-        MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(companyAttestationRequest.getMtCompanyId());
-        if (maintenanceCompany == null) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "团队不存在不能发起认证");
-        }
+        //将公司信息设置为审核中状态
         maintenanceCompany.setIsCertificated(ApiConstants.CompanyConstants.MAINTENANCE_WAIT_CERTIFICATE);
         //设置公司审核信息为审核中
         mtCompanyAttestation.setIsCertificated(ApiConstants.CompanyConstants.MAINTENANCE_WAIT_CERTIFICATE);

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/PushUserService.java

@@ -62,7 +62,7 @@ public class PushUserService extends BaseServiceImpl<IPushUserMapper, PushUserIn
      * @date 2020/5/2 10:46 下午
      */
     public List<PushUserInfo> getCompanyUserInfoByRoleCode(Long companyId, String roleCode) {
-        return this.baseMapper.getPushUserInfoByRoleCodes(companyId, Arrays.asList(roleCode));
+        return this.baseMapper.getPushUserInfoByRoleCodes(companyId, Collections.singletonList(roleCode));
     }
 
     /**

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserApplicationService.java

@@ -412,7 +412,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
             //项目审核通过
             projectPass(userApplication);
         }
-        if (this.updateById(userApplication)) {
+        if (!this.updateById(userApplication)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "更新用户申请信息失败");
         }
@@ -427,7 +427,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
      */
     private void teamPassPushMessage(Long companyId, Long userId) {
         //获取区域主管信息
-        List<PushUserInfo> pushUserInfoList = pushUserService.getUserInfoByRoleCode(
+        List<PushUserInfo> pushUserInfoList = pushUserService.getCompanyUserInfoByRoleCode(companyId,
                 CommonEnum.DefaultRole.REGION_DIRECTOR.getCode());
         if (pushUserInfoList != null && pushUserInfoList.size() > 0) {
             //申请人