Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java

@@ -46,7 +46,7 @@ public interface BusTransferRecordsFeign {
 
     @ApiOperation("根据接收人sid以及车辆sid查询是否有待接收记录")
     @GetMapping("/selectByVinSid")
-    ResultBean<BusTransferRecords> selectByVinSid(@RequestParam("vinSid") String vinSid, @RequestParam("receiveUserSid") String receiveUserSid,@RequestParam("goodsTypeKey") String goodsTypeKey);
+    ResultBean<BusTransferRecords> selectByVinSid(@RequestParam("contractNo") String contractNo,@RequestParam("vinSid") String vinSid, @RequestParam("receiveUserSid") String receiveUserSid,@RequestParam("goodsTypeKey") String goodsTypeKey);
 
     @ApiOperation("根据来源sid删除")
     @PostMapping("/delBySourceSid")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -1082,10 +1082,10 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         //出门证
         BusExitPermitVo permitVo = new BusExitPermitVo();
         if (null != busHandover) {
-            if (StringUtils.isNotBlank(busHandover.getPayTypeValue())) {
-                if ("全款".equals(busHandover.getPayTypeValue())) {
+            if (StringUtils.isNotBlank(busHandover.getPayTypeKey())) {
+                if ("1".equals(busHandover.getPayTypeKey())) {
                     permitVo.setReason("全款交车");
-                } else if ("贷款".equals(busHandover.getPayTypeValue())) {
+                } else if ("2".equals(busHandover.getPayTypeKey())) {
                     permitVo.setReason("消贷交车");
                 }
             }
@@ -1196,8 +1196,8 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         String s2 = exitPermitCreatePdf(permitVo);
         String s3 = commonCreatePdf(pdfVo);
         filePaths.add(s1);
-        filePaths.add(s2);
         filePaths.add(s3);
+        filePaths.add(s2);
         return rb.success().setData(filePaths);
     }
 
@@ -1298,7 +1298,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         }
         dataMap.put("newList", newList);
         //获取模板
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vehicledatahandover.ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vinDataHandover.ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1333,11 +1333,11 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         dataMap.put("vinNo", pdfVo.getVinNo());
         dataMap.put("reason", pdfVo.getReason());
         dataMap.put("operator", pdfVo.getOperator());
-        dataMap.put("finOperator", pdfVo.getFinOperator());
+        dataMap.put("finOperator", "");
         dataMap.put("carCollector", pdfVo.getCarCollector());
         dataMap.put("signature", pdfVo.getSignature());
         //获取模板
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/outdoor.ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/exitPermit.ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -305,7 +305,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         BusHandoverPrepare busHandoverPrepare = fetchBySid(busHandoverPrepareVehicle.getMainSid());
         String receiveUserSid = busHandoverPrepare.getCreateBySid();
         //根据车辆sid以及销售专员的用户sid查询是否有待接收的记录
-        ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode());
+        ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepare.getContractNo(),busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode());
         if (busTransferRecordsResultBean.getData() == null) {
             return rb.setMsg("发票未准备好");
         } else {
@@ -348,7 +348,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         //查询销售专员的用户sid
         BusHandoverPrepare busHandoverPrepare = fetchBySid(busHandoverPrepareVehicle.getMainSid());
         String receiveUserSid = busHandoverPrepare.getCreateBySid();
-        ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode());
+        ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid("",busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode());
         if (busTransferRecordsResultBean.getData() == null) {
             return rb.setMsg("合格证未准备好");
         } else {
@@ -670,7 +670,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
             //发票确认：确认时更新接收记录的接收日期及接收备注，如果发票移交状态为移交中的，则更新为已移交。
             busHandoverPrepareVehicle.setInvoicingState(1);
             //根据车辆sid查询移交记录
-            ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.FP.getCode());
+            ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepare.getContractNo(),busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.FP.getCode());
             if (busTransferRecordsResultBean.getData() != null) {
                 BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData();
                 busTransferRecords.setReceiveRemarks(dto.getRemarks());
@@ -700,7 +700,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
             //合格证确认：确认接收后，修改合格证的移交状态为已移交。
             busHandoverPrepareVehicle.setCertificateState(1);
             //根据车辆sid查询移交记录
-            ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.HGZ.getCode());
+            ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid("",busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.HGZ.getCode());
             if (busTransferRecordsResultBean.getData() != null) {
                 BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData();
                 busTransferRecords.setReceiveRemarks(dto.getRemarks());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java

@@ -131,13 +131,13 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
         list.removeAll(Collections.singleton(null));
         for(AppBusHandoverPrepareVehicleInfoVo vo : list){
             //先判断是否准备好合格证
-            ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode());
+            ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid("",vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode());
             if (busTransferRecordsResultBean.getData() != null && !vo.isCertificateState()) {
                 vo.setCertificateStateStr("原件接收确认");
             }
             //判断发票是否准备好
             //根据车辆sid以及销售专员的用户sid查询是否有待接收的记录
-            busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode());
+            busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepare.getContractNo(),vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode());
             if (busTransferRecordsResultBean.getData() != null && !vo.isInvoicingState()) {
                 vo.setInvoicingStateStr("原件接收确认");
             }
