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

lift-batch-service/src/main/java/cn/com/ty/lift/batch/config/AppletDataSchedulingConfig.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.batch.config;
 import cn.com.ty.lift.batch.applet.util.DataInitUtil;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 
 import javax.annotation.Resource;
 
@@ -19,7 +20,7 @@ public class AppletDataSchedulingConfig {
     private DataInitUtil dataInitUtil;
 
     //定时刷新redis中的数据，每天凌晨两点执行
-    //@Scheduled(cron = "0 0 2 * * ?")
+    @Scheduled(cron = "0 0 2 * * ?")
     public void flushRedisCacheData(){
         dataInitUtil.initAppletData();
     }

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

@@ -24,6 +24,7 @@ import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.ty.lift.common.utils.MapHelper;
 import cn.com.ty.lift.common.verify.VerifyUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -151,19 +152,22 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         if (ObjectUtil.isEmpty(project)) return false;
         //项目结束时间默认增加三个月
         LocalDate endDate = project.getEndDate().plusMonths(3);
-        //获取当前的保养时间
-        LocalDate currentTime = LocalDate.now();
         //获取当前期数
         Integer periods = request.getPeriods();
         //获取当前电梯的保养间隔
         ProjectLiftRelevance entry = projectLiftRelevanceService.getOne(mtCompanyId, liftId);
         if (ObjectUtil.isEmpty(entry)) return false;
         int interval = entry.getPlanInterval();
-        List<MaintenancePlan> planList = maintenancePlanService.findPlanList(liftId, projectId, mtCompanyId, currentTime);
+        List<MaintenancePlan> planList = maintenancePlanService.findPlanList(liftId, projectId, mtCompanyId, request.getCurrentTime());
         //获取当前时间后的维保计划列表，并清除计划
         maintenancePlanService.removeByIds(planList.stream().map(MaintenancePlan::getId).collect(Collectors.toList()));
         //按照修改时间重新生成计划
-        List<MaintenancePlan> plans = maintenancePlanService.generatePlan(plan, periods, interval, currentTime, endDate);
+        List<MaintenancePlan> plans = maintenancePlanService.generatePlan(plan, periods, interval, request.getCurrentTime(), endDate);
+        for (MaintenancePlan p : plans) {
+            if (request.getCurrentTime().equals(p.getPlanDate())) {
+                p.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.MAINTENANCE_DOING.getCode()));
+            }
+        }
         return maintenancePlanService.saveBatch(plans, plans.size());
     }
 
@@ -180,6 +184,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         Long mtCompanyId = record.getMtCompanyId();
         Long workerId = record.getWorkerId();
         Long liftId = record.getLiftId();
+        request.setCurrentTime(LocalDate.now());
         //校验电梯是否定位
         String liftCoordinate = getCoordinate(liftId);
         if (StrUtil.isEmpty(liftCoordinate)) return RestResponse.fail(MessageUtils.get("msg.lift.not.position"));
@@ -196,10 +201,22 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         boolean result = calc(liftCoordinate, coordinate);
         if (result)
             return RestResponse.fail(MessageUtils.get("msg.error.person.scope"));
-        //若提前保养，需要修改维保计划
-        boolean modifyPlan = modifyPlan(request);
-        if (!modifyPlan){
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        MaintenancePlan plan = maintenancePlanService.getOne(record.getMtPlanId());
+        if (ObjectUtil.isEmpty(plan)) return RestResponse.fail(MessageUtils.get("msg.maintenance.plan.not.exist"));
+        //若保养时间在计划时间之前，则需要修改维保计划
+        boolean compareResult = request.getCurrentTime().isBefore(plan.getPlanDate());
+        if (compareResult) {
+            boolean modifyPlan = modifyPlan(request);
+            if (!modifyPlan) {
+                return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+            }
+        } else {
+            plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.MAINTENANCE_DOING.getCode()));
+            boolean planResult = maintenancePlanService.updateById(plan);
+            if (!planResult) {
+                rollback();
+                return RestResponse.fail(MessageUtils.get("msg.add.fail"));
+            }
         }
         Optional<Lift> lift = liftService.getOne(null, liftId);
         if (lift.isPresent()) {
@@ -209,20 +226,12 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             record.setStatus(CommonEnum.MaintenanceRecordStatus.MAINTENANCE_DOING.getCode());
             record.setWorkerId1(record.getWorkerId1());
             record.setWorkDate(LocalDate.now());
-            MaintenancePlan plan = maintenancePlanService.getOne(record.getMtPlanId());
-            if (ObjectUtil.isEmpty(plan)) return RestResponse.fail(MessageUtils.get("msg.add.fail"));
             record.setPlanDate(plan.getPlanDate());
             boolean ret = save(record);
             if (!ret) {
                 rollback();
                 return RestResponse.fail(MessageUtils.get("msg.add.fail"));
             }
-            plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.MAINTENANCE_DOING.getCode()));
-            boolean planResult = maintenancePlanService.updateById(plan);
-            if (!planResult){
-                rollback();
-                return RestResponse.fail(MessageUtils.get("msg.add.fail"));
-            }
         } else {
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         }

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

