Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java
This commit is contained in:
commit
f692577ae7
|
@ -104,12 +104,13 @@ public class ConfigMaterialInfoController extends JeecgController<ConfigMaterial
|
||||||
@RequiresPermissions("configMaterialInfo:config_material_info:edit")
|
@RequiresPermissions("configMaterialInfo:config_material_info:edit")
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
public Result<String> edit(@RequestBody ConfigMaterialInfo configMaterialInfo) {
|
public Result<String> edit(@RequestBody ConfigMaterialInfo configMaterialInfo) {
|
||||||
|
if(StringUtils.isNotBlank(configMaterialInfo.getMaterialName())){
|
||||||
String chinese = configMaterialInfo.getMaterialName();
|
String chinese = configMaterialInfo.getMaterialName();
|
||||||
String firstLetter = PinyinUtils.getFirstLetter(chinese);
|
String firstLetter = PinyinUtils.getFirstLetter(chinese);
|
||||||
configMaterialInfo.setPinyin(firstLetter);
|
configMaterialInfo.setPinyin(firstLetter);
|
||||||
|
}
|
||||||
configMaterialInfoService.updateById(configMaterialInfo);
|
configMaterialInfoService.updateById(configMaterialInfo);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("操作成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -107,7 +107,7 @@ public class ConfigSuppliersInfoController extends JeecgController<ConfigSupplie
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
public Result<String> edit(@RequestBody ConfigSuppliersInfo configSuppliersInfo) {
|
public Result<String> edit(@RequestBody ConfigSuppliersInfo configSuppliersInfo) {
|
||||||
configSuppliersInfoService.updateById(configSuppliersInfo);
|
configSuppliersInfoService.updateById(configSuppliersInfo);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("操作成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -102,4 +102,8 @@ public class ConfigSuppliersInfo implements Serializable {
|
||||||
/**所属部门*/
|
/**所属部门*/
|
||||||
@ApiModelProperty(value = "所属部门")
|
@ApiModelProperty(value = "所属部门")
|
||||||
private java.lang.String sysOrgCode;
|
private java.lang.String sysOrgCode;
|
||||||
|
/**是否启用 0启用 1未启用*/
|
||||||
|
@Dict(dicCode = "iz_enabled")
|
||||||
|
@ApiModelProperty(value = "是否启用 0启用 1未启用")
|
||||||
|
private java.lang.String izEnabled;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue