Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

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

@@ -344,15 +344,7 @@ public class MaintenanceRecordController {
     @PostMapping("fill")
     @Validation(fields = {"id", "maintenanceOption", "imgs"})
     public RestResponse fill(@Val @RequestBody MtRecordRequest request) {
-        Long planId = request.getId();
-        //根据计划id获取记录id
-        Long recordId = maintenanceRecordMapper.getRecordIdByPlanId(planId);
-        MaintenanceRecord entity = maintenanceRecordService.getById(recordId);
-        Validate.notNull(entity, ValuePool.MAINTENANCE_RECORD_NOT_EXIST);
-
-        entity.setMaintenanceOption(request.getMaintenanceOption());
-        entity.setStatus("0");
-        return maintenanceRecordService.fill(entity, request.getImgs());
+        return maintenanceRecordService.fill(request);
     }
 
     /**

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

@@ -22,7 +22,7 @@ public class MtRecordRequest extends PageRequest {
     /**
      * 主键id
      */
-    @Min(value = 1,message = "维保计划ID有误")
+    @Min(value = 1,message = "维保记录ID有误")
     private Long id;
     /**
      * 电梯id

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

@@ -21,6 +21,8 @@ import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.project.service.ProjectService;
 import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.ty.lift.common.utils.MapHelper;
+import cn.com.ty.lift.common.utils.ValuePool;
+import cn.com.ty.lift.common.verify.Validate;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.IterUtil;
@@ -116,7 +118,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         LambdaQueryWrapper<MaintenanceRecord> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(MaintenanceRecord::getMtPlanId, planId);
         lambdaQueryWrapper.eq(MaintenanceRecord::getMtCompanyId, mtCompanyId);
-        lambdaQueryWrapper.eq(MaintenanceRecord::getLiftId,liftId);
+        lambdaQueryWrapper.eq(MaintenanceRecord::getLiftId, liftId);
         return getOne(lambdaQueryWrapper);
     }
 
@@ -239,7 +241,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             record.setPlanDate(plan.getPlanDate());
             record.setStopDate(LocalDateTime.now());
             MaintenanceRecord one = findOne(planId, mtCompanyId, liftId);
-            if (Objects.isNull(one)){
+            if (Objects.isNull(one)) {
                 boolean ret = save(record);
                 if (!ret) {
                     rollback();
@@ -396,6 +398,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
 
     /**
      * 批量打印
+     *
      * @param request
      * @return
      */
@@ -477,26 +480,43 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
     }
 
     /**
-     * 填写保养单-确认，带维保项和现场图片 ，修改record
+     * 工单补录
      *
-     * @param entity MaintenanceRecord
-     * @param imgs   List<String>
+     * @param request 维保记录id 和相应数据
      * @return boolean
      * @author wcz
      */
     @Transactional(rollbackFor = Exception.class)
-    public RestResponse fill(MaintenanceRecord entity, List<String> imgs) {
-        boolean mr = saveOrUpdate(entity);
+    public RestResponse fill(MtRecordRequest request) {
+        Long recordId = request.getId();
+        //获取维保记录
+        MaintenanceRecord record = this.getById(recordId);
+        Validate.notNull(record, ValuePool.MAINTENANCE_RECORD_NOT_EXIST);
+        //获取维保计划
+        MaintenancePlan plan = maintenancePlanService.getOne(record.getMtPlanId());
+        Validate.notNull(plan, ValuePool.MAINTENANCE_PLAN_NOT_EXIST);
+        //更新状态 - 维保记录
+        record.setMaintenanceOption(request.getMaintenanceOption());
+        record.setStatus("0");
+        boolean mr = saveOrUpdate(record);
         if (!mr) {
             return RestResponse.fail("修改保养单失败，请稍后重试");
         }
+        //更新状态 - 维保计划
+        plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.COMPLETE.getCode()));
+        if (!maintenancePlanService.updateById(plan)) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail("更新保养计划失败，请稍后重试");
+        }
+        //保存维保收费项
+        List<String> imgs = request.getImgs();
         if (IterUtil.isEmpty(imgs)) {
             return RestResponse.success(true);
         }
         List<MtRecordImg> mtRecordImgs = new ArrayList<>();
         for (int i = 0; i < imgs.size(); i++) {
             MtRecordImg mri = new MtRecordImg();
-            mri.setMtRecordId(entity.getId());
+            mri.setMtRecordId(record.getId());
             mri.setImgUrl(imgs.get(i));
             mri.setSort(i);
             mtRecordImgs.add(mri);

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/EnterpriseApplication.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
  * @create 2019/11/4
  */
 @Slf4j
-@CrossOrigin
+//@CrossOrigin
 @EnableJms
 @EnableFeignClients
 @MapperScan("cn.com.ty.**.mapper")

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/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/homepage/service/LiftDataService.java

@@ -52,7 +52,7 @@ public class LiftDataService {
         List<LiftMapDataModel> liftMapDataModelList = getLiftMapDataModel(liftDataRequest);
         if (liftMapDataModelList != null && liftMapDataModelList.size() > 0) {
             //设置总电梯数
-            liftStatusToNum.put(CommonConstants.LiftDataConstants.STATUS_ALL_LIFT, liftMapDataModelList.stream().count());
+            liftStatusToNum.put(CommonConstants.LiftDataConstants.STATUS_ALL_LIFT, (long) liftMapDataModelList.size());
             //设置未定位电梯数
             long noLocateCount = liftMapDataModelList.stream()
                     .filter(liftMapDataModel -> liftMapDataModel.getLiftLocateStatus() == -1).count();
@@ -139,18 +139,13 @@ public class LiftDataService {
             List<MtPlanDataModel> mtPlanDataModelList = commonDataMapper.getMtPlanData(liftDataRequest);
             //将维保计划数据转化为 liftId(电梯id) -> status(维保计划状态)
             final Map<Long, Integer> liftIdToMaintenancePlanStatus = getLiftIdToMaintenancePlanStatus(mtPlanDataModelList);
-            //获取维保记录
-            List<MtRecordDataModel> mtRecordDataModelList = commonDataMapper.getMtRecordData(liftDataRequest);
-            //将维保记录数据转化为 liftId(电梯id) -> status(维保记录状态)
-            final Map<Long, String> liftIdToMaintenanceRecordStatus = getLiftIdToMaintenanceRecordStatus(
-                    mtRecordDataModelList);
             //获取急修记录
             List<EmergencyRecordDataModel> emergencyRecordDataModelList =
                     commonDataMapper.getEmergencyRecordData(liftDataRequest);
             //将急修记录数据转化为 liftId(电梯id) -> status(急修状态)
             final Map<Long, Integer> liftIdToEmergencyStatus = getLiftIdToEmergencyStatus(emergencyRecordDataModelList);
             //设置电梯状态
-            setLiftMapStatus(liftMapDataModelList, liftIdToMaintenancePlanStatus, liftIdToMaintenanceRecordStatus, liftIdToEmergencyStatus);
+            setLiftMapStatus(liftMapDataModelList, liftIdToMaintenancePlanStatus, liftIdToEmergencyStatus);
         }
         return liftMapDataModelList;
     }
@@ -163,7 +158,6 @@ public class LiftDataService {
      */
     private void setLiftMapStatus(List<LiftMapDataModel> liftMapDataModelList,
                                   Map<Long, Integer> liftIdToMaintenancePlanStatus,
-                                  Map<Long, String> liftIdToMaintenanceRecordStatus,
                                   Map<Long, Integer> liftIdToEmergencyStatus) {
         //循环设置电梯状态
         liftMapDataModelList.forEach(liftMapDataModel -> {
@@ -178,16 +172,16 @@ public class LiftDataService {
             if (liftIdToMaintenancePlanStatus.size() > 0) {
                 Integer maintenanceStatus = liftIdToMaintenancePlanStatus.get(liftMapDataModel.getLiftId());
                 if (maintenanceStatus != null) {
-                    //状态不为空说明有维保计划，设置待维保
-                    liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_WAIT_MAINTENANCE);
-                    if (liftIdToMaintenanceRecordStatus.size() > 0) {
-                        if (liftIdToMaintenanceRecordStatus.get(liftMapDataModel.getLiftId()) != null) {
-                            //有维保记录设置为维保中
-                            liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_GO_MAINTENANCE);
-                        }
+                    if(maintenanceStatus == 0) {
+                        //维保状态 - 待维保
+                        liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_WAIT_MAINTENANCE);
+                    }
+                    if(maintenanceStatus == 2) {
+                        //维保状态 - 维保中
+                        liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_GO_MAINTENANCE);
                     }
-                    //设置维保完成
                     if (maintenanceStatus == 1) {
+                        //维保完成
                         liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_HAVE_MAINTENANCE);
                     }
                 }