优化

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java

@@ -49,36 +49,38 @@ import lombok.Data;
 @ApiModel(value = "开票申请表 视图数据对象", description = "开票申请表 视图数据对象")
 public class FinBillApplicationVo implements Vo {
 
-    private String sid; // sid
+    private String sid;
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
     @ApiModelProperty(value = "销售类型value")
     private String saleTypeValue;
     @ApiModelProperty("合同编号")
-    private String contractNo; // 合同编号
+    private String contractNo;
     @ApiModelProperty(value = "开票单位名称")
     private String openTickUnitName;
     @ApiModelProperty("客户名称")
-    private String customerName; // 客户名称
+    private String customerName;
     @ApiModelProperty("车辆总台数")
     private Integer num;
     @ApiModelProperty("开票状态Value")
-    private String billStateValue; // 开票状态Value
+    private String billStateValue;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
     @ApiModelProperty("创建人接口")
-    private String createByName; // 创建人接口
+    private String createByName;
     @ApiModelProperty("申请日期")
     private String applyDate;
     @ApiModelProperty("车型名称")
-    private String modelName; // 车型名称
+    private String modelName;
 
     @ApiModelProperty("欠款金额")
-    private String arrearsMoney; // 欠款金额
+    private String arrearsMoney;
     @ApiModelProperty("承诺回款日期")
-    private String returnedMoneyDate; // 承诺回款日期
+    private String returnedMoneyDate;
     @ApiModelProperty("欠款开票原因value")
-    private String arrearsOpenYYValue; // 欠款开票原因value
+    private String arrearsOpenYYValue;
     @ApiModelProperty("单据编号")
-    private String billNo; // 单据编号
+    private String billNo;
 
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
@@ -99,4 +101,6 @@ public class FinBillApplicationVo implements Vo {
     private String vinNo;
     @ApiModelProperty("销售订单sid")
     private String orderSid;
+    @ApiModelProperty("是否可以操作")
+    private Boolean isCZ;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java

@@ -51,6 +51,8 @@ public class FinCompanyInvoicingVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
 	@ApiModelProperty("银行账号")
     private String bankAccount; // 银行账号
 	@ApiModelProperty("开户行")
@@ -73,4 +75,6 @@ public class FinCompanyInvoicingVo implements Vo {
     private String purchaseSystemName; // 采购系统名称
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
+    @ApiModelProperty("是否可以操作")
+    private Boolean isCZ;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java

@@ -81,4 +81,6 @@ public class FinUncollectedReceivablesDetailedQuery implements Query {
     private String purchaseSystemSid;
 
     private List<String> busVinSids;
+
+    private String menuUrl;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java

@@ -56,6 +56,8 @@ public class FinUncollectedReceivablesDetailedVo implements Vo {
 
     @ApiModelProperty("应收未收款项sid")
     private String sid; // 应收未收款项sid
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
     @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
 	@ApiModelProperty("合同编号")
@@ -96,5 +98,6 @@ public class FinUncollectedReceivablesDetailedVo implements Vo {
     private String payTypeKey;
     @ApiModelProperty("付款类型(全款/贷款)")
     private String payType;
-
+    @ApiModelProperty("是否可以操作")
+    private Boolean isCZ;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -371,6 +371,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             String contractNo = record.getContractNo();
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
             record.setOrderSid(busSalesOrder.getSid());
+            if (record.getCreateBySid().equals(query.getCreateBySid())){
+                record.setIsCZ(true);
+            }else {
+                record.setIsCZ(false);
+            }
         }
         PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -139,6 +139,13 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         }
         IPage<FinCompanyInvoicing> page = PagerUtil.queryToPage(pq);
         IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVoGS(page, qw);
+        for (FinCompanyInvoicingVo record : pagging.getRecords()) {
+            if (record.getCreateBySid().equals(query.getUserSid())){
+                record.setIsCZ(true);
+            }else {
+                record.setIsCZ(false);
+            }
+        }
         PagerVo<FinCompanyInvoicingVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -10,7 +10,6 @@
         SELECT
         *
         from fin_uncollected_receivables_detailed
-
         <where>
             ${ew.sqlSegment}
             ORDER BY createTime DESC ,id

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -379,6 +379,11 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         //=============================分页结束======================================
         List<FinUncollectedReceivablesDetailedVo> records = pagging.getRecords();
         for (FinUncollectedReceivablesDetailedVo record : records) {
+            if (record.getCreateBySid().equals(params.getCreateBySid())){
+                record.setIsCZ(true);
+            }else {
+                record.setIsCZ(false);
+            }
             record.setDownload(false);
             //获取单条对应的应收未收sid
             String sid = record.getSid();