移动端切换机构

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java

@@ -76,9 +76,9 @@ public interface AppScmVehiclePatrolinspectionFeign {
     public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-获取巡检报告:切换组织机构")
-    @GetMapping("/getCarInspectionReport/{sid}/{userSid}/{orgPath}")
+    @GetMapping("/getCarInspectionReport")
     @ResponseBody
-    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid, @PathVariable("orgPath") String orgPath);
+    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(@SpringQueryMap VehPatrolinspectionmonthInfoQuery query);
 
     @ApiOperation("发送报告")
     @PostMapping("/sendReport")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java

@@ -68,7 +68,7 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle
 	}
 
 	@Override
-	public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
+	public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(VehPatrolinspectionmonthInfoQuery query) {
 		return null;
 	}
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionmonthInfoQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/23 0:36
+ * @Description
+ */
+@Data
+public class VehPatrolinspectionmonthInfoQuery {
+
+    private String sid;
+
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java

@@ -77,8 +77,8 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins
     }
 
     @Override
-    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
-        return appScmVehiclePatrolinspectionService.getCarInspectionReport(sid,userSid,orgPath);
+    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(VehPatrolinspectionmonthInfoQuery query) {
+        return appScmVehiclePatrolinspectionService.getCarInspectionReport(query);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java

@@ -172,10 +172,12 @@ public class AppScmVehiclePatrolinspectionService {
         return rb.success().setData(vo);
     }
 
-    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
+    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(VehPatrolinspectionmonthInfoQuery query) {
         ResultBean<VehPatrolinspectionmonthInfoVo> rb = ResultBean.fireFail();
         VehPatrolinspectionmonthInfoVo vo = new VehPatrolinspectionmonthInfoVo();
-        ResultBean<AppScmVehPatrolinspectionmonthInfoVo> resultBean = scmVehPatrolinspectionmonthFeign.getCarInspectionReport(sid, userSid, orgPath);
+        VehPatrolinInfoQuery vehPatrolinInfoQuery = new VehPatrolinInfoQuery();
+        BeanUtil.copyProperties(query,vehPatrolinInfoQuery);
+        ResultBean<AppScmVehPatrolinspectionmonthInfoVo> resultBean = scmVehPatrolinspectionmonthFeign.getCarInspectionReport(vehPatrolinInfoQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }