From 6f11bfbfa6d8d6656cd1578d802ff5cc3c05d71f Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 15 Oct 2024 14:31:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=94=AE=E5=90=8E=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/kingdee/voucher/data_FEntity.json    |  5 ++++-
 .../as/api/asserviceitem/AsServiceItemVo.java    |  2 ++
 .../asbusrepairbill/AsBusrepairBillMapper.java   |  2 ++
 .../asbusrepairbill/AsBusrepairBillMapper.xml    |  3 +++
 .../asbusrepairbill/AsBusrepairBillService.java  | 16 ++++++++++++++++
 .../AsCustomerVehicleService.java                |  8 +++++---
 .../biz/asservicegroup/AsServiceGroupMapper.java |  2 ++
 .../biz/asservicegroup/AsServiceGroupMapper.xml  | 11 +++++++++++
 .../asservicegroup/AsServiceGroupService.java    |  8 +++++++-
 9 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json
index e52494e171..810ef2973b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json
@@ -4,6 +4,9 @@
     "FNumber": "@KD_FACCOUNTID"
   },
   "FDetailID": {
+    "FDETAILID__FF100003": {
+      "FNumber": "@KD_FF100003"
+    },
     "FDETAILID__FFLEX5": {
       "FNumber": "@KD_FFLEX5"
     },
@@ -24,4 +27,4 @@
   "FAMOUNTFOR": "",
   "FDEBIT": "@KD_FDEBIT",
   "FCREDIT": "@KD_FCREDIT"
-}
\ No newline at end of file
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java
index 3c2bfe253a..02acb2928d 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java
@@ -85,5 +85,7 @@ public class AsServiceItemVo implements Vo {
     private String isClean;
     @ApiModelProperty("排序号")
     private String sortNo;
+    @ApiModelProperty("科目")
+    private String subjectName;
 
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
index 735ee245b9..b24b57c1a2 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
@@ -63,4 +63,6 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
 
     @Update("update as_busrepair_bill set oldIsReclaim = '1' where billNo = #{billNo}")
     ResultBean updateOldIsReclaim(String billNo);
+
+    String selLastTaxRateByUseOrgSid(@Param("createOrgSid") String createOrgSid);
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
index 080fdb7759..e58e459c79 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
@@ -312,4 +312,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="selLastTaxRateByUseOrgSid" resultType="java.lang.String">
+        SELECT parameterValue FROM anrui_portal.sys_parameter as s WHERE s.useOrgSid LIKE concat('%', #{createOrgSid}, '%') AND S.parameterNo = 'SHXSZDSL'
+    </select>
 </mapper>
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index 0eed5a8a90..b909680c11 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -1232,6 +1232,22 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     }
                 }
             }
+            //如果开发票含税其中税率不能低于财务中心设置的最低税率
+            InvoiceVo invoiceVo = dto.getInvoiceVo();
+            if (null != invoiceVo) {
+                if (StringUtils.isNotBlank(invoiceVo.getTaxRate())) {
+                    String taxRate = invoiceVo.getTaxRate();
+                    String createOrgSid = dto.getCreateOrgSid();
+                    String lastRate = baseMapper.selLastTaxRateByUseOrgSid(createOrgSid);
+                    if (StringUtils.isNotBlank(lastRate)) {
+                        BigDecimal a = new BigDecimal(taxRate);
+                        BigDecimal b = new BigDecimal(lastRate);
+                        if (a.compareTo(b) < 0) {
+                            return rb.setMsg("其中税率不能低于财务中心设置的最低税率！");
+                        }
+                    }
+                }
+            }
         }
         ResultBean<String> resultBean = saveBill(dto);
         if (resultBean.getSuccess()) {
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
index 385ef4c411..e072fedcb8 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
@@ -226,10 +226,10 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
             // 0代表保险维修，显示所有客户（不传值也查询所有）；
             // 1欠款月结显示已备案且在有效期内的定点维修客户；
             // 2常规维修显示非定点维修客户
-            if (query.getBillType().equals("1")) {
+            if (query.getBillType().equals("欠款月结")) {
                 qw.apply("\tc.isDesignatedEnterprise = 1 \n" +
                         "\tAND c.filingIndate >= CURDATE()");
-            } else if (query.getBillType().equals("2")) {
+            } else if (query.getBillType().equals("常规维修")) {
                 qw.ne("isDesignatedEnterprise","1");
             }
         }
@@ -237,7 +237,9 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
             qw.like("v.vehMark", query.getVehMark());
         }
         if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.like("v.vinNo", query.getVinNo());
+            if (query.getVinNo().length() > 4) {
+                qw.like("v.vinNo", query.getVinNo());
+            }
         }
         qw.orderByDesc("v.id");
         IPage<AsCustomerVehicle> page = PagerUtil.queryToPage(pq);
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java
index 5a33e27a60..588ee4250f 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java
@@ -71,4 +71,6 @@ public interface AsServiceGroupMapper extends BaseMapper<AsServiceGroup> {
 
 	@Select("select * from as_service_group where sid = #{sid} and isDelete = '0'")
 	AsServiceGroup fetchIsDeleteBySid(String sid);
+
+    String selTitleNameByUserSid(@Param("userSid") String userSid);
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml
index b9af7258de..115254f4f7 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml
@@ -15,4 +15,15 @@
         where useOrgSid = #{useOrgSid}
         and isDelete = '0'
     </select>
+    <select id="selTitleNameByUserSid" resultType="java.lang.String">
+        SELECT
+            d.titleNameValue
+        FROM
+            as_tech_title_detail AS d
+                LEFT JOIN as_tech_title_apply AS a ON d.mainSid = a.sid
+                LEFT JOIN as_tech_title AS t ON t.sid = d.titleSid
+        WHERE d.techSid = #{userSid} AND a.nodeState = '已办结' AND t.state = '0'
+        ORDER BY a.finishTime DESC
+            LIMIT 1
+    </select>
 </mapper>
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
index 8c60fdfd1c..c9a6396810 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
@@ -229,7 +229,13 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
                     for (int i = 0; i < splitSid.length; i++) {
                         MemberVo memberVo = new MemberVo();
                         memberVo.setMemberSid(splitSid[i]);
-                        memberVo.setMemberName(splitName[i]);
+                        //查询有无职称
+                        String titleName = baseMapper.selTitleNameByUserSid(splitSid[i]);
+                        if (StringUtils.isNotBlank(titleName)) {
+                            memberVo.setMemberName(splitName[i] + "-" + titleName);
+                        } else {
+                            memberVo.setMemberName(splitName[i]);
+                        }
                         members.add(memberVo);
                     }
                     vo.setMembers(members);