Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2024-03-05 200f9e99bab7dcab9360f34fa25f6fa97c33c167

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java

@@ -9,6 +9,7 @@
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
import cn.gistack.sm.patrol.vo.RecordBatchVO;
import cn.gistack.sm.patrol.vo.RecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -172,4 +173,23 @@
      return R.data(patrolRecordService.getHistoryRecord(patrolRecordVO));
   }

   @GetMapping("getRecordDetail")
   public R getRecordVO(RecordVO recordVO){
      RecordVO detail = patrolRecordService.getRecordVO(recordVO);
      return R.data(detail);
   }

   /**
    * 获取处理情况
    * @param patrolRecord
    * @return
    */
   @GetMapping("getHandleRecord")
   public R getHandleRecord(PatrolRecord patrolRecord){

      PatrolRecordVO res = patrolRecordService.getHandleRecord(patrolRecord);
      return R.data(res);
   }


}