修改

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillExcelVo.java

@@ -41,6 +41,6 @@ public class AsBusclaimBillExcelVo {
     private String state;
     @ExportEntityMap(CnName = "审核时间", EnName = "auditDate")
     private String auditDate;
-    @ExportEntityMap(CnName = "保单时间", EnName = "policyDate")
+    @ExportEntityMap(CnName = "报单时间", EnName = "policyDate")
     private String policyDate;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java

@@ -306,9 +306,9 @@ public class AsBusclaimBillRest {
                         checkWord.add("索赔单编号不能为空");
                         break;
                     }else {
-                        AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNoAndVinNo(asBusclaimBillExcelInfo.getBillNo(),asBusclaimBillExcelInfo.getVinNo());
+                        AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNoAndVinNo(excelInfo.getBillNo(),excelInfo.getVinNo());
                         if (asBusclaimBill == null){
-                            checkWord.add("索赔单号" + excelInfo.getBillNo() + "不存在或车架号" + asBusclaimBillExcelInfo.getVinNo() + "填写不正确");
+                            checkWord.add("索赔单号" + excelInfo.getBillNo() + "不存在或车架号" + excelInfo.getVinNo() + "填写不正确");
                             break;
                         }
                     }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -184,6 +185,45 @@ public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapp
 
     public List<AsBusclaimBillExcelVo> listExcel(AsBusclaimBillQuery query) {
         QueryWrapper<AsBusclaimBill> 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 {
+                    List<AsBusclaimBillExcelVo> p = new ArrayList<>();
+                    return p;
+                }
+            } else {
+                List<AsBusclaimBillExcelVo> p = new ArrayList<>();
+                return p;
+            }
+        }
         //ToDo:添加查询条件
         //索赔单号
         if (StringUtils.isNotBlank(query.getBillNo())) {

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

@@ -13,23 +13,23 @@
         IFNULL(abb.goodsAmount,0) AS goodsAmount1,
         IFNULL(abb.outAmount,0) AS claimOutAmount1,
         IFNULL(abb.subsidyAmount,0) AS claimSubsidyAmount1,
-        IFNULL(abb.claimRescueAmount,0) AS claimRescueAmount1,
+        IFNULL(abb.rescueAmount,0) AS claimRescueAmount1,
         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.claimHourAmount) AS claimHourAmount2,
-        SUM(aibd.`claimGoodsAmount`) AS claimGoodsAmount2,
+        SUM(aibd.claimGoodsAmount) AS claimGoodsAmount2,
-        SUM(aibd.`claimOutAmount`) AS claimOutAmount2,
+        SUM(aibd.claimOutAmount) AS claimOutAmount2,
-        SUM(aibd.`claimSubsidyAmount`) AS claimSubsidyAmount2,
+        SUM(aibd.claimSubsidyAmount) AS claimSubsidyAmount2,
-        SUM(aibd.`claimRescueAmount`) AS claimRescueAmount2,
+        SUM(aibd.claimRescueAmount) AS claimRescueAmount2,
-        SUM(aibd.`claimOtherAmount`) AS claimOtherAmount2,
+        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)) 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
+        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`
+        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

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

@@ -12,7 +12,9 @@
                a.closeDate,
                a.invoiceName,
                a.invoiceValue,
-               a.invoiceMoney
+               a.invoiceMoney,
+               a.procInstId,
+               a.procDefId
         from as_busclaim_invoice_bill a
         LEFT JOIN anrui_portal.sys_organization AS s ON a.deptSid = s.sid
         <where>