From 9e2a5ddb62295f83da74f32b953c76933cc44fe5 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 29 Jul 2022 19:46:48 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=B5=81=E7=A8=8B=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml | 1 + .../com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml index 8cc70c2513..b4457fda87 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml @@ -134,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ahpi.END_TIME_, ahpi.PROC_DEF_ID_, ahpi.PROC_INST_ID_, + ahpi.START_TIME_ processCreateTime, arpd.KEY_ AS PROC_DEF_KEY_, arpd.NAME_ AS PROC_DEF_NAME_, arpd.VERSION_ AS PROC_DEF_VERSION_, diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index a2aa3cb671..75aff7d88a 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -774,9 +774,13 @@ public class FlowTaskService extends MybatisBaseService> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString()); From 8b115ea3b5057775b29616652837a5a6681b88de Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 29 Jul 2022 20:02:45 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 75aff7d88a..d341cfc92d 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -5,15 +5,14 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; +import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.flowable.api.flowcomment.FlowCommentDto; import com.yxt.anrui.flowable.api.flowtask.*; import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; import com.yxt.anrui.flowable.biz.process.ProcessService; import com.yxt.anrui.flowable.biz.sysdeployform.SysDeployFormService; import com.yxt.anrui.flowable.biz.sysprourl.SysProUrlService; -import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.flowable.exception.CustomException; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskParam; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery; @@ -26,7 +25,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUser; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; From 01df44ada5031c2aaba259cead3d1f4ce8f3968e Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Fri, 29 Jul 2022 20:27:39 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=AE=B0=E5=BD=95=E7=9A=84=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java | 4 ++-- .../anrui/flowable/biz/flowtask/FlowTaskController.java | 3 ++- .../yxt/anrui/flowable/biz/flowtask/FlowTaskService.java | 7 ++++++- .../java/com/yxt/anrui/portal/biz/flow/FlowableRest.java | 3 ++- .../com/yxt/anrui/portal/biz/flow/FlowableService.java | 3 ++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java index 7f99856b40..91da8d41ca 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java @@ -91,11 +91,11 @@ public class FlowTask extends BaseEntity implements Serializable { private String candidate; @ApiModelProperty("任务创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date createTime; @ApiModelProperty("任务完成时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date finishTime; @ApiModelProperty("环节的办理人信息") diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java index b40437ffb3..a4d89e0032 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java @@ -237,7 +237,8 @@ public class FlowTaskController implements FlowTaskFeign { @Override public ResultBean businessFlowRecord(String procInsId, String deployId) { - return flowTaskService.businessFlowRecord(procInsId, deployId); + ResultBean flowRecordVoResultBean = flowTaskService.businessFlowRecord(procInsId, deployId); + return flowRecordVoResultBean; } @Override diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 75aff7d88a..bc25b6f749 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -259,10 +259,14 @@ public class FlowTaskService extends MybatisBaseService> sysUserVoResultBean = sysUserFeign.fetchBySids(histIns.getAssignee());// sysUserService.selectUserById(Long.parseLong(histIns.getAssignee())); List data1 = sysUserVoResultBean.getData(); @@ -311,6 +315,7 @@ public class FlowTaskService extends MybatisBaseService flowRecord(String procInsId, String deployId) { - return flowableService.flowRecord(procInsId, deployId); + ResultBean flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId); + return flowRecordVoResultBean;// flowableService.flowRecord(procInsId, deployId); } @Override diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java index 16cbf9761b..5060ab48ce 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java @@ -296,7 +296,8 @@ public class FlowableService extends MybatisBaseService flowRecord(String procInsId, String deployId) { - return flowTaskFeign.businessFlowRecord(procInsId, deployId); + ResultBean flowRecordVoResultBean = flowTaskFeign.businessFlowRecord(procInsId, deployId); + return flowRecordVoResultBean;//flowTaskFeign.businessFlowRecord(procInsId, deployId); } /** From fcc7df6644342ee263406650eb3023053cfda4af Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 29 Jul 2022 21:03:50 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java | 2 ++ .../scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java | 2 ++ .../anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java | 2 ++ .../scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java | 2 ++ .../anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java | 3 +++ .../yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java | 2 ++ .../anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java | 1 + .../scm/biz/scmvehiclereturn/ScmVehicleReturnService.java | 1 + 8 files changed, 15 insertions(+) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java index 24ffb743cb..bf40799d64 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java @@ -30,4 +30,6 @@ public class ScmVehicleReturn extends BaseEntity { private String taskDefKey; @ApiModelProperty(value = "分公司名称") private String orgName; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java index 8da8b0d988..00c8b6fc50 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java @@ -36,4 +36,6 @@ public class ScmVehicleReturnDetailsVo implements Vo { private String remarks; @ApiModelProperty(value = "分公司名称") private String orgName; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java index ff88ccff88..76139e85d4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java @@ -64,4 +64,6 @@ public class ScmVehicleReturnDto implements Dto { private String createBySid; @ApiModelProperty(value = "分公司名称") private String orgName; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java index b9aa5aa7d4..d43ce71985 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java @@ -53,4 +53,6 @@ public class ScmVehicleReturnFlowDto implements Serializable { private String taskDefKey; @ApiModelProperty(value = "分公司名称") private String orgName; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java index 9c7a2c293f..2833516928 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java @@ -24,5 +24,8 @@ public class ScmVehicleReturnQuery implements Query { @ApiModelProperty(value = "用户sid") private String userSid; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java index 6c04319c12..4a5d2cdba7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java @@ -29,4 +29,6 @@ public class ScmVehicleReturnVo implements Vo { private Integer num; @ApiModelProperty(value = "分公司名称") private String orgName; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index db06aa62bd..f8de6885eb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -112,6 +112,7 @@ public class ScmApplyInboundService extends MybatisBaseService pagging = baseMapper.pagerList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); From 60c3c3d159773c1f83ed246fd9c4a323eef06070 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 29 Jul 2022 21:06:12 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/portal/biz/flow/FlowableService.java | 1 - .../ScmVehinspectItemService.java | 9 +++++---- .../api/app/flowable/AppFlowableRecordVo.java | 14 ++++++++++---- .../scmvehiclegression/AppGressionDetailsVo.java | 4 +++- .../scmvehiclegression/AppGressionInfoVo.java | 3 ++- .../com/yxt/anrui/terminal/biz/app/AppService.java | 10 ++++------ 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java index 5060ab48ce..cca707f7d0 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java @@ -591,7 +591,6 @@ public class FlowableService extends MybatisBaseService flowMap = f.getProcessVariables(); Map appMap = ConstantUtils.getMap(flowMap, "app"); String json = JSONObject.toJSONString(appMap); - System.out.println(json); AppVo appVo = new AppVo(); appVo.setJson(json); //app版本的sid diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java index 5b861971e5..6de96440b2 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java @@ -30,9 +30,9 @@ import com.yxt.anrui.scm.api.scmvehinspectitem.*; import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmItemDetailVo; import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmVehinspectItemdetail; import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmVehinspectItemdetailVo; -import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgDto; import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmItemImgVo; import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimg; +import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgDto; import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgVo; import com.yxt.anrui.scm.biz.scmvehicleinspectitem.ScmVehicleInspectitemService; import com.yxt.anrui.scm.biz.scmvehinspectitemdetail.ScmVehinspectItemdetailService; @@ -45,7 +45,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -239,8 +238,10 @@ public class ScmVehinspectItemService extends MybatisBaseService detailsList = item.getDetails(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java index 8604c90a99..dff1880ab2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java @@ -1,11 +1,13 @@ package com.yxt.anrui.terminal.api.app.flowable; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -26,10 +28,14 @@ public class AppFlowableRecordVo implements Vo { @ApiModelProperty(value = "流程状态value") private String stateValue; - @ApiModelProperty(value = "办理时间") - private String time; - @ApiModelProperty(value = "接收时间") - private String createTime; + @ApiModelProperty("接收时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTime; + + @ApiModelProperty("办理时间") + @JsonProperty("time") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date finishTime; @ApiModelProperty(value = "任务耗时") private String duration; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java index c89c804e65..785f7dff1d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java @@ -10,13 +10,15 @@ import java.util.List; @Data public class AppGressionDetailsVo implements Vo { + private static final long serialVersionUID = -2419006122141103302L; private String sid; @ApiModelProperty("任务id") private String taskId; @ApiModelProperty("流程实例id") - private String procInsId; + @JsonProperty("procInsId") + private String procInstId; @ApiModelProperty("用户sid") private String userSid; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java index 761bba24fe..4c475c3e9b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java @@ -16,7 +16,8 @@ public class AppGressionInfoVo implements Vo { private String taskId; @ApiModelProperty("流程实例id") - private String procInsId; + @JsonProperty("procInsId") + private String procInstId; @ApiModelProperty("用户sid") private String userSid; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java index 1d5755c50d..e1730e4f35 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java @@ -36,13 +36,14 @@ public class AppService { List voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList()); voList.removeAll(Collections.singleton(null)); for (AppFlowableRecordVo vo : voList) { - String time = vo.getTime(); - if (StringUtils.isNotBlank(time)) { + if (vo.getFinishTime() != null) { AppFlowCommentVo commentVo = vo.getComment(); //类型 String type = commentVo.getType(); String comment = commentVo.getComment(); - vo.setContent(comment); + if(StringUtils.isNotBlank(comment) ){ + vo.setContent(comment); + } String stateValue = FlowComment.getRemarkByType(type); if (StringUtils.isNotBlank(stateValue)) { vo.setStateValue(stateValue); @@ -50,10 +51,7 @@ public class AppService { if (StringUtils.isNotBlank(type)) { vo.setStateKey(type); } - vo.setTime(sdf.format(new Date(Long.parseLong(time)))); } - - vo.setCreateTime(sdf.format(new Date(Long.parseLong(vo.getCreateTime())))); } return rb.success().setData(voList); } From 23e692eee3b965ca74a5c78306f428ff8f2f2405 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Fri, 29 Jul 2022 21:44:06 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E9=AA=8C=E8=BD=A6=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scmvehinspectitem/ScmResultImageDto.java | 3 ++- .../ScmVehinspectItemResultImageDto.java | 3 ++- .../ScmVehinspectItemimgDto.java | 3 ++- .../ScmVehinspectItemService.java | 18 ++++++++++++------ .../ScmVehinspectItemimgMapper.xml | 5 +++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java index 4650a58aed..834d6f9c0d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java @@ -6,6 +6,7 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -22,6 +23,6 @@ public class ScmResultImageDto implements Dto { private String remarks; @ApiModelProperty("相关图片") - private ScmVehinspectItemimgDto scmVehinspectItemimgDto; + private List itemImgVoList = new ArrayList<>(); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemResultImageDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemResultImageDto.java index 0ab02a3266..1e41967a8c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemResultImageDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemResultImageDto.java @@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -14,6 +15,6 @@ public class ScmVehinspectItemResultImageDto implements Dto { private String vehInspectSid; @ApiModelProperty("检验结果及相关照片") - private List scmResultImageDtos; + private List scmResultImageDtos = new ArrayList<>(); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java index ae2ea4edad..485985e763 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java @@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -16,7 +17,7 @@ public class ScmVehinspectItemimgDto implements Dto { @ApiModelProperty("照片路径") private String imgUrl; @ApiModelProperty("照片路径集合") - private List imgUrlList; + private List imgUrlList = new ArrayList<>(); @ApiModelProperty("照片模板路径") private String imgPath; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java index 6de96440b2..4ac4eab434 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java @@ -109,14 +109,20 @@ public class ScmVehinspectItemService extends MybatisBaseService scmResultImageDtos = dto.getScmResultImageDtos(); for (ScmResultImageDto scmResultImageDto : scmResultImageDtos) { + baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getRemarks(), scmResultImageDto.getResult()); - ScmVehinspectItemimgDto scmVehinspectItemimgDto = scmResultImageDto.getScmVehinspectItemimgDto(); - List imgUrlList = scmVehinspectItemimgDto.getImgUrlList(); - String imgUrl = null; - for (int i = 0; i < imgUrlList.size(); i++) { - imgUrl = imgUrlList.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ","; + + List itemImgVoList = scmResultImageDto.getItemImgVoList(); + + for (ScmVehinspectItemimgDto scmVehinspectItemimgDto : itemImgVoList) { + String imgUrl = ""; + List imgUrlList = scmVehinspectItemimgDto.getImgUrlList(); + for (String s : imgUrlList) { + imgUrl = s.replace(fileUploadComponent.getUrlPrefix(), "") + ","; + } + scmVehinspectItemimgDto.setImgUrl(imgUrl); + scmVehinspectItemimgService.updateByMainSid(scmVehinspectItemimgDto.getMainSid(), scmVehinspectItemimgDto.getImgUrl(), scmVehinspectItemimgDto.getImgTitle()); } - scmVehinspectItemimgService.updateByMainSid(scmResultImageDto.getSid(), imgUrl, scmVehinspectItemimgDto.getImgTitle()); } return rb.success().setMsg("保存成功"); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml index 72e26a4ed7..60f7051cbf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml @@ -21,7 +21,8 @@