数据应用审批管理改造

mybusiness/src/main/resources/mapper/applyData/DataRecordMapper.xml

@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             end_time,
             status
         FROM
-            int_record
+            data_record
     </sql>
 
     <select id="selectDataRecordList" parameterType="DataRecord" resultMap="DataRecordResult">
@@ -126,15 +126,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.interface_address,
             c.code
         FROM
-            int_record a
-        LEFT JOIN int_detailed b ON b.record_id = a.id
+            data_record a
+        LEFT JOIN data_detailed b ON b.record_id = a.id
         LEFT JOIN t_u_interfaceinfo c on b.int_id = c.id
         WHERE a.id = #{id}
     </select>
 
     <!--新增主表，返回主键-->
     <insert id="insertDataRecord" parameterType="DataRecord" useGeneratedKeys="true" keyProperty="id">
-        insert into int_record
+        insert into data_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="applyDeptId != null">apply_dept_id,</if>
             <if test="applyDeptName != null">apply_dept_name,</if>
@@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!--新增申请明细-->
     <insert id="insertDataDetailed" parameterType="DataDetailed" useGeneratedKeys="true" keyProperty="id">
-        insert into int_detailed(int_id, secret_key, purpose, int_code) values (#{intId} ,#{secretKey}, #{purpose}, #{code})
+        insert into data_detailed(int_id, secret_key, purpose, int_code) values (#{intId} ,#{secretKey}, #{purpose}, #{code})
     </insert>
 
     <select id="selectDataRecordDetailedBySubId" parameterType="String" resultMap="DataDetailedResult">
@@ -181,7 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             purpose,
             file
         FROM
-            int_detailed
+            data_detailed
         WHERE
             id = #{subId}
     </select>
@@ -195,21 +195,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             purpose,
             file
         FROM
-            int_detailed
+            data_detailed
         WHERE
             int_id = #{intId}
     </select>
 
     <!--批量新增子表-->
     <insert id="batchDataDetailed">
-        insert into int_detailed(record_id, int_id, secret_key, purpose, file) values
+        insert into data_detailed(record_id, int_id, secret_key, purpose, file) values
         <foreach item="item" index="index" collection="list" separator=",">
             ( #{item.recordId}, #{item.intId} ,#{item.secretKey}, #{item.purpose}, #{item.file})
         </foreach>
     </insert>
 
     <update id="editDataRecord" parameterType="DataRecord">
-        UPDATE int_record
+        UPDATE data_record
         <trim prefix="SET" suffixOverrides=",">
             <if test="applyDeptId != null">apply_dept_id = #{applyDeptId},</if>
             <if test="applyDeptName != null">apply_dept_name = #{applyDeptName},</if>
@@ -239,7 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <update id="updateStatus" parameterType="String">
-        update int_record
+        update data_record
         <set>
             <if test="status != null and status != ''">status = #{status},</if>
         </set>
@@ -253,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <update id="changeStatus" parameterType="DataDetailed">
-        update int_detailed
+        update data_detailed
         <set>
             <if test="status != null and status != ''">status = #{status},</if>
         </set>
@@ -261,14 +261,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDataRecordByIds" parameterType="String">
-        delete from int_record where id in
+        delete from data_record where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
 
     <delete id="deleteDataDetailedByRecordIds" parameterType="String">
-        delete from int_detailed where record_id in
+        delete from data_detailed where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">
             #{recordId}
         </foreach>
@@ -414,8 +414,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     r.apply_time,
                     i.share_type
                 FROM
-                    int_record r
-                LEFT JOIN int_detailed d ON r.id = d.record_id
+                    data_record r
+                LEFT JOIN data_detailed d ON r.id = d.record_id
                 LEFT JOIN t_u_interfaceinfo i ON d.int_id = i.id
                 WHERE
                     share_type in
@@ -565,8 +565,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     r.apply_time,
                     i.share_type
                 FROM
-                    int_record r
-                LEFT JOIN int_detailed d ON r.id = d.record_id
+                    data_record r
+                LEFT JOIN data_detailed d ON r.id = d.record_id
                 LEFT JOIN t_u_interfaceinfo i ON d.int_id = i.id
                 WHERE
                     r.provide_dept_id = #{provideDeptId}

mybusiness/src/main/resources/templates/apply/record/add.html

@@ -287,7 +287,7 @@
         if ($.validate.form()) {
             let accordion = $("#accordion").html();
             if(accordion.length < 255){//1334
-                $.modal.alertWarning("请先选择接口！");
+                $.modal.alertWarning("请先选择接口应用模块！");
                return false;
             }else {
                 let sub = {"name":"subData","value":JSON.stringify(subData)};

mybusiness/src/main/resources/templates/applyData/record/add.html

@@ -292,9 +292,15 @@
             subData.push(data);
         }
         if ($.validate.form()) {
-            let sub = {"name":"subData","value":JSON.stringify(subData)};
-            formData.push(sub);
-            $.operate.saveTab(apply_prefix + "/add", formData);
+            let accordion = $("#accordion").html();
+            if(accordion.length < 255){//1334
+                $.modal.alertWarning("请先选择数据应用模块！");
+                return false;
+            }else {
+                let sub = {"name":"subData","value":JSON.stringify(subData)};
+                formData.push(sub);
+                $.operate.saveTab(apply_prefix + "/add", formData);
+            }
         }
     }
 

mybusiness/src/main/resources/templates/applyData/record/record.html

@@ -121,7 +121,7 @@
         /**提交审核**/
         function report(id) {
             $.modal.confirm("确认要提交审核吗?", function() {
-                let url = ctx + "applyData/updateStatus";
+                let url = ctx + "applyData/record/updateStatus";
                 $.operate.post(url,{ "id": id, "status": "3" });
             });
         }