合规性分析

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/HgxfxController.java

@@ -2,13 +2,13 @@ package com.onemap.apply.controller.fzss;
 
 import com.onemap.apply.domain.config.fzss.HgxfxDTO;
 import com.onemap.apply.service.fzss.IHgxfxService;
+import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.common.core.web.page.RecordTableDataInfo;
+import com.onemap.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -27,21 +27,22 @@ public class HgxfxController extends BaseController {
      */
     @GetMapping("/GetScxList")
     public RequestResult GetScxList(String param) {
-        RequestResult list = hgxfxService.GetScxList(param);
-        return list;
+        return hgxfxService.GetScxList(param);
     }
 
-
     /**
-     * 获取分析历史列表
+     * 新建合规性分析
      *
+     * @param hgxfxDTO
      * @return
      */
-    @GetMapping("/GetPage")
-    public RecordTableDataInfo GetPage(Integer page, Integer total, String kssj, String jssj, String xmmc, Integer limit, Integer allpage) {
-        startRecordPage();
-        List<HgxfxDTO> list = hgxfxService.GetPage(kssj, jssj, xmmc);
-        return getRecordDataTable(list);
+    @PostMapping("/AddHgxfx")
+    public RequestResult AddHgxfx(@RequestBody HgxfxDTO hgxfxDTO) {
+        if (StringUtils.isNull(hgxfxDTO)) {
+            return RequestResult.error("参数为空");
+        }
+        hgxfxDTO.setCjyh(SecurityUtils.getUsername());
+        return hgxfxService.AddHgxfx(hgxfxDTO);
     }
 
     /**
@@ -57,38 +58,56 @@ public class HgxfxController extends BaseController {
     }
 
     /**
-     * 获取分析结果
+     * 获取分析历史列表
      *
-     * @param bsm
      * @return
      */
-    @GetMapping("/GetFxjg")
-    public RequestResult GetFxjg(String bsm) {
-        RequestResult res = hgxfxService.GetFxjg(bsm);
-        return res;
+    @GetMapping("/GetPage")
+    public RequestResult GetPage(
+            Integer page, Integer total,
+            String kssj, String jssj,
+            String xmmc, Integer limit, Integer allpage) {
+        String username = SecurityUtils.getUsername();
+        startRecordPage();
+        List<HgxfxDTO> list = hgxfxService.GetPage(kssj, jssj, xmmc,username);
+        return RequestResult.success(list);
     }
 
-    /**
-     * 删除分析结果
-     *
-     * @param bsm
-     * @return
-     */
-    @GetMapping("/DeleteFxjg")
-    public RequestResult DeleteFxjg(String bsm) {
-        RequestResult res = hgxfxService.DeleteFxjg(bsm);
-        return res;
-    }
 
-    /**
-     * 同步合规性审查因子项
-     *
-     * @param params 预留
-     * @return
-     */
-    @GetMapping("/UpdateScx")
-    public RequestResult UpdateScx(String params) {
-        RequestResult res = hgxfxService.UpdateScx(params);
-        return res;
-    }
+//
+//    /**
+//     * 获取分析结果
+//     *
+//     * @param bsm
+//     * @return
+//     */
+//    @GetMapping("/GetFxjg")
+//    public RequestResult GetFxjg(String bsm) {
+//        RequestResult res = hgxfxService.GetFxjg(bsm);
+//        return res;
+//    }
+//
+//    /**
+//     * 删除分析结果
+//     *
+//     * @param bsm
+//     * @return
+//     */
+//    @GetMapping("/DeleteFxjg")
+//    public RequestResult DeleteFxjg(String bsm) {
+//        RequestResult res = hgxfxService.DeleteFxjg(bsm);
+//        return res;
+//    }
+//
+//    /**
+//     * 同步合规性审查因子项
+//     *
+//     * @param params 预留
+//     * @return
+//     */
+//    @GetMapping("/UpdateScx")
+//    public RequestResult UpdateScx(String params) {
+//        RequestResult res = hgxfxService.UpdateScx(params);
+//        return res;
+//    }
 }