申请用途

leiSP-common/src/main/java/com/sooka/common/utils/file/MimeTypeUtils.java

@@ -17,7 +17,7 @@ public class MimeTypeUtils
 
     public static final String IMAGE_GIF = "image/gif";
     
-    public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
+    public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png", "ico" };
 
     public static final String[] FLASH_EXTENSION = { "swf", "flv" };
 
@@ -26,7 +26,7 @@ public class MimeTypeUtils
 
     public static final String[] DEFAULT_ALLOWED_EXTENSION = {
             // 图片
-            "bmp", "gif", "jpg", "jpeg", "png",
+            "bmp", "gif", "jpg", "jpeg", "png", "ico",
             // word excel powerpoint
             "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件

mybusiness/src/main/resources/templates/applyData/approval/approvalDetail.html

@@ -49,10 +49,6 @@
                                     <input type="text" class="form-control" id="duration" name="duration" placeholder="从 - 至" th:value="${DataRecord.duration}" required>
                                 </div>
                             </div>
-                            <!--<label class="col-sm-2 control-label is-required">调用者IP</label>-->
-                            <!--<div class="col-sm-4">-->
-                                <!--<input type="input" readonly name="ip" class="form-control" maxlength="15" th:value="${DataRecord.ip}" required>-->
-                            <!--</div>-->
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label is-required">数据应用来源</label>
@@ -70,19 +66,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!--<div class="form-group">-->
-                            <!--<label class="col-sm-2 control-label is-required">每天调用频率</label>-->
-                            <!--<div class="col-sm-4">-->
-                                <!--<input type="input" class="form-control" readonly name="frequency" maxlength="10" th:value="${DataRecord.frequency}" required>-->
-                            <!--</div>-->
-                            <!--<label class="col-sm-2 control-label is-required">使用时效</label>-->
-                            <!--<div class="col-sm-4">-->
-                                <!--<div class="input-group date">-->
-                                    <!--<span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-                                    <!--<input type="text" class="form-control" readonly id="duration" name="duration" placeholder="从 - 至" th:value="${DataRecord.duration}" required>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                        <!--</div>-->
                     </form>
                 </div>
             </div>
@@ -97,8 +80,6 @@
 
                     </div>
                 </div>
-
-
                 <div id="#id#" class="panel-collapse collapse" style="display: block">
                     <div class="panel-body">
                         <form class="form-horizontal" id="#formId#">
@@ -113,14 +94,13 @@
                                 <label class="col-sm-2 control-label">附件</label>
                                 <div class="col-sm-10">
                                     <iframe id="#file_upload#" src="/applyData/record/uploadFrame" width="100%" height="412px" frameborder="0" seamless></iframe>
-
                                 </div>
-
                             </div>
                         </form>
                     </div>
                 </div>
             <!--子表字段end-->
+            </div>
         </div>
     </div>
 </div>

mybusiness/src/main/resources/templates/applyData/examine/examineDetail.html

@@ -114,6 +114,7 @@
                     </div>
                 </div>
             <!--子表字段end-->
+            </div>
         </div>
     </div>
 </div>

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

@@ -48,20 +48,12 @@
                                     <input type="text" class="form-control" id="duration" name="duration" placeholder="从 - 至" required>
                                 </div>
                             </div>
-                            <!--<label class="col-sm-2 control-label is-required">调用者IP</label>-->
-                            <!--<div class="col-sm-4">-->
-                                <!--<input type="input" name="ip" class="form-control" maxlength="15" required>-->
-                            <!--</div>-->
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label is-required">数据应用来源</label>
                             <div class="col-sm-4">
                                 <label><input name="shareType" type="radio" value="share_type_1" onchange="changeShareType()" checked/>市共享</label>
                                 <label><input name="shareType" type="radio" value="share_type_4" onchange="changeShareType()"/>省共享</label>
-                                <!--<select class='form-control' id="shareType" name='shareType' onchange="changeShareType()">-->
-                                    <!--<option value="share_type_1">市共享</option>-->
-                                    <!--<option value="share_type_4">省共享</option>-->
-                                <!--</select>-->
                             </div>
                             <label class="col-sm-2 control-label is-required">数据应用提供部门</label>
                             <div class="col-sm-4">
@@ -72,19 +64,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!--<div class="form-group">-->
-                            <!--<label class="col-sm-2 control-label is-required">每天调用频率</label>-->
-                            <!--<div class="col-sm-4">-->
-                                <!--<input type="input" class="form-control" name="frequency" maxlength="10" required>-->
-                            <!--</div>-->
-                            <!--<label class="col-sm-2 control-label is-required">使用时效</label>-->
-                            <!--<div class="col-sm-4">-->
-                                <!--<div class="input-group date">-->
-                                    <!--<span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-                                    <!--<input type="text" class="form-control" id="duration" name="duration" placeholder="从 - 至" required>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                        <!--</div>-->
                     </form>
                 </div>
             </div>
@@ -95,35 +74,29 @@
                     <button type="button" class="btn btn-w-m btn-success" onclick="selectInterface()">点击此处选择数据应用模块</button>
                 </div>
                 <div class="ibox-content no_p">
-                    <div class="panel-group panel_top clearfix" id="accordion">
-
-                    </div>
+                    <div class="panel-group panel_top clearfix" id="accordion"></div>
                 </div>
-
-
-                <div id="#id#" class="panel-collapse collapse" style="display: block">
-                    <div class="panel-body">
-                        <form class="form-horizontal" id="#formId#">
-                            <input type="hidden" name="intId" value="#id#">
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">申请用途</label>
-                                <div class="col-sm-10">
-                                    <input type="text" class="form-control" name="purpose">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">附件</label>
-                                <div class="col-sm-10">
-                                    <iframe id="#file_upload#" src="/applyData/record/uploadFrame" width="100%" height="412px" frameborder="0" seamless></iframe>
-
-                                </div>
-
-                            </div>
-                        </form>
-                    </div>
+                <div id="rte" class="panel-collapse collapse" style="display: block">
+                    <!--<div class="panel-body">-->
+                        <!--<form class="form-horizontal" id="#formId#">-->
+                            <!--<input type="hidden" name="intId" value="#id#">-->
+                            <!--<div class="form-group">-->
+                                <!--<label class="col-sm-2 control-label">申请用途</label>-->
+                                <!--<div class="col-sm-10">-->
+                                    <!--<input type="text" class="form-control" name="purpose">-->
+                                <!--</div>-->
+                            <!--</div>-->
+                            <!--<div class="form-group">-->
+                                <!--<label class="col-sm-2 control-label">附件</label>-->
+                                <!--<div class="col-sm-10">-->
+                                    <!--<iframe id="#file_upload#" src="/applyData/record/uploadFrame" width="100%" height="412px" frameborder="0" seamless></iframe>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                        <!--</form>-->
+                    <!--</div>-->
                 </div>
-
                 <!--子表字段end-->
+            </div>
         </div>
     </div>
 </div>
@@ -224,10 +197,12 @@
                 '	<div class="panel_idv">' +
                 '		<h5 >' +
                 '			<span>#rownum#、 </span>' +
+                '			<form style="display: inline" id="#formId#">' +
+                '               <input type="hidden" name="intId" value="#id#">' +
+                '			</form>' +
                 '			<a data-toggle="collapse" data-parent="#accordion" href="##id#" onclick="openOrClose(this)">#interfaceName#</a>' +
                 '		</h5>' +
                 '	</div>' +
-
                 '</div>';
             if(res.length > 0){
                 $("#accordion").html("");
@@ -242,6 +217,26 @@
                     $("#accordion").append(docm);
                     num += 1;
                 }
+                $("#rte").html("");
+                let fileUpload =
+                    '    <div class="panel-body">\n' +
+                    '        <form class="form-horizontal" id="sub-form0">\n' +
+                    '            <input type="hidden" name="intId" value="' + res[0].id + '">\n' +
+                    '            <div class="form-group">\n' +
+                    '                <label class="col-sm-2 control-label">申请用途</label>\n' +
+                    '                <div class="col-sm-10">\n' +
+                    '                    <input type="text" class="form-control" name="purpose">\n' +
+                    '                </div>\n' +
+                    '            </div>\n' +
+                    '            <div class="form-group">\n' +
+                    '                <label class="col-sm-2 control-label">附件</label>\n' +
+                    '                <div class="col-sm-10">\n' +
+                    '                   <iframe id="file_upload0" src="/applyData/record/uploadFrame" width="100%" height="412px" frameborder="0" seamless></iframe>\n' +
+                    '                </div>\n' +
+                    '            </div>\n' +
+                    '        </form>\n' +
+                    '    </div>';
+                $("#rte").append(fileUpload);
             }
         });
     }

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

