Merge remote-tracking branch 'origin/master'

src/main/java/com/sooka/sponest/mobile/comprehensive/comprehensivePersonBasicInfo/AppSafetyInvolvedController.java

@@ -0,0 +1,78 @@
+package com.sooka.sponest.mobile.comprehensive.comprehensivePersonBasicInfo;
+
+import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.comprehensive.api.comprehensiveSchoolSafety.domain.ComprehensiveSafetyInvolved;
+import com.sooka.sponest.comprehensive.api.comprehensiveSchoolSafety.service.RemoteSafetyInvolvedService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 涉及师生安全的案（事）件app
+ *
+ * @author hanfucheng
+ * @date 2023/9/18 9:39
+ */
+@RestController
+@RequestMapping("/AppSafetyInvolvedController")
+public class AppSafetyInvolvedController extends BaseController {
+
+    @Resource
+    RemoteSafetyInvolvedService remoteSafetyInvolvedService;
+
+    /**
+     * 查询涉及师生安全的案（事）件列表
+     */
+    @GetMapping("/leader/list")
+    public AjaxResult list(ComprehensiveSafetyInvolved comprehensiveSafetyInvolved) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        TableDataInfo tableDataInfo = remoteSafetyInvolvedService.selectComprehensiveSafetyInvolvedList(pageNum, pageSize, comprehensiveSafetyInvolved.getCaseName());
+        if (HttpStatus.SUCCESS == tableDataInfo.getCode()) {
+            return AjaxResult.success(tableDataInfo.getRows());
+        } else {
+            return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
+        }
+    }
+
+
+    /**
+     * 获取涉及师生安全的案（事）件详细信息
+     */
+    @GetMapping("/leader/edit")
+    public AjaxResult getInfo(String id) {
+        return remoteSafetyInvolvedService.selectComprehensiveSafetyInvolvedById(id);
+    }
+
+    /**
+     * 新增涉及师生安全的案（事）件
+     */
+    @PostMapping("/leader")
+    public AjaxResult add(@RequestBody String json) {
+        return remoteSafetyInvolvedService.insertComprehensiveSafetyInvolved(json);
+    }
+
+    /**
+     * 修改涉及师生安全的案（事）件
+     */
+    @PostMapping("/leader/put")
+    public AjaxResult edit(@RequestBody String json) {
+        return remoteSafetyInvolvedService.updateComprehensiveSafetyInvolved(json);
+    }
+
+    /**
+     * 删除涉及师生安全的案（事）件
+     */
+    @GetMapping("/leader/del")
+    public AjaxResult remove(@RequestParam("id") List<String> id) {
+        return remoteSafetyInvolvedService.deleteComprehensiveSafetyInvolvedByIds(id.toArray(new String[0]));
+    }
+
+}

src/main/java/com/sooka/sponest/mobile/comprehensive/comprehensivePersonBasicInfo/AppSchoolController.java

@@ -0,0 +1,79 @@
+package com.sooka.sponest.mobile.comprehensive.comprehensivePersonBasicInfo;
+
+import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveRfhGridLeader;
+import com.sooka.sponest.comprehensive.api.comprehensiveSchoolSafety.domain.ComprehensiveSchool;
+import com.sooka.sponest.comprehensive.api.comprehensiveSchoolSafety.service.RemoteSchoolService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 学校app
+ *
+ * @author hanfucheng
+ * @date 2023/9/18 9:39
+ */
+@RestController
+@RequestMapping("/AppSchoolController")
+public class AppSchoolController extends BaseController {
+
+    @Resource
+    RemoteSchoolService remoteSchoolService;
+
+    /**
+     * 查询学校列表
+     */
+    @GetMapping("/leader/list")
+    public AjaxResult list(ComprehensiveSchool comprehensiveSchool) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        TableDataInfo tableDataInfo = remoteSchoolService.selectComprehensiveSchoolList(pageNum, pageSize, comprehensiveSchool.getSchoolName());
+        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
+            return AjaxResult.success(tableDataInfo.getRows());
+        }else{
+            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
+        }
+    }
+
+
+    /**
+     * 获取学校详细信息
+     */
+    @GetMapping("/leader/edit")
+    public AjaxResult getInfo(String id) {
+        return remoteSchoolService.selectComprehensiveSchoolById(id);
+    }
+
+    /**
+     * 新增学校
+     */
+    @PostMapping("/leader")
+    public AjaxResult add(@RequestBody String json) {
+        return remoteSchoolService.insertComprehensiveSchool(json);
+    }
+    /**
+     * 修改学校
+     */
+    @PostMapping("/leader/put")
+    public AjaxResult edit(@RequestBody String json) {
+        return remoteSchoolService.updateComprehensiveSchool(json);
+    }
+
+    /**
+     * 删除学校
+     */
+    @GetMapping("/leader/del")
+    public AjaxResult remove(@RequestParam("id") List<String> id) {
+        return remoteSchoolService.deleteComprehensiveSchoolByIds(id.toArray(new String[0]));
+    }
+
+
+}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/AppInstitutionsController.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutioncontroller;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
@@ -48,7 +49,16 @@ public class AppInstitutionsController extends BaseController {
      */
     @GetMapping("/comprehensiveInstitutionsf/edit")
     public AjaxResult getInfo(String id) {
-        return remoteInstitutionsService.selectComprehensiveInstitutionsById(id);
+       R<ComprehensiveInstitutions> comprehensiveInstitutionsR = remoteInstitutionsService.selectComprehensiveInstitutionsById(id);
+       ComprehensiveInstitutions data = comprehensiveInstitutionsR.getData();
+       if (HttpStatus.SUCCESS == comprehensiveInstitutionsR.getCode()){
+            data.setIsEdit(true);
+       }else if(HttpStatus.ERROR == comprehensiveInstitutionsR.getCode() && null!=data){
+           data.setIsEdit(false);
+       }else {
+           return AjaxResult.error(comprehensiveInstitutionsR.getCode(),comprehensiveInstitutionsR.getMsg());
+       }
+        return AjaxResult.success(data);
     }
 
     /**