Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/CapitalRepairImageService.java

@@ -27,7 +27,7 @@ public class CapitalRepairImageService extends ServiceImpl<CapitalRepairImageMap
      */
     public List<CapitalRepairImage> imageUrlList(Long id, Long mtCompanyId) {
         LambdaQueryWrapper<CapitalRepairImage> lambdaQueryWrapper = new QueryWrapper<CapitalRepairImage>().lambda();
-        lambdaQueryWrapper.eq(CapitalRepairImage::getId, id);
+        lambdaQueryWrapper.eq(CapitalRepairImage::getProjectId, id);
         lambdaQueryWrapper.eq(CapitalRepairImage::getMtCompanyId, mtCompanyId);
         return list(lambdaQueryWrapper);
     }

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

@@ -165,10 +165,11 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
      */
     @Transactional(rollbackFor = Exception.class)
     public RestResponse modify(MaintenanceRecordRequest request) {
-        MaintenanceRecord oldRecord = detail(request.getId());
+        MaintenanceRecord record = request.getRecord();
+        MaintenanceRecord oldRecord = detail(record.getId());
         if (Objects.isNull(oldRecord))
             return RestResponse.success(null, MessageUtils.get("msg.record.not.exist"));
-        MaintenanceRecord record = request.getRecord();
+
         record.setStatus(CommonEnum.MaintenanceRecordStatus.COMPLETE.getCode());
         boolean result = updateById(record);
         if (!result){

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

@@ -119,8 +119,9 @@ public class ProjectAppController {
      * @date 2020/1/13 2:33 下午
      */
     @PostMapping("record/modify")
-    @Validation(fields = {"id", "recordImageList"})
+    @Validation(fields = {"recordImageList"})
     public RestResponse modify(@Val @RequestBody MaintenanceRecordRequest request) {
+        Validator.valid(request.getRecord(), "id");
         return maintenanceRecordService.modify(request);
     }