替换进账日期时间

src/main/java/com/ydtech/modules/inv/model/InvAccountIncoice.java

@@ -15,6 +15,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 发票管理表(InvAccountIncoice)表实体类
@@ -105,7 +106,7 @@ public class InvAccountIncoice implements Serializable{
     @ApiModelProperty(value = "进账日期")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     @TableField(exist = false)
-    private LocalDate payoutTime;
+    private Date payoutTime;
 
     @ApiModelProperty(value = "进账卡号")
     private String revBankCardNum;

src/main/java/com/ydtech/modules/inv/model/InvAccountOperateResult.java

@@ -11,5 +11,5 @@ public class InvAccountOperateResult {
     private Long invoiceId;
 
     @ApiModelProperty("进账时间")
-    private LocalDateTime createTime;
+    private LocalDateTime payoutTime;
 }

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountIncoiceServiceImpl.java

@@ -141,7 +141,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         invAccountOperate.setFundUse(invAccountIncoice.getFundUse());
         invAccountOperate.setFundFen(invAccountIncoice.getFundFen());
         invAccountOperate.setInvoiceId(invAccountIncoice1.getInvoiceId());
-        invAccountOperate.setCreateTime(invAccountIncoice.getPayoutTime().atStartOfDay());
+        invAccountOperate.setCreateTime(LocalDateTime.now());
         invAccountOperate.setEntProfit(entProfit);
         invAccountOperate.setDel(String.valueOf(date.getTime()));
         invAccountOperate.setOutCardNum(outCard.getBankCardNum());
@@ -160,7 +160,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         outInvAccountOperate.setFundUse(invAccountIncoice.getFundUse());
         outInvAccountOperate.setFundFen(invAccountIncoice.getFundFen());
         outInvAccountOperate.setInvoiceId(invAccountIncoice1.getInvoiceId());
-        outInvAccountOperate.setCreateTime(invAccountIncoice.getPayoutTime().atStartOfDay());
+        outInvAccountOperate.setCreateTime(LocalDateTime.now());
         outInvAccountOperate.setOutProfit(outProfit);
         outInvAccountOperate.setDel(String.valueOf(date.getTime()));
         outInvAccountOperate.setOutCardNum(outCard.getBankCardNum());
@@ -357,16 +357,17 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         //解决时间格式报错问题
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         invAccountIncoices.forEach(invAccountIncoice -> {
-            List<InvAccountOperateResult> createTimeList =  invAccountIncoiceMapper.selectAccountOperate(invAccountIncoice.getInvoiceId());
-            if (createTimeList != null && !createTimeList.isEmpty()) {
-                for (InvAccountOperateResult result : createTimeList) {
-                    if (result.getCreateTime() == null) {
-                        invAccountIncoice.setPayoutDate("");
-                    } else {
-                        List<InvAccountOperateResult> sortedList = new ArrayList<>(createTimeList);
-                        sortedList.sort(Comparator.comparing(InvAccountOperateResult::getCreateTime).reversed());
-                        invAccountIncoice.setPayoutDate(createTimeList.get(0).getCreateTime().format(formatter).toString());
-                    }
+            List<InvAccountOperateResult> payoutTimeList =  invAccountIncoiceMapper.selectAccountOperate(invAccountIncoice.getInvoiceId());
+            if (payoutTimeList != null && !payoutTimeList.isEmpty()) {
+                List<InvAccountOperateResult> filteredList = payoutTimeList.stream()
+                        .filter(result -> result.getPayoutTime() != null)
+                        .collect(Collectors.toList());
+
+                if (!filteredList.isEmpty()) {
+                    filteredList.sort(Comparator.comparing(InvAccountOperateResult::getPayoutTime).reversed());
+                    invAccountIncoice.setPayoutDate(filteredList.get(0).getPayoutTime().format(formatter).toString());
+                } else {
+                    invAccountIncoice.setPayoutDate("");
                 }
             }
             if (invAccountIncoice.getInvoiceTime() != null) {

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountOperateServiceImpl.java

@@ -90,12 +90,6 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
             }
         }
         invAccountOperateIPage.setRecords(records);
-//        List<InvAccountOperate> recordsData = invAccountOperateIPage.getRecords();
-//        if (!recordsData.isEmpty()) {
-//            InvAccountOperate lastRecord = records.get(records.size() - 1);
-//            LocalDateTime lastCreateTime = lastRecord.getCreateTime();
-//            System.out.println(lastCreateTime);
-//        }
         return invAccountOperateIPage;
     }
 

src/main/resources/mapper/modules/inv/InvAccountIncoiceMapper.xml

@@ -80,7 +80,7 @@ biller = values(biller) invoice_subjects = values(invoice_subjects) invoice_by =
 
     <select id="selectAccountOperate" resultType="com.ydtech.modules.inv.model.InvAccountOperateResult">
         SELECT a.invoice_id,
-               b.create_time
+               b.payout_time
         FROM inv_account_incoice a
             left join inv_account_operate b
                 on a.invoice_id = b.invoice_id WHERE a.del_flag = '0'

src/main/resources/mapper/modules/inv/InvAccountOperateMapper.xml

@@ -34,7 +34,7 @@
         apply_time,collection_message,fund_flow,
         fund_use,apply_amount,pay_method,
         remark,company,big_apply_amount,
-        revenue_outlay,invoice_id,out_profit,ent_profit,fund_fen,create_time,enter_card_num,out_card_num
+        revenue_outlay,invoice_id,out_profit,ent_profit,fund_fen,create_time,enter_card_num,out_card_num,payout_time
     </sql>
     <update id="updateOperateByIncoiceId">
         UPDATE inv_account_operate