Merge branch 'jndx_hcxy' of http://192.168.1.43:3000/v2/zd-parents into jndx_hcxy

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectController.java

@@ -1,6 +1,7 @@
 package com.zd.laboratory.controller;
 
 import cn.hutool.core.util.StrUtil;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.model.domain.DTO.UserPhoneInfo;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
@@ -238,6 +239,21 @@ public class LabSubjectController extends BaseController {
         return ResultData.success();
     }
 
+    /***
+     * 修改实验室排序
+     * @param labSubject
+     * @return
+     */
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBJECT + PerFun.EDIT)
+    @Log(title = "实验室", businessType = BusinessType.UPDATE)
+    @PostMapping("/editSort")
+    public ResultData editSort(@RequestBody LabSubject labSubject) {
+        if(StringUtils.isNull(labSubject) || StringUtils.isNull(labSubject.getId())){
+            ResultData.fail("参数异常！");
+        }
+        return ResultData.success(labSubjectService.editSort(labSubject));
+    }
+
 
     /**
      * 修改实验室

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabSubjectService.java

@@ -409,4 +409,11 @@ public interface ILabSubjectService {
      * @return
      */
     List<UserPhoneInfo> selectAdminAndSafeAdminById(Long subId);
+
+    /**
+     * 实验室排序编号修改
+     * @param labSubject
+     * @return
+     */
+    int  editSort(LabSubject labSubject);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectServiceImpl.java

@@ -973,4 +973,9 @@ public class LabSubjectServiceImpl implements ILabSubjectService {
         }
         return userPhoneInfoList;
     }
+
+    @Override
+    public int editSort(LabSubject labSubject) {
+        return labSubjectMapper.updateLabSubject(labSubject);
+    }
 }