测试环境 楼栋管理员问题 微调
diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TRole.java b/src/main/java/com/supwisdom/dlpay/framework/domain/TRole.java
index 3112259..0db1f5a 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/domain/TRole.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/domain/TRole.java
@@ -31,6 +31,9 @@
@Column(name="LASTSAVED", length = 14)
private String lastsaved;
+ @Column(name = "GRADE",length = 3)
+ private Integer grade;
+
public String getRoleId() {
return roleId;
}
@@ -86,4 +89,12 @@
public void setLastsaved(String lastsaved) {
this.lastsaved = lastsaved;
}
+
+ public Integer getGrade() {
+ return grade;
+ }
+
+ public void setGrade(Integer grade) {
+ this.grade = grade;
+ }
}
diff --git a/src/main/java/com/supwisdom/dlpay/mainservice/dao/impl/DoordtlDaoImpl.java b/src/main/java/com/supwisdom/dlpay/mainservice/dao/impl/DoordtlDaoImpl.java
index 047e876..17111ec 100644
--- a/src/main/java/com/supwisdom/dlpay/mainservice/dao/impl/DoordtlDaoImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/mainservice/dao/impl/DoordtlDaoImpl.java
@@ -171,7 +171,7 @@
" to_char(to_date(a.coldate ,'yyyymmdd'),'yyyy-mm-dd')||' '||to_char(to_timestamp(a.coltime,'hh24miss'),'hh24:mi:ss') coldate,"
+ " case when a.status='' then '失败' else '成功' end status,a.dtldesc "
+ " from t_doordtl a "
- + " left join t_card c left join on a.custid=c.custid,t_nc_device b "
+ + " left join t_card c on a.custid=c.custid,t_nc_device b "
+ " left join tb_region d on b.regionid=d.regionid "
+ " left join t_building e on b.buildingid=e.buildingid "
+ " left join t_operBuilding f on e.buildingid = f.buildingid "
@@ -550,7 +550,7 @@
String queryString = "select a.doorseqno,b.deviceid,b.devname,a.custname,c.cardno,c.cardphyid,c.bankcardno,a.transdate||a.transtime transdate, a.coldate||a.coltime coldate,"
+ " case when a.status='' then '失败' else '成功' end status,a.dtldesc "
+ " from t_doordtl a "
- + " left join t_card c on a.custid=c.custid,t_nc_devcie b "
+ + " left join t_card c on a.custid=c.custid,t_nc_device b "
+ " left join tb_region d on b.regionid=d.regionid "
+ " left join t_building e on b.buildingid=e.buildingid "
+ " left join t_operBuilding f on e.buildingid = f.buildingid "
diff --git a/src/main/java/com/supwisdom/dlpay/query/controller/QueryController.java b/src/main/java/com/supwisdom/dlpay/query/controller/QueryController.java
index ef75b27..b82e700 100644
--- a/src/main/java/com/supwisdom/dlpay/query/controller/QueryController.java
+++ b/src/main/java/com/supwisdom/dlpay/query/controller/QueryController.java
@@ -139,7 +139,7 @@
tDoordtlInfos = webInterfaceService.findOperatorExportExcelDoordtl(startTranDate, endTranDate, startTranTime,
endTranTime, cardno, custname, buildingid, regionid, devname, streamstatus,operUser.getRegionid());
}else if (opertype.equals("L")){
-
+ tDoordtlInfos = webInterfaceService.findBuildingOperExportExcelDoorDtl(startTranDate, endTranDate, startTranTime, endTranTime, cardno, custname, buildingid, devname, streamstatus, operUser.getOperid());
}
/**
* 2.设置表格属性: title:标题 sheetName:工作簿名 type:表格类型