no message

src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -485,6 +485,8 @@ public class BizCollectionController extends BaseController {
                 collection.setContractNo(archiveInput.getContractNo());
                 collection.setContractAmount(archiveInput.getTrueAmount());
                 collection.setOrderRemark(archiveInput.getRemark());
+                collection.setBoss(archiveInput.getBoss());
+                collection.setParty(archiveInput.getParty());
                 BizCollection collectionCondition = new BizCollection();
                 if (archiveInput.getFormDate() != null) {
                     collection.setActuallyDate(new Timestamp(archiveInput.getFormDate().getTime()));

src/main/java/cn/ezhizao/project/business/collection/domain/BizCollection.java

@@ -34,7 +34,6 @@ public class BizCollection extends BaseEntity implements Serializable {
     private String flowNo;
 
 
-
     @ApiModelProperty(value = "收款流水号")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Timestamp formDate;
@@ -46,7 +45,6 @@ public class BizCollection extends BaseEntity implements Serializable {
     private String subsidiary;
 
 
-
     @ApiModelProperty(value = "服务公司账号")
     private String subsidiaryBankAccount;
 
@@ -57,14 +55,11 @@ public class BizCollection extends BaseEntity implements Serializable {
     private Long companyId;
 
 
-
-
-
-    @ApiModelProperty(value="应收金额")
+    @ApiModelProperty(value = "应收金额")
     private BigDecimal amount;
 
     @ApiModelProperty(value = "到账日期")
-    @JsonFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Timestamp arriveDate;
 
     @ApiModelProperty(value = "到账时间")
@@ -111,14 +106,10 @@ public class BizCollection extends BaseEntity implements Serializable {
     private Long contractId;
 
 
-
     @ApiModelProperty(value = "申请人")
     private Long applierId;
 
 
-
-
-
     @TableField(exist = false)
     private List<BizCollectionDetail> contractDetails;
 
@@ -163,9 +154,11 @@ public class BizCollection extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String orderRemark;
 
-    /** 导出数据 */
+    /**
+     * 导出数据
+     */
 
-    @Excel(name = "客户名称",width = 35)
+    @Excel(name = "客户名称", width = 35)
     @ApiModelProperty(value = "客户名称")
     private String companyName;
 
@@ -174,7 +167,7 @@ public class BizCollection extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String contractNo;
 
-    @Excel(name = "实际付款时间",width = 20, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "实际付款时间", width = 20, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("确认到账时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Timestamp actuallyDate;
@@ -206,15 +199,17 @@ public class BizCollection extends BaseEntity implements Serializable {
 
     @TableField(exist = false)
     private List<SysFileStorage> evidenceFiles;
-
+    @TableField(exist = false)
+    private String boss;
+    @TableField(exist = false)
+    private String party;
     private Long verifyId;
-    public String getRemark()
-    {
+
+    public String getRemark() {
         return remark;
     }
 
-    public void setRemark(String remark)
-    {
+    public void setRemark(String remark) {
         this.remark = remark;
     }
 

src/main/java/cn/ezhizao/project/business/order/domain/BizArchiveInput.java

@@ -220,4 +220,6 @@ public class BizArchiveInput extends BaseEntity {
 
     @TableField(exist = false)
     private BigDecimal paidAmount;
+    private String boss;
+    private String party;
 }

src/main/java/cn/ezhizao/project/business/payment/controller/BizPaymentController.java

@@ -305,6 +305,8 @@ public class BizPaymentController extends BaseController {
             if (archiveInput != null) {
                 payment.setContractNo(archiveInput.getContractNo());
                 payment.setContractAmount(archiveInput.getTrueAmount());
+                payment.setParty(archiveInput.getParty());
+                payment.setBoss(archiveInput.getBoss());
                 BizPayment payemntConditions = new BizPayment();
                 payemntConditions.setContractId(archiveInput.getId());
                 payemntConditions.setPaymentStatus((byte) 1);

src/main/java/cn/ezhizao/project/business/payment/domain/BizPayment.java

@@ -181,4 +181,8 @@ public class BizPayment extends BaseEntity {
 
     @TableField(exist = false)
     private List<SysFileStorage> evidenceFiles;
+    @TableField(exist = false)
+    private String boss;
+    @TableField(exist = false)
+    private String party;
 }

src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -287,7 +287,9 @@
     </select>
 
     <sql id="getListSql">
-        SELECT a.id, a.flow_no, a.subsidiary_id, a.subsidiary, a.subsidiary_name, a.subsidiary_bank_account, a.form_date
+        SELECT
+        ai.boss,ai.party,
+            a.id, a.flow_no, a.subsidiary_id, a.subsidiary, a.subsidiary_name, a.subsidiary_bank_account, a.form_date
         , a.subsidiary_bank_name, a.company_id, b.name as company_name
         , a.is_new, a.is_project, a.project_name, a.project_no, a.project_main_name
         , a.amount
@@ -392,6 +394,14 @@
             <if test="remark != null  and remark != '' ">
                 a.remark = #{remark} AND
             </if>
+
+            <if test="boss != null  and boss != '' ">
+                ai.boss = #{boss} AND
+            </if>
+
+            <if test="party != null  and party != '' ">
+                ai.party = #{party} AND
+            </if>
         </trim>
     </sql>
 </mapper>

src/main/resources/mybatis/business/BizPaymentMapper.xml

@@ -44,7 +44,7 @@
     </select>
 
     <sql id="getListSql">
-        SELECT t1.id, t1.flow_no, t1.form_date, t1.subsidiary_id, t1.subsidiary, t1.subsidiary_name,
+        SELECT t4.boss,t4.party,t1.id, t1.flow_no, t1.form_date, t1.subsidiary_id, t1.subsidiary, t1.subsidiary_name,
         t1.contract_id,
         t1.verify_date,
         t1.bank_no,
@@ -160,6 +160,12 @@
         <if test="acceptAccountNo != null">
             AND t1.accept_account_no = #{acceptAccountNo}
         </if>
+        <if test="boss != null">
+            AND t4.boss = #{boss}
+        </if>
+        <if test="party != null">
+            AND t4.party = #{party}
+        </if>
         <if test="accountBank != null and accountBank != ''">
             AND t1.account_bank = #{accountBank}
         </if>