资格

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

@@ -97,14 +97,10 @@ public class BizSqrEnterpriseApplyController {
      */
     @ApiOperation("新增承储资格申请")
     @PostMapping("/add")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "bizSqrEnterpriseApplyJson", value = "JSON数据对象", paramType = "form"),
-            @ApiImplicitParam(name = "userInfo", value = "JSON登录对象", paramType = "form")
-    })
-    public Map<String, Object> save(HttpServletRequest request, String bizSqrEnterpriseApplyJson, String userInfo) {
+    public Map<String, Object> save(@RequestBody BizSqrEnterpriseApply bizSqrEnterpriseApply) {
         Map<String, Object> modelMap = new HashMap<>();
         try {
-            modelMap = bizGrQeApplyService.saveOrUpdate(request, bizSqrEnterpriseApplyJson, userInfo);
+            modelMap = bizGrQeApplyService.saveOrUpdate(bizSqrEnterpriseApply);
         } catch (Exception e) {
             e.printStackTrace();
             modelMap.put("status", "error");

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

@@ -43,12 +43,12 @@ public interface BizSqrEnterpriseApplyService {
 
     /**
      * 新增申请
-     * @param bizSqrEnterpriseApplyJson
+     * @param bizSqrEnterpriseApply
      *
      */
 
 
-    public Map<String, Object> saveOrUpdate(HttpServletRequest request, String bizSqrEnterpriseApplyJson, String userInfo) throws Exception;
+    public Map<String, Object> saveOrUpdate(BizSqrEnterpriseApply bizSqrEnterpriseApply) throws Exception;
 
     void remove(Integer applyType,String unitInfoId,Integer enterpriseApplyId);
 

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

@@ -109,7 +109,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
 
     @Override
     @Transactional
-    public Map<String, Object> saveOrUpdate(HttpServletRequest request, String bizSqrEnterpriseApplyJson, String userInfo) throws Exception {
+    public Map<String, Object> saveOrUpdate(BizSqrEnterpriseApply bizSqrEnterpriseApply) throws Exception {
         Map<String, Object> modelMap = new HashMap<String, Object>();
         JSONObject user = null;
         JSONObject org = null;
@@ -117,24 +117,18 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
         String userName = "";
         Map<String, Object> modelMap1 = new HashMap<String, Object>();
         //获取单位信息
-        String orgInfo = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
         String dwbm = "";
         String ajbm ="";
-        if (null != orgInfo && !"".equals(orgInfo)) {
-            org = JSONObject.parseObject(orgInfo);
-            dwbm = org.get("creditCode") == null?"":org.get("creditCode").toString();
-        }
 
         Date date = new Date();
         // JSON字符串转对象
         ObjectMapper mapper = new ObjectMapper();
 
-        BizSqrEnterpriseApply bizSqrEnterpriseApply = (BizSqrEnterpriseApply) mapper.readValue(bizSqrEnterpriseApplyJson, BizSqrEnterpriseApply.class);
         String unitInfoId =bizSqrEnterpriseApply.getUnitInfoId();
         BizSqrEnterprise bizSqrEnterprise=bizSqrEnterpriseMapper.fibdByEnterprise(unitInfoId);
 
        // BizSqrEnterpriseApply bSqrEnterpriseApply = bizSqrEnterpriseApplyService.findById(bizSqrEnterpriseApplyId);
-        if(bizSqrEnterpriseApply.getApplyStatus()==0){//保存
+        if(bizSqrEnterpriseApply.getApplyStatus()==0){
             if(bizSqrEnterpriseApply.getApplyType()==4){
                 if(bizSqrEnterpriseApply.getId()!=null){
                     bizSqrEnterpriseApplyMapper.delete(bizSqrEnterpriseApply.getId());