Merge remote-tracking branch 'origin/dev1.0' into dev1.0

src/main/java/com/sunxung/factoring/service/acceptancesheet/impl/AcceptanceBasicInfoServiceImpl.java

@@ -1085,10 +1085,10 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
         List<String> sellBillNumber = oldAcceptanceBasicInfo.getSellBillNumber();
         Long oldId = oldAcceptanceBasicInfo.getId();
         //保存基础信息
-        AcceptanceBasicInfo basicInfo = get(oldAcceptanceBasicInfo.getId());
+       // AcceptanceBasicInfo basicInfo = get(oldAcceptanceBasicInfo.getId());
         AcceptanceHisInfo acceptanceHisInfo = new AcceptanceHisInfo();
         BeanUtils.copyProperties(oldAcceptanceBasicInfo, acceptanceHisInfo, "id");
-        acceptanceHisInfo.setAcceptanceNumber(basicInfo.getAcceptanceNumber());
+        //acceptanceHisInfo.setAcceptanceNumber(oldAcceptanceBasicInfo.getAcceptanceNumber());
         //保存历史基础信息
         acceptanceHisInfoService.save(acceptanceHisInfo);
         //保存相关货物信息

src/main/java/com/sunxung/factoring/service/ledger/impl/LedgerManagementServiceImpl.java

@@ -491,7 +491,7 @@ public class LedgerManagementServiceImpl implements LedgerManagementService {
         OaOtherPaymentTradeVo oaOtherPaymentTradeVo = new OaOtherPaymentTradeVo();
         User user = null;
         if (supplierInfoId != null) {
-            SupplierInfo supplierInfo = supplierInfoService.getById(supplierInfoId);
+            SupplierInfo supplierInfo = supplierInfoService.get(supplierInfoId);
             if (supplierInfo != null) {
                 UserDO userDO = cUserService.getById(supplierInfo.getSysUserId());
                 if (userDO != null) {

src/main/resources/mapper/financing/apply/CFinancingBasicInfoMapper.xml

@@ -76,8 +76,8 @@
                  LEFT JOIN trading_platform t6 ON t1.trading_platform_id = t6.id
                  LEFT JOIN t_dictionary t7 ON t1.current_stage = t7.code
                  LEFT JOIN t_dictionary t8 ON t1.financing_status = t8.code
-                LEFT JOIN c_supplier_info t10 ON t1.supplier_id = t10.c_enterprise_id
-                LEFT JOIN c_sys_user t11 ON t10.sys_user_id = t11.id
+                 LEFT JOIN c_supplier_info t10 ON t1.supplier_id = t10.c_enterprise_id
+                 LEFT JOIN c_sys_user t11 ON t10.sys_user_id = t11.id
         <where>
             <if test="userIds != null and userIds.size()>0">
                 AND t11.project_manager IN
@@ -96,5 +96,6 @@
                 AND t1.financing_status = #{status}
             </if>
         </where>
+        ORDER BY t1.gmt_modified DESC
     </select>
 </mapper>

src/main/resources/mapper/ledger/LedgerManagementMapper.xml

@@ -110,9 +110,9 @@
 			t4.settlement_date loan_date,
 			t6.c_supplier_info_id supplier_id,
 			t9.corporate_name supplier_name,
-			t6.acceptance_status,
-			t4.settlement_status,
-			t1.invoice_status
+			t10.name acceptance_status,
+			t11.name settlement_status,
+			t12.name invoice_status
 		FROM
 			c_invoice_basic_info t1,
 			c_invoice_goods_info t2,
@@ -120,7 +120,10 @@
 			c_settlement_goods_info t5,
 			c_acceptance_basic_info t6,
 			c_acceptance_goods_info t7,
-			c_enterprise t9
+			c_enterprise t9,
+			t_dictionary t10,
+			t_dictionary t11,
+			t_dictionary t12
 		WHERE
 			t1.id = t2.c_invoice_basic_info_id
 		  AND t2.c_settlement_basic_info_id = t4.id
@@ -128,6 +131,9 @@
 		  AND t5.c_acceptance_goods_info_id = t7.id
 		  AND t6.id = t7.c_acceptance_basic_info_id
 		  AND t9.id = t6.c_project_core_enterprise_id
+		  AND t6.acceptance_status = t10.code
+		  AND t4.settlement_status = t11.code
+		  AND t1.invoice_status = t12.code
 		  AND t9.id = #{enterpriseId}
 		  AND t1.invoice_status = ( SELECT t3.id FROM t_dictionary t3 WHERE t3.CODE = 'invoice_pass' )
 		  AND t6.is_settlement = 1