From 4e86c5b2aab78ec599d7b88c8caf0134c5d954bb Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 23 Feb 2023 13:58:39 +0800 Subject: [PATCH] =?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 --- .../BaseAccadjApplyService.java | 1 + .../biz/basevehicle/BaseVehicleMapper.xml | 2 ++ .../base/biz/basevehicle/BaseVehicleRest.java | 2 ++ .../BaseVehicleModelMapper.xml | 5 +++++ .../flow/PCHistTaskListAndCommentList.java | 3 ++- .../anrui/portal/biz/flow/FlowableRest.java | 13 +++++------ .../ScmApplyInboundQueryMapper.java | 22 +++++++++++-------- .../ScmApplyInboundQueryService.java | 7 ++++++ .../api/app/flowable/ProcessCommentVo.java | 2 +- 9 files changed, 39 insertions(+), 18 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 98771b234a..466e417f75 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -632,6 +632,7 @@ public class BaseAccadjApplyService extends MybatisBaseService save = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index c834b3d51f..84fc3ab5ea 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -468,6 +468,7 @@ bvm.`powerValue`, bvm.`vehicleVersionValue`, bvm.`fuelTypeValue`, + bvm.tranCaseTypeValue, bvm.`gearboxTypeValue`, bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, @@ -523,6 +524,7 @@ bvm.`powerValue`, bvm.`vehicleVersionValue`, bvm.`fuelTypeValue`, + bvm.tranCaseTypeValue, bvm.`gearboxTypeValue`, bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 052c12a9ab..71f80bc78f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -475,6 +475,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date())); scmApplyInboundQueryDto.setCreateOrgSid(scmApplyInboundVo.getUseOrgSid()); scmApplyInboundQueryDto.setCreateOrgName(scmApplyInboundVo.getUseOrgName()); + scmApplyInboundQueryDto.setDownNum("0"); scmApplyInboundQueryDto.setBusSid(scmApplyInboundVo.getSid()); List scmApplyInboundVehQuerys = new ArrayList<>(); for (BaseVehicleDto baseVehicleDto1 : dto) { @@ -523,6 +524,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date())); scmApplyInboundQueryDto.setCreateOrgSid(baseOutsourcingApplication.getUseOrgSid()); scmApplyInboundQueryDto.setCreateOrgName(baseOutsourcingApplication.getUseOrgName()); + scmApplyInboundQueryDto.setDownNum("0"); scmApplyInboundQueryDto.setBusSid(baseOutsourcingApplication.getSid()); List scmApplyInboundVehQuerys = new ArrayList<>(); for (BaseVehicleDto baseVehicleDto1 : dto) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml index 5162cdd1e8..0d685993a8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml @@ -18,6 +18,7 @@ bvm.`vehicleVersionValue` vehicleVersion, bvm.`vehicleTypeCode`, bvm.`emissionStandardValue`, + bvm.tranCaseTypeValue, bvm.vehicleAlias, bvm.createOrgName, (SELECT @@ -65,6 +66,8 @@ -- bvm.power, bvm.powerValue, + bvm.tranCaseTypeKey, + bvm.tranCaseTypeValue, -- bvm.gearboxType, bvm.gearboxTypeValue, @@ -266,6 +269,8 @@ bvm.gearboxType, bvm.gearboxTypeValue, + bvm.tranCaseTypeKey, + bvm.tranCaseTypeValue, bvm.fuelType, bvm.fuelTypeValue, diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/PCHistTaskListAndCommentList.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/PCHistTaskListAndCommentList.java index 6c9ec25ab6..aa51c9ec02 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/PCHistTaskListAndCommentList.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/PCHistTaskListAndCommentList.java @@ -1,5 +1,6 @@ package com.yxt.anrui.portal.api.flow; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +14,7 @@ public class PCHistTaskListAndCommentList { @JsonProperty("state") private String state; @ApiModelProperty(value = "时间") - @JsonProperty("time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date time; @ApiModelProperty(value = "审批记录") @JsonProperty("flowableRecordVo") diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 1480d1785a..75cd24baa3 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.portal.biz.flow; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yxt.anrui.flowable.api.processcomment.ProcessCommentFeign; import com.yxt.anrui.portal.api.flow.*; @@ -50,10 +51,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Project: anrui-parent
@@ -164,6 +162,8 @@ public class FlowableRest implements FlowableFeign { PCHistTaskListAndCommentList a=new PCHistTaskListAndCommentList(); a.setTime(f.getFinishTime()==null?new Date():f.getFinishTime()); Map stringObjectMap = BeanUtil.beanToMap(f); + stringObjectMap.put("finishTime",DateUtil.format(f.getFinishTime(),"yyyy-MM-dd HH:mm:ss")); + stringObjectMap.put("createTime",DateUtil.format(f.getCreateTime(),"yyyy-MM-dd HH:mm:ss")); a.setFlowableRecordVo(stringObjectMap); a.setState(0+""); flowList.add(a); @@ -172,8 +172,7 @@ public class FlowableRest implements FlowableFeign { ResultBean> commentList = getCommentList(procInsId,deployId); commentList.getData().forEach(f->{ PCHistTaskListAndCommentList a=new PCHistTaskListAndCommentList(); - Date time = f.getCreateTime(); - a.setTime(time); + a.setTime(f.getCreateTime()); f.setTitle(f.getTaskUserInfo().getAssigneeName()+"添加了评论"); Map stringObjectMap = BeanUtil.beanToMap(f); a.setProcessCommentVo(stringObjectMap); @@ -195,7 +194,7 @@ public class FlowableRest implements FlowableFeign { ProcessCommentVo processCommentVo = new ProcessCommentVo(); BeanUtil.copyProperties(f,processCommentVo); processCommentVo.setCreateTime(f.getTime()); - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String format = sdf.format(f.getTime()); processCommentVo.setTime(format); list.add(processCommentVo); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.java index cfaa616390..e467109b76 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.java @@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -53,13 +54,16 @@ import java.util.List; @Mapper public interface ScmApplyInboundQueryMapper extends BaseMapper { - //@Update("update scm_apply_inbound_query set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_apply_inbound_query") - List selectListVo(); + //@Update("update scm_apply_inbound_query set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_apply_inbound_query") + List selectListVo(); + + @Update("update scm_apply_inbound_query set downNum = #{downNum},newDownDate = NOW() where sid = #{cgrkdSid}") + void updateDown(@Param("cgrkdSid") String cgrkdSid, @Param("downNum") String downNum); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java index ab843a9c7b..9032acc3b4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java @@ -243,6 +243,13 @@ public class ScmApplyInboundQueryService extends MybatisBaseService