审批接口调整

common/common_utils/src/main/java/com/founder/commonutils/model/asjEntity/TbStAsj.java

@@ -849,6 +849,11 @@ public class TbStAsj extends Model<TbStAsj> {
      */
     @TableField(exist = false)
     private String sfjyPdbz;
+    /**
+     * 1true，2flase
+     */
+    @TableField(exist = false)
+    private String flag;
 
     /**
      * 获取主键值

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ApprovalEntity/TbstApproveOrder.java

@@ -72,5 +72,5 @@ public class TbstApproveOrder {
     protected int limit;//每页多少行
     private int begin; //开始行数
     private int end; //结束行数
-    private String sqdztStatus;// 申请单状态
+    private int sqdztStatus;// 申请单状态
 }

service/publicapi/src/main/java/com/founder/publicapi/controller/ApprovalService/SpxxController.java

@@ -238,7 +238,8 @@ public class SpxxController {
         } catch (Exception e) {
             e.printStackTrace();
             jsonObject.put("count", 0);
-            jsonObject.put("code", 0);
+            jsonObject.put("status", 201);
+            jsonObject.put("msg", "异常");
             jsonObject.put("data", new ArrayList<>());
         }
         return jsonObject;

service/publicapi/src/main/java/com/founder/publicapi/controller/ApprovalService/UserController.java

@@ -67,7 +67,7 @@ public class UserController {
         try {
             if(StringUtils.isEmpty(loginUserPoliceId)|| StringUtils.isEmpty(agentUserPoliceId)){
                 result.put("data","");
-                result.put("state","fail");
+                result.put("status",201);
                 result.put("msg","登录用户或者被授权用户警号为空，不能进行授权！");
                 return result;
             }
@@ -78,7 +78,7 @@ public class UserController {
             if(userList!=null && !userList.isEmpty()){
                 loginUser=userList.get(0);
             }else{
-                result.put("state","fail");
+                result.put("status",201);
                 result.put("msg","授权用户不存在！");
                 result.put("data","");
                 return result;
@@ -90,7 +90,7 @@ public class UserController {
             if(userList!=null && !userList.isEmpty()){
                 agentUser=userList.get(0);
             }else{
-                result.put("state","fail");
+                result.put("status",201);
                 result.put("msg","被授权用户不存在！");
                 result.put("data","");
                 return result;
@@ -99,7 +99,7 @@ public class UserController {
 
         } catch (Exception e) {
             e.printStackTrace();
-            result.put("state","error");
+            result.put("status",201);
             result.put("msg","授权用户发生异常！"+e.getMessage());
             result.put("data","");
         }

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/OrderMapper.xml

@@ -120,6 +120,7 @@
         t.ORDER_CODE as orderCode,
         t.ORDER_TITLE as orderTitle,
         t.ORDER_STATUS as orderStatus,
+        t.ORDER_STATUS as sqdztStatus,
         t.ORDER_ISDEL as idDel,
         t.ORDER_METHOD as orderMethod,
         t.ORDER_SHGTSM as orderShldsm,
@@ -727,6 +728,7 @@
         t.PZID as pzCode,
         t.ORDER_TITLE as orderTitle,
         t.ORDER_STATUS as orderStatus,
+        t.ORDER_STATUS as sqdztStatus,
         t.ORDER_ISDEL as idDel,
         t.ORDER_SQDLX as spdlx,
         t.ORDER_METHOD as orderMethod,

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SpxxServiceImpl.java

@@ -523,7 +523,7 @@ public class SpxxServiceImpl implements SpxxService {
             jsonObject.put("count", 0);
             jsonObject.put("data", new ArrayList<>());
         }
-        jsonObject.put("code", 200);
+        jsonObject.put("status", 200);
         jsonObject.put("msg", "success");
         return jsonObject;
     }

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/UserServiceImpl.java

@@ -82,11 +82,11 @@ public class UserServiceImpl implements UserService {
             map.put("lrr",loginUser.getPolicemanid());
             int r = userMapper.addApproveUserRole(map);
             if(r>0){
-                result.put("state","success");
+                result.put("status",200);
                 result.put("msg","授权成功，新增授权信息。");
                 result.put("data","");
             }else{
-                result.put("state","fail");
+                result.put("status",201);
                 result.put("msg","新增授权失败。");
                 result.put("data","");
             }
@@ -98,11 +98,11 @@ public class UserServiceImpl implements UserService {
                 map.put("gxr",loginUser.getPolicemanid());
                 int r = userMapper.updateApproveUserRole(map);
                 if(r>0){
-                    result.put("state","success");
+                    result.put("status",200);
                     result.put("msg","授权成功，更新授权信息。");
                     result.put("data","");
                 }else{
-                    result.put("state","fail");
+                    result.put("status",201);
                     result.put("msg","更新授权失败。");
                     result.put("data","");
                 }