Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java =================================================================== diff -u -r39254 -r40426 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java (.../Sterilizer.java) (revision 39254) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java (.../Sterilizer.java) (revision 40426) @@ -315,6 +315,19 @@ * 灭菌器运行记录表体现内容(自定义表单) */ public FormDefinition runTableRecordFormDefinition; + + /** + * 维护周期(天) + * QHRSGZZYY-16 + */ + private Integer maintenanceCycle; + + /** + * 检测周期(天) + * QHRSGZZYY-16 + */ + private Integer inspectionCycle; + static { ColumnNameAndPoPropertyNameMap.put("名称", "name"); ColumnNameAndPoPropertyNameMap.put("购买日期", "purchaseDateStr"); @@ -779,5 +792,20 @@ this.isDoubleCheckOfSterilization = isDoubleCheckOfSterilization; } - + public Integer getMaintenanceCycle() { + return maintenanceCycle; + } + + public void setMaintenanceCycle(Integer maintenanceCycle) { + this.maintenanceCycle = maintenanceCycle; + } + + public Integer getInspectionCycle() { + return inspectionCycle; + } + + public void setInspectionCycle(Integer inspectionCycle) { + this.inspectionCycle = inspectionCycle; + } + } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java =================================================================== diff -u -r39095 -r40426 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java (.../RinserAction.java) (revision 39095) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java (.../RinserAction.java) (revision 40426) @@ -215,6 +215,13 @@ return null; } }); + config.registerDefaultValueProcessor(Integer.class, + new DefaultValueProcessor() { + @Override + public Object getDefaultValue(@SuppressWarnings("rawtypes") Class arg0) { + return null; + } + }); Map map = new HashMap(); map.put("success", true); map.put("data", rinser); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java =================================================================== diff -u -r39254 -r40426 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java (.../Rinser.java) (revision 39254) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java (.../Rinser.java) (revision 40426) @@ -175,6 +175,18 @@ /**“用途”的选项“吹干”*/ public static final String PURPOSE_DRY = "吹干";//ZSYY-371 + /** + * 维护周期(天) + * QHRSGZZYY-16 + */ + private Integer maintenanceCycle; + + /** + * 检测周期(天) + * QHRSGZZYY-16 + */ + private Integer inspectionCycle; + public String getUseStatus() { return useStatus; } @@ -508,5 +520,21 @@ public void setPurpose(String purpose) { this.purpose = purpose; } + + public Integer getMaintenanceCycle() { + return maintenanceCycle; + } + + public void setMaintenanceCycle(Integer maintenanceCycle) { + this.maintenanceCycle = maintenanceCycle; + } + + public Integer getInspectionCycle() { + return inspectionCycle; + } + + public void setInspectionCycle(Integer inspectionCycle) { + this.inspectionCycle = inspectionCycle; + } }