Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/SubmitBusVehicleApplyDto.java

@@ -14,8 +14,8 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class SubmitBusVehicleApplyDto extends BusVehicleApplyDto {
     private static final long serialVersionUID = 378585162071125756L;
-    @ApiModelProperty("意见")
+    /*@ApiModelProperty("意见")
-    private String comment;
+    private String comment;*/
     @ApiModelProperty("流程实例id")
     private String instanceId;
     @ApiModelProperty("任务id")

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

@@ -18,7 +18,6 @@
                bv.engineNo,
                bv.vehicleStateValue,
                bv.locationName,
-               bv.libraryAge,
                bv.modelConfigSid
         FROM base_vehicle bv
         <where>
@@ -55,9 +54,7 @@
         <!--存放地点-->
         bv.location,
         <!--首次发车日期-->
-        DATE_FORMAT(bv.manufactureDate, '%Y-%m-%d') as firstStartDate,
+        DATE_FORMAT(bv.manufactureDate, '%Y-%m-%d') as firstStartDate
-        <!--库龄（根据首次发车日期计算）-->
-        bv.libraryAge
         FROM base_vehicle bv
                  LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
                  LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
@@ -102,19 +99,19 @@
         <!--发动机型号-->
         bvm.engineTypeValue,
         <!--系列-->
-        bvm.seriesValue,
+      <!--  bvm.seriesValue,-->
         <!--悬架value值-->
-        bvm.suspensionValue,
+       <!-- bvm.suspensionValue,-->
         <!--后桥-->
-        bvm.rearAxleValue,
+       <!-- bvm.rearAxleValue,-->
         <!--速比value值-->
-        bvm.speedRatioValue,
+        <!--bvm.speedRatioValue,-->
         <!--轴距-->
-        bvm.wheelbase,
+        <!--bvm.wheelbase,-->
         <!--轮胎规格-->
-        bvm.tyreSpecification,
+       <!-- bvm.tyreSpecification,-->
         <!--车型配置代码-->
-        bmc.vehicleCode,
+       <!-- bmc.vehicleCode,-->
         <!--车身颜色-->
         bmc.carColor,
         <!--驾驶室规格-->
@@ -134,19 +131,19 @@
         <!--其他配置-->
         bmc.otherConfig,
         <!--彩色仪表盘（是、否）-->
-        bmc.isColorPanel,
+        <!--bmc.isColorPanel,-->
         <!--基础单位-->
-        bmc.basedUnit,
+        <!--bmc.basedUnit,-->
         <!--公司指导价-->
-        bmc.companyGuidePrice,
+        <!--bmc.companyGuidePrice,-->
         <!--备注-->
         bmc.remarks,
         <!--使用组织-->
         bvm.useOrg,
-        bvm.useOrgName,
+        bvm.useOrgName
         <!--是否有效-->
-        bvm.isValidity,
+        <!--bvm.isValidity,
-        bvm.isValidityValue
+        bvm.isValidityValue-->
         FROM base_vehicle_model bvm
                  LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
                  LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
@@ -193,52 +190,52 @@
         <!--发动机号/许可证号-->
         bv.engineNo,
         <!--制造日期-->
-        DATE_FORMAT(bv.manufactureDate, '%Y-%m-%d') as manufactureDate,
+        <!--DATE_FORMAT(bv.manufactureDate, '%Y-%m-%d') as manufactureDate,-->
         <!--车辆状态-->
         bv.vehicleState,
         bv.vehicleStateValue,
         <!--存放地点-->
         bv.location,
         <!--首次发车日期-->
-        DATE_FORMAT(bv.firstStartDate, '%Y-%m-%d') as firstStartDate,
+        <!--DATE_FORMAT(bv.firstStartDate, '%Y-%m-%d') as firstStartDate,-->
         <!--库龄（根据首次发车日期计算）-->
-        bv.libraryAge,
+        <!--bv.libraryAge,-->
         <!--使用组织-->
-        bv.useOrg,
+        bv.useOrgSid,
         <!--使用组织名称-->
         bv.useOrgName,
         <!--验收人-->
-        bv.acceptPeople,
+        <!--bv.acceptPeople,-->
         <!--订车单号-->
         bv.orderingNo,
         <!--出厂价-->
-        bv.exFactoryPrice,
+        <!--bv.exFactoryPrice,-->
         <!--入库价-->
-        bv.priced,
+       <!-- bv.priced,-->
         <!--入库日期-->
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
         <!--实销日期-->
-        DATE_FORMAT(bv.solidDate, '%Y-%m-%d') as solidDate,
+        DATE_FORMAT(bv.solidDate, '%Y-%m-%d') as solidDate
         <!--出库日期-->
-        DATE_FORMAT(bv.deliveryDate, '%Y-%m-%d') as deliveryDate,
+        <!--DATE_FORMAT(bv.deliveryDate, '%Y-%m-%d') as deliveryDate,-->
         <!--出库类型-->
-        bv.deliveryType,
+        <!--bv.deliveryType,-->
         <!--出库价-->
-        bv.deliveryPrice,
+        <!--bv.deliveryPrice,-->
         <!--销售合同编号-->
-        bv.salesContractNo,
+       <!-- bv.salesContractNo,-->
         <!--销售渠道-->
-        bv.salesType,
+        <!--bv.salesType,-->
         <!--指导价-->
-        bv.guidedPrice,
+       <!-- bv.guidedPrice,-->
         <!--财务开票价-->
-        bv.financialFare,
+        <!--bv.financialFare,-->
         <!--补贴金额-->
-        bv.subsidies,
+        <!--bv.subsidies,-->
         <!--是否占用-->
-        bv.isUse,
+        <!--bv.isUse,-->
         <!--具体其他配置-->
-        bv.otherRemarks
+        <!--bv.otherRemarks-->
         from base_vehicle bv
         where bv.sid = #{sid}
     </select>
@@ -581,7 +578,7 @@
             </if>
             AND (SELECT count (*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid
             AND bv.lockedState = #{state}
-            AND bv.useOrg = #{useOrgSid} )
+            AND bv.useOrgSid = #{useOrgSid} )
               > 0
         </where>
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -288,7 +288,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             }
             bv.setTaskId(busVehicleApply.getTaskId());
             bv.setTaskDefKey(busVehicleApply.getNodeId());
-            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);
         }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/flow/SubmitFinCostDto.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.fin.api.fincostapply.flow;
 
 import com.yxt.anrui.fin.api.fincostapply.FinCostapplyDto;
-import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,8 +13,8 @@ import lombok.Data;
 public class SubmitFinCostDto extends FinCostapplyDto {
     private static final long serialVersionUID = -7652070660634157511L;
 
-    @ApiModelProperty("意见")
+    /*@ApiModelProperty("意见")
-    private String comment;
+    private String comment;*/
     @ApiModelProperty("流程实例id")
     private String instanceId;
     @ApiModelProperty("任务id")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@@ -252,7 +252,7 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
             }
             bv.setTaskId(finCostapply.getTaskId());
             bv.setTaskDefKey(finCostapply.getNodeId());
-            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -363,6 +363,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 scmEntryVehicleExamineDto.setUserSid(dto.getUserSid());
                 scmEntryVehicleExamineDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
                 scmEntryVehicleExamineDto.setInspectionResult("1");
+                scmEntryVehicleExamineDto.setDepartureDate(dto.getDepartureDate());
                 ResultBean resultBean = scmVehicleExamineService.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
                 if (!resultBean.getSuccess()){
                     return rb.setMsg("验车业务模块的数据推送失败!");