盘库巡检问题修改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java

@@ -89,7 +89,7 @@ public interface ScmVehInventorymonthFeign {
     public ResultBean<PagerVo<AppScmVehInventorymonthVo>> getCarInventoryReportList(@RequestBody PagerQuery<AppScmVehInventorymonthQuery> pagerQuery);
 
     @ApiOperation("手机端-获取盘库报告")
-    @GetMapping("/getCarInventoryReport/{sid}")
+    @GetMapping("/getCarInventoryReport/{sid}/{userSid}")
     @ResponseBody
-    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(@PathVariable("sid") String sid);
+    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(@PathVariable("sid") String sid,@PathVariable("userSid")String userSid);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java

@@ -29,6 +29,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -81,7 +82,7 @@ public class ScmVehInventorymonthFeignFallback implements ScmVehInventorymonthFe
 	}
 
 	@Override
-	public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid) {
+	public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid,String userSid) {
 		return null;
 	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java

@@ -91,8 +91,8 @@ public interface ScmVehPatrolinspectionmonthFeign {
     public ResultBean<PagerVo<AppScmVehPatrolinspectionmonthVo>> getCarInspectionReportList(@RequestBody PagerQuery<AppScmVehPatrolinspectionmonthQuery> pagerQuery);
 
     @ApiOperation("手机端-获取巡检报告")
-    @GetMapping("/getCarInspectionReport/{sid}")
+    @GetMapping("/getCarInspectionReport/{sid}/{userSid}")
     @ResponseBody
-    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid);
+    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid);
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java

@@ -81,7 +81,7 @@ public class ScmVehPatrolinspectionmonthFeignFallback implements ScmVehPatrolins
 	}
 
 	@Override
-	public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid) {
+	public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid,String userSid) {
 		return null;
 	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthRest.java

@@ -115,7 +115,7 @@ public class ScmVehInventorymonthRest implements ScmVehInventorymonthFeign {
     }
 
     @Override
-    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid) {
+    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid,String userSid) {
-        return scmVehInventorymonthService.getCarInventoryReport(sid);
+        return scmVehInventorymonthService.getCarInventoryReport(sid,userSid);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -281,11 +281,12 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         return iPage;
     }
 
-    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid) {
+    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid,String userSid) {
         ResultBean<AppScmVehInventorymonthInfoVo> rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppScmVehInventorymonthInfoVo vo = new AppScmVehInventorymonthInfoVo();
         AppScmVehInventorymonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid);
