Merge remote-tracking branch 'origin/master'

src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java

@@ -27,7 +27,7 @@ public class ItemController extends BaseController {
         String name = parmsUtil.getString("name");
         String tel = parmsUtil.getString("tel");
 
-        return success(itemService.getPageList(page, size, name, tel));
+        return success(itemService.list(page, size, name, tel));
     }
 
     @RequestMapping("/getItemById")
@@ -36,13 +36,13 @@ public class ItemController extends BaseController {
         if (id == null) {
             throw new MessageException("id参数为空");
         }
-        return success(itemService.getItemById(id));
+        return success(itemService.get(id));
     }
 
     @RequestMapping("/add")
     public Result<?> createItem() {
         Item item = parmsUtil.getObject("data", Item.class);
-        itemService.createItem(item);
+        itemService.save(item);
         return success();
     }
 
@@ -56,7 +56,7 @@ public class ItemController extends BaseController {
     @RequestMapping("/delete")
     public Result<?> deleteItem() {
         Integer id = parmsUtil.getInteger("id");
-        itemService.del(id);
+        itemService.delete(id);
         return success();
     }
 

src/main/java/com/syjiaer/clinic/server/controller/item/ItemGroupController.java

@@ -22,14 +22,14 @@ public class ItemGroupController extends BaseController {
         Integer page = parmsUtil.getInteger("page", "页码不能为空");
         Integer size = parmsUtil.getInteger("size", "页容量不能为空");
         String name = parmsUtil.getString("name");
-        Page<ItemGroup> pageResult = itemGroupService.getItemGroupList(page, size, name);
+        Page<ItemGroup> pageResult = itemGroupService.list(page, size, name);
         return success(pageResult);
     }
 
     @RequestMapping("/getItemGroupById")
     public Result<ItemGroup> getItemGroupById() {
         Integer id = parmsUtil.getInteger("id", "id不能为空");
-        ItemGroup itemGroup = itemGroupService.getItemGroupById(id);
+        ItemGroup itemGroup = itemGroupService.get(id);
         return success(itemGroup);
     }
 
@@ -39,7 +39,7 @@ public class ItemGroupController extends BaseController {
         if (itemGroupParam == null){
             throw new MessageException("请求参数不能为空");
         }
-        itemGroupService.saveItemGroup(itemGroupParam);
+        itemGroupService.save(itemGroupParam);
         return success();
     }
 

src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java

@@ -23,7 +23,7 @@ public class OrganizationMemberController extends BaseController {
         int size = parmsUtil.getInteger("size", "页容量不能为空");
         String name = parmsUtil.getString("name");
         String tel = parmsUtil.getString("tel");
-        return success(organizationMemberService.listPage(page,size,name,tel));
+        return success(organizationMemberService.pageList(page,size,name,tel));
     }
     @RequestMapping("/add")
     public Result<?> add() {

src/main/java/com/syjiaer/clinic/server/service/item/ItemGroupService.java

@@ -31,7 +31,7 @@ public class ItemGroupService extends BaseService {
      * @param pageSize 页面大小
      * @param name 项目组名称
      */
-    public Page<ItemGroup> getItemGroupList(int pageNum, int pageSize, String name) {
+    public Page<ItemGroup> list(int pageNum, int pageSize, String name) {
         QueryWrapper<ItemGroup> queryWrapper = new QueryWrapper<>();
         if (name != null && !name.isEmpty()) {
             queryWrapper.like("name", name);
@@ -44,7 +44,7 @@ public class ItemGroupService extends BaseService {
      * 获取项目组详情
      * @param id 项目组id
      */
-    public ItemGroup getItemGroupById(int id) {
+    public ItemGroup get(int id) {
         return itemGroupMapper.selectById(id);
     }
 
@@ -53,7 +53,7 @@ public class ItemGroupService extends BaseService {
      * @param itemGroupParam 项目组参数
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveItemGroup(ItemGroupParam itemGroupParam) {
+    public void save(ItemGroupParam itemGroupParam) {
         if (itemGroupParam.getId() != null) {
             QueryWrapper<ItemGroup> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("name", itemGroupParam.getName()).ne("id", itemGroupParam.getId()).eq("del_flag", false);
@@ -61,7 +61,7 @@ public class ItemGroupService extends BaseService {
             if (!itemGroups.isEmpty()) {
                 throw new MessageException("项目分组名称已存在");
             }
-            ItemGroup itemGroup = getItemGroup(itemGroupParam);
+            ItemGroup itemGroup = getDetail(itemGroupParam);
             itemGroup.setId(itemGroupParam.getId());
             itemGroupMapper.updateById(itemGroup);
             return;
@@ -72,7 +72,7 @@ public class ItemGroupService extends BaseService {
         if (!itemGroups.isEmpty()) {
             throw new MessageException("项目分组名称已存在");
         }
-        ItemGroup itemGroup = getItemGroup(itemGroupParam);
+        ItemGroup itemGroup = getDetail(itemGroupParam);
         itemGroupMapper.insert(itemGroup);
     }
 
@@ -80,7 +80,7 @@ public class ItemGroupService extends BaseService {
      * 生成项目组
      * @param itemGroupParam 项目组参数
      */
-    private ItemGroup getItemGroup(ItemGroupParam itemGroupParam) {
+    private ItemGroup getDetail(ItemGroupParam itemGroupParam) {
         ItemGroup itemGroup = new ItemGroup();
         BigDecimal unitPrice = new BigDecimal(0);
         BigDecimal purchaseUnitPrice = new BigDecimal(0);

src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java

@@ -25,7 +25,7 @@ public class ItemService extends BaseService {
      * @param name 项目名称
      * @param tel 手机号
      */
-    public Page<Item> getPageList(int pageNum, int pageSize, String name, String tel) {
+    public Page<Item> list(int pageNum, int pageSize, String name, String tel) {
         QueryWrapper<Item> queryWrapper = new QueryWrapper<>();
         if (name != null && !name.isEmpty()) {
             queryWrapper.like("name", name);
@@ -40,36 +40,26 @@ public class ItemService extends BaseService {
      * 根据id获取项目信息
      * @param id 项目id
      */
-    public Item getItemById(int id) {
+    public Item get(int id) {
         return itemMapper.selectById(id);
     }
     /*
      * 创建项目
      * @param item 项目信息
      */
-    public void createItem(Item item) {
+    public void save(Item item) {
         if (item == null) {
             throw new MessageException("item参数为空");
         }
         ManagerUser managerUser = getManagerUser();
         item.setCreateDatetime(LocalDateTime.now());
         item.setCreateBy(managerUser.getName());
-        itemMapper.insert(item);
-    }
-    /*
-     * 更新项目信息
-     * @param item 项目信息
-     */
-    public void updateItem(Item item) {
-        if (item == null) {
-            throw new MessageException("item参数为空");
-        }
-        item.setUpdateBy(getManagerUser().getName());
-        item.setUpdateDatetime(LocalDateTime.now());
-        itemMapper.updateById(item);
+        itemMapper.insertOrUpdate(item);
     }
+
+
     @Transactional(rollbackFor = Exception.class)
-    public void del(Integer id) {
+    public void delete(Integer id) {
         if (id == null) {
             throw new MessageException("id参数为空");
         }

src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java

@@ -30,7 +30,7 @@ public class OrganizationMemberService extends BaseService {
      * @param name 姓名
      * @param tel 电话
      */
-    public Page<OrganizationMember> listPage(int pageNum, int pageSize, String name, String tel) {
+    public Page<OrganizationMember> pageList(int pageNum, int pageSize, String name, String tel) {
         QueryWrapper<OrganizationMember> queryWrapper = new QueryWrapper<>();
         if (name != null && !name.isEmpty()) {
             queryWrapper.like("name", name);