@@ -154,7 +154,7 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
                         //根据随车资料主表sid查询随车资料的记录
                         List<HandoverInformationIntemVo> listTwo = busVehicleInformationService.selectByMainSid(busVehicleInformationHandover.getSid());
                         list.removeAll(Collections.singleton(null));
-                        if(listTwo.size() <=1){
+                        if(listTwo.size() ==1){
                             HandoverInformationIntemVo handoverInformationIntemVo = listTwo.get(0);
                             if(StringUtils.isBlank(handoverInformationIntemVo.getRecTime())){
                                 vo.setOnBoardDataState(false);
@@ -163,6 +163,7 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
                             }
                         }else{
                             vo.setOnBoardDataState(false);
+                            vo.setOnBoardDataStateStr("接收确认");
                         }
                     }else{
                         vo.setOnBoardDataState(true);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java

@@ -24,7 +24,7 @@ import java.util.List;
 public interface BusTransferRecordsMapper extends BaseMapper<BusTransferRecords> {
     IPage<BusTransferRecordsVo> pagerList(IPage<BusTransferRecords> page, @Param(Constants.WRAPPER)QueryWrapper<BusTransferRecords> qw, @Param("list") List<String> roleSidList);
 
-    BusTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid,@Param("typeKey") String typeKey);
+    BusTransferRecords selectByVinSid(@Param("contractNo") String contractNo,@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid,@Param("typeKey") String typeKey);
 
     @Delete("DELETE FROM bus_transfer_records WHERE goodsSid = #{sourceSid}")
     void delBySourceSid(String sourceSid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml

@@ -34,6 +34,10 @@
         where vinSid = #{vinSid}
           and receiveSid = #{userSid}
           and goodsTypeKey = #{typeKey}
+        <if test="contractNo != null and contractNo != ''">
+            and contractNo = #{contractNo}
+        </if>
+        order by id desc limit 1
     </select>
 
     <select id="hgzPagerList" resultType="com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsHgzVo">

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java

@@ -52,8 +52,8 @@ public class BusTransferRecordsRest implements BusTransferRecordsFeign {
     }
 
     @Override
-    public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid,String goodsTypeKey) {
-        return busTransferRecordsService.selectByVinSid(vinSid, receiveUserSid,goodsTypeKey);
+    public ResultBean<BusTransferRecords> selectByVinSid(String contractNo,String vinSid, String receiveUserSid, String goodsTypeKey) {
+        return busTransferRecordsService.selectByVinSid(contractNo,vinSid, receiveUserSid,goodsTypeKey);
     }
 
     @Override

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@@ -189,9 +189,9 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
         return rb.success().setData(busRecordsInvoiceVo);
     }
 
-    public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid, String type) {
+    public ResultBean<BusTransferRecords> selectByVinSid(String contractNo,String vinSid, String receiveUserSid, String type) {
         ResultBean<BusTransferRecords> rb = ResultBean.fireFail();
-        BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(vinSid, receiveUserSid, type);
+        BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(contractNo,vinSid, receiveUserSid, type);
         return rb.success().setData(BusTransferRecords);
     }