-        List<RecipientListVo> recipientListVos = scmVehInventoryreportService.selectByMainSid();
+        List<RecipientListVo> recipientListVos = scmVehInventoryreportService.selectByMainSid(userSid);
         if (recipientListVos.size() > 0) {
             if (StringUtils.isNotBlank(recipientListVos.get(0).getName())) {
                 List<RecipientListVo> list = new ArrayList<>();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java

@@ -64,6 +64,6 @@ public interface ScmVehInventoryreportMapper extends BaseMapper<ScmVehInventoryr
     @Select("select * from scm_veh_inventoryreport")
     List<ScmVehInventoryreportVo> selectListVo();
 
-    @Select("select receiverSids as sid, receiverNames as name  from scm_veh_inventoryreport order by id desc")
+    @Select("select receiverSids as sid, receiverNames as name  from scm_veh_inventoryreport where createBySid=#{userSid} order by id desc")
-    List<RecipientListVo> selectByMainSid();
+    List<RecipientListVo> selectByMainSid(String userSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java

@@ -144,7 +144,7 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         ScmVehInventoryreport scmVehInventoryreport = new ScmVehInventoryreport();
         BeanUtil.copyProperties(dto, scmVehInventoryreport, "sid");
-        AppScmVehInventorymonthInfoVo data = scmVehInventorymonthService.getCarInventoryReport(dto.getMainSid()).getData();
+        AppScmVehInventorymonthInfoVo data = scmVehInventorymonthService.getCarInventoryReport(dto.getMainSid(),dto.getUserSid()).getData();
         scmVehInventoryreport.setReportContent(data.getProfitRemarks() + data.getLossRemarks() + data.getDamageRemarks());
         scmVehInventorymonthService.updateByMainSid(dto.getMainSid());
         List<RecipientListDto> recipientList = dto.getRecipientList();
@@ -156,6 +156,7 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
         }
         scmVehInventoryreport.setReceiverNames(receiverNames.substring(0, receiverNames.length() - 1));
         scmVehInventoryreport.setReceiverSids(receiverSids.substring(0, receiverSids.length() - 1));
+        scmVehInventoryreport.setCreateBySid(dto.getUserSid());
         save(scmVehInventoryreport);
         List<String> receiveIdList = new ArrayList<>();
         for (RecipientListDto recipientListDto : recipientList) {
@@ -241,7 +242,7 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
         System.out.println("process end");
     }
 
-    public List<RecipientListVo> selectByMainSid() {
+    public List<RecipientListVo> selectByMainSid(String userSid) {
-        return baseMapper.selectByMainSid();
+        return baseMapper.selectByMainSid(userSid);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthRest.java

@@ -114,7 +114,7 @@ public class ScmVehPatrolinspectionmonthRest implements ScmVehPatrolinspectionmo
     }
 
     @Override
-    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid) {
+    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid,String userSid) {
-        return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid);
+        return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -364,15 +364,16 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         return iPage;
     }
 
-    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid) {
+    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid,String userSid) {
         ResultBean<AppScmVehPatrolinspectionmonthInfoVo> rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppScmVehPatrolinspectionmonthInfoVo vo = new AppScmVehPatrolinspectionmonthInfoVo();
         AppScmVehPatrolinspectionmonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid);
         if (appScmVehInventorymonthInfoVo != null) {
             vo.setRecipient(appScmVehInventorymonthInfoVo.getRecipient());
             vo.setDate(appScmVehInventorymonthInfoVo.getDate());
         }
-        List<AppLiableListVo> appLiableListVos = scmVehPatrolinspectionreportService.selectByMainSid();
+        List<AppLiableListVo> appLiableListVos = scmVehPatrolinspectionreportService.selectByMainSid(userSid);
         if (appLiableListVos.size() > 0) {
             if (StringUtils.isNotBlank(appLiableListVos.get(0).getLiableName())) {
                 List<AppLiableListVo> list = new ArrayList<>();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportMapper.java

@@ -64,6 +64,6 @@ public interface ScmVehPatrolinspectionreportMapper extends BaseMapper<ScmVehPat
     @Select("select * from scm_veh_patrolinspectionreport")
     List<ScmVehPatrolinspectionreportVo> selectListVo();
 
-    @Select("select receiverSids as liableSid, receiverNames as liableName  from scm_veh_patrolinspectionreport order by id desc")
+    @Select("select receiverSids as liableSid, receiverNames as liableName  from scm_veh_patrolinspectionreport where createBySid = #{userSid} order by id desc")
-    List<AppLiableListVo> selectByMainSid();
+    List<AppLiableListVo> selectByMainSid(@Param("userSid") String userSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java

@@ -181,6 +181,7 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService<ScmV
         }
         scmVehPatrolinspectionreport.setReceiverNames(DutyName.substring(0, DutyName.length() - 1));
         scmVehPatrolinspectionreport.setReceiverSids(DutySid.substring(0, DutySid.length() - 1));
+        scmVehPatrolinspectionreport.setCreateBySid(dto.getUserSid());
         save(scmVehPatrolinspectionreport);
         scmVehiclePatrolinspectionService.updateState(dto.getMainSid());
         scmVehPatrolinspectionmonthService.updateBySidState(dto.getMainSid());
@@ -199,7 +200,7 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService<ScmV
         return rb.success();
     }
 
-    public List<AppLiableListVo> selectByMainSid() {
+    public List<AppLiableListVo> selectByMainSid(String userSid) {
-        return baseMapper.selectByMainSid();
+        return baseMapper.selectByMainSid(userSid);
     }
 }

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

@@ -67,9 +67,9 @@ public interface AppScmVehiclePatrolinspectionFeign {
     public ResultBean<PagerVo<VehPatrolinspectionmonthVo>> getCarInspectionReportList(@RequestBody PagerQuery<VehPatrolinspectionmonthQuery> pagerQuery);
 
     @ApiOperation("手机端-获取巡检报告")
-    @GetMapping("/getCarInspectionReport/{sid}")
+    @GetMapping("/getCarInspectionReport/{sid}/{userSid}")
     @ResponseBody
-    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid);
+    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid);
 
     @ApiOperation("发送报告")
     @PostMapping("/sendReport")

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

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

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java

