Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java

@@ -25,19 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.base.api.baseinternalpurchase;
 
-import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseTaskQuery;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.SubmitBaseInterNalPurchaseDto;
-import com.yxt.anrui.base.api.baseoutsourcingapplication.BusinessVariablesDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto;
-import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyTaskQuery;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
@@ -91,14 +87,29 @@ public interface BaseInternalPurchaseFeign {
     @PostMapping("/submitBaseInternalPurchase")
     public ResultBean submitBaseInternalPurchase(@Valid @RequestBody SubmitBaseInterNalPurchaseDto dto);
 
+    /**
+     * 申请方审批同意、应对方审批同意（除申请方最后一个环节）
+     * @param bvd
+     * @return
+     */
     @ApiOperation(value = "办理（同意）")
     @PostMapping("/complete")
     public ResultBean complete(@Valid @RequestBody BaseInterNalPurchaseCompleteDto bvd);
 
+    /**
+     * 申请方跳应对方的同意
+     * @param bvd
+     * @return
+     */
     @ApiOperation(value = "办理（同意）")
     @PostMapping("/InitiatorToAnswer")
     public ResultBean InitiatorToAnswer(@Valid @RequestBody BaseInterNalPurchaseCompleteDto bvd);
 
+    /**
+     * 分公司到事业部同意
+     * @param bvd
+     * @return
+     */
     @ApiOperation(value = "办理（同意）")
     @PostMapping("/companyToDivisionOperate")
     public ResultBean companyToDivisionOperate(@Valid @RequestBody BaseInterNalPurchaseCompleteDto bvd);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java

@@ -44,4 +44,11 @@ public class BaseVehicleActualVo implements Vo {
     @ApiModelProperty(value = "入库价")
     @JsonSerialize(using = ToStringSerializer.class)
     private String priced;
+
+    @ApiModelProperty("与该内部编码一致的车辆")
+    private int vehicleNum;
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java

@@ -102,4 +102,6 @@ public class BaseVehicleVo implements Vo {
     private String witPinStateValue;
     @ApiModelProperty(value = "合格证状态value")
     private String certificateStateValue;
+    @ApiModelProperty(value = "库龄")
+    private Long libraryAge;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/AppBaseVehicleActualDetailsVo.java

@@ -25,4 +25,11 @@ public class AppBaseVehicleActualDetailsVo implements Vo {
     private String modelSid;
     @ApiModelProperty("配置sid")
     private String configSid;
+
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
+    @ApiModelProperty("车辆数量")
+    private int vehicleNum;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java

@@ -24,4 +24,11 @@ public class BaseVehicleActualDetails extends BaseEntity {
     private Date inboundDate;
     @ApiModelProperty(value = "入库价")
     private String inboundPrice;
+
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
+    @ApiModelProperty("车辆数量")
+    private int vehicleNum;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java

@@ -24,4 +24,11 @@ public class BaseVehicleActualDetailsDto implements Dto {
     @ApiModelProperty(value = "入库价")
     private String inboundPrice;
 
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
+    @ApiModelProperty("车辆数量")
+    private int vehicleNum;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java

@@ -22,4 +22,11 @@ public class BaseVehicleActualDetailsVo implements Vo {
     private String inboundDate;
     @ApiModelProperty(value = "入库价")
     private String inboundPrice;
+
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
+    @ApiModelProperty("车辆数量")
+    private int vehicleNum;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java

@@ -31,4 +31,7 @@ public class AppBaseVehicleActualSalesVo implements Vo {
     private String reason;
 
     private List<AppBaseVehicleActualDetailsVo> records;
+
+    @ApiModelProperty("未售买断费用")
+    private String money;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java

@@ -26,6 +26,8 @@ public class BaseVehicleActualSales extends BaseEntity {
     private String procInstId;
     @ApiModelProperty(value = "任务id")
     private String taskId;
+    @ApiModelProperty("未售买断费用")
+    private String money;
 
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java

@@ -32,4 +32,7 @@ public class BaseVehicleActualSalesDetailsVo implements Vo {
     private String taskId;
     @ApiModelProperty(value = "实例id")
     private String procInstId;
+
+    @ApiModelProperty("未售买断费用")
+    private String money;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java

@@ -34,5 +34,8 @@ public class BaseVehicleActualSalesDto implements Dto {
     @ApiModelProperty(value = "车辆列表")
     private List<BaseVehicleActualDetailsDto> detailsList;
 
+    @ApiModelProperty("未售买断费用")
+    private String money;
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -755,7 +755,11 @@
         bmc.configName,
         bmc.sid as configSid,
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
-        bv.costPrice as priced
+        bv.costPrice as priced,
+        bv.insideCode,
+        (select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or bvv.vehicleStateValue = '调入')) as vehicleNum,
+        (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum
+
         FROM base_vehicle bv
         LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
         LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -1,7 +1,9 @@
 package com.yxt.anrui.base.biz.basevehicle;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
@@ -16,8 +18,6 @@ import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateServi
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
-import com.yxt.anrui.base.common.enums.VehicleState;
-import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -26,10 +26,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -44,10 +41,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -92,6 +86,16 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     public ResultBean<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehicleVo>> rb = ResultBean.fireFail();
         IPage<BaseVehicleVo> page = baseVehicleService.pagerList(pagerQuery);
+        List<BaseVehicleVo> records = page.getRecords();
+        for (BaseVehicleVo record : records) {
+            if (record.getPriceDate() != null){
+                Date priceDate = record.getPriceDate();
+                String today = DateUtil.today();
+                DateTime currentDate = DateUtil.parse(today);
+                long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
+                record.setLibraryAge(betweenDay);
+            }
+        }
         PagerVo<BaseVehicleVo> pv = new PagerVo<>();
         PagerVo<BaseVehicleVo> pv1 = PagerUtil.pageToVo(page, pv);
         return rb.success().setData(pv1);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml

@@ -14,7 +14,14 @@
     </delete>
 
     <select id="detailsList" resultType="com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo">
-        select sid, vinNo, modelName, DATE_FORMAT(inboundDate, '%Y-%m-%d') as inboundDate, inboundPrice
+        select sid,
+               vinNo,
+               modelName,
+               DATE_FORMAT(inboundDate, '%Y-%m-%d') as inboundDate,
+               inboundPrice,
+               insideCode,
+               vehicleNum,
+               dayNum
         from base_vehicle_actual_details
         where vehicleActualSid = #{sid}
     </select>
@@ -37,7 +44,10 @@
                DATE_FORMAT(bd.inboundDate, '%Y-%m-%d') as inboundDate,
                bd.inboundPrice,
                bv.modelSid,
-               bv.modelConfigSid as configSid
+               bv.modelConfigSid                       as configSid,
+               bd.insideCode,
+               bd.vehicleNum,
+               bd.dayNum
         from base_vehicle_actual_details bd
                  left join base_vehicle bv on bv.vinNo = bd.vinNo
         where bd.vehicleActualSid = #{sid}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml

@@ -22,7 +22,8 @@
                applicationName,
                taskId,
                procInstId,
-               createBySid                            userSid
+               createBySid                            userSid,
+               money
         from base_vehicle_actual_sales
         where sid = #{sid}
     </select>
@@ -57,7 +58,8 @@
                procInstId                          as procInsId,
                applicationName                     as applyName,
                DATE_FORMAT(createTime, '%Y-%m-%d') as date,
-               reason
+               reason,
+               money
         from base_vehicle_actual_sales
         where sid = #{sid}
     </select>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml

@@ -20,9 +20,9 @@
         FROM
         scm_vehicle_stay_inventory svsi
         LEFT JOIN scm_vehicle_inventory svi
-        ON svsi.`mainSid` = svi.`mainSid`
+        ON svsi.`mainSid` = svi.`mainSid` AND svsi.createOrgSid = svi.createOrgSid
         LEFT JOIN anrui_base.`base_vehicle` bv
-        ON bv.`vinNo` = svsi.mainSid
+        ON bv.`vinNo` = svsi.mainSid AND svsi.createOrgSid = bv.createOrgSid
         <where>${ew.sqlSegment}</where>
         GROUP BY svsi.`mainSid`
     </select>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutDetailsListVo.java

@@ -30,4 +30,11 @@ public class UnsoldBuyoutDetailsListVo implements Vo {
     private String modelSid;
     @ApiModelProperty("配置sid")
     private String configSid;
+
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
+    @ApiModelProperty("车辆数量")
+    private int vehicleNum;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutVo.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.api.supplychain.unsoldBuyout;
 
-import com.yxt.anrui.base.api.basevehicleactualdetails.AppBaseVehicleActualDetailsVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,5 +30,5 @@ public class UnsoldBuyoutVo implements Vo {
     @ApiModelProperty("买断原因")
     private String reason;
 
-    private List<AppBaseVehicleActualDetailsVo> records;
+    private List<UnsoldBuyoutDetailsListVo> records;
 }