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

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

@@ -27,4 +27,9 @@ public class LiftExtendResponse extends Lift {
      * 项目关联id
      */
     private Long relevanceId;
+
+    /**
+     * 电梯品牌name
+     */
+    private String liftBrandName;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -914,7 +914,8 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
                 registrationCode = StrUtil.isNotEmpty(registrationCode) ? registrationCode.replace(illegalChars, "-") : "[电梯注册代码]";
                 useCompanyCode = useCompanyCode != null ? useCompanyCode : "未设置梯号";
                 //保养单及图片文件夹 dir/i.ProjectName-RegistrationCode/
-                String imgDir = StrUtil.format("{}{}.{}-{}", dir + File.separator, useCompanyCode, projectName, registrationCode + File.separator);
+                String imgDir = StrUtil.format("{}{}{}.{}-{}{}", dir, File.separator, useCompanyCode, projectName, registrationCode, File.separator);
+                new File(imgDir).mkdir();
                 //生成维保图片
                 List<MtRecordImg> mtRecordImgs = mtRecordResponse.getMtRecordImgs();
                 List<MtRecordImg> imgs = mtRecordImgs.stream().filter(img -> mtRecordResponse.getId().equals(img.getMtRecordId())).collect(Collectors.toList());

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

@@ -39,6 +39,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 /**
@@ -323,30 +324,31 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         //循环前端传过来的项目信息
         log.info("前端传过来的项目id" + projectIds);
         projectIds.forEach(projectId -> {
+            //用户当前是否存在项目中
+            AtomicBoolean hasUser = new AtomicBoolean(false);
             //查询项目用户关联表中是否有这个关联
-            for (ProjectUser projectUser : projectUsers) {
-                boolean existCompanyProject = projectId.equals(projectUser.getProjectId()) &&
-                        request.getMtCompanyId().equals(projectUser.getMtCompanyId());
-                //如果用户在公司项目下且有关联,就终止循环
-                if (existCompanyProject && newWorkerId.equals(projectUser.getUserId())) {
-                    break;
-                }
-                //如果用户不存在关联表中且用户应在项目中,就将用户放入待插入列表,并终止循环
-                if (existCompanyProject) {
-                    ProjectUser pu = new ProjectUser();
-                    pu.setProjectId(projectId);
-                    pu.setUserId(newWorkerId);
-                    pu.setMtCompanyId(request.getMtCompanyId());
-                    pu.setUserRole(CommonEnum.DefaultRole.MTWORK.getCode());
-                    pu.setCreatorId(10000L);
-                    pu.setUpdateId(10000L);
-                    insertProjectUsers.add(pu);
-                    break;
-                }
+            projectUsers.stream().
+                    filter(p -> projectId.equals(p.getProjectId()) && request.getMtCompanyId().equals(p.getMtCompanyId())).
+                    forEach(p -> {
+                        //如果存在项目中，且列表中有这个用户
+                        if (newWorkerId.equals(p.getUserId())) {
+                            hasUser.set(true);
+                        }
+                    });
+            //如果用户不存在关联表中且用户应在项目中,就将用户放入待插入列表,并终止循环
+            if ( !hasUser.get()) {
+                ProjectUser pu = new ProjectUser();
+                pu.setProjectId(projectId);
+                pu.setUserId(newWorkerId);
+                pu.setMtCompanyId(request.getMtCompanyId());
+                pu.setUserRole(CommonEnum.DefaultRole.MTWORK.getCode());
+                pu.setCreatorId(10000L);
+                pu.setUpdateId(10000L);
+                insertProjectUsers.add(pu);
             }
         });
         //批量保存项目用户关联信息
-        log.info("批量保存项目用户关联信息" + insertProjectUsers.size());
+        log.info("批量保存项目用户关联信息" + insertProjectUsers);
         if (insertProjectUsers.size() > 0) {
             if (!projectUserService.saveBatch(insertProjectUsers)) {
                 throw new BusinessBasicException("数据库保存失败");

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

@@ -15,6 +15,7 @@ import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResp
 import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
 import cn.com.ty.lift.business.push.service.PushUserService;
 import cn.com.ty.lift.common.base.ExportRequest;
+import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.ty.lift.common.constants.CommonEnum.ProjectStatus;
 import cn.com.ty.lift.common.constants.WebSocketConstants;
 import cn.com.ty.lift.common.model.PushMessage;
@@ -341,15 +342,15 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         LocalDate tomorrow = now.plus(1, ChronoUnit.DAYS);
         //如果项目开始时间在今天之后，项目状态设置成未开始
         if (startDate.isAfter(now)) {
-            project.setProjectStatus("1");
+            project.setProjectStatus(ProjectStatus.NOT_START.getCode());
         }
         //如果项目开始时间在明天之前，项目状态设置成服务中
         if (startDate.isBefore(tomorrow)) {
-            project.setProjectStatus("2");
+            project.setProjectStatus(ProjectStatus.IN_SERVICE.getCode());
         }
         //如果项目结束时间在今天之前，项目状态设置成逾期
-        if (endDate.isAfter(now)) {
-            project.setProjectStatus("3");
+        if (endDate.isBefore(now)) {
+            project.setProjectStatus(ProjectStatus.OVERDUE.getCode());
         }
     }
 

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -204,12 +204,14 @@
     <select id="queryById" resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftExtendResponse"
             parameterType="java.lang.Long">
         SELECT l.*,
+               lb.name AS liftBrandName,
                plr.id  AS relevanceId,
                plr.worker_id AS workerId,
                ui.name AS workerName
         FROM lift l
                  LEFT JOIN project_lift_relevance plr ON l.id = plr.lift_id
                  LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
+                 LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
         WHERE l.id = #{id,jdbcType=BIGINT}
           AND plr.project_id = #{projectId}
     </select>

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

@@ -97,6 +97,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
             //如果是申请，判断是否重复申请
             int companyAttestationCount = this.count(new QueryWrapper<MtCompanyAttestation>()
                     .eq("mt_company_id", companyAttestationRequest.getMtCompanyId())
+                    .ne("is_certificated", ApiConstants.CompanyConstants.MAINTENANCE_FAIL)
             );
             if (companyAttestationCount > 0) {
                 return RestResponse.fail(ApiConstants.RESULT_ERROR, "当前公司已经申请过了请勿重复申请");