索赔调整

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckQuery.java

@@ -15,4 +15,14 @@ public class AsBusclaimCheckQuery implements Query {
     private static final long serialVersionUID = -5046272268264726533L;
     @ApiModelProperty("维修工单号")
     private String repairBillNo;
+    @ApiModelProperty("差异金额开始范围")
+    private String cyStartMoney;
+    @ApiModelProperty("差异金额结束范围")
+    private String cyEndMoney;
+
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    private String userSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckVo.java

@@ -72,4 +72,7 @@ public class AsBusclaimCheckVo {
 
     //合计
     private String all2;
+
+    //差异合计
+    private String all3;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApply.java

@@ -19,9 +19,9 @@ public class AsBusclaimCheckApply extends BaseEntity {
     @ApiModelProperty("申请人")
     private String createByName;
     @ApiModelProperty("申请部门sid")
-    private String createDeptSid;
+    private String deptSid;
-    @ApiModelProperty("申请部门")
+    @ApiModelProperty("申请部门名称")
-    private String createDeptName;
+    private String deptName;
     @ApiModelProperty("附件")
     private String file;
     @ApiModelProperty("创建组织sid")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.as.api.asbusclaimcheckapply;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.as.api.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailVo;
 import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -19,17 +21,37 @@ public class AsBusclaimCheckApplyDetailsVo {
     private String sid;
     private String createBySid;
     private String createByName;
-//    private String orgPath;
 
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date createTime;
 
     @ApiModelProperty("申请部门sid")
-    private String createDeptSid;
+    private String deptSid;
-    @ApiModelProperty("申请部门")
+    @ApiModelProperty("申请部门名称")
-    private String createDeptName;
+    private String deptName;
 
-    private List<String> fileList = new ArrayList<>();
+    private List<AsBusclaimCheckApplyFile> fileList = new ArrayList<>();
     private String remarks;
 
-    private List<AsBusclaimCheckApplyDetailVo> detailList = new ArrayList<>();
+    private String billNo;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("办结日期")
+    private String closeDate;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务iD")
+    private String taskId;
+    @ApiModelProperty("环节iD")
+    private String taskDefKey;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+
+    private List<AsBusclaimCheckApplyDetailVo> detailsList = new ArrayList<>();
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDto.java

@@ -18,17 +18,36 @@ public class AsBusclaimCheckApplyDto {
     private String sid;
     private String createBySid;
     private String createByName;
-//    private String orgPath;
 
     private String createTime;
 
     @ApiModelProperty("申请部门sid")
-    private String createDeptSid;
+    private String deptSid;
-    @ApiModelProperty("申请部门")
+    @ApiModelProperty("申请部门名称")
-    private String createDeptName;
+    private String deptName;
 
-    private List<String> fileList = new ArrayList<>();
+    private List<AsBusclaimCheckApplyFile> fileList = new ArrayList<>();
     private String remarks;
 
+    private String billNo;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("办结日期")
+    private String closeDate;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务iD")
+    private String taskId;
+    @ApiModelProperty("环节iD")
+    private String taskDefKey;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+
     private List<AsBusclaimCheckApplyDetailDto> detailsList = new ArrayList<>();
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyFile.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.as.api.asbusclaimcheckapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class AsBusclaimCheckApplyFile {
+
+    private String url;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyQuery.java

@@ -15,8 +15,8 @@ public class AsBusclaimCheckApplyQuery implements Query {
 
     @ApiModelProperty("分公司")
     private String useOrgName;
-    @ApiModelProperty("申请部门")
+    @ApiModelProperty("申请部门名称")
-    private String createDeptName;
+    private String deptName;
     @ApiModelProperty("申请人")
     private String createByName;
     @ApiModelProperty("单据编号")
@@ -30,6 +30,8 @@ public class AsBusclaimCheckApplyQuery implements Query {
     @ApiModelProperty("办结日期结束时间")
     private String closeDateEnd;
 
-    private String createBySid;
     private String orgPath;
+    private String userSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java

@@ -22,8 +22,8 @@ public class AsBusclaimCheckApplyVo {
     private String billNo;
     @ApiModelProperty("分公司")
     private String useOrgName;
-    @ApiModelProperty("申请部门")
+    @ApiModelProperty("申请部门名称")
-    private String createDeptName;
+    private String deptName;
     @ApiModelProperty("申请人")
     private String createByName;
     @ApiModelProperty("申请日期")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java

@@ -41,8 +41,9 @@ public class AsBusclaimCheckApplyDetail extends BaseEntity {
     private BigDecimal claimOtherAmount;
     @ApiModelProperty("预留")
     private BigDecimal reserved;
-    @ApiModelProperty("原因")
+    @ApiModelProperty("原因key")
-    private String reason;
+    private String reasonKey;
-
+    @ApiModelProperty("原因value")
+    private String reasonValue;
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java

@@ -37,6 +37,8 @@ public class AsBusclaimCheckApplyDetailDto {
     private String claimOtherAmount;
     @ApiModelProperty("预留")
     private String reserved;
-    @ApiModelProperty("原因")
+    @ApiModelProperty("原因key")
-    private String reason;
+    private String reasonKey;
+    @ApiModelProperty("原因value")
+    private String reasonValue;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java

@@ -37,8 +37,10 @@ public class AsBusclaimCheckApplyDetailVo {
     private String claimOtherAmount;
     @ApiModelProperty("预留")
     private String reserved;
-    @ApiModelProperty("原因")
+    @ApiModelProperty("原因key")
-    private String reason;
+    private String reasonKey;
+    @ApiModelProperty("原因value")
+    private String reasonValue;
 
     //工单：工时费
     private String hourAmount1;
@@ -75,4 +77,10 @@ public class AsBusclaimCheckApplyDetailVo {
 
     //合计
     private String all2;
+
+    //差异合计
+    private String all3;
+
+    //差异调整合计
+    private String all4;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java

@@ -18,9 +18,9 @@ public class AsBusclaimInvoiceBill extends BaseEntity {
     @ApiModelProperty("申请人")
     private String createByName;
     @ApiModelProperty("申请部门sid")
-    private String createDeptSid;
+    private String deptSid;
-    @ApiModelProperty("申请部门")
+    @ApiModelProperty("申请部门名称")
-    private String createDeptName;
+    private String deptName;
     @ApiModelProperty("开票sid")
     private String invoiceSid;
     @ApiModelProperty("开票名称")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java

@@ -38,9 +38,9 @@ public class AsBusclaimInvoiceBillDetailsVo {
     private String nodeState;
 
     @ApiModelProperty("申请部门sid")
-    private String createDeptSid;
+    private String deptSid;
-    @ApiModelProperty("申请部门")
+    @ApiModelProperty("申请部门名称")
-    private String createDeptName;
+    private String deptName;
     @ApiModelProperty("开票sid")
     private String invoiceSid;
     @ApiModelProperty("开票名称")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java

@@ -32,9 +32,9 @@ public class AsBusclaimInvoiceBillDto {
     private String nodeState;
 
     @ApiModelProperty("申请部门sid")
-    private String createDeptSid;
+    private String deptSid;
-    @ApiModelProperty("申请部门")
+    @ApiModelProperty("申请部门名称")
-    private String createDeptName;
+    private String deptName;
     @ApiModelProperty("开票sid")
     private String invoiceSid;
     @ApiModelProperty("开票名称")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java

@@ -15,8 +15,8 @@ public class AsBusclaimInvoiceBillQuery implements Query {
 
     @ApiModelProperty("分公司")
     private String useOrgName;
-    @ApiModelProperty("申请部门")
+    @ApiModelProperty("申请部门名称")
-    private String createDeptName;
+    private String deptName;
     @ApiModelProperty("申请人")
     private String createByName;
     @ApiModelProperty("单据编号")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java

@@ -21,8 +21,8 @@ public class AsBusclaimInvoiceBillVo {
     private String billNo;
     @ApiModelProperty("分公司")
     private String useOrgName;
-    @ApiModelProperty("申请部门")
+    @ApiModelProperty("申请部门名称")
-    private String createDeptName;
+    private String deptName;
     @ApiModelProperty("申请人")
     private String createByName;
     @ApiModelProperty("申请日期")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheck/AsBusclaimCheckMapper.xml

@@ -2,13 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.as.biz.asbusclaimcheck.AsBusclaimCheckMapper">
     <select id="listPage" resultType="com.yxt.anrui.as.api.asbusclaimcheck.AsBusclaimCheckVo">
-        select ac.repairBillNo,
+        SELECT
-               ac.vehMark,
+        ac.repairBillNo,
-               ac.vinNo,
+        ac.vehMark,
-               ac.billNo,
+        ac.vinNo,
-               ac.billInvoiceSid,
+        ac.billNo,
-               ac.billInvoiceDetailSid
+        ac.billInvoiceSid,
-        from as_busclaim_check ac
+        ac.billInvoiceDetailSid,
+        IFNULL(abb.hourAmount,0) AS hourAmount1,
+        IFNULL(abb.goodsAmount,0) AS goodsAmount1,
+        IFNULL(abb.outAmount,0) AS claimOutAmount1,
+        IFNULL(abb.subsidyAmount,0) AS claimSubsidyAmount1,
+        IFNULL(abb.otherAmount,0) AS claimOtherAmount1,
+        (COALESCE(abb.hourAmount, 0) + COALESCE(abb.goodsAmount, 0) + COALESCE(abb.outAmount, 0) + COALESCE(abb.subsidyAmount, 0) + COALESCE(abb.otherAmount, 0)) AS all1,
+        SUM(aibd.`claimHourAmount`) AS claimHourAmount2,
+        SUM(aibd.`claimGoodsAmount`) AS claimGoodsAmount2,
+        SUM(aibd.`claimOutAmount`) AS claimOutAmount2,
+        SUM(aibd.`claimSubsidyAmount`) AS claimSubsidyAmount2,
+        SUM(aibd.`claimOtherAmount`) AS claimOtherAmount2,
+        SUM(COALESCE(aibd.`claimHourAmount`, 0) + COALESCE(aibd.`claimGoodsAmount`, 0) + COALESCE(aibd.`claimOutAmount`, 0) + COALESCE(aibd.`claimSubsidyAmount`, 0) + COALESCE(aibd.`claimOtherAmount`, 0)) AS all2,
+        SUM(COALESCE(aibd.`claimHourAmount`, 0) + COALESCE(aibd.`claimGoodsAmount`, 0) + COALESCE(aibd.`claimOutAmount`, 0) + COALESCE(aibd.`claimSubsidyAmount`, 0) + COALESCE(aibd.`claimOtherAmount`, 0)) - (COALESCE(abb.hourAmount, 0) + COALESCE(abb.goodsAmount, 0) + COALESCE(abb.outAmount, 0) + COALESCE(abb.subsidyAmount, 0) + COALESCE(abb.otherAmount, 0)) AS all3
+        FROM
+        as_busclaim_check ac
+        LEFT JOIN as_busclaim_invoice_bill ab
+        ON ac.billInvoiceSid = ab.sid
+        LEFT JOIN as_busrepair_bill abb
+        ON ac.repairBillNo = abb.`billNo`
+        LEFT JOIN as_busclaim_invoice_bill_detail aibd
+        ON ac.billInvoiceSid = aibd.billSid
+        LEFT JOIN anrui_portal.sys_organization AS s
+        ON ab.deptSid = s.sid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheck/AsBusclaimCheckService.java

@@ -12,8 +12,12 @@ import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBill;
 import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillQuery;
 import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
 import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
 import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
 import com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailService;
+import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
+import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -23,6 +27,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
 
@@ -35,9 +40,13 @@ import java.util.List;
 public class AsBusclaimCheckService extends MybatisBaseService<AsBusclaimCheckMapper, AsBusclaimCheck> {
 
     @Autowired
-    private AsBusclaimBillService asBusclaimBillService;
+    private AsBusrepairBillService asBusrepairBillService;
     @Autowired
     private AsBusclaimInvoiceBillDetailService asBusclaimInvoiceBillDetailService;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private AsBusclaimBillService asBusclaimBillService;
 
     public ResultBean saveCheck(List<AsBusclaimCheckDto> list) {
         ResultBean rb = ResultBean.fireFail();
@@ -56,11 +65,53 @@ public class AsBusclaimCheckService extends MybatisBaseService<AsBusclaimCheckMa
     public PagerVo<AsBusclaimCheckVo> listPage(PagerQuery<AsBusclaimCheckQuery> pagerQuery) {
         AsBusclaimCheckQuery query = pagerQuery.getParams();
         QueryWrapper<AsBusclaimCheck> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("ab.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<AsBusclaimCheckVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<AsBusclaimCheckVo> p = new PagerVo<>();
+                return p;
+            }
+        }
         //ToDo:添加查询条件
         if (StringUtils.isNotBlank(query.getRepairBillNo())) {
             qw.like("ac.repairBillNo", query.getRepairBillNo());
         }
-
+        if (StringUtils.isNotBlank(query.getCyStartMoney()) && StringUtils.isNotBlank(query.getCyEndMoney())) {
+            qw.groupBy("ac.repairBillNo");
+            qw.having("all3 >= {0}", query.getCyStartMoney()).having("all3 <= {0}", query.getCyEndMoney());
+        }
         IPage<AsBusclaimCheck> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AsBusclaimCheckVo> pagging = baseMapper.listPage(page, qw);
         List<AsBusclaimCheckVo> records = pagging.getRecords();
@@ -68,23 +119,12 @@ public class AsBusclaimCheckService extends MybatisBaseService<AsBusclaimCheckMa
         if (!records.isEmpty()) {
             for (int i = 0; i < records.size(); i++) {
                 AsBusclaimCheckVo asBusclaimCheckVo = records.get(i);
-                String billNo = asBusclaimCheckVo.getBillNo();
+                AsBusrepairBill asBusrepairBill = asBusrepairBillService.selectByBillNo(asBusclaimCheckVo.getRepairBillNo());
-                AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(billNo);
+                List<String> billNos = asBusclaimBillService.selectByRepairBillSid(asBusrepairBill.getSid());
-                if (asBusclaimBill != null) {
+                asBusclaimCheckVo.setCount(String.valueOf(billNos.size()));
-                    asBusclaimCheckVo.setHourAmount1(asBusclaimBill.getHourAmount().toString());
+                int ykpSpdCount = asBusclaimInvoiceBillDetailService.selectYkpSpdCount(asBusrepairBill.getBillNo());
-                    asBusclaimCheckVo.setGoodsAmount1(asBusclaimBill.getGoodsAmount().toString());
+                asBusclaimCheckVo.setCount1(String.valueOf(ykpSpdCount));
-                    asBusclaimCheckVo.setClaimOutAmount1(asBusclaimBill.getClaimOutAmount().toString());
+                asBusclaimCheckVo.setCount2(String.valueOf(billNos.size() - ykpSpdCount));
-                    asBusclaimCheckVo.setClaimSubsidyAmount1(asBusclaimBill.getClaimSubsidyAmount().toString());
-                    asBusclaimCheckVo.setClaimOtherAmount1(asBusclaimBill.getClaimOtherAmount().toString());
-                }
-                AsBusclaimInvoiceBillDetail asBusclaimInvoiceBillDetail = asBusclaimInvoiceBillDetailService.fetchBySid(asBusclaimCheckVo.getBillInvoiceDetailSid());
-                if (asBusclaimInvoiceBillDetail != null) {
-                    asBusclaimCheckVo.setClaimHourAmount2(asBusclaimInvoiceBillDetail.getClaimHourAmount().toString());
-                    asBusclaimCheckVo.setClaimGoodsAmount2(asBusclaimInvoiceBillDetail.getClaimGoodsAmount().toString());
-                    asBusclaimCheckVo.setClaimOutAmount2(asBusclaimInvoiceBillDetail.getClaimOutAmount().toString());
-                    asBusclaimCheckVo.setClaimSubsidyAmount2(asBusclaimInvoiceBillDetail.getClaimSubsidyAmount().toString());
-                    asBusclaimCheckVo.setClaimOtherAmount2(asBusclaimInvoiceBillDetail.getClaimOtherAmount().toString());
-                }
             }
         }
         PagerVo<AsBusclaimCheckVo> p = PagerUtil.pageToVo(pagging, null);

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyMapper.java

@@ -23,4 +23,6 @@ public interface AsBusclaimCheckApplyMapper extends BaseMapper<AsBusclaimCheckAp
     int selectBySid(String join);
 
     int updateFlowFiled(Map<String, Object> beanToMap);
+
+    String selectNum(String billNo);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyMapper.xml

@@ -6,22 +6,23 @@
                a.nodeState,
                a.billNo,
                a.useOrgName,
-               a.createDeptName,
+               a.deptName,
                a.createByName,
                DATE_FORMAT(a.createTime, '%Y-%m-%d') as createTime,
                a.closeDate,
                a.file
         from as_busclaim_check_apply a
+        LEFT JOIN anrui_portal.sys_organization AS s ON a.deptSid = s.sid
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
 
     <select id="selectBySid" resultType="int">
-        select count(*)
+        SELECT COUNT(*)
-        from as_busclaim_check_apply
+        FROM as_busclaim_check_apply
-        where length(nodeState) > 0
+        WHERE nodeState != '待提交'
-          and find_in_set(sid, #{list})
+		  and find_in_set(sid, #{list})
     </select>
 
     <update id="updateFlowFiled">
@@ -41,4 +42,12 @@
         </if>
         WHERE sid = #{sid}
     </update>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (billNo, 4)
+        from as_busclaim_check_apply
+        where billNo LIKE concat(#{billNo}, '%')
+        order by billNo desc
+                limit 1
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java

@@ -7,15 +7,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
+import com.yxt.anrui.as.api.asbusclaimcheck.AsBusclaimCheckVo;
 import com.yxt.anrui.as.api.asbusclaimcheckapply.*;
 import com.yxt.anrui.as.api.asbusclaimcheckapply.flowable.*;
 import com.yxt.anrui.as.api.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailDto;
 import com.yxt.anrui.as.api.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailVo;
 import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
 import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
 import com.yxt.anrui.as.biz.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailMapper;
 import com.yxt.anrui.as.biz.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailService;
 import com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailService;
+import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
+import com.yxt.anrui.as.feign.base.billno.Rule;
 import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
 import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign;
 import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum;
@@ -28,8 +32,10 @@ import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo;
 import com.yxt.anrui.as.feign.message.MessageFeign;
 import com.yxt.anrui.as.feign.message.MessageFlowVo;
 import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
+import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -41,6 +47,7 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -60,7 +67,7 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService<AsBusclaimCh
     @Autowired
     private AsBusclaimCheckApplyDetailMapper asBusclaimCheckApplyDetailMapper;
     @Autowired
-    private AsBusclaimBillService asBusclaimBillService;
+    private AsBusrepairBillService asBusrepairBillService;
     @Autowired
     private AsBusclaimInvoiceBillDetailService asBusclaimInvoiceBillDetailService;
     @Autowired
@@ -73,19 +80,60 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService<AsBusclaimCh
     private FlowTaskFeign flowTaskFeign;
     @Autowired
     private FlowableFeign flowableFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
 
 
     public PagerVo<AsBusclaimCheckApplyVo> listPage(PagerQuery<AsBusclaimCheckApplyQuery> pagerQuery) {
         AsBusclaimCheckApplyQuery query = pagerQuery.getParams();
         QueryWrapper<AsBusclaimCheckApply> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("a.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<AsBusclaimCheckApplyVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<AsBusclaimCheckApplyVo> p = new PagerVo<>();
+                return p;
+            }
+        }
         //ToDo:添加查询条件
         //分公司
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
             qw.like("a.useOrgName", query.getUseOrgName());
         }
         //申请部门
-        if (StringUtils.isNotBlank(query.getCreateDeptName())) {
+        if (StringUtils.isNotBlank(query.getDeptName())) {
-            qw.like("a.createDeptName", query.getCreateDeptName());
+            qw.like("a.deptName", query.getDeptName());
         }
         //申请人
         if (StringUtils.isNotBlank(query.getCreateByName())) {
@@ -124,36 +172,54 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService<AsBusclaimCh
     public ResultBean<String> saveOrUpdateBill(AsBusclaimCheckApplyDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
+        SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+        dto.setUseOrgSid(dto.getUseOrgSid());
+        dto.setUseOrgName(organizationVo.getName());
+        dto.setCreateOrgSid(dto.getUseOrgSid());
         if (StringUtils.isBlank(sid)) {
             AsBusclaimCheckApply asBusclaimCheckApply = new AsBusclaimCheckApply();
+            //生成单据编号
+            String billNo = "";
+            String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+            billNo = "SPTZ" + organizationVo.getOrgCode() + date;
+            String i = baseMapper.selectNum(billNo);
+            if (StringUtils.isNotBlank(i)) {
+                billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+            } else {
+                billNo = Rule.getBillNo(billNo, 0);
+            }
+            dto.setBillNo(billNo);
             BeanUtil.copyProperties(dto, asBusclaimCheckApply, "sid");
-            asBusclaimCheckApply.setCreateBySid(dto.getCreateBySid());
             sid = asBusclaimCheckApply.getSid();
-            List<String> fileList = dto.getFileList();
+            List<AsBusclaimCheckApplyFile> fileList = dto.getFileList();
             fileList.removeAll(Collections.singleton(null));
-            if (!fileList.isEmpty()) {
+            String url = "";
-                String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+            for (AsBusclaimCheckApplyFile asBusclaimCheckApplyFile : fileList) {
-                asBusclaimCheckApply.setFile(files);
+                String filePath = asBusclaimCheckApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+                url = url + filePath + ",";
             }
+            asBusclaimCheckApply.setFile(url);
             List<AsBusclaimCheckApplyDetailDto> detailList = dto.getDetailsList();
             detailList.removeAll(Collections.singleton(null));
             if (!detailList.isEmpty()) {
                 asBusclaimCheckApplyDetailService.saveOrUpdateDetails(sid, detailList);
             }
+            asBusclaimCheckApply.setNodeState("待提交");
             baseMapper.insert(asBusclaimCheckApply);
-
         } else {
             AsBusclaimCheckApply asBusclaimCheckApply = fetchBySid(sid);
             if (asBusclaimCheckApply == null) {
                 return rb.setMsg("该单据不存在");
             }
             BeanUtil.copyProperties(dto, asBusclaimCheckApply, "sid");
-            List<String> fileList = dto.getFileList();
+            List<AsBusclaimCheckApplyFile> fileList = dto.getFileList();
             fileList.removeAll(Collections.singleton(null));
-            if (!fileList.isEmpty()) {
+            String url = "";
-                String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+            for (AsBusclaimCheckApplyFile asBusclaimCheckApplyFile : fileList) {
-                asBusclaimCheckApply.setFile(files);
+                String filePath = asBusclaimCheckApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+                url = url + filePath + ",";
             }
+            asBusclaimCheckApply.setFile(url);
             List<AsBusclaimCheckApplyDetailDto> detailList = dto.getDetailsList();
             detailList.removeAll(Collections.singleton(null));
             if (!detailList.isEmpty()) {
@@ -189,21 +255,27 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService<AsBusclaimCh
         BeanUtil.copyProperties(asBusclaimCheckApply, asBusclaimCheckApplyDetailsVo);
         if (StringUtils.isNotBlank(asBusclaimCheckApply.getFile())) {
             List<String> fileList = Arrays.asList(asBusclaimCheckApply.getFile().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
-            asBusclaimCheckApplyDetailsVo.setFileList(fileList);
+            List<AsBusclaimCheckApplyFile> asBusclaimCheckApplyFiles = new ArrayList<>();
+            for (String s : fileList) {
+                AsBusclaimCheckApplyFile asBusclaimCheckApplyFile = new AsBusclaimCheckApplyFile();
+                asBusclaimCheckApplyFile.setUrl(s);
+                asBusclaimCheckApplyFiles.add(asBusclaimCheckApplyFile);
+            }
+            asBusclaimCheckApplyDetailsVo.setFileList(asBusclaimCheckApplyFiles);
         }
         List<AsBusclaimCheckApplyDetailVo> detailList = asBusclaimCheckApplyDetailService.selectDetails(sid);
         detailList.removeAll(Collections.singleton(null));
         if (!detailList.isEmpty()) {
             for (int i = 0; i < detailList.size(); i++) {
                 AsBusclaimCheckApplyDetailVo asBusclaimCheckApplyDetailVo = detailList.get(i);
-                String billNo = asBusclaimCheckApplyDetailVo.getClaimBillNo();
+                AsBusrepairBill asBusrepairBill = asBusrepairBillService.selectByBillNo(asBusclaimCheckApplyDetailVo.getRepairBillNo());
-                AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(billNo);
+                if (asBusrepairBill != null) {
-                if (asBusclaimBill != null) {
+                    asBusclaimCheckApplyDetailVo.setHourAmount1("0");
-                    asBusclaimCheckApplyDetailVo.setHourAmount1(asBusclaimBill.getHourAmount().toString());
+                    asBusclaimCheckApplyDetailVo.setGoodsAmount1("0");
-                    asBusclaimCheckApplyDetailVo.setGoodsAmount1(asBusclaimBill.getGoodsAmount().toString());
+                    asBusclaimCheckApplyDetailVo.setClaimOutAmount1("0");
-                    asBusclaimCheckApplyDetailVo.setClaimOutAmount1(asBusclaimBill.getClaimOutAmount().toString());
+                    asBusclaimCheckApplyDetailVo.setClaimSubsidyAmount1("0");
-                    asBusclaimCheckApplyDetailVo.setClaimSubsidyAmount1(asBusclaimBill.getClaimSubsidyAmount().toString());
+                    asBusclaimCheckApplyDetailVo.setClaimOtherAmount1("0");
-                    asBusclaimCheckApplyDetailVo.setClaimOtherAmount1(asBusclaimBill.getClaimOtherAmount().toString());
+                    asBusclaimCheckApplyDetailVo.setAll1("0");
                 }
                 AsBusclaimInvoiceBillDetail asBusclaimInvoiceBillDetail = asBusclaimInvoiceBillDetailService.fetchBySid(asBusclaimCheckApplyDetailVo.getBillInvoiceDetailSid());
                 if (asBusclaimInvoiceBillDetail != null) {
@@ -212,9 +284,12 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService<AsBusclaimCh
                     asBusclaimCheckApplyDetailVo.setClaimOutAmount2(asBusclaimInvoiceBillDetail.getClaimOutAmount().toString());
                     asBusclaimCheckApplyDetailVo.setClaimSubsidyAmount2(asBusclaimInvoiceBillDetail.getClaimSubsidyAmount().toString());
                     asBusclaimCheckApplyDetailVo.setClaimOtherAmount2(asBusclaimInvoiceBillDetail.getClaimOtherAmount().toString());
+                    asBusclaimCheckApplyDetailVo.setAll2(asBusclaimInvoiceBillDetail.getClaimHourAmount().add(asBusclaimInvoiceBillDetail.getClaimGoodsAmount()).add(asBusclaimInvoiceBillDetail.getClaimOutAmount()).add(asBusclaimInvoiceBillDetail.getClaimSubsidyAmount()).add(asBusclaimInvoiceBillDetail.getClaimOtherAmount()).toString());
                 }
+                asBusclaimCheckApplyDetailVo.setAll3(new BigDecimal(asBusclaimCheckApplyDetailVo.getAll2()).subtract(new BigDecimal(asBusclaimCheckApplyDetailVo.getAll1())).toString());
+                asBusclaimCheckApplyDetailVo.setAll4(new BigDecimal(asBusclaimCheckApplyDetailVo.getClaimHourAmount()).add(new BigDecimal(asBusclaimCheckApplyDetailVo.getClaimGoodsAmount()).add(new BigDecimal(asBusclaimCheckApplyDetailVo.getClaimOutAmount()).add(new BigDecimal(asBusclaimCheckApplyDetailVo.getClaimSubsidyAmount()).add(new BigDecimal(asBusclaimCheckApplyDetailVo.getClaimOtherAmount()).subtract(new BigDecimal(asBusclaimCheckApplyDetailVo.getReserved())))))).toString());
             }
-            asBusclaimCheckApplyDetailsVo.setDetailList(detailList);
+            asBusclaimCheckApplyDetailsVo.setDetailsList(detailList);
         }
         return rb.success().setData(asBusclaimCheckApplyDetailsVo);
     }
@@ -243,7 +318,7 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService<AsBusclaimCh
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         //用户的部门全路径sid
-        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimCheckApply.getCreateDeptSid()).getData();
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimCheckApply.getDeptSid()).getData();
         if (sysOrganization != null) {
             bv.setOrgSidPath(sysOrganization.getOrgSidPath());
         }
@@ -336,7 +411,7 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService<AsBusclaimCh
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         bv.setFormVariables(variables);
-        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimCheckApply.getCreateDeptSid()).getData();
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimCheckApply.getDeptSid()).getData();
         if (sysOrganization != null) {
             bv.setOrgSidPath(sysOrganization.getOrgSidPath());
         }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailMapper.xml

@@ -20,7 +20,8 @@
                a.claimOtherAmount,
                a.repairBillNo,
                a.reserved,
-               a.reason,
+               a.reasonKey,
+               a.reasonValue,
                a.claimBillNo,
                a.billInvoiceSid,
                a.billInvoiceDetailSid

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml

@@ -6,7 +6,7 @@
                a.nodeState,
                a.billNo,
                a.useOrgName,
-               a.createDeptName,
+               a.deptName,
                a.createByName,
                DATE_FORMAT(a.createTime, '%Y-%m-%d') as createTime,
                a.closeDate,
@@ -52,7 +52,7 @@
                 invoiceValue
         FROM
                 as_busclaim_invoice_bill
-        WHERE createDeptSid = #{deptSid}
+        WHERE deptSid = #{deptSid}
         AND nodeState = '已办结'
         ORDER BY createTime DESC
                 LIMIT 1

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@@ -103,8 +103,8 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
             qw.like("a.useOrgName", query.getUseOrgName());
         }
         //申请部门
-        if (StringUtils.isNotBlank(query.getCreateDeptName())) {
+        if (StringUtils.isNotBlank(query.getDeptName())) {
-            qw.like("a.createDeptName", query.getCreateDeptName());
+            qw.like("a.deptName", query.getDeptName());
         }
         //申请人
         if (StringUtils.isNotBlank(query.getCreateByName())) {
@@ -269,7 +269,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         //用户的部门全路径sid
-        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getCreateDeptSid()).getData();
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getDeptSid()).getData();
         if (sysOrganization != null) {
             bv.setOrgSidPath(sysOrganization.getOrgSidPath());
         }
@@ -361,7 +361,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         bv.setFormVariables(variables);
-        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getCreateDeptSid()).getData();
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getDeptSid()).getData();
         if (sysOrganization != null) {
             bv.setOrgSidPath(sysOrganization.getOrgSidPath());
         }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.java

@@ -19,4 +19,6 @@ public interface AsBusclaimInvoiceBillDetailMapper extends BaseMapper<AsBusclaim
     List<AsBusclaimInvoiceBillDetailVo> selectDetails(String sid);
 
     List<AsBusclaimInvoiceBillDetail> selectByBillSid(String businessSid);
+
+    int selectYkpSpdCount(String repairBillNo);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml

@@ -29,4 +29,14 @@
         from as_busclaim_invoice_bill_detail
         where billSid = #{businessSid}
     </select>
+
+    <select id="selectYkpSpdCount" resultType="int">
+        SELECT
+                COUNT(*)
+        FROM as_busclaim_invoice_bill_detail ad
+                     LEFT JOIN as_busclaim_invoice_bill ab
+                ON ad.billSid = ab.sid
+        WHERE ab.`nodeState` = '已办结'
+          AND ad.repairBillNo = #{repairBillNo}
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java

@@ -34,4 +34,8 @@ public class AsBusclaimInvoiceBillDetailService extends MybatisBaseService<AsBus
     public List<AsBusclaimInvoiceBillDetail> selectByBillSid(String businessSid) {
         return baseMapper.selectByBillSid(businessSid);
     }
+
+    public int selectYkpSpdCount(String repairBillNo) {
+        return baseMapper.selectYkpSpdCount(repairBillNo);
+    }
 }

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

@@ -8,6 +8,7 @@ import com.yxt.anrui.as.api.asbusrepairbill.*;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -39,4 +40,7 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
     List<SitemsVo> selectSitemList(String sourceBillSid);
 
     IPage<AsBusrepairBillPageListVo> billPageList(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
+
+    @Select("select * from as_busrepair_bill where billNo = #{billNo}")
+    AsBusrepairBill selectOneByBillNo(String billNo);
 }

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

@@ -858,4 +858,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         PagerVo<AsBusrepairBillPageListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public AsBusrepairBill selectByBillNo(String billNo) {
+       return baseMapper.selectOneByBillNo(billNo);
+    }
 }