问题修改

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<BaseAccadjApplyMa
                         scmApplyInboundQueryDto.setCreateOrgSid(baseAccadjApply.getCreateOrgSid());
                         SysOrganizationVo sysOrganizationVoCreate = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCreateOrgSid()).getData();
                         scmApplyInboundQueryDto.setCreateOrgName(sysOrganizationVoCreate.getName());
+                        scmApplyInboundQueryDto.setDownNum("0");
                         scmApplyInboundQueryDto.setBusSid(baseAccadjApply.getSid());
                         scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys);
                         ResultBean<String> save = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto);

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`,

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<ScmApplyInboundVehQueryDto> 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<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
         for (BaseVehicleDto baseVehicleDto1 : dto) {

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,

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")

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 <br/>
@@ -164,6 +162,8 @@ public class FlowableRest implements FlowableFeign {
             PCHistTaskListAndCommentList a=new PCHistTaskListAndCommentList();
             a.setTime(f.getFinishTime()==null?new Date():f.getFinishTime());
             Map<String, Object> 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<List<ProcessCommentVo>> 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<String, Object> 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);

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<ScmApplyInboundQuery> {
 
-	//@Update("update scm_apply_inbound_query set name=#{msg} where id=#{id}")
-	//IPage<ScmApplyInboundQueryVo> voPage(IPage<ScmApplyInboundQuery> page, @Param(Constants.WRAPPER) QueryWrapper<ScmApplyInboundQuery> qw);
-	
-	IPage<ScmApplyInboundQueryVo> selectPageVo(IPage<ScmApplyInboundQuery> page, @Param(Constants.WRAPPER) Wrapper<ScmApplyInboundQuery> qw);
-	
-	List<ScmApplyInboundQueryVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmApplyInboundQuery> qw);
-	
-	@Select("select * from scm_apply_inbound_query")
-	List<ScmApplyInboundQueryVo> selectListVo();
+    //@Update("update scm_apply_inbound_query set name=#{msg} where id=#{id}")
+    //IPage<ScmApplyInboundQueryVo> voPage(IPage<ScmApplyInboundQuery> page, @Param(Constants.WRAPPER) QueryWrapper<ScmApplyInboundQuery> qw);
+
+    IPage<ScmApplyInboundQueryVo> selectPageVo(IPage<ScmApplyInboundQuery> page, @Param(Constants.WRAPPER) Wrapper<ScmApplyInboundQuery> qw);
+
+    List<ScmApplyInboundQueryVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmApplyInboundQuery> qw);
+
+    @Select("select * from scm_apply_inbound_query")
+    List<ScmApplyInboundQueryVo> 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);
 }

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<ScmApplyInbo
         String pdfName = "采购入库单_" + dateStr + seconds + ".pdf";
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
         pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
+        String downNum = scmApplyInboundQuery.getDownNum();
+        if (StringUtils.isBlank(downNum)){
+            downNum = "1";
+        }else {
+            downNum = String.valueOf((Integer.parseInt(downNum) + 1));
+        }
+        baseMapper.updateDown(cgrkdSid,downNum);
         return rb.success().setData(pdfPath);
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java

@@ -57,7 +57,7 @@ public class ProcessCommentVo implements Vo {
     @ApiModelProperty("标题")
     private String title; // 标题
     @ApiModelProperty("评论创建时间")
-    @JsonIgnore
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime; // 评论时间
     @ApiModelProperty("评论页面显示时间")
     private String time; // 评论时间