diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index bd39772b11..10b8586972 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/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 pagging = baseMapper.selectPageVo(page, qw); @@ -365,7 +368,7 @@ public class BaseVehicleOutService extends MybatisBaseService sysOrganizationVos = sysOrganizationFeign.selectOrgByPSid(sybSid).getData(); for (SysOrganizationVo sysOrganizationVo : sysOrganizationVos) { Map map = new HashMap<>(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordSourceLCVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordSourceLCVo.java index 01d8c1a30b..10be3776b2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordSourceLCVo.java +++ b/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; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index e3ebba4b52..e30525c726 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/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 flowList = flowRecordVo.getFlowList(); List 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 flowList = flowRecordVo.getFlowList(); List 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