删除

src/main/java/com/chinaitop/depot/sqr/controller/BizSqrEnterpriseApplyController.java

@@ -16,6 +16,8 @@ package com.chinaitop.depot.sqr.controller;
 import com.chinaitop.depot.sqr.model.BizSqrEnterpriseApply;
 import com.chinaitop.depot.sqr.model.vo.BizSqrEnterpriseApplyVO;
 import com.chinaitop.depot.sqr.service.BizSqrEnterpriseApplyService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -23,10 +25,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import javax.annotation.Resource;
@@ -42,10 +41,9 @@ import java.util.Map;
  * @author ZeroLiYi
  * @date  2024/04/28 10:01
  */
-@Api(tags = "粮食储备-承储资格企业-承储资格申请控制器")
-@RequestMapping(value="/grqeapply")
+@RequestMapping(value="/sqr")
 @RestController
-@Validated
+@Api(description = "承储资格申请控制器")
 public class BizSqrEnterpriseApplyController {
 
     @Resource
@@ -58,7 +56,7 @@ public class BizSqrEnterpriseApplyController {
      * @date  2024/04/28 10:01
      */
 
-    @ApiOperation("获取粮食储备-承储资格企业-承储资格申请分页")
+    @ApiOperation("承储资格申请分页")
     @GetMapping("/page")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
@@ -78,7 +76,7 @@ public class BizSqrEnterpriseApplyController {
     }
 
 
-    @ApiOperation("获取粮食储备-承储资格企业-承储资格申请详情")
+    @ApiOperation("承储资格申请详情")
     @GetMapping("/findById")
     @ApiImplicitParams({
 
@@ -98,7 +96,7 @@ public class BizSqrEnterpriseApplyController {
      * @author ZeroLiYi
      * @date  2024/04/28 10:01
      */
-    @ApiOperation("添加粮食储备-承储资格企业-承储资格申请")
+    @ApiOperation("新增承储资格申请")
     @PostMapping("/add")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "bizSqrEnterpriseApplyJson", value = "JSON数据对象", paramType = "form"),
@@ -131,21 +129,24 @@ public class BizSqrEnterpriseApplyController {
 //    }
 
     /**
-     * 删除粮食储备-承储资格企业-承储资格申请
+     * 删除承储资格申请
      *
      * @author ZeroLiYi
      * @date  2024/04/28 10:01
-//     */
-//    @ApiOperationSupport(order = 4)
-//    @ApiOperation("删除粮食储备-承储资格企业-承储资格申请")
-//    @CommonLog("删除粮食储备-承储资格企业-承储资格申请")
-//    @SaCheckPermission("/biz/grqeapply/delete")
-//    @PostMapping("/biz/grqeapply/delete")
-//    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
-//                                                   CommonValidList<BizGrQeApplyIdParam> bizGrQeApplyIdParamList) {
-//        bizGrQeApplyService.delete(bizGrQeApplyIdParamList);
-//        return CommonResult.ok();
-//    }
+     */
+    @RequestMapping(value="/remove", method = RequestMethod.POST)
+    @ApiOperation(value="删除承储资格申请", notes = "根据申请记录唯一标识符删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "enterpriseApplyId", value = "申请记录唯一标识符", paramType = "form")
+    })
+    public Map<String, Object> remove(Integer enterpriseApplyId) throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<>();
+        if (enterpriseApplyId != null) {
+            bizGrQeApplyService.remove(enterpriseApplyId);
+        }
+        modelMap.put("status", "success");
+        return modelMap;
+    }
 
     /**
      * 获取粮食储备-承储资格企业-承储资格申请详情

src/main/java/com/chinaitop/depot/sqr/service/BizSqrEnterpriseApplyService.java

@@ -50,43 +50,5 @@ public interface BizSqrEnterpriseApplyService {
 
     public Map<String, Object> saveOrUpdate(HttpServletRequest request, String bizSqrEnterpriseApplyJson, String userInfo) throws Exception;
 
-    /**
-     * 添加粮食储备-承储资格企业-承储资格申请
-     *
-     * @author ZeroLiYi
-     * @date  2024/04/28 10:01
-     */
-   // void add(BizGrQeApplyAddParam bizGrQeApplyAddParam);
-
-    /**
-     * 编辑粮食储备-承储资格企业-承储资格申请
-     *
-     * @author ZeroLiYi
-     * @date  2024/04/28 10:01
-     */
-    //void edit(BizGrQeApplyEditParam bizGrQeApplyEditParam);
-
-    /**
-     * 删除粮食储备-承储资格企业-承储资格申请
-     *
-     * @author ZeroLiYi
-     * @date  2024/04/28 10:01
-     */
-    //void delete(List<BizGrQeApplyIdParam> bizGrQeApplyIdParamList);
-
-    /**
-     * 获取粮食储备-承储资格企业-承储资格申请详情
-     *
-     * @author ZeroLiYi
-     * @date  2024/04/28 10:01
-     */
-    //BizGrQeApply detail(BizGrQeApplyIdParam bizGrQeApplyIdParam);
-
-    /**
-     * 获取粮食储备-承储资格企业-承储资格申请详情
-     *
-     * @author ZeroLiYi
-     * @date  2024/04/28 10:01
-     **/
-   // BizGrQeApply queryEntity(String id);
+    void remove(Integer enterpriseApplyId);
 }

src/main/java/com/chinaitop/depot/sqr/service/impl/BizSqrEnterpriseApplyServiceImpl.java

@@ -24,6 +24,7 @@ import com.chinaitop.depot.sqr.service.AuditRecordService;
 import com.chinaitop.depot.sqr.service.AuditRequestService;
 import com.chinaitop.depot.sqr.service.BizSqrEnterpriseApplyService;
 import com.chinaitop.depot.sqr.service.BizSqrEnterpriseService;
+import com.chinaitop.depot.system.service.ButtonInfoService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
@@ -50,6 +51,9 @@ import java.util.regex.Pattern;
 public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplyService {
 
     @Resource
+    private     ButtonInfoService bizGrQeApplyService;
+
+    @Resource
     private AuditRecordService auditRecordService;
     @Resource
     private AuditRequestService auditRequestService;
@@ -63,6 +67,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
     @Resource
     private BizSqrEnterpriseApplyMapper bizSqrEnterpriseApplyMapper;
 
+
     @Override
     public  List<BizSqrEnterpriseApply> findByPage(String dwdm,Integer applyType){
         Map map=new HashMap<>();
@@ -160,6 +165,14 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
         return modelMap;
     }
 
+    @Override
+    public void remove(Integer enterpriseApplyId) {
+        //查找
+        BizSqrEnterpriseApplyVO bizSqrEnterpriseApplyVO = bizSqrEnterpriseApplyService.findById(enterpriseApplyId);
+        bizSqrEnterpriseService.delete(bizSqrEnterpriseApplyVO.getSqrEnterpriseId());//删除资格企业
+        bizSqrEnterpriseApplyMapper.delete(enterpriseApplyId);//删除申请
+    }
+
     private int saveAndcreatEbizSqrEnterprise(BizSqrEnterpriseApply bizSqrEnterpriseApply,String userName){
         BizSqrEnterprise bizSqrEnterprise = new BizSqrEnterprise();