提交成果资料按钮调整

 src/main/java/com/zbooksoft/gdmis/controller/CatYswjxxController.java

@@ -42,6 +42,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;

import static com.zbooksoft.gdmis.common.ZipUtil.copyFile;
import static com.zbooksoft.gdmis.common.ZipUtil.zipFile;
@@ -144,6 +145,7 @@
                    String jnxh = stringObjectMap.get("JNXH") == null ? "" : stringObjectMap.get("JNXH").toString();
                    String newDh = newDhString + "-" + jnxh;
                    stringObjectMap.put("DH", newDh);
                    stringObjectMap.put("WJLX", jsonData.get("wjlx"));
                    iform.insert(1823017354756390913L, stringObjectMap);

                    String updateSql = "update CAT_ITEM_YSWJXX set SL = '" + slInt + "' where ID = " + ids.get(i);
@@ -357,8 +359,10 @@
     */
    @RequestMapping({"/updateFileTypeIndex"})
    @RequiresUser
    public ModelAndView importIndex(Integer type) {
    public ModelAndView importIndex(Integer type,String moduleId) {
        ModelAndView mv = new ModelAndView("gh/catAjjxx/updateFileTypeIndex");
        mv.addObject("type", type);
        mv.addObject("moduleId", moduleId);
        return mv;
    }

@@ -425,8 +429,11 @@
    @RequestMapping(value = "/getFileType")
    @ResponseBody
    @RequiresUser
    public List<Map<String, Object>> getFileType() {
    public List<Map<String, Object>> getFileType(Integer type) {
        String sql = "SELECT param_name , param_value  FROM sys_keyword_param where  keyword_id = 1830441538759495681";
        if (type==1){
            sql = "SELECT param_name , param_value  FROM sys_keyword_param where  keyword_id = 1830439705299193857";
        }
        List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sql);
        return mapList;
    }

 src/main/webapp/WEB-INF/view/gh/catAjjxx/updateFileTypeIndex.jsp

@@ -96,13 +96,24 @@
<div class="margin-lr">
    <div class="pt-main-top clear">
        <div class="pt-nav">
                <span class="pt-title-icon"> <i class="fa fa-upload"></i>
            <c:if test="${type==0}">
                <span class="pt-title-icon"> <i class="fa fa-upload"></i>
                </span>
            <div class="pt-title">
                <div>
                    <h4>修改文件类型</h4>
                <div class="pt-title">
                    <div>
                        <h4>修改文件类型</h4>
                    </div>
                </div>
            </div>
            </c:if>
            <c:if test="${type==1}">
                <span class="pt-title-icon"> <i class="fa fa-upload"></i>
                </span>
                <div class="pt-title">
                    <div>
                        <h4>添加到成果资料</h4>
                    </div>
                </div>
            </c:if>
        </div>
    </div>
    <div class="pt-form">
@@ -123,7 +134,14 @@
                            </div>
                        </td>
                    </tr>

                    <c:if test="${type==1}">
                        <tr>
                            <td class="tbtitle">请输入添加的数量：</td>
                            <td>
                                <input class="easyui-textbox" id="returnOpinion" type="text" style="width: 300px;height: 30px;"/>
                            </td>
                        </tr>
                    </c:if>
                </table>
                <div class="progress" style="display: none;">
                    <span class="text">0%</span>
@@ -167,6 +185,26 @@
        $("#btnSave").click(function () {
            var wjlx = $("#WJLX").combobox("getValue");
            var idList = params.ids;
            <c:if test="${type==1}">
            var returnOpinion = $("#returnOpinion").textbox("getValue");
            var _jsonData = new Object();
            _jsonData["ids"] = idList;
            _jsonData["returnOpinion"] = returnOpinion;
            _jsonData["wjlx"] = wjlx;
            wcp.ui.setBusy("body", wcp.ajax({
                url: 'catYswjxx/addCg?moduleId=${moduleId}',
                data: JSON.stringify(_jsonData)
            }).done(function (result) {
                //判断是否需要执行回调函数
                if (params.callBack) {
                    params.callBack();
                }
                //关闭窗口
                closeWindow();
                top.wcp.notify.success("保存成功！");
            }));
            </c:if>
            <c:if test="${type==0}">
            wcp.ui.setBusy("body", wcp.ajax({
                url: "catYswjxx/updateFileType?fileType=" + wjlx,
                data: JSON.stringify(idList)
@@ -179,6 +217,7 @@
                closeWindow();
                top.wcp.notify.success("保存成功！");
            }));
            </c:if>
        });

        $("#btnClose").click(function () {
@@ -190,7 +229,7 @@
    function initSelectProject() {
        var data = [];
        wcp.ui.setBusy("body", wcp.ajax({
            url: "catYswjxx/getFileType"
            url: "catYswjxx/getFileType?type=${type}"
        }).done(function (result) {
            result.forEach(function (item) {
                var dept = {