gushoubang 8 kuukautta sitten
vanhempi
commit
256ccca9de

+ 33 - 27
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/FzxzController.java

@@ -16,7 +16,6 @@ import java.util.List;
 @RestController
 @RequestMapping("/fzxz")
 public class FzxzController extends BaseController {
-
     @Autowired
     private IFzxzService fzxzService;
 
@@ -75,7 +74,6 @@ public class FzxzController extends BaseController {
         return list;
     }
 
-
     /**
      * 添加辅助选址模板
      *
@@ -87,33 +85,41 @@ public class FzxzController extends BaseController {
         RequestResult res = fzxzService.AddTemplate(addFactorTemplateVo);
         return res;
     }
-
     /**
-     * 获取辅助选址列表
-     *
-     * @param xmmc
-     * @param kssj
-     * @param jssj
-     * @param limit
-     * @param page
-     * @return
+     * 删除模板列表
      */
-    @GetMapping("/GetFzxzList")
-    public RecordTableDataInfo GetFzxzList(String xmmc, String kssj, String jssj, Integer limit, Integer page) {
-        startRecordPage();
-        List<FzxzEntityDTO> list = fzxzService.GetFzxzList(xmmc, kssj, jssj);
-        return getRecordDataTable(list);
+    @DeleteMapping("/DelTemplate")
+    public RequestResult DelTemplate(@NotNull String landTypeCode) {
+        RequestResult list = fzxzService.DelTemplate(landTypeCode);
+        return list;
     }
 
-    /**
-     * 删除选址结果
-     *
-     * @param bsm
-     * @return
-     */
-    @GetMapping("/DeleteXzjg")
-    public RequestResult DeleteXzjg(String bsm) {
-        RequestResult res = fzxzService.DeleteXzjg(bsm);
-        return res;
-    }
+    // /**
+    //  * 获取辅助选址列表
+    //  *
+    //  * @param xmmc
+    //  * @param kssj
+    //  * @param jssj
+    //  * @param limit
+    //  * @param page
+    //  * @return
+    //  */
+    // @GetMapping("/GetFzxzList")
+    // public RecordTableDataInfo GetFzxzList(String xmmc, String kssj, String jssj, Integer limit, Integer page) {
+    //     startRecordPage();
+    //     List<FzxzEntityDTO> list = fzxzService.GetFzxzList(xmmc, kssj, jssj);
+    //     return getRecordDataTable(list);
+    // }
+    //
+    // /**
+    //  * 删除选址结果
+    //  *
+    //  * @param bsm
+    //  * @return
+    //  */
+    // @GetMapping("/DeleteXzjg")
+    // public RequestResult DeleteXzjg(String bsm) {
+    //     RequestResult res = fzxzService.DeleteXzjg(bsm);
+    //     return res;
+    // }
 }

+ 2 - 0
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IFzxzService.java

@@ -23,6 +23,8 @@ public interface IFzxzService {
 
     RequestResult AddTemplate(AddFactorTemplateVo addFactorTemplateVo);
 
+    RequestResult DelTemplate(String landTypeCode);
+
     List<FzxzEntityDTO> GetFzxzList(String xmmc, String kssj, String jssj);
 
     RequestResult DeleteXzjg(String bsm);

+ 12 - 0
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/FzxzServiceImpl.java

@@ -161,6 +161,18 @@ public class FzxzServiceImpl implements IFzxzService {
         return RequestResult.success("保存成功!", 1);
     }
 
+    @Override
+    public RequestResult DelTemplate(String landTypeCode) {
+        Long userId = SecurityUtils.getUserId();
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("land_type_code", landTypeCode);
+        map.put("user_id", userId.toString());
+        map.put("system", false);
+        fzxzTemplateMapper.deleteByMap(map);
+        return RequestResult.success("删除成功!", null);
+    }
+
     @Override
     public List<FzxzEntityDTO> GetFzxzList(String xmmc, String kssj, String jssj) {
         try {