Browse Source

数据应用审批完成

wangzhe 2 years ago
parent
commit
62c3fd00c5

+ 0 - 1
mybusiness/src/main/resources/mapper/applyData/DataRecordMapper.xml

@@ -124,7 +124,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.secret_key,
             b.purpose,
             b.file,
-            a.share_type,
             c.menu_name interface_name
         FROM
             data_record a

+ 1 - 1
mybusiness/src/main/resources/mapper/system/TUInterfaceinfoMapper.xml

@@ -480,7 +480,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t.dept_id,
             t.dept_name
         FROM
-            t.t_u_interfaceinfo t
+            t_u_interfaceinfo t
         WHERE
             t.dept_id != '' and t.del_flag = '0' and t.share_type = 'share_type_2'
         GROUP BY

+ 6 - 1
mybusiness/src/main/resources/templates/applyData/approval/approvalDetail.html

@@ -220,9 +220,14 @@
 
     function ok() {
         let id = $("input[name='id']").val();
+        let shareType = $("input[name='shareType']:checked").val();
+        let status = shareType == 'share_type_4' ? '2' : '4';//省共享部门提供部门通过2 其他情况提供部门待审批4
         $.modal.confirm("确认审批通过吗?", function() {
             let url = ctx + "applyData/record/updateStatus";
-            $.operate.post(url,{ "id": id, "status": "4" },function(res){
+            //当选择省共享部门,审批流程节点变为开始-政数局审批-完成。
+            //状态:0新建,政数局通过1,提供部门通过2,政数局待审批3,提供部门待审批4,政数局驳回5,提供部门驳回6
+            // $.operate.post(url,{ "id": id, "status": "4" },function(res){
+            $.operate.post(url, { "id": id, "status": status },function(res){
                 $.operate.successTabCallback(res);
             });
         });