Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java =================================================================== diff -u -r13571 -r13792 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 13571) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 13792) @@ -122,11 +122,11 @@ String orgUnitCodingFromSupplyRoomConfig = AcegiHelper.getLoginUser() .getOrgUnitCodingFromSupplyRoomConfig(); - if (DatabaseUtil.isSqlServer(dbConnection.getDatabase())) { + if (dbConnection.isSqlServer()) { String tempSql = "(SELECT TOP " + end - + " r.*,p.type FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where p.handleDepartCoding = '" + + " r.*,p.type,p.remark FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where p.handleDepartCoding = '" + orgUnitCodingFromSupplyRoomConfig + "' and " + filterSql @@ -140,8 +140,8 @@ + " order by recyclingTime desc)"; sql = "SELECT TOP 20 * FROM " + tempSql + " WHERE id not in " + tempSql2; - } else if (DatabaseUtil.isOracle(dbConnection.getDatabase())) { - sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT r.*,p.type FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where p.handleDepartCoding = '" + } else if (dbConnection.isOracle()) { + sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT r.*,p.type,p.remark FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where p.handleDepartCoding = '" + orgUnitCodingFromSupplyRoomConfig + "' and " + filterSql Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r13744 -r13792 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 13744) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 13792) @@ -289,14 +289,15 @@ }else if(status == "未保存"){ status = ""+status+""; } + var departName = result.data[i].depart; - var recyclingRecordElement = $('' + var recyclingRecordElement = $('' +'
'+departName - +'
'+dateObjFormat(result.data[i].recyclingTime) - +'
'+result.data[i].operator - +'
'+result.data[i].recyclingApplicationType - +'
'+status - +'
'); + +'
'+dateObjFormat(result.data[i].recyclingTime) + +'
'+result.data[i].operator + +'
'+result.data[i].recyclingApplicationType + +'
'+status + +'
'+ result.data[i].remark +'
'); $("#recyclingRecordTable").append(recyclingRecordElement); idArray.push(result.data[i].id); } @@ -1019,11 +1020,12 @@
- - - - - + + + + + +
科室回收时间操作员申请单类型状态科室回收时间操作员申请单类型状态备注
Index: forgon-tools/src/main/java/com/forgon/tools/string/StringTools.java =================================================================== diff -u -r12331 -r13792 --- forgon-tools/src/main/java/com/forgon/tools/string/StringTools.java (.../StringTools.java) (revision 12331) +++ forgon-tools/src/main/java/com/forgon/tools/string/StringTools.java (.../StringTools.java) (revision 13792) @@ -36,13 +36,14 @@ } public static String getDefaultString(String source) { - String dest = source; - - if (isEmpty(source)) { - dest = ""; - } - - return dest; + return getDefaultString(source,""); +// String dest = source; +// +// if (isEmpty(source)) { +// dest = ""; +// } +// +// return dest; } public static String getDefaultString(String source, String defaultValue) { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java =================================================================== diff -u -r13461 -r13792 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java (.../RecyclingRecord.java) (revision 13461) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java (.../RecyclingRecord.java) (revision 13792) @@ -63,6 +63,11 @@ private String recyclingUser;// 回收人 private String recyclingApplicationType;// 申请单类型 + + /** + * 备注 + */ + private String remark; @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -171,7 +176,16 @@ public void setRecyclingApplicationType(String recyclingApplicationType) { this.recyclingApplicationType = recyclingApplicationType; } + + @Transient + public String getRemark() { + return remark; + } + public void setRemark(String remark) { + this.remark = remark; + } + @Transient public boolean isMaterialsLost() { boolean materialsLost = false;// 是否有丢失材料 Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r13748 -r13792 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13748) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13792) @@ -1430,6 +1430,7 @@ record.setRecyclingTime(rs.getTimestamp("recyclingTime")); record.setOperator(rs.getString("operator")); record.setRecyclingApplicationType(rs.getString("type")); + record.setRemark(StringTools.getDefaultString(rs.getString("remark"))); // 设置申请单状态 records.add(record); }