Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java =================================================================== diff -u -r40929 -r41034 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 40929) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 41034) @@ -782,6 +782,11 @@ private String deviceMaintenanceUpdateMode = MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS; public static final String MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS = "通过管理权限进行修改"; public static final String ONLY_THE_REGISTRANT_CAN_MAKE_MODIFICATIONS = "仅登记人可以修改"; + /** + * 质量监测记录修改模式 + * GZSZYY-122 + */ + private String qualityMonitoringUpdateMode = MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS; /** * 管理员登录IP地址范围的开始IP @@ -1937,6 +1942,14 @@ this.deviceMaintenanceUpdateMode = deviceMaintenanceUpdateMode; } + public String getQualityMonitoringUpdateMode() { + return qualityMonitoringUpdateMode; + } + + public void setQualityMonitoringUpdateMode(String qualityMonitoringUpdateMode) { + this.qualityMonitoringUpdateMode = qualityMonitoringUpdateMode; + } + @Column(columnDefinition=" varchar(20) default '" + Constants.STR_NO + "' not null ") public String getDisplayRecipientPhoneNumber() { return displayRecipientPhoneNumber; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r40929 -r41034 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 40929) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 41034) @@ -1007,6 +1007,15 @@ }else{ supplyRoomConfig.setDeviceMaintenanceUpdateMode(SupplyRoomConfig.MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS); } + String qualityMonitoringUpdateMode = rq.getParameter("qualityMonitoringUpdateMode"); + //默认就是MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS + if(StringUtils.isBlank(qualityMonitoringUpdateMode)){ + supplyRoomConfig.setQualityMonitoringUpdateMode(SupplyRoomConfig.MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS); + }else if(SupplyRoomConfig.ONLY_THE_REGISTRANT_CAN_MAKE_MODIFICATIONS.equals(qualityMonitoringUpdateMode.trim())){ + supplyRoomConfig.setQualityMonitoringUpdateMode(SupplyRoomConfig.ONLY_THE_REGISTRANT_CAN_MAKE_MODIFICATIONS); + }else{ + supplyRoomConfig.setQualityMonitoringUpdateMode(SupplyRoomConfig.MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS); + } supplyRoomConfig.setInsideTousseMaterialOutCost(insideTousseMaterialOutCost); supplyRoomConfig.setAutoMergeApplication(autoMergeApplication);