Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -179,4 +179,8 @@ public interface BusSalesOrderVehicleFeign {
     @ApiOperation("批量保存")
     @PostMapping("/saveList")
     ResultBean saveList(@RequestBody List<BusSalesOrderVehicle> vehicles);
+
+    @ApiOperation("批量修改")
+    @PostMapping("/updateVehiclesList")
+    ResultBean updateVehiclesList(@RequestBody List<BusSalesOrderVehicle> updateVehicles);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -178,4 +178,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean updateVehiclesList(List<BusSalesOrderVehicle> updateVehicles) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -187,4 +187,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     BusSalesOrderVehicle selByOrderSidAndVinNo(@Param("salesOrderSid") String salesOrderSid, @Param("vinNo") String vinNo);
 
     int saveList(@Param("list") List<BusSalesOrderVehicle> list);
+
+    void updateVehiclesList(@Param("list") List<BusSalesOrderVehicle> list);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -82,6 +82,30 @@
             temporaryName = #{temporaryName}
         where sid = #{sid}
     </update>
+    <update id="updateVehiclesList" parameterType="java.util.List">
+        update bus_sales_order_vehicle
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="borrowerSid =case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    <if test="item.borrowerSid !=null and item.borrowerSid != ''">
+                        when id=#{item.id} then #{item.borrowerSid}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="loanContractSid =case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    <if test="item.loanContractSid !=null and item.loanContractSid != ''">
+                        when id=#{item.id} then #{item.loanContractSid}
+                    </if>
+                </foreach>
+            </trim>
+        </trim>
+        where id in
+        <foreach collection="list" index="index" item="item"
+                 separator="," open="(" close=")">
+            #{item.id}
+        </foreach>
+    </update>
 
     <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select *

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -206,4 +206,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         int i = busSalesOrderVehicleService.saveList(vehicles);
         return rb.success();
     }
+
+    @Override
+    public ResultBean updateVehiclesList(List<BusSalesOrderVehicle> updateVehicles) {
+        ResultBean rb = ResultBean.fireFail();
+        busSalesOrderVehicleService.updateVehiclesList(updateVehicles);
+        return rb.success();
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -676,4 +676,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public int saveList(List<BusSalesOrderVehicle> vehicles) {
         return baseMapper.saveList(vehicles);
     }
+
+    public void updateVehiclesList(List<BusSalesOrderVehicle> updateVehicles) {
+         baseMapper.updateVehiclesList(updateVehicles);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -4916,6 +4916,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         List<CrmCustomerTemp> customerTemps = new ArrayList<>();//客户表
         List<BusSalesOrder> orders = new ArrayList<>();//销售订单
         List<BusSalesOrderVehicle> vehicles = new ArrayList<>();//销售订单车辆
+        List<BusSalesOrderVehicle> updateVehicles = new ArrayList<>();//销售订单车辆
         List<BusSalesOrderBorrower> borrowers = new ArrayList<>();//贷款人
         List<BusSalesOrderLoancontract> contracts = new ArrayList<>();//消贷合同
         List<LoanRepaymentPlanDetails> planDetails = new ArrayList<>();//还款计划表明细
@@ -5142,6 +5143,11 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     } else {
                         loanContractSid = vehicleData.getLoanContractSid();
                     }
+                    if (StringUtils.isBlank(vehicleData.getBorrowerSid())) {
+                        vehicleData.setBorrowerSid(borrowerSid);
+                        vehicleData.setLoanContractSid(loanContractSid);
+                        updateVehicles.add(vehicleData);
+                    }
                 } else {
                     //生成销售订单贷款人表
                     BusSalesOrderBorrower busSalesOrderBorrower = new BusSalesOrderBorrower();
@@ -5504,6 +5510,9 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
 
         }
         //批量插入数据
+        if (updateVehicles.size() > 0 && !updateVehicles.isEmpty()) {
+            busSalesOrderVehicleFeign.updateVehiclesList(updateVehicles);
+        }
         if (schedules.size() > 0 && !schedules.isEmpty()) {
             baseMapper.saveList(schedules);
         }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@@ -125,7 +125,11 @@ public class AsBusrepairBillRest {
         return asBusrepairBillService.statConfirmOut(sids);
     }
 
-
+    @ApiOperation("生成出门证")
+    @PostMapping("/createPdf")
+    public ResultBean<String> createPdf(@RequestParam("sid") String sid){
+        return asBusrepairBillService.createPdf(sid);
+    };
 
     //==============================================================================
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -2202,4 +2202,53 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         }
         return finalPath;
     }
+
+    public ResultBean<String> createPdf(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        Map<String, Object> map = new HashMap<>();
+        AsBusrepairBill asBusrepairBill = fetchBySid(sid);
+        AsBusrepairBillVech asBusrepairBillVech = asBusrepairBillVechService.fetchByBillSid(sid);
+        //分公司简称
+        map.put("orgName",asBusrepairBill.getCreateOrgName());
+        //日期
+        map.put("date",DateUtil.formatDate(new Date()));
+        //科目
+        map.put("km",asBusrepairBill.getSubject());
+        //维修单号
+        map.put("billNo",asBusrepairBill.getBillNo());
+        //客户名称
+        map.put("custName",asBusrepairBill.getCustomerName());
+        //车型
+        map.put("modelName",asBusrepairBillVech.getVehModel());
+        //车牌号
+        map.put("vehMark",asBusrepairBillVech.getVehMark());
+        //车架号
+        map.put("vinNo",asBusrepairBillVech.getVinNo());
+        //出门原因
+        map.put("cmyy","维修完毕");
+        //业务经办人
+        map.put("ywjbr",asBusrepairBill.getWaitorName());
+        //财务经办人
+        map.put("cwjbr","");
+        //提车人
+        map.put("tcr","");
+        //出门签章
+        map.put("cmqz","");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "cmz" + ".ftl");
+        //生成word文件名
+        String targetPath = docPdfComponent.getUploadTemplateUrl();
+        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+        long seconds = System.currentTimeMillis();
+        String typeName = dateStr + seconds + ".doc";
+        File file = new File(targetPath + "cmz" + seconds + ".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
+        //新生成的word路径
+        String wordPath = targetPath + typeName;
+        //生成文件名
+        String pdfName = "出门证_" + dateStr + seconds + ".pdf";
+        WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
+        return rb.success().setData(pdfName);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java

@@ -301,7 +301,7 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
 			asTechTitleDetailDetailsVo.setTitleNameValue(asTechTitle.getTitleNameValue());
 			asTechTitleDetailDetailsVo.setWeight(asTechTitle.getWeight());
 			AsTechTitleDetail asTechTitleDetail = asTechTitleDetailService.selByTechSid(techSid);
-			if (asTechTitleDetail != null){
+			if (StringUtils.isNotBlank(asTechTitleDetail.getTechSid())){
 				asTechTitleDetailDetailsVo.setTechSids(Arrays.asList(asTechTitleDetail.getTechSid().split(",")));
 				asTechTitleDetailDetailsVo.setTechNames(Arrays.asList(asTechTitleDetail.getTechName().split(",")));
 			}

yxt-as/src/main/resources/ftl/出门证.doc

@@ -0,0 +1,10 @@
+
+|(${orgName!})出 门 证                                             |
+|日期：${date!}       |科目：${km!}         |维修单号：${billNo!} |
+|客户名称    |${custName!}    |车型    |${modelName!}             |
+|车牌号      |${vehMark!}     |车架号  |${vinNo!}                 |
+|出门原因    |${cmyy!}                                            |
+|业务经办人  |${ywjbr!}       |财务经办|${cwjbr!}                 |
+|            |                |人      |                          |
+|提车人      |${tcr!}         |出门签章|${cmqz!}                  |
+