weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nc推送添加推送时间;nc动态获取组织;

Browse Source
This commit is contained in:
王奎兴
2026-03-27 13:45:07 +08:00
parent 62a84e8a19
commit 708d80bcd3
15 changed files with 126 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
+9
View File
@@ -3,12 +3,15 @@ package com.linke.finance.application.server.reconciliation;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.aliyun.dingtalkworkflow_1_0.models.StartProcessInstanceResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.linke.finance.domain.businessDocument.entity.BusinessDocument;
import com.linke.finance.domain.businessDocument.service.BusinessDocumentDomainService;
import com.linke.finance.domain.ncLog.entity.NcLog;
import com.linke.finance.domain.ncLog.repository.mapper.NcLogMapper;
import com.linke.finance.domain.reconciliation.entity.Reconciliation;
import com.linke.finance.domain.reconciliation.entity.ReconciliationOrderDetail;
import com.linke.finance.domain.reconciliation.repository.po.FinacialReconciliationListVO;
@@ -86,6 +89,8 @@ public class ReconciliationApplicationService {
private WlhyServiceFeign wlhyServiceFeign;
@Resource
private TmsReceiptMapper tmsReceiptMapper;
@Resource
private NcLogMapper ncLogMapper;
@Autowired
private ReconciliationAccountDomainService reconciliationAccountDomainService;
@@ -822,6 +827,10 @@ public class ReconciliationApplicationService {
return reconciliationDomainService.getEarliestCreateTimeByOrderIdList(orderIds);
}
public List<NcLog> getNcLog(Long id,String type) {
return ncLogMapper.selectList(new LambdaQueryWrapper<NcLog>().eq(NcLog::getOrderId, id).eq(NcLog::getType, type).orderByDesc(NcLog::getSendTime));
}
/**
* 对账单审核
*
mhd_finance/src/main/java/com/linke/finance/domain/ncLog/entity/NcLog.java
+6 -2
View File
@@ -9,6 +9,7 @@ import java.math.BigDecimal;
import lombok.Data;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -53,6 +54,9 @@ public class NcLog extends BaseVOEntity{
@ApiModelProperty("组织名称")
@Excel(name = "组织名称")
private String organizationName;
@ApiModelProperty(value = "推送时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date sendTime;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+7 -1
View File
@@ -569,6 +569,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
ncLog.setRequestBody(xmlString);
ncLog.setResponeBody("");
ncLog.setType(0L);
ncLog.setSendTime(new Date());
ncLog.setOrganizationId(reconciliation.getOrganizationId());
ncLog.setOrganizationName(reconciliation.getOrganizationName());
ncLog.setTopOrganizationId(reconciliation.getTopOrganizationId());
@@ -828,6 +829,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
ncLog.setRequestBody(xmlString);
ncLog.setResponeBody("");
ncLog.setType(0L);
ncLog.setSendTime(new Date());
ncLog.setOrganizationId(reconciliation.getOrganizationId());
ncLog.setOrganizationName(reconciliation.getOrganizationName());
ncLog.setTopOrganizationId(reconciliation.getTopOrganizationId());
@@ -1079,6 +1081,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
ncLog.setRequestBody(xmlString);
ncLog.setResponeBody("");
ncLog.setType(0L);
ncLog.setSendTime(new Date());
ncLog.setOrganizationId(reconciliation.getOrganizationId());
ncLog.setOrganizationName(reconciliation.getOrganizationName());
ncLog.setTopOrganizationId(reconciliation.getTopOrganizationId());
@@ -1284,6 +1287,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
ncLog.setRequestBody(xmlString);
ncLog.setResponeBody("");
ncLog.setType(1L);
ncLog.setSendTime(new Date());
ncLog.setOrganizationId(reconciliation.getOrganizationId());
ncLog.setOrganizationName(reconciliation.getOrganizationName());
ncLog.setTopOrganizationId(reconciliation.getTopOrganizationId());
@@ -1540,6 +1544,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
ncLog.setRequestBody(xmlString);
ncLog.setResponeBody("");
ncLog.setType(1L);
ncLog.setSendTime(new Date());
ncLog.setOrganizationId(reconciliation.getOrganizationId());
ncLog.setOrganizationName(reconciliation.getOrganizationName());
ncLog.setTopOrganizationId(reconciliation.getTopOrganizationId());
@@ -1791,6 +1796,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
ncLog.setRequestBody(xmlString);
ncLog.setResponeBody("");
ncLog.setType(1L);
ncLog.setSendTime(new Date());
ncLog.setOrganizationId(reconciliation.getOrganizationId());
ncLog.setOrganizationName(reconciliation.getOrganizationName());
ncLog.setTopOrganizationId(reconciliation.getTopOrganizationId());
@@ -1862,4 +1868,4 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
}
return true;
}
}
}
mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/persistence/TmsReceiptImpl.java
+2 -1
View File
@@ -191,6 +191,7 @@ public class TmsReceiptImpl extends ServiceImpl<TmsReceiptMapper, TmsReceipt> im
ncLog.setRequestBody(xmlString);
ncLog.setResponeBody("");
ncLog.setType(0L);
ncLog.setSendTime(new Date());
ncLog.setOrganizationId(tmsReceipt.getOrganizationId());
ncLog.setOrganizationName(tmsReceipt.getOrganizationName());
ncLog.setTopOrganizationId(tmsReceipt.getTopOrganizationId());
@@ -204,4 +205,4 @@ public class TmsReceiptImpl extends ServiceImpl<TmsReceiptMapper, TmsReceipt> im
}
return true;
}
}
}
mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java
+15
View File
@@ -8,6 +8,7 @@ import com.linke.finance.application.server.businessDocument.BusinessDocumentApp
import com.linke.finance.application.server.reconciliation.ReconciliationApplicationService;
import com.linke.finance.domain.businessDocument.repository.po.BusinessDocumentPO;
import com.linke.finance.domain.businessDocument.repository.todo.BusinessDocumentDO;
import com.linke.finance.domain.ncLog.entity.NcLog;
import com.linke.finance.domain.reconciliation.entity.Reconciliation;
import com.linke.finance.domain.reconciliation.repository.po.FinacialReconciliationListVO;
import com.linke.finance.interfaces.assembler.businessDocument.BusinessDocumentAssembler;
@@ -78,6 +79,20 @@ public class ReconciliationApi extends BaseController{
reconciliationApplicationService.review(reconciliationDTO);
return AjaxResult.success("对账单审核成功");
}
@ApiOperation("获取nc推送日志")
@GetMapping(value = "/getNcLog")
public AjaxResult getNcLog(@RequestParam(name = "billManageId") Long billManageId, @RequestParam(name = "type") String type)
{
List<NcLog> ncLog = reconciliationApplicationService.getNcLog(billManageId, type);
if (ncLog == null || ncLog.size() == 0) {
return AjaxResult.error("暂无数据");
} else {
return AjaxResult.success(ncLog.get(0));
}
}
@ApiOperation("接口-根据ids查询对账单列表")
@GetMapping("/queryListByids")
public AjaxResult queryListByids(@RequestParam List<Long> reconciliationIds)