@@ -22,6 +22,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * @author bieao
@@ -60,7 +61,7 @@ public class ProjectController {
      * @description 获取物业端数据接口
      * @date 2020/5/11 10:21 上午
      */
-    @PostMapping("/propertyList")
+    @PostMapping("propertyList")
     public RestResponse propertyList(@RequestBody ProjectRequest request) {
         IPage<Project> page = projectService.propertyList(request);
         return RestResponse.success(page, "获取项目列表成功");
@@ -130,6 +131,19 @@ public class ProjectController {
         return RestResponse.success(resultMap, MessageUtils.get("msg.query.detail.success"));
     }
 
+    /**
+     * @param projectRequest 项目id
+     * @return 项目详情
+     * @description
+     * @date 2020/5/13 8:57 上午
+     */
+    @PostMapping("propertyDetail")
+    @Validation(fields = {"id"})
+    public RestResponse propertyDetail(@Val @RequestBody ProjectRequest projectRequest) {
+        Optional<Project> project = projectService.getOne(projectRequest.getId());
+        return RestResponse.success(project, "获取项目详情成功");
+    }
+
     /**
      * @param request 新增项目数据项
      * @return 1.成功, 0.失败, 消息描述

lift-business-service/src/main/resources/locale/response.properties

@@ -34,5 +34,6 @@ msg.record.not.exist=\u4FDD\u517B\u5355\u4E0D\u5B58\u5728
 msg.lift.not.exist=\u7535\u68AF\u4E0D\u5B58\u5728
 msg.project.not.exist=\u9879\u76EE\u4E0D\u5B58\u5728
 msg.contract.not.exist=\u5408\u540C\u4E0D\u5B58\u5728
+msg.maintenance.plan.not.exist=\u7EF4\u4FDD\u8BA1\u5212\u4E0D\u5B58\u5728
 msg.capital.not.sign.record=\u8BE5\u9879\u76EE\u8FD8\u6CA1\u6709\u7B7E\u5230\u8BB0\u5F55
 msg.longitude.error=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u7ECF\u7EAC\u5EA6

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

@@ -73,12 +73,26 @@
 		LEFT JOIN platform_company_lift_relevance pclr ON plr.mt_company_id = pclr.mt_company_id AND plr.lift_id = pclr.lift_id
 		LEFT JOIN lift l ON plr.lift_id = l.id
 		LEFT JOIN project p ON plr.mt_company_id = p.mt_company_id AND plr.project_id = p.id
-		LEFT JOIN maintenance_plan mp ON plr.mt_company_id = mp.mt_company_id AND plr.project_id = mp.project_id
-		AND mp.status = 0 AND mp.plan_date = (SELECT MIN(plan_date) FROM maintenance_plan WHERE status = 0
-		AND mt_company_id = #{request.mtCompanyId,jdbcType=VARCHAR} AND lift_id = plr.lift_id) AND plr.lift_id = mp.lift_id
-		LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
-		LEFT JOIN region r ON p.region_id = r.id
-		WHERE plr.mt_company_id = #{request.mtCompanyId,jdbcType=VARCHAR}
+			LEFT JOIN (
+		SELECT 	MIN(m.plan_date) plan_date,
+				m.lift_id,
+				m.id
+		FROM maintenance_plan m
+				  LEFT JOIN project_lift_relevance p ON m.mt_company_id = p.mt_company_id
+			AND p.project_id = m.project_id
+			AND m.lift_id = p.lift_id
+		WHERE m.STATUS = 0
+			AND m.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
+		GROUP BY m.lift_id
+		) lmp ON lmp.lift_id = plr.lift_id
+				LEFT JOIN maintenance_plan mp ON plr.mt_company_id = mp.mt_company_id
+		AND plr.project_id = mp.project_id
+		AND mp.STATUS = 0
+		AND mp.plan_date = lmp.plan_date
+		AND plr.lift_id = mp.lift_id
+				LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
+				LEFT JOIN region r ON p.region_id = r.id
+		WHERE plr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
 		AND pclr.lift_company_status != '1'
 		<if test="request.projectId!=null and request.projectId > 0">
 			AND p.id = #{request.projectId,jdbcType=BIGINT}
@@ -96,12 +110,12 @@
 			AND <![CDATA[mp.plan_date > #{request.beginTime}]]>
 		</if>
 		<if test="request.endTime!=null">
-			AND <![CDATA[mp.plan_date < #{request.endTime,jdbcType=VARCHAR}]]>
+			AND <![CDATA[mp.plan_date < #{request.endTime}]]>
 		</if>
 		<if test="request.registrationCode!=null and request.registrationCode!=''">
 			AND l.registration_code LIKE #{request.registrationCode,jdbcType=VARCHAR}
 		</if>
-		ORDER BY plan_date
+		ORDER BY planDate
 	</select>
 
 	<select id="queryPlanListByIds" parameterType="java.util.Map" resultMap="BaseResultMap">

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

@@ -121,12 +121,20 @@
 		    mr.has_evaluate     AS hasEvaluate
 		FROM maintenance_record mr
 		LEFT JOIN project p ON mr.project_id = p.id
+        <if test="request.currentRoleCode == 'REGION_DIRECTOR' ">
+            LEFT JOIN project_user pu ON p.id = pu.project_id
+        </if>
 		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}
-		<if test="request.userId!=null">
-			AND mr.worker_id1 = #{request.userId,jdbcType=BIGINT}
-		</if>
+        <choose>
+            <when test="request.userId > 0 and request.currentRoleCode == 'REGION_DIRECTOR' ">
+                AND pu.user_id = #{request.userId,jdbcType=BIGINT}
+            </when>
+            <otherwise>
+                AND mr.worker_id1 = #{request.userId,jdbcType=BIGINT}
+            </otherwise>
+        </choose>
 		<if test="request.status!=null and request.status!=''">
 			AND mr.status = #{request.status,jdbcType=VARCHAR}
 		</if>
@@ -153,12 +161,20 @@
                  count(1) total
         FROM maintenance_record mr
                 LEFT JOIN project p ON mr.project_id = p.id
+                <if test="request.currentRoleCode == 'REGION_DIRECTOR' ">
+                    LEFT JOIN project_user pu ON p.id = pu.project_id
+                </if>
                 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}
-        <if test="request.userId!=null">
-            AND mr.worker_id1 = #{request.userId,jdbcType=BIGINT}
-        </if>
+        <choose>
+            <when test="request.userId > 0 and request.currentRoleCode == 'REGION_DIRECTOR' ">
+                AND pu.user_id = #{request.userId,jdbcType=BIGINT}
+            </when>
+            <otherwise>
+                AND mr.worker_id1 = #{request.userId,jdbcType=BIGINT}
+            </otherwise>
+        </choose>
         <if test="request.beginTime!=null">
             AND <![CDATA[ mr.plan_date >= #{request.beginTime}]]>
         </if>

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

@@ -243,7 +243,7 @@ public class CommonConstants {
          * 9.年检完成电梯
          */
         int[] LIFT_STATUS_ARRAY = {
-                1, 2, 3,
+                -1, 1, 2, 3,
                 4, 5, 6,
                 7, 8, 9
         };

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

@@ -8,7 +8,6 @@ import cn.com.ty.lift.system.homepage.dao.mapper.CommonDataMapper;
 import cn.com.ty.lift.system.homepage.dao.model.*;
 import cn.com.ty.lift.system.utils.CommonUtil;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -102,8 +101,6 @@ public class PlatformCalendarService {
         //时间转化
         CommonUtil.setMonthDate(platformCalendarRequest);
         Map<Integer, Map<Integer, List<CalendarLiftDataModel>>> dayToCalendarLift = new HashMap<>();
-        //获取维保记录数据,并将维保记录数据转化为 天 -> 维保记录(电梯id -> 维保记录)
-        Map<Integer, Map<Long, List<MtRecordDataModel>>> dayToMtRecord = getDayToMtRecord(platformCalendarRequest);
         //获取维保计划,并将维保计划信息转化为 天 -> 维保计划(电梯id -> 维保计划)
         Map<Integer, Map<Long, List<MtPlanDataModel>>> dayToMtPlan = getDayToMtPlan(platformCalendarRequest);
         //获取急修记录,并将急修记录转化为 天 -> 急修数据(电梯id -> 急修数据)
@@ -117,7 +114,7 @@ public class PlatformCalendarService {
                 platformCalendarRequest.getRequestDateStr(), CommonConstants.PlatformCalendarConstants.REQUEST_DATE_FORMAT);
         //循环设置每日的数据
         for (int day = 1; day <= monthDayNum; day++) {
-            addCalendarLift(dayToCalendarLift, dayToMtRecord, dayToMtPlan, dayToEmergencyRecord, dayToAnnualInspection, day);
+            addCalendarLift(dayToCalendarLift, dayToMtPlan, dayToEmergencyRecord, dayToAnnualInspection, day);
         }
         return dayToCalendarLift;
     }
@@ -129,12 +126,9 @@ public class PlatformCalendarService {
      * @date 2020/2/21 3:05 下午
      */
     private void addCalendarLift(Map<Integer, Map<Integer, List<CalendarLiftDataModel>>> dayToCalendarLift,
-                                 Map<Integer, Map<Long, List<MtRecordDataModel>>> dayToMtRecord,
                                  Map<Integer, Map<Long, List<MtPlanDataModel>>> dayToMtPlan,
                                  Map<Integer, Map<Long, List<EmergencyRecordDataModel>>> dayToEmergencyRecord,
                                  Map<Integer, Map<Long, List<AnnualInspectionDataModel>>> dayToAnnualInspection, int day) {
-        //获取每天的维保记录数据
-        Map<Long, List<MtRecordDataModel>> liftIdToMtRecord = dayToMtRecord.get(day);
         //获取每天的维保计划数据
         Map<Long, List<MtPlanDataModel>> liftIdToMtPlan = dayToMtPlan.get(day);
         //获取每天的急修记录数据
@@ -142,8 +136,7 @@ public class PlatformCalendarService {
         //获取每天的年检记录数据
         Map<Long, List<AnnualInspectionDataModel>> liftIdToAnnualInspection = dayToAnnualInspection.get(day);
         //获取电梯id集合
-        Set liftIdSet = getLiftIdSet(liftIdToMtRecord, liftIdToMtPlan, liftIdToEmergencyRecord,
-                liftIdToAnnualInspection);
+        Set liftIdSet = getLiftIdSet(liftIdToMtPlan, liftIdToEmergencyRecord, liftIdToAnnualInspection);
         //状态 -> 电梯列表
         Map<Integer, List<CalendarLiftDataModel>> statusToCalendarLift = new HashMap<>();
         if (liftIdSet.size() > 0) {
@@ -151,7 +144,7 @@ public class PlatformCalendarService {
             liftIdSet.forEach(liftId -> {
                 long liftIdLong = Long.parseLong(liftId.toString());
                 //封装维保的电梯信息
-                addMaintenanceStatusLift(liftIdToMtRecord, liftIdToMtPlan, calendarLiftDataModelList, liftIdLong);
+                addMaintenanceStatusLift(liftIdToMtPlan, calendarLiftDataModelList, liftIdLong);
                 //封装急修信息
                 addEmergencyStatusLift(liftIdToEmergencyRecord, calendarLiftDataModelList, liftIdLong);
                 //封装年检信息
@@ -207,48 +200,38 @@ public class PlatformCalendarService {
      * @description 封装维保的电梯信息
      * @date 2020/2/21 2:55 下午
      */
-    private void addMaintenanceStatusLift(Map<Long, List<MtRecordDataModel>> liftIdToMtRecord,
-                                          Map<Long, List<MtPlanDataModel>> liftIdToMtPlan,
+    private void addMaintenanceStatusLift(Map<Long, List<MtPlanDataModel>> liftIdToMtPlan,
                                           List<CalendarLiftDataModel> calendarLiftDataModelList,
                                           Long liftId) {
-        if (liftIdToMtRecord != null) {
-            //获取保养记录数据
-            List<MtRecordDataModel> mtRecordDataModelList = liftIdToMtRecord.get(liftId);
-            if (mtRecordDataModelList != null && mtRecordDataModelList.size() > 0) {
-                MtRecordDataModel mtRecordDataModel = mtRecordDataModelList.get(0);
+        if (liftIdToMtPlan != null) {
+            //获取保养计划数据
+            List<MtPlanDataModel> mtPlanDataModelList = liftIdToMtPlan.get(liftId);
+            if (mtPlanDataModelList != null && mtPlanDataModelList.size() > 0) {
+                MtPlanDataModel mtPlanDataModel = mtPlanDataModelList.get(0);
                 CalendarLiftDataModel calendarLiftDataModel = new CalendarLiftDataModel(
-                        mtRecordDataModel.getLiftId(), mtRecordDataModel.getProjectName(),
-                        mtRecordDataModel.getRegistrationCode(), mtRecordDataModel.getLiftCode(),
-                        mtRecordDataModel.getWorkerName());
+                        mtPlanDataModel.getLiftId(), mtPlanDataModel.getProjectName(),
+                        mtPlanDataModel.getRegistrationCode(), mtPlanDataModel.getLiftCode(),
+                        mtPlanDataModel.getWorkerName());
                 //默认是维保已完成
                 calendarLiftDataModel.setMaintenanceStatus(3);
-                if (StringUtils.isNotBlank(mtRecordDataModel.getStatus())) {
-                    switch (mtRecordDataModel.getStatus()) {
-                        case "-2":
-                        case "-1":
-                        case "0":
+                if (mtPlanDataModel.getStatus() != null) {
+                    switch (mtPlanDataModel.getStatus()) {
+                        case 0:
+                            //待完成
                             calendarLiftDataModel.setMaintenanceStatus(1);
                             break;
-                        case "1":
+                        case 2:
+                            //维保中
                             calendarLiftDataModel.setMaintenanceStatus(2);
                             break;
+                        case -1:
+                            calendarLiftDataModel.setMaintenanceStatus(-1);
+                            break;
                     }
                 }
                 calendarLiftDataModelList.add(calendarLiftDataModel);
             }
-        } else if (liftIdToMtPlan != null) {
-            //获取保养计划数据
-            List<MtPlanDataModel> mtPlanDataModelList = liftIdToMtPlan.get(liftId);
-            if (mtPlanDataModelList != null && mtPlanDataModelList.size() > 0) {
-                //有计划 则说明有待保养的电梯
-                MtPlanDataModel mtPlanDataModel = mtPlanDataModelList.get(0);
-                CalendarLiftDataModel calendarLiftDataModel = new CalendarLiftDataModel(
-                        mtPlanDataModel.getLiftId(), mtPlanDataModel.getProjectName(),
-                        mtPlanDataModel.getRegistrationCode(), mtPlanDataModel.getLiftCode(),
-                        mtPlanDataModel.getWorkerName());
-                calendarLiftDataModel.setMaintenanceStatus(1);
-                calendarLiftDataModelList.add(calendarLiftDataModel);
-            }
+
         }
     }
 
@@ -405,13 +388,11 @@ public class PlatformCalendarService {
      * @description 获取电梯id集合
      * @date 2020/2/21 1:16 下午
      */
-    private Set getLiftIdSet(Map<Long, List<MtRecordDataModel>> liftIdToMtRecord,
-                                   Map<Long, List<MtPlanDataModel>> liftIdToMtPlan,
-                                   Map<Long, List<EmergencyRecordDataModel>> liftIdToEmergencyRecord,
-                                   Map<Long, List<AnnualInspectionDataModel>> liftIdToAnnualInspection) {
+    private Set getLiftIdSet(Map<Long, List<MtPlanDataModel>> liftIdToMtPlan,
+                             Map<Long, List<EmergencyRecordDataModel>> liftIdToEmergencyRecord,
+                             Map<Long, List<AnnualInspectionDataModel>> liftIdToAnnualInspection) {
         //数据集合数组
         Map[] dataMapArray = {
-                liftIdToMtRecord,
                 liftIdToMtPlan,
                 liftIdToEmergencyRecord,
                 liftIdToAnnualInspection

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

@@ -19,7 +19,6 @@ import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
 import cn.com.ty.lift.system.settings.service.IMtCompanyAttestationService;
 import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
 import cn.com.ty.lift.system.user.dao.entity.Role;
-import cn.com.ty.lift.system.user.dao.entity.UserAccount;
 import cn.com.ty.lift.system.user.dao.entity.UserRole;
 import cn.com.ty.lift.system.user.dao.entity.model.MenuRequest;
 import cn.com.ty.lift.system.user.service.*;
@@ -111,14 +110,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         Long companyId = maintenanceCompany.getId();
 
         //创建团队成功
-        //1.设置申请用户为企业管理员
-        UserAccount userAccount = userAccountService.getByUserId(userId);
-        userAccount.setType(ApiConstants.UserConstants.TYPE_ENTERPRISE_ADMIN);
-        if (!userAccountService.updateById(userAccount)) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "更新用户信息失败");
-        }
-        //2.设置用户类型为企业管理员
+        //1.设置用户类型为企业管理员
         MtCompanyUser mtCompanyUser = new MtCompanyUser();
         mtCompanyUser.setCreateUserId(userId);
         mtCompanyUser.setUserId(userId);
@@ -127,7 +119,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存成员关联公司信息失败");
         }
-        //3.创建默认角色-企业管理员
+        //2.创建默认角色-企业管理员
         Role role = new Role();
         role.setName(CommonEnum.DefaultRole.ENTERPRISE_ADMIN.getLabel());
         role.setCode(CommonEnum.DefaultRole.ENTERPRISE_ADMIN.getCode());
@@ -137,7 +129,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存角色信息失败");
         }
-        //4.创建用户角色关联关系
+        //3.创建用户角色关联关系
         UserRole userRole = new UserRole();
         userRole.setUserId(userId);
         userRole.setRoleId(role.getId());

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/UserApplyResponse.java

@@ -21,4 +21,5 @@ public class UserApplyResponse {
     private Integer powerType;//申请权限
     private LocalDateTime applyDate;//申请日期
     private LocalDateTime dealDate;//处理日期
+    private String roleName;//角色名称
 }

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

@@ -11,10 +11,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IUserRoleService extends IService<UserRole> {
 
     /**
-     * @description 通过用户id和公司id获取用户角色关联信息
-     * @date 2019/11/27 10:03 AM
      * @param userRole 关联对象
      * @return
+     * @description 通过用户id和公司id获取用户角色关联信息
+     * @date 2019/11/27 10:03 AM
      */
     UserRole getByUserRole(UserRole userRole);
 }

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

@@ -10,10 +10,7 @@ import cn.com.ty.lift.common.utils.SendMessageUtil;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
-import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
-import cn.com.ty.lift.system.user.dao.entity.UserApplication;
-import cn.com.ty.lift.system.user.dao.entity.UserInfo;
-import cn.com.ty.lift.system.user.dao.entity.UserRole;
+import cn.com.ty.lift.system.user.dao.entity.*;
 import cn.com.ty.lift.system.user.dao.entity.model.*;
 import cn.com.ty.lift.system.user.dao.mapper.UserApplicationMapper;
 import cn.com.ty.lift.system.user.service.*;
@@ -54,6 +51,9 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
     @Resource
     private IUserRoleService userRoleService;
 
+    @Resource
+    private IRoleService roleService;
+
     @Resource
     private IUserService userService;
 
@@ -142,7 +142,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
 
     @Override
     public RestResponse applyList(UserApplyRequest userApplyRequest) {
-
+        Long companyId = userApplyRequest.getCompanyId();
         List<Long> userQueryIdList = null;
         //通过用户名或手机号查找用户id
         if (StringUtils.isNotBlank(userApplyRequest.getQueryCondition())) {
@@ -151,7 +151,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         //获取所有状态的申请信息集合
         List<UserApplication> userApplicationListResult = this.list(new QueryWrapper<UserApplication>()
                 .select("status")
-                .eq("mt_company_id", userApplyRequest.getCompanyId())
+                .eq("mt_company_id", companyId)
         );
         //封装不同状态的条数信息
         ApplyPageResponse applyPageResponse = new ApplyPageResponse();
@@ -162,13 +162,15 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         IPage userApplicationPage = new Page(userApplyRequest.getPageNum(), userApplyRequest.getPageSize());
         userApplicationPage = this.page(userApplicationPage, new QueryWrapper<UserApplication>()
                 .in(userQueryIdList != null && userQueryIdList.size() > 0, "user_id", userQueryIdList)
-                .eq("mt_company_id", userApplyRequest.getCompanyId())
+                .eq("mt_company_id", companyId)
                 .eq("status", userApplyRequest.getStatus())
         );
         List<UserApplication> userApplicationList = userApplicationPage.getRecords();
         if (userApplicationList != null && userApplicationList.size() > 0) {
             //获取用id集合
             List<Long> userIdList = ProjectUtils.getAttrList(userApplicationList, "userId", null);
+            //获取用户id -> 角色关系
+            Map<Long, Role> userIdToRole = roleService.getUserIdToRoleByUserIdsAndCompanyId(userIdList, companyId);
             //用户id对应的用户基本信息
             Map<Long, UserResponse> userIdToUserResponse = userService.getUserResponseByUserIdList(userIdList);
             for (UserApplication userApplication : userApplicationList) {
@@ -179,7 +181,13 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
                     userApplyResponse.setUserAvatarUrl(userResponse.getAvatarUrl());
                     userApplyResponse.setUserName(userResponse.getName());
                     userApplyResponse.setUserMobile(userResponse.getMobile());
-                    userApplyResponse.setUserType(userResponse.getType());
+                }
+                //设置申请人角色信息
+                if (userIdToRole != null) {
+                    Role role = userIdToRole.get(userApplication.getUserId());
+                    if(role != null) {
+                        userApplyResponse.setRoleName(role.getName());
+                    }
                 }
                 //设置申请基础信息
                 userApplyResponse.setApplyDate(userApplication.getApplyDate());

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

@@ -1,12 +1,17 @@
 package cn.com.ty.lift.system.user.service.impl;
 
+import cn.com.ty.lift.system.user.dao.entity.Role;
 import cn.com.ty.lift.system.user.dao.entity.UserRole;
 import cn.com.ty.lift.system.user.dao.mapper.UserRoleMapper;
 import cn.com.ty.lift.system.user.service.IUserRoleService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.sql.Wrapper;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author huangyuan
@@ -24,4 +29,5 @@ public class UserRoleService extends ServiceImpl<UserRoleMapper, UserRole> imple
     public UserRole getByUserRole(UserRole userRole) {
         return userRoleMapper.getByUserRole(userRole);
     }
+
 }

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

@@ -155,11 +155,12 @@
         lift l
         on
         mp.lift_id = l.id
+
         <include refid="liftInfoJoinSql"/>
         where
         mp.mt_company_id = #{mtCompanyId}
         and
-        mp.plan_date <![CDATA[ >= ]]> #{monthEndStr}
+        mp.plan_date <![CDATA[ >= ]]> #{monthBeginStr}
         and
         mp.plan_date <![CDATA[ <= ]]> #{monthEndStr}
 

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

@@ -83,7 +83,7 @@
 		LEFT JOIN lift l ON plr.lift_id = l.id
 		LEFT JOIN project p ON plr.mt_company_id = p.mt_company_id AND plr.project_id = p.id
 		LEFT JOIN maintenance_plan mp ON plr.mt_company_id = mp.mt_company_id AND plr.project_id = mp.project_id
-		AND mp.status = 0 AND mp.plan_date = (SELECT MIN(plan_date) FROM maintenance_plan WHERE status = 0
+		AND mp.status = -1 AND mp.plan_date = (SELECT MIN(plan_date) FROM maintenance_plan WHERE status = -1
 		AND mt_company_id = #{mtCompanyId,jdbcType=VARCHAR} AND lift_id = plr.lift_id) AND plr.lift_id = mp.lift_id
 		LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
 		LEFT JOIN region r ON p.region_id = r.id