优化开票文件 车辆新增手机号空格 付款下载公司问题

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java

@@ -55,7 +55,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- *
  * paymentdoc
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
@@ -88,7 +87,6 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
     private PaymentdocMapper paymentdocMapper;
 
 
-
     @Override
     public List<PaymentdocEntity> getList(PaymentdocPagination paymentdocPagination) {
 
@@ -227,6 +225,7 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
             return paymentdocPagination.setData(list, list.size());
         }
     }
+
     @Override
     public List<PaymentdocEntity> getTypeList(PaymentdocPagination paymentdocPagination, String dataType) {
         String userId = userProvider.get().getUserId();
@@ -361,12 +360,14 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
         entity.setId(id);
         return this.updateById(entity);
     }
+
     @Override
     public void delete(PaymentdocEntity entity) {
         if (entity != null) {
             this.removeById(entity.getId());
         }
     }
+
     //子表方法
     @Override
     public List<PaymentdocItem0Entity> GetPaymentdocItem0List(String id) {
@@ -374,12 +375,14 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
         queryWrapper.lambda().eq(PaymentdocItem0Entity::getPaymentdocId, id);
         return paymentdocItem0Service.list(queryWrapper);
     }
+
     @Override
     public List<PaymentdocItem1Entity> GetPaymentdocItem1List(String id) {
         QueryWrapper<PaymentdocItem1Entity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, id);
         return paymentdocItem1Service.list(queryWrapper);
     }
+
     @Override
     public List<PaymentdocItem2Entity> GetPaymentdocItem2List(String id) {
         QueryWrapper<PaymentdocItem2Entity> queryWrapper = new QueryWrapper<>();
@@ -449,14 +452,26 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
                     substring1 = substring1.substring(substring1.indexOf("/") + 1, substring1.length());
                 }
 
+//                while (true){
+//                    int intNum = StringUtils.countMatches(paymentdocMessage.getFullName(), "公司");
+//                    if (intNum>1){
+//                        paymentdocMessage.setFullName(fullName.substring(fullName.IndexOf("公司")+3,fullName.length()));
+//                    }else {
+//                        break;
+//                    }
+//                }
+                try {   //pdf拟稿单位。截取后面的单位
+                    paymentdocMessage.setFullName(substring + "/" + substring1); //拼接后面的两个单位名称
+                } catch (Exception e) {
                     while (true) {
                         int intNum = StringUtils.countMatches(paymentdocMessage.getFullName(), "公司");
                         if (intNum > 1) {
-                        paymentdocMessage.setFullName(fullName.substring(fullName.indexOf("公司")+3,fullName.length()));
+                            paymentdocMessage.setFullName(fullName.substring(fullName.lastIndexOf("公司") + 3, fullName.length()));
                         } else {
                             break;
                         }
                     }
+                }
             } else {
                 substring = fullName.substring(fullName.indexOf("/") + 1, fullName.length());
                 substring1 = "再生资源事业部";
@@ -465,7 +480,6 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
         }
 
 
-
         StringBuilder payEnclosureStr = new StringBuilder();
         if (paymentdocMessage.getEnclosure() != null) {//附件不为空
             String enclosure = paymentdocMessage.getEnclosure();

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java

@@ -160,6 +160,7 @@ public class VehicleController {
            VehicleEntity entity = JsonUtil.getJsonToBean(vehicleCrForm, VehicleEntity.class);
            entity.setId(mainId);
            entity.setDrivername(vehicleCrForm.getDrivername().replaceAll(" ", ""));
+           entity.setContact(vehicleCrForm.getContact().replaceAll(" ", ""));
 //           entity.setDrivername(vehicleCrForm.getDrivername().replaceAll( "[\\pP+~$`^=|<>～｀＄＾＋＝｜＜＞￥；：:;. ]", ""));
            vehicleService.save(entity);
            return ActionResult.success("创建成功");

SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml

@@ -192,15 +192,15 @@
                 FROM
                     jg_purchaseorder AS a
                         LEFT JOIN jg_purchaseorder_item0 d ON a.id = d.purchaseorder_id
-                        AND d.delete_mark = '0'
+
                         LEFT JOIN jg_poundlist b ON b.id = d.poundlist_id
-                        AND b.delete_mark = '0'
+
                         LEFT JOIN jg_material c ON b.material_id = c.id
-                        AND c.delete_mark = '0'
+
                         LEFT JOIN jg_contract e ON a.contract_code = e.id
-                        AND e.delete_mark = '0'
+
                 WHERE
-                    a.delete_mark = '0'
+                    a.delete_mark = '0'   AND d.delete_mark = '0'  AND b.delete_mark = '0' AND c.delete_mark = '0'  AND e.delete_mark = '0'
                 GROUP BY
                     a.id,
                     b.material_id,
@@ -229,15 +229,15 @@
                 FROM
                     jg_purchaseorder AS a
                         LEFT JOIN jg_purchaseorder_item0 d ON a.id = d.purchaseorder_id
-                        AND d.delete_mark = '0'
+
                         LEFT JOIN jg_poundlist b ON b.id = d.poundlist_id
-                        AND b.delete_mark = '0'
+
                         LEFT JOIN jg_material c ON b.material_id = c.id
-                        AND c.delete_mark = '0'
+
                         LEFT JOIN jg_contract e ON a.contract_code = e.id
-                        AND e.delete_mark = '0'
+
                 WHERE
-                    a.delete_mark = '0'
+                    a.delete_mark = '0'  AND d.delete_mark = '0'   AND b.delete_mark = '0' AND c.delete_mark = '0'   AND e.delete_mark = '0'
                 GROUP BY
                     a.id,
                     a.rate,