@@ -100,9 +100,9 @@ public interface AppScmVehicleInventoryFeign {
     public ResultBean<PagerVo<VehInventorymonthVo>> getCarInventoryReportList(@RequestBody PagerQuery<VehInventorymonthQuery> pagerQuery);
 
     @ApiOperation("手机端-获取盘库报告")
-    @GetMapping("/getCarInventoryReport/{sid}")
+    @GetMapping("/getCarInventoryReport/{sid}/{userSid}")
     @ResponseBody
-    public ResultBean<VehInventorymonthInfoVo> getCarInventoryReport(@PathVariable("sid") String sid);
+    public ResultBean<VehInventorymonthInfoVo> getCarInventoryReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
 
     @ApiOperation("发送报告")
     @PostMapping("/sendReport")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java

@@ -72,7 +72,7 @@ public class AppScmVehicleInventoryFeignFallback implements AppScmVehicleInvento
     }
 
     @Override
-	public ResultBean saveInventory (StayInventoryDto dto) {
+    public ResultBean saveInventory(StayInventoryDto dto) {
         return null;
     }
 
@@ -92,7 +92,7 @@ public class AppScmVehicleInventoryFeignFallback implements AppScmVehicleInvento
     }
 
     @Override
-	public ResultBean<VehInventorymonthInfoVo> getCarInventoryReport(String sid) {
+    public ResultBean<VehInventorymonthInfoVo> getCarInventoryReport(String sid, String userSid) {
         return null;
     }
 

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

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

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

@@ -155,10 +155,10 @@ public class AppScmVehiclePatrolinspectionService {
         return rb.success().setData(vo);
     }
 
-    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid) {
+    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid) {
         ResultBean<VehPatrolinspectionmonthInfoVo> rb = ResultBean.fireFail();
         VehPatrolinspectionmonthInfoVo vo = new VehPatrolinspectionmonthInfoVo();
-        ResultBean<AppScmVehPatrolinspectionmonthInfoVo> resultBean = scmVehPatrolinspectionmonthFeign.getCarInspectionReport(sid);
+        ResultBean<AppScmVehPatrolinspectionmonthInfoVo> resultBean = scmVehPatrolinspectionmonthFeign.getCarInspectionReport(sid, userSid);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java

@@ -108,8 +108,8 @@ public class AppScmVehicleInventoryRest implements AppScmVehicleInventoryFeign {
     }
 
     @Override
-    public ResultBean<VehInventorymonthInfoVo> getCarInventoryReport(String sid) {
+    public ResultBean<VehInventorymonthInfoVo> getCarInventoryReport(String sid,String userSid) {
-        return appScmVehicleInventoryService.getCarInventoryReport(sid);
+        return appScmVehicleInventoryService.getCarInventoryReport(sid,userSid);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java

@@ -215,10 +215,10 @@ public class AppScmVehicleInventoryService {
      * @param sid
      * @return
      */
-    public ResultBean<VehInventorymonthInfoVo> getCarInventoryReport(String sid) {
+    public ResultBean<VehInventorymonthInfoVo> getCarInventoryReport(String sid,String userSid) {
         ResultBean<VehInventorymonthInfoVo> rb = ResultBean.fireFail();
         VehInventorymonthInfoVo vo = new VehInventorymonthInfoVo();
-        ResultBean<AppScmVehInventorymonthInfoVo> resultBean = scmVehInventorymonthFeign.getCarInventoryReport(sid);
+        ResultBean<AppScmVehInventorymonthInfoVo> resultBean = scmVehInventorymonthFeign.getCarInventoryReport(sid,userSid);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }