优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQKQuery.java

@@ -31,4 +31,6 @@ public class CommonContractQKQuery implements Query {
     private String orgPath;
     @ApiModelProperty("客户名称")
     private String customerName;
+
+    private String menuUrl;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -207,16 +207,18 @@
 
     <select id="selectByStaffSid" resultType="com.yxt.anrui.base.api.commoncontract.CommonContractVo">
         SELECT
-        sid,
-        contractNo,
-        customerSid,
-        partyA,
-        partyB,
-        createDate,
-        modelSid,
-        modelName
+        cc.sid,
+        cc.contractNo,
+        cc.customerSid,
+        cc.partyA,
+        cc.partyB,
+        DATE_FORMAT(cc.createDate, '%Y-%m-%d') AS createDate,
+        cc.modelSid,
+        cc.modelName
         FROM
-        common_contract
+        common_contract cc
+        JOIN anrui_buscenter.`bus_sales_order` bo
+        ON cc.`contractNo` = bo.`contractNo`
         <where>
             ${ew.sqlSegment}
         </where>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -2619,31 +2619,72 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         String staffSid = sysUserVo.getStaffSid();
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
-        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(params.getOrgPath()).getData();
-        qw.eq("staffSid", staffSid);
-        qw.eq("orgSid", sysOrganizationVo.getSid());
+        //=======================
+        if(StringUtils.isNotBlank(params.getMenuUrl())){
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(params.getOrgPath());
+            privilegeQuery.setMenuUrl(params.getMenuUrl());
+            privilegeQuery.setUserSid(params.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = params.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("bo.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(params.getOrgPath()).getData();
+                    qw.eq("cc.staffSid", staffSid);
+                    qw.eq("cc.orgSid", sysOrganizationVo.getSid());
+                } else {
+                    IPage<CommonContractVo> page = PagerUtil.queryToPage(query);
+                    page.setRecords(new ArrayList<>());
+                    return rb.success().setData(page);
+                }
+            }
+        }else{
+            /*SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(params.getOrgPath()).getData();
+            qw.eq("cc.staffSid", staffSid);
+            qw.eq("cc.orgSid", sysOrganizationVo.getSid());*/
+            IPage<CommonContractVo> page = PagerUtil.queryToPage(query);
+            page.setRecords(new ArrayList<>());
+            return rb.success().setData(page);
+        }
+
+
         ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), useOrgSid);
         if (!busList.getData().isEmpty()) {
-            qw.in("busSid", busList.getData());
+            qw.in("cc.busSid", busList.getData());
         } else {
             PagerVo<CommonContractVo> p = new PagerVo<>();
             return rb.success().setData(p);
         }
         if (StringUtils.isNotBlank(params.getCustomerName())) {
-            qw.like("partyB", params.getCustomerName());
+            qw.like("cc.partyB", params.getCustomerName());
         }
         if (StringUtils.isNotBlank(params.getContractNo())) {
-            qw.like("contractNo", params.getContractNo());
+            qw.like("cc.contractNo", params.getContractNo());
         }
-        qw.orderByDesc("createDate");
+        qw.orderByDesc("cc.createDate");
         IPage<CommonContract> page = PagerUtil.queryToPage(query);
         IPage<CommonContractVo> pagging = baseMapper.selectByStaffSid(page, qw);
         List<CommonContractVo> records = pagging.getRecords();
         for (CommonContractVo record : records) {
-            String createDate = record.getCreateDate();
-            DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd");
-            createDate = DateUtil.formatDate(dateTime);
-            record.setCreateDate(createDate);
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData();
             record.setSaleTypeKey(busSalesOrder.getPayTypeKey());
             record.setSaleTypeValue(busSalesOrder.getPayType());

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/AppCarListVo.java

@@ -31,8 +31,9 @@ public class AppCarListVo implements Vo {
     private String zlStateValue;
     @ApiModelProperty("资料是否齐全：0未齐全/1已齐全")
     private String zlState;
-
+    @ApiModelProperty("欠款开票sid")
     private String qkKpSid;
+    @ApiModelProperty("欠款领票sid")
     private String qkLpSid;