yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改卡日志分页问题

Browse Source
This commit is contained in:
yuyang 2022-06-02 11:44:13 +08:00
parent 4c1a14fdb7
commit df676c1af4
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardLogInfo.java
View File

@ -38,6 +38,12 @@ public class CardLogInfo {
*/
@JsonProperty("cardNo")
private String cardNo;
/**
* cardNo
*/
@JsonProperty("corpIndex")
private String corpIndex;
/**
* cardType
*/

8
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
View File

@ -570,9 +570,15 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
for (TIccardLog tIccardLog : dataList) {
OperateCardsLogResponse.DataDTO dataDTO = new OperateCardsLogResponse.DataDTO();
String log = tIccardLog.getLog();
CardLogInfo cardLogInfo = JSONUtil.toBean(log, CardLogInfo.class);
CardLogInfo.CardInfoDTO cardInfo = cardLogInfo.getCardInfo();
XhpcOperator operator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(cardInfo.getCorpNo(), tokenService.getLoginUser().getSysUser().getTenantId());
XhpcOperator operator =new XhpcOperator();
if(tIccardLog.getOperate()==0){
operator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(cardInfo.getCorpNo(), tokenService.getLoginUser().getSysUser().getTenantId());
}else{
operator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(cardInfo.getCorpIndex(), tokenService.getLoginUser().getSysUser().getTenantId());
}
dataDTO.setGrantOperatorName(operator.getName());
dataDTO.setCardSerialNumber(tIccardLog.getUniqueid());
dataDTO.setOperate(Integer.valueOf(tIccardLog.getOperate()));

1
xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml
View File

@ -47,6 +47,7 @@
FROM
t_iccard_log
<where>
type = 0
<if test="logStartTime!=null and logStartTime!=''">
and createTime &gt;= #{logStartTime}
</if>