@@ -49,10 +49,6 @@
                                     <input type="text" class="form-control" readonly id="duration" name="duration" placeholder="从 - 至" th:value="${DataRecord.duration}" required>
                                 </div>
                             </div>
-                            <!--<label class="col-sm-2 control-label is-required">调用者IP</label>-->
-                            <!--<div class="col-sm-4">-->
-                                <!--<input type="input" readonly name="ip" class="form-control" maxlength="15" th:value="${DataRecord.ip}" required>-->
-                            <!--</div>-->
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label is-required">数据应用</label>
@@ -70,20 +66,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!--<div class="form-group">-->
-                            <!--<label class="col-sm-2 control-label is-required">每天调用频率</label>-->
-                            <!--<div class="col-sm-4">-->
-                                <!--<input type="input" class="form-control" readonly name="frequency" maxlength="10" th:value="${DataRecord.frequency}" required>-->
-                            <!--</div>-->
-                            <!--<label class="col-sm-2 control-label is-required">使用时效</label>-->
-                            <!--<div class="col-sm-4">-->
-                                <!--<div class="input-group date">-->
-                                    <!--<span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-                                    <!--<input type="text" class="form-control" readonly id="duration" name="duration" placeholder="从 - 至" th:value="${DataRecord.duration}" required>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                        <!--</div>-->
-
                         <div class="form-group" style="display: none;" id="rejectDiv">
                             <!--政数局驳回部分-->
                             <label class="col-sm-2 control-label is-required" style="display: none;" name="approval">驳回原因</label>
