Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -128,11 +128,9 @@ public enum StatusEnum {
     //付款管理状态
     TO_BE_SETTLED("1", "待结算", "to_be_settled"),
 
-
-    TO_BE_TRADERETURN("1", "待还款", "to_be_tradereturn"),
-
     //贸易仓单状态
-    RETURN_TRADE_WAREHOUSE_RECEIPT("0", "已退回", "return_trade_warehouse_receipt"),
+    TO_BE_TRADERETURN("3", "待还款", "to_be_tradereturn"),
+    RETURN_TRADE_WAREHOUSE_RECEIPT("0", "已驳回", "return_trade_warehouse_receipt"),
 
     ;
     @Getter

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseInOutInfo.java

@@ -300,6 +300,21 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
     @TableField(exist = false)
     private String searchType;
 
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date startDate;
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date endDate;
+
     /**
      * 质检员
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -157,6 +157,8 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         List<IdentityAuthenticationInfo> identityAuthenticationInfoList =
                 this.selectList(new EntityWrapper<IdentityAuthenticationInfo>()
                         .eq(IdentityAuthenticationInfo.QueryFiles.CUSTOMER_PHONE, identityAuthenticationInfo.getCustomerPhone())
+                        .eq("customer_name", identityAuthenticationInfo.getCustomerName())
+                        .eq("comp_id", identityAuthenticationInfo.getCompId())
                         .eq("customer_type_flag", identityAuthenticationInfo.getCustomerTypeFlag())
                         .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         //同一手机号再次被认证

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/RepaymentManagementServiceImpl.java

@@ -53,6 +53,7 @@ public class RepaymentManagementServiceImpl extends ServiceImpl<RepaymentManagem
         //公司id
         pageView.put("compId", repaymentManagement.getCompId());
         pageView.put("tradeWarehouseReceiptId", repaymentManagement.getTradeWarehouseReceiptId());
+        pageView.put("contractNo", repaymentManagement.getContractNo());
         pageView.put("pageSize", repaymentManagement.getPageSize());
         pageView.put("currentPage", repaymentManagement.getCurrentPage());
         // 查询还款总数

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -1262,6 +1262,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         pageView.put("baseId", warehouseInOutInfo.getBaseId());
         //  仓位ID
         pageView.put("positionId", warehouseInOutInfo.getPositionId());
+        pageView.put("startDate", warehouseInOutInfo.getStartDate());
+        pageView.put("endDate", warehouseInOutInfo.getEndDate());
         pageView.put("pcFlag", warehouseInOutInfo.getPcFlag());
         pageView.put("statusFlag", warehouseInOutInfo.getStatusFlag());
         pageView.put("searchType", warehouseInOutInfo.getSearchType());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/TradeServicesListener.java

@@ -3,9 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.workflow;
 import com.yh.saas.common.support.workflow.AbstractWorkflowTaskListener;
 import com.yh.saas.common.support.workflow.annotation.WorkflowTaskListener;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
 import com.yh.saas.plugin.yiliangyiyun.entity.TradeWarehouseReceiptAppl;
-import com.yh.saas.plugin.yiliangyiyun.service.ISaleOrderService;
 import com.yh.saas.plugin.yiliangyiyun.service.ITradeWarehouseReceiptApplService;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -40,8 +38,8 @@ public class TradeServicesListener extends AbstractWorkflowTaskListener {
         if (tradeWarehouseReceiptAppl == null) {
             return;
         }
-        tradeWarehouseReceiptAppl.setStatusFlag(StatusEnum.TASK_RETURN.getFlag());
-        tradeWarehouseReceiptAppl.setStatus(StatusEnum.TASK_RETURN.getName());
+        tradeWarehouseReceiptAppl.setStatusFlag(StatusEnum.RETURN_TRADE_WAREHOUSE_RECEIPT.getFlag());
+        tradeWarehouseReceiptAppl.setStatus(StatusEnum.RETURN_TRADE_WAREHOUSE_RECEIPT.getName());
         tradeWarehouseReceiptAppl.setApproveStatus(null);
         tradeWarehouseReceiptApplService.updateAllColumnById(tradeWarehouseReceiptAppl);
 

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -133,7 +133,9 @@
         left join common_company c on c.comp_id = a.comp_id and c.delete_flag = 0
         left join identity_authentication_info i on i.customer_name = a.customer_name
             and i.customer_phone = a.customer_phone and i.customer_type_flag = 1 and i.delete_flag = 0 and i.cover = 0
+        left join common_company_identity cci on  cci.com_id = a.comp_id  and cci.delete_flag = 0
         WHERE a.delete_flag = '0'
+        and cci.identity_id = i.id
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
                 AND a.status='待结算'  and( a.approve_status= ''

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/RepaymentManagementMapper.xml

@@ -9,6 +9,9 @@
         WHERE
         comp_id = #{compId}
         and delete_flag = '0'
+        <if test="contractNo != null and contractNo != ''">
+            AND contract_no = #{contractNo}
+        </if>
     </select>
     <!-- 获得还款管理列表 -->
     <select id="getListByCondition" parameterType="Map"
@@ -27,6 +30,9 @@
         WHERE
         comp_id = #{compId}
         and delete_flag = '0'
+        <if test="contractNo != null and contractNo != ''">
+            AND contract_no = #{contractNo}
+        </if>
         ORDER BY create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -30,6 +30,20 @@
                 and wbi.person_phone = ${phone}
             </if>
         </if>
+        <if test="startDate != null">
+            AND (DATE_FORMAT(in_out_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(in_out_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+        <if test="baseId != null and baseId != ''">
+            AND base_id = #{baseId}
+        </if>
+        <if test="positionId != null and positionId != ''">
+            AND position_id = #{positionId}
+        </if>
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}
         </if>
@@ -108,6 +122,20 @@
              and wbi.person_phone = ${phone}
          </if>
         </if>
+        <if test="startDate != null">
+            AND (DATE_FORMAT(in_out_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(in_out_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+        <if test="baseId != null and baseId != ''">
+            AND base_id = #{baseId}
+        </if>
+        <if test="positionId != null and positionId != ''">
+            AND position_id = #{positionId}
+        </if>
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}
         </if>