问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -340,6 +340,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (StringUtils.isNotBlank(params.getInsideCode())) {
                 qw.like("bv.insideCode", params.getInsideCode());
             }
+            if (StringUtils.isNotBlank(params.getOrgSid())){
+                qw.eq("bvo.createOrgSid",params.getOrgSid());
+            }
             qw.orderByDesc("bvo.saleDate");
         }
         IPage<BaseVehicleOutVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -365,7 +368,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
         String orgLevelKey = data.getOrgLevelKey();
         if ("2".equals(orgLevelKey)) {
-            String sybSid = orgSidPath.substring(36, 73);
+            String sybSid = orgSidPath.substring(37, 73);
             List<SysOrganizationVo> sysOrganizationVos = sysOrganizationFeign.selectOrgByPSid(sybSid).getData();
             for (SysOrganizationVo sysOrganizationVo : sysOrganizationVos) {
                 Map<String, String> map = new HashMap<>();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordSourceLCVo.java

@@ -41,5 +41,5 @@ public class FinPaymentrecordSourceLCVo implements Vo {
     @ApiModelProperty(value = "审批人意见")
     private String comment;
     @ApiModelProperty(value = "审批时间")
-    private Date spsj;
+    private String spsj;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -45,6 +45,7 @@ import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
 import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
 import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTask;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.portal.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -114,7 +115,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     @Autowired
     private FileUploadComponent fileUploadComponent;
     @Autowired
-    private FlowableFeign flowableFeign;
+    private FlowTaskFeign flowTaskFeign;
     @Autowired
     private DocPdfComponent docPdfComponent;
 
@@ -359,14 +360,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         if (StringUtils.isNotBlank(baseOutsourcingApplicationDetailsVo.getApplicationCode())) {
             dataMap.put("applyCode", baseOutsourcingApplicationDetailsVo.getApplicationCode());
             //获取审批记录
-            FlowRecordVo flowRecordVo = flowableFeign.flowRecord(baseOutsourcingApplicationDetailsVo.getProcInstSid(), null).getData();
+            FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(baseOutsourcingApplicationDetailsVo.getProcInstSid()).getData();
             List<FlowTask> flowList = flowRecordVo.getFlowList();
             List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
             for (FlowTask flowTask : flowList) {
                 FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
                 finPaymentrecordSourceLCVo.setName(flowTask.getAssigneeName());
                 finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment());
-                finPaymentrecordSourceLCVo.setSpsj(flowTask.getFinishTime());
+                finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(),"yyyy-MM-dd"));
                 finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
             }
             dataMap.put("lcList", finPaymentrecordSourceLCVos);
@@ -378,19 +379,19 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         } else if (StringUtils.isNotBlank(busVehicleApplyDetailsVo.getSid())) {
             dataMap.put("applyCode", busVehicleApplyDetailsVo.getApplicationCode());
             //获取审批记录
-            FlowRecordVo flowRecordVo = flowableFeign.flowRecord(busVehicleApplyDetailsVo.getProcInstId(), null).getData();
+            FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(busVehicleApplyDetailsVo.getProcInstId()).getData();
             List<FlowTask> flowList = flowRecordVo.getFlowList();
             List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
             for (FlowTask flowTask : flowList) {
                 FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
                 finPaymentrecordSourceLCVo.setName(flowTask.getAssigneeName());
                 finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment());
-                finPaymentrecordSourceLCVo.setSpsj(flowTask.getFinishTime());
+                finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(),"yyyy-MM-dd"));
                 finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
             }
             dataMap.put("lcList", finPaymentrecordSourceLCVos);
         }
-        dataMap.put("createTime", finPaymentrecord.getCreateTime());
+        dataMap.put("createTime", DateUtil.format(finPaymentrecord.getCreateTime(),"yyyy-MM-dd"));
         dataMap.put("createByName", createByName);
         dataMap.put("createByDeptName", deptName);
         dataMap.put("createOrgName", createOrgName);
@@ -400,7 +401,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         dataMap.put("cost", finPaymentrecord.getCost());
         dataMap.put("payRemark", finPaymentrecord.getPayRemark());
         //获取图片路径
-        String photoPath = "D:\\anrui\\upload\\20211227\\kbjl_20211227143750186948.jpg";
+//        String photoPath = "file://D:/anrui/upload/20211227/kbjl_20211227143750186948.jpg";
+        String photoPath =fileUploadComponent.getUrlPrefix()+ "20211227/kbjl_20211227143750186948.jpg";
         String photoPath64 = image2Base64(photoPath);
         dataMap.put("photoPath64", photoPath64);
         //获取模板