Forráskód Böngészése

解决问题-工单补录

黄远 5 éve
szülő
commit
5ca3e800a6

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

@@ -344,9 +344,8 @@ 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);
+        Long recordId = request.getId();
+        //获取维保记录
         MaintenanceRecord entity = maintenanceRecordService.getById(recordId);
         Validate.notNull(entity, ValuePool.MAINTENANCE_RECORD_NOT_EXIST);
 

+ 1 - 1
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

+ 1 - 1
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")

+ 2 - 2
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());