@@ -114,35 +96,15 @@
                     <button type="button" class="btn btn-w-m btn-success" onclick="selectInterface()">点击此处选择数据应用模块</button>
                 </div>
                 <div class="ibox-content">
-                    <div class="panel-group panel_top clearfix" id="accordion">
-
-                    </div>
+                    <div class="panel-group panel_top clearfix" id="accordion"></div>
                 </div>
+                <!--附件start-->
+                <div id="rte" class="panel-collapse collapse" style="display: block;">
 
-
-                <div id="#id#" class="panel-collapse collapse" style="display: block">
-                    <div class="panel-body">
-                        <form class="form-horizontal" id="#formId#">
-                            <input type="hidden" name="intId" value="#id#">
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">申请用途</label>
-                                <div class="col-sm-10">
-                                    <input type="text" class="form-control" name="purpose">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">附件</label>
-                                <div class="col-sm-10">
-                                    <iframe id="#file_upload#" src="/applyData/record/uploadFrame" width="100%" height="412px" frameborder="0" seamless></iframe>
-
-                                </div>
-
-                            </div>
-                        </form>
-                    </div>
+                <!--附件end-->
                 </div>
-
-                <!--子表字段end-->
+            <!--子表字段end-->
+            </div>
         </div>
     </div>
 </div>
@@ -259,7 +221,6 @@
             '			<a data-toggle="collapse" data-parent="#accordion" href="##id#" onclick="openOrClose(this)">#interfaceName#</a>' +
             '		</h5>' +
             '	</div>' +
-
             '</div>';
         for(let i=0;i<data.length;i++){
             let docm = html.replace(/#interfaceName#/g,data[i].interfaceName);
@@ -275,6 +236,26 @@
             $("#accordion").append(docm);
             num += 1;
         }
+    let subId = data[0].subId;
+    let fileUpload = 
+        '    <div class="panel-body">\n' +
+        '        <form class="form-horizontal" id="#formId#">\n' +
+        '            <input type="hidden" name="intId" value="#id#">\n' +
+        '            <div class="form-group">\n' +
+        '                <label class="col-sm-2 control-label">申请用途</label>\n' +
+        '                <div class="col-sm-10">\n' +
+        '                    <input type="text" readonly class="form-control" name="purpose" value="' + data[0].purpose + '">\n' +
+        '                </div>\n' +
+        '            </div>\n' +
+        '            <div class="form-group">\n' +
+        '                <label class="col-sm-2 control-label">附件</label>\n' +
+        '                <div class="col-sm-10">\n' +
+        '                   <iframe id="#file_upload#" src="/apply/record/uploadFrameDisabled/"' + subId + ' width="100%" height="412px" frameborder="0" seamless></iframe>\n' +
+        '                </div>\n' +
+        '            </div>\n' +
+        '        </form>\n' +
+        '    </div>';
+        $("#rte").append(fileUpload);
     }
 
     /**手风琴右侧上下箭头样式变换控制**/

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

@@ -93,35 +93,28 @@
                     <button type="button" class="btn btn-w-m btn-success" onclick="selectInterface()">点击此处选择数据应用模块</button>
                 </div>
                 <div class="ibox-content">
-                    <div class="panel-group panel_top clearfix" id="accordion">
-
-                    </div>
+                    <div class="panel-group panel_top clearfix" id="accordion"></div>
                 </div>
-
-
-               <div id="#id#" class="panel-collapse collapse" style="display: block">
-               	<div class="panel-body">
-                  			<form class="form-horizontal" id="#formId#">
-                              <input type="hidden" name="intId" value="#id#">
-                        <div class="form-group">
-                            <label class="col-sm-2 control-label">申请用途</label>
-                         <div class="col-sm-10">
-                                <input type="text" class="form-control" name="purpose">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-2 control-label">附件</label>
-                            <div class="col-sm-10">
-                                <iframe id="#file_upload#" src="/applyData/record/uploadFrame" width="100%" height="412px" frameborder="0" seamless></iframe>
-
-                            </div>
-
-                        </div>
-                   			</form>
-                  		</div>
+               <div id="rte" class="panel-collapse collapse" style="display: block">
+                   <!--<div class="panel-body">-->
+                        <!--<form class="form-horizontal" id="#formId#">-->
+                            <!--<input type="hidden" name="intId" value="#id#">-->
+                            <!--<div class="form-group">-->
+                                <!--<label class="col-sm-2 control-label">申请用途</label>-->
+                                <!--<div class="col-sm-10">-->
+                                    <!--<input type="text" class="form-control" name="purpose">-->
+                                <!--</div>-->
+                            <!--</div>-->
+                            <!--<div class="form-group">-->
+                                <!--<label class="col-sm-2 control-label">附件</label>-->
+                                <!--<div class="col-sm-10">-->
+                                    <!--<iframe id="#file_upload#" src="/applyData/record/uploadFrame" width="100%" height="412px" frameborder="0" seamless></iframe>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                        <!--</form>-->
+                    <!--</div>-->
                	</div>
-
-
+            </div>
             <!--子表字段end-->
         </div>
     </div>
@@ -193,6 +186,9 @@
             '	<div class="panel_idv">' +
             '		<h5 >' +
             '			<span>#rownum#、 </span>' +
+            '			<form style="display: inline" id="#formId#">' +
+            '               <input type="hidden" name="intId" value="#id#">' +
+            '			</form>' +
             '			<a data-toggle="collapse" data-parent="#accordion" href="##id#" onclick="openOrClose(this)">#interfaceName#</a>' +
             '		</h5>' +
             '	</div>' +
@@ -210,6 +206,27 @@
             $("#accordion").append(docm);
             num += 1;
         }
+        $("#rte").html("");
+        let fileUpload =
+            '                   <div class="panel-body">\n' +
+            '                        <form class="form-horizontal" id="sub-form0">\n' +
+            '                            <input type="hidden" name="intId" value="' + data[0].id + '">\n' +
+            '                            <div class="form-group">\n' +
+            '                                <label class="col-sm-2 control-label">申请用途</label>\n' +
+            '                                <div class="col-sm-10">\n' +
+            '                                    <input type="text" class="form-control" name="purpose" value="' + data[0].purpose + '">\n' +
+            '                                </div>\n' +
+            '                            </div>\n' +
+            '                            <div class="form-group">\n' +
+            '                                <label class="col-sm-2 control-label">附件</label>\n' +
+            '                                <div class="col-sm-10">\n' +
+            '                                    <iframe id="file_upload0" src="/applyData/record/uploadFrame" width="100%" height="412px" frameborder="0" seamless></iframe>\n' +
+            '                                </div>\n' +
+            '                            </div>\n' +
+            '                        </form>\n' +
+            '                    </div>\n' +
+            '               </div>';
+        $("#rte").append(fileUpload);
     }
 
     /**手风琴右侧上下箭头样式变换控制**/
@@ -252,10 +269,12 @@
                     '	<div class="panel_idv">' +
                     '		<h5 >' +
                     '			<span>#rownum#、 </span>' +
+                    '			<form style="display: inline" id="#formId#">' +
+                    '               <input type="hidden" name="intId" value="#id#">' +
+                    '			</form>' +
                     '			<a data-toggle="collapse" data-parent="#accordion" href="##id#" onclick="openOrClose(this)">#interfaceName#</a>' +
                     '		</h5>' +
                     '	</div>' +
-
                     '</div>';
 
                 $("#accordion").html("");