Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue

@@ -93,7 +93,7 @@ export default {
           this.formobj = res.data
           this.formobj.asTechTitleDetailDetailsList.forEach((e) => {
             if (e.techNames.length > 0) {
-              e.techNames = e.techNames.split(',')
+              e.techNames = e.techNames.join(',')
             }
           })
           if (this.formobj.asTechTitleApplyFileList.length > 0) {

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!}                  |
+