Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java =================================================================== diff -u -r39852 -r40411 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 39852) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 40411) @@ -728,7 +728,16 @@ public static final String NO_OPTION_CLEAN_METHOD_SOLUTION_ALLOW_ANY_CLEAN_METHOD = "允许使用任意清洗程序"; public static final String NO_OPTION_CLEAN_METHOD_SOLUTION_DO_NOT_ALLOW_ANY_CLEAN_METHOD = "不允许使用任意清洗程序"; - + /** + * 自定义表单修改模式 + */ + private String defineFormModificationMode; + /** + * 设备维护记录修改模式 + */ + private String deviceMaintenanceUpdateMode; + public static final String MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS = "通过管理权限进行修改"; + public static final String ONLY_THE_REGISTRANT_CAN_MAKE_MODIFICATIONS = "仅登记人可以修改"; @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { @@ -1824,5 +1833,20 @@ public void setNoOptionCleanMethodSolution(String noOptionCleanMethodSolution) { this.noOptionCleanMethodSolution = noOptionCleanMethodSolution; } + @Column(columnDefinition=" varchar(255) default '" + MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS + "' not null ") + public String getDefineFormModificationMode() { + return defineFormModificationMode; + } + public void setDefineFormModificationMode(String defineFormModificationMode) { + this.defineFormModificationMode = defineFormModificationMode; + } + + public String getDeviceMaintenanceUpdateMode() { + return deviceMaintenanceUpdateMode; + } + + public void setDeviceMaintenanceUpdateMode(String deviceMaintenanceUpdateMode) { + this.deviceMaintenanceUpdateMode = deviceMaintenanceUpdateMode; + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r40302 -r40411 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 40302) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 40411) @@ -968,6 +968,26 @@ supplyRoomConfig.setIsFtOnlyImplantConvert(isFtOnlyImplantConvert); supplyRoomConfig.setIsTousseDgMergeConvert(isTousseDgMergeConvert); supplyRoomConfig.setDamagedTousseAtCost(damagedTousseAtCost); + String defineFormModificationMode = rq.getParameter("defineFormModificationMode"); + //默认就是MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS + if(StringUtils.isBlank(defineFormModificationMode)){ + supplyRoomConfig.setDefineFormModificationMode(SupplyRoomConfig.MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS); + }else if(SupplyRoomConfig.ONLY_THE_REGISTRANT_CAN_MAKE_MODIFICATIONS.equals(defineFormModificationMode.trim())){ + supplyRoomConfig.setDefineFormModificationMode(SupplyRoomConfig.ONLY_THE_REGISTRANT_CAN_MAKE_MODIFICATIONS); + }else{ + supplyRoomConfig.setDefineFormModificationMode(SupplyRoomConfig.MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS); + } + + String deviceMaintenanceUpdateMode = rq.getParameter("deviceMaintenanceUpdateMode"); + //默认就是MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS + if(StringUtils.isBlank(deviceMaintenanceUpdateMode)){ + supplyRoomConfig.setDeviceMaintenanceUpdateMode(SupplyRoomConfig.MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS); + }else if(SupplyRoomConfig.ONLY_THE_REGISTRANT_CAN_MAKE_MODIFICATIONS.equals(deviceMaintenanceUpdateMode.trim())){ + supplyRoomConfig.setDeviceMaintenanceUpdateMode(SupplyRoomConfig.ONLY_THE_REGISTRANT_CAN_MAKE_MODIFICATIONS); + }else{ + supplyRoomConfig.setDeviceMaintenanceUpdateMode(SupplyRoomConfig.MODIFY_THROUGH_ADMINISTRATIVE_PERMISSIONS); + } + supplyRoomConfig.setInsideTousseMaterialOutCost(insideTousseMaterialOutCost); supplyRoomConfig.setAutoMergeApplication(autoMergeApplication); supplyRoomConfig.setIsORAppFormMerge(isORAppFormMerge);