签证

src/main/java/com/jeeplus/modules/projectVisa/entity/ProjectVisa.java

@@ -1,9 +1,12 @@
 package com.jeeplus.modules.projectVisa.entity;
 
+import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.modules.projectType.entity.ProjectType;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 实施阶段-签证汇总
@@ -18,6 +21,7 @@ public class ProjectVisa extends DataEntity<ProjectVisa> {
     private String procedure;//审批手续合规性
     private Double confirmMoney;//定审金额
     private String type;//汇总类型1是签证2是设计
+    private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
     public String getContractId() {
         return contractId;
@@ -83,4 +87,12 @@ public class ProjectVisa extends DataEntity<ProjectVisa> {
     public void setContent(String content) {
         this.content = content;
     }
+
+    public List<WorkClientAttachment> getWorkAttachments() {
+        return workAttachments;
+    }
+
+    public void setWorkAttachments(List<WorkClientAttachment> workAttachments) {
+        this.workAttachments = workAttachments;
+    }
 }

src/main/java/com/jeeplus/modules/projectVisa/service/ProjectVisaService.java

@@ -7,8 +7,12 @@ import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.modules.projectVisa.dao.ProjectVisaDao;
 import com.jeeplus.modules.projectVisa.entity.ProjectVisa;
 import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
+import com.jeeplus.modules.projectrecord.entity.ProjectPaymentTreeData;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,6 +24,8 @@ public class ProjectVisaService extends CrudService<ProjectVisaDao,ProjectVisa>
 
     @Autowired
     private ProjectVisaDao projectVisaDao;
+    @Autowired
+    private WorkClientAttachmentDao workClientAttachmentDao;
 
     @Transactional(readOnly = true)
     public ProjectVisa getVisa(ProjectVisa projectVisa) {
@@ -32,6 +38,43 @@ public class ProjectVisaService extends CrudService<ProjectVisaDao,ProjectVisa>
         return projectVisaList;
     }
 
+    /**
+     * 新增方法
+     * @param
+     * @return
+     */
+    @Transactional(readOnly = false)
+    public void save(ProjectVisa projectVisa) {
+        //判断是否为修改信息
+        super.save(projectVisa);
+
+        if (projectVisa.getWorkAttachments()!=null && !projectVisa.getWorkAttachments().isEmpty()) {
+            //保存附件信息
+            for (WorkClientAttachment workClientAttachment : projectVisa.getWorkAttachments()) {
+                if (org.apache.commons.lang3.StringUtils.isBlank(workClientAttachment.getId())&& org.apache.commons.lang3.StringUtils.isNotBlank(workClientAttachment.getAttachmentId())) {
+                    continue;
+                }
+                if (org.apache.commons.lang3.StringUtils.isBlank(workClientAttachment.getId())&& org.apache.commons.lang3.StringUtils.isBlank(workClientAttachment.getUrl())) {
+                    continue;
+                }
+                if (WorkClientAttachment.DEL_FLAG_NORMAL.equals(workClientAttachment.getDelFlag())) {
+                    workClientAttachment.setAttachmentId(projectVisa.getId());
+                    workClientAttachment.setAttachmentFlag("134");
+                    workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
+                    if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
+                        workClientAttachment.preInsert();
+                        workClientAttachmentDao.insert(workClientAttachment);
+                    } else {
+                        workClientAttachment.preUpdate();
+                        workClientAttachmentDao.update(workClientAttachment);
+                    }
+                } else {
+                    workClientAttachmentDao.delete(workClientAttachment);
+                }
+            }
+        }
+    }
+
 
 
     /*

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectVisaController.java

@@ -22,6 +22,8 @@ import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
@@ -57,6 +59,8 @@ public class ProjectVisaController extends BaseController {
     private ProjectcontentinfoService projectcontentinfoService;
     @Autowired
     private ContractService contractService;
+    @Autowired
+    private WorkClientAttachmentDao workClientAttachmentDao;
 
 
     /*@ModelAttribute
@@ -96,135 +100,6 @@ public class ProjectVisaController extends BaseController {
         return "modules/projectrecord/implementStage/projectVisaList";
     }
 
-    /**
-     * 签证汇总表列表页面
-     *//*
-    @RequiresPermissions("project:projectVisa:list")
-    @RequestMapping(value = {"list", ""})
-    public String list(ProjectVisa projectVisa, HttpServletRequest request, HttpServletResponse response, Model model) {
-        if(UserUtils.isManager()){
-            model.addAttribute("flag","1");
-        }
-        Page<ProjectVisa> page = projectVisaService.findProjectPage(new Page<ProjectVisa>(request, response), projectVisa);
-        //无合同状态下，获取委托方的名称
-        List<ProjectVisa> list = page.getList();
-        model.addAttribute("page", page);
-        return "modules/projectrecord/implementEarly/projectImplementEarlyList";
-    }*/
-
-    /**
-     * 项目列表页面
-     */
-    /*@RequestMapping(value = "getVisaList")
-    @ResponseBody
-    public Map<String,List> getVisaList(ProjectImplementEarly projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
-        if(UserUtils.isManager()){
-            model.addAttribute("flag","1");
-        }
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
-        //无合同状态下，获取委托方的名称
-        List<ProjectImplementEarly> list = page.getList();
-        List<ProjectRecordTreeData> projectRecordTreeDataList = new ArrayList<>();
-        Map<String,List> map = new HashMap<>();
-        for (int i = 0; i < list.size(); i++) {
-            ProjectRecordTreeData projectRecordTreeData = new ProjectRecordTreeData();
-            ProjectImplementEarly records1 = list.get(i);
-            if (records1.getWorkContractInfo() == null) {
-                if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
-                    WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-                    WorkContractInfo contractInfo = new WorkContractInfo();
-                    contractInfo.setClient(linkman.getClientId());
-                    records1.setWorkContractInfo(contractInfo);
-                }
-            }
-            //将界面需要展示数据放入类中
-            projectRecordTreeData.setId(records1.getId());
-            projectRecordTreeData.setProjectName(records1.getProjectName());
-            projectRecordTreeData.setProjectId(records1.getProjectId());
-            projectRecordTreeData.setProjectContentId(records1.getProjectContentId());
-            if(null!= records1.getWorkContractInfo()){
-                projectRecordTreeData.setContractName(records1.getWorkContractInfo().getName());
-                projectRecordTreeData.setClientName(records1.getWorkContractInfo().getClient().getName());
-            }else{
-                projectRecordTreeData.setContractName("");
-                projectRecordTreeData.setClientName("");
-            }
-            projectRecordTreeData.setProjectStatus(records1.getProjectStatus());
-            projectRecordTreeData.setProjectRegistrant(records1.getProjectRegistrant());
-            projectRecordTreeData.setCreateDate(records1.getCreateDate());
-            projectRecordTreeData.setCreateId(records1.getCreateBy().getId());
-            //父节点的pid设置为0
-            projectRecordTreeData.setPid("0");
-            //遍历项目负责人信息
-            List<User> masterUserList = records1.getProjectLeaders();
-            List<String> masterList = new ArrayList<>();
-            Set masterIdSet = new HashSet();
-            for (User masterUser:masterUserList) {
-                masterList.add(masterUser.getName());
-                masterIdSet.add(masterUser.getId());
-            }
-            //masterIdSet.add(records1.getCreateBy().getId());
-            //Set转List
-            List<String> masterIdList = new ArrayList<>(masterIdSet);
-            //如果当前登录人为项目登记者或项目负责人则允许其添加子节点信息
-            for (String masterId : masterIdList) {
-                if(masterId.equals(UserUtils.getUser().getId())){
-                    projectRecordTreeData.setOperationSign(1);
-                    break;
-                }else{
-                    projectRecordTreeData.setOperationSign(0);
-                }
-            }
-
-            //项目负责人list数据转String
-            String projectLeader = masterList.toString().replaceAll("(?:\\[|null|\\]| +)", "");
-            projectRecordTreeData.setProjectLeader(projectLeader);
-            projectRecordTreeData.setLoginId(UserUtils.getUser().getId());
-            projectRecordTreeDataList.add(projectRecordTreeData);
-
-            //获取阶段Type父节点信息
-            String projectType = projectImplementEarlyService.getProjectType(records1.getProjectTypeId(), "实施前期");
-            //根据项目id查询相关的项目阶段内容
-            List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataList(records1.getId(),projectType);
-            if(0 != reportDataList.size()){
-                Projectcontentinfo select = new Projectcontentinfo();
-                ProjectRecords project = new ProjectRecords();
-                project.setId(records1.getId());
-                select.setParentIds("0,");
-                select.setProject(project);
-                List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
-                for (ProjectRecordTreeData reportData : reportDataList) {
-                    //添加工作内容id
-                    if(p.size()>0){
-                        reportData.setContentPId(p.get(0).getId());
-                        reportData.setParentIds("0,");
-                        reportData.setDictType("");
-                    }
-                    //将项目所属类型名称放入树形列表的projectId中
-                    reportData.setProjectId(reportData.getProjectLeader());
-                    //添加项目负责人
-                    reportData.setProjectLeader(projectLeader);
-                    //添加登陆者id
-                    reportData.setLoginId(UserUtils.getUser().getId());
-                    reportData.setCreateId(records1.getCreateBy().getId());
-                    //如果当前登录人为项目登记者或项目负责人则允许其添加子节点信息
-                    for (String masterId : masterIdList) {
-                        if(masterId.equals(UserUtils.getUser().getId())){
-                            reportData.setOperationSign(1);
-                            break;
-                        }else{
-                            reportData.setOperationSign(0);
-                        }
-                    }
-                }
-            }
-            projectRecordTreeDataList.addAll(reportDataList);
-
-        }
-        map.put("data",projectRecordTreeDataList);
-        return map;
-    }*/
-
     //添加签证汇总页面
     @RequestMapping(value = "form")
     public String form(ProjectVisa projectVisa, Model model) {
@@ -240,6 +115,10 @@ public class ProjectVisaController extends BaseController {
 
         if(StringUtils.isNotEmpty(projectVisa.getId())){
             ProjectVisa visa=projectVisaService.getVisa(projectVisa);
+            WorkClientAttachment attchment = new WorkClientAttachment();
+            attchment.setAttachmentId(projectVisa.getId());
+            List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
+            visa.setWorkAttachments(attachments);
             model.addAttribute("projectVisa", visa);
         }else{
             model.addAttribute("projectVisa", projectVisa);
@@ -253,29 +132,7 @@ public class ProjectVisaController extends BaseController {
      * 保存客户管理
      */
     @RequestMapping(value = "save")
-    public String save(ProjectVisa projectVisa,
-                       Model model, RedirectAttributes redirectAttributes,
-//					   @RequestParam(value = "upload_files") MultipartFile[] upload_files.
-                       HttpServletRequest request
-    ) throws Exception{
-
-
-        //上传文件
-//		List<WorkClientAttachment> workClientAttachments = workClientInfoService.uploadFile(request, upload_files, workClientInfo.getId(), VarStr.attachmentFlag[0]);
-//		List<WorkClientAttachment> workClientAttachmentList = workClientInfo.getWorkClientAttachmentList();
-//		workClientAttachments.addAll(workClientAttachmentList);
-//		workClientInfo.setWorkClientAttachmentList(workClientAttachments);
-
-        /*//保存当前人的公司
-        workClientInfo.setCompanyId(UserUtils.getSelectCompany().getId());
-        workClientInfo.setOfficeId(UserUtils.getSelectOffice().getId());
-        if(!workClientInfo.getIsNewRecord()){//编辑表单保存
-            WorkClientInfo t = workClientInfoService.get(workClientInfo.getId());//从数据库取出记录的值
-            MyBeanUtils.copyBeanNotNull2Bean(workClientInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-            workClientInfoService.save(t);//保存
-        }else{//新增表单保存
-            workClientInfoService.save(workClientInfo);//保存
-        }*/
+    public String save(ProjectVisa projectVisa,RedirectAttributes redirectAttributes) throws Exception{
         projectVisa.setType("1");
         projectVisaService.save(projectVisa);
 

src/main/webapp/webpage/modules/projectrecord/implementStage/projectVisaForm.jsp

@@ -71,7 +71,6 @@
                     }
                 }
             });
-            changeContentDetail(document.getElementById("projectContentDataType"));
             var tp = "${projectcontentinfo.dictType}";
             var tp2 = "${projectcontentinfo.projectContentData.id}"
             if((tp!=null && tp!='')||(tp2!=null && tp2!='')){
@@ -181,116 +180,6 @@
             //var idx1 = $("#workBaseDataList tr").length +1;
         }
 
-
-        function changeContentDetail(obj) {
-            var val = $(obj).val();
-            var modify = $("#modify").val();
-            if("modify" != modify){
-                $("#workBaseDataList").empty();
-                $.ajax({
-                    type:'post',
-                    url:'${ctx}/project/projectImplementEarly/projectBasedDataList',
-                    data:{
-                        "typeId":val
-                    },
-                    success:function(data){
-                        console.log(data);
-                        if(data.projectBasedDataList.length > 0){
-                            var data = data.projectBasedDataList;
-                            for(var i=0;i<data.length;i++){
-                                var idArr = $("#workBaseDataList tr:visible .clientId");
-                                if(data[i].id!=''&&!hasInArr(data[i].id,idArr)){
-                                    addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTplFirst,data[i]);
-                                    workBaseDataRowIdx=workBaseDataRowIdx+1;
-                                }
-                            }
-                        }
-                    }
-                })
-
-            }
-
-
-            $("#contentDetail").empty();
-            contentDetailTypeShow(val);
-            $("#contentDetailTypeDiv").show();
-            $("#projectContentDataSign").val(val);
-            var param2 = {'contentId':"${projectcontentinfo.projectContentData.id}",'projectId':"${projectcontentinfo.project.id}"};
-            detailFlag=1;
-            switch (val){
-                case '22':
-                    $("#contentDetail").load("${ctx}/workPreliminary/workPreliminaryDesignEstimate/list",param2);
-                    break;
-                case '13':
-                case '25':
-                    $("#contentDetail").load("${ctx}/workcontentinvestmentcost/workContentInvestmentCost/list",param2);
-                    break;
-                case '31':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentContprogram/form",param2);
-                    break;
-                case '32':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentBiddingplan/form",param2);
-                    break;
-                case '23':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentCtrlprice/form",param2);
-                    break;
-                case '41':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentContractinfo/form",param2);
-                    break;
-                case '42':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentPricemanage/form",param2);
-                    break;
-                case '43':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentAltermanage/form",param2);
-                    break;
-                case '45':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentVisamanage/form",param2);
-                    break;
-                case '46':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentClaim/form",param2);
-                    break;
-                case '47':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentFundplan/form",param2);
-                    break;
-                case '48':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentProjectprice/form",param2);
-                    break;
-                case '49':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentPriceadjust/form",param2);
-                    break;
-                case '52':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentBudget/form",param2);
-                    break;
-                case '53':
-                    $("#contentDetail").load("${ctx}/workcontent/workContentDocument/form",param2);
-                    break;
-                case '410':
-                    $("#contentDetail").load("${ctx}/workConcealProject/workConcealProject/list",param2);
-                    break;
-                case '411':
-                    $("#contentDetail").load("${ctx}/fiveDirectionsAffirm/workFiveDirectionsAffirm/list",param2);
-                    break;
-                /*新加代码*/
-                case '412':
-                    $("#contentDetail").load("${ctx}/workcontentbranchaccount/workcontentBranchAccount/list",param2);
-                    break;
-                /*新加代码*/
-                case '510':
-                    $("#contentDetail").load("${ctx}/workContent/workContentCompleteAccount/list",param2);
-                    break;
-                case '420':
-                    $("#contentDetail").load("${ctx}/workSchedule/workSchedule/list",param2);
-                    break;
-                case '421':
-                    $("#contentDetail").load("${ctx}/workMaterialsPrice/workMaterialsPrice/list",param2);
-                    break;
-                default:
-                    detailFlag=0;
-                    $("#contentDetail").html("");
-                    break;
-            }
-        }
-
         function addFile() {
             $("#attachment_file").click();
         }
@@ -427,60 +316,6 @@
             }
         }
 
-        /**
-         * 获取临时数据
-         * @param obj
-         * @param othis
-         */
-        function initGetControlData(){
-            $.ajax({
-                type:'post',
-                url:'${ctx}/projectcontroltable/projectControlTable/getControlData',
-                data:{
-                    "projectId":"${projectcontentinfo.project.id}",
-                    "proId":"${projectcontentinfo.projectContentData.id}"
-                },
-                success:function(data){
-                    if(data){
-                        var htmlStr = '';
-                        data = data.list.projectControlTableList;
-                        for(var i=0;i<data.length;i++){
-                            htmlStr += "<tr id='tr"+i+"'>"+
-                                "   <td style='text-align:center;'>"+
-                                "	   "+data[i].tName+
-                                "	   <input type='hidden' name='projectContentData.projectControlTableList["+i+"].id' value='"+data[i].id+"'>"+
-                                "	   <input type='hidden' name='projectContentData.projectControlTableList["+i+"].tName' value='"+data[i].tName+"'>"+
-                                "	   <input type='hidden' name='projectContentData.projectControlTableList["+i+"].processName' value='"+data[i].processName+"'>"+
-                                "	   <input type='hidden' name='projectContentData.projectControlTableList["+i+"].pfId' value='"+data[i].pfId+"'>"+
-                                "   </td>"+
-                                "   <td style='text-align:center;'>" +
-                                "  			"+data[i].processName+
-                                "	   		<input type='hidden' name='projectContentData.projectControlTableList["+i+"].tType' value='"+data[i].tType+"'>"+
-                                "	</td>"+
-                                "   <td style='text-align:center;'>"+
-                                "  		"+data[i].tUser.name+
-                                "   </td>"+
-                                "   <td style='text-align:center;'>"+
-                                "  "+ getMatchDate(data[i].createDate)+
-                                //										"	    <input type='hidden' name='projectControlTableList["+i+"].createDate' value='"+data[i].createDate+"'>"+
-                                //										"	    <input type='hidden' name='projectControlTableList["+i+"].updateDate' value='"+data[i].updateDate+"'>"+
-                                //										"	    <input type='hidden' name='projectControlTableList["+i+"].delFlag' value='"+data[i].delFlag+"'>"+
-                                //										"	    <input type='hidden' name='projectControlTableList["+i+"].createBy.id' value='"+data[i].createBy.id+"'>"+
-                                "   </td>"+
-                                "   <td style='text-align:center;'>"+
-                                "   	<a href='javascript:void(0)' onclick=\"openDialogView('查看过程控制明细', '${ctx}/projectcontroltable/projectControlTable/form?view=view&id="+data[i].id+"','90%', '90%')\" class='btn btn-info btn-xs' ><i class='fa fa-search-plus'></i> 查看</a>"+
-                                "  		<a href=\"javascript:initControlData('0','#tr"+i+"','del','"+data[i].id+"')\" onclick=\"return confirmx('确认要删除该过程控制数据吗？', this.href)\"   class='btn btn-danger btn-xs'><i class='fa fa-trash'></i> 删除</a>"+
-                                "  </td>"+
-                                "</tr>";
-                        }
-                        if(htmlStr){
-                            $("#projectControlTables").html(htmlStr);
-                        }
-                    }
-                }
-            })
-        }
-
         function formatNum(obj) {
             var val = $(obj).val();
             console.log("-----------val"+val);
@@ -600,7 +435,7 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${projectcontentinfo.projectContentData.workAttachments}" var = "workAttachment" varStatus="status">
+                        <c:forEach items="${projectVisa.workAttachments}" var = "workAttachment" varStatus="status">
                             <tr>
                                 <c:choose>
                                     <c:when test="${fn:containsIgnoreCase(workAttachment.attachmentName,'jpg')
@@ -638,334 +473,8 @@
                     </table>
                 </div>
             </div>
-            <c:if test="${projectcontentinfo.infoId !=null and projectcontentinfo.edit  == 'edit'}">
-                <div class="pull-right">
-                    <button id="btnSubmit" class="nav-btn nav-btn-add" type="submit" onclick="$('#edit').val('edit');beforeSubmit();"><i class="fa fa-chevron-up"></i> 提交</button>
-                </div>
-            </c:if>
-            <div class="form-group layui-row page-end">
-                <br>
-                <br>
-                <br>
-            </div>
         </form:form>
     </div>
 </div>
-<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
-<script>
-    function contentDetailTypeShow(obj) {
-        var projectContentDataId = '${projectcontentinfo.projectContentData.id}';
-        $.ajax({
-            type:'post',
-            url:'${ctx}/projectcontentinfo/projectcontentinfo/getAchievementTypeList2',
-            data:{
-                "achievementParentId":obj,
-                "type":3
-            },
-            success:function(data){
-                if(data.success) {
-                    if (null != obj && "" != obj) {
-                        if(null !=projectContentDataId && ""!= projectContentDataId) {
-                            $.ajax({
-                                type: 'post',
-                                url: getExistingDataOnPath(obj),
-                                data: {
-                                    "contentId": "${projectcontentinfo.projectContentData.id}"
-                                },
-                                success: function (tableTypeList) {
-                                    var dataList = data.body.list;
-                                    var newDataList = [];
-                                    var holdDataList = data.body.list;
-                                    if (0 != dataList.length) {
-                                        for (i in holdDataList) {
-                                            newDataList.push(holdDataList[i])
-                                        }
-                                    }
-                                    if (0 != newDataList.length && 0 !=tableTypeList.length){
-                                        for (i in newDataList) {
-                                            for (j in tableTypeList) {
-                                                if (newDataList[i].value == tableTypeList[j]) {
-                                                    var newData = {
-                                                        "name": newDataList[i].name,
-                                                        "value": newDataList[i].value,
-                                                        "selected": true
-                                                    }
-                                                    holdDataList.splice(i,1,newData);
-                                                }
-                                                modifyGetDetailsNum(tableTypeList);
-                                            }
-                                        }
-                                        xmSelect.render({
-                                            el: '#contentDetailType',
-                                            language: 'zn',
-                                            data: holdDataList
-                                        })
-                                        $("#dataBodyList").val(holdDataList);
-                                    }else{
-                                        xmSelect.render({
-                                            el: '#contentDetailType',
-                                            language: 'zn',
-                                            data: dataList
-                                        })
-                                        $("#dataBodyList").val(holdDataList);
-                                    }
-                                }
-                            })
-                        }else{
-                            xmSelect.render({
-                                el: '#contentDetailType',
-                                language: 'zn',
-                                data: data.body.list
-                            })
-                            $("#dataBodyList").val(data.body.list);
-                        }
-                    }else {
-                        xmSelect.render({
-                            el: '#contentDetailType',
-                            language: 'zn',
-                            data: data.body.list
-                        })
-                        $("#dataBodyList").val(data.body.list);
-                    }
-                }
-            }
-        })
-    }
-
-    var contentDetailType = xmSelect.render({
-        el: '#contentDetailType',
-        language: 'zn',
-        data: [
-        ]
-    })
-
-    function getExistingDataOnPath(val) {
-        switch (val){
-            case '22':
-                return "${ctx}/workPreliminary/workPreliminaryDesignEstimate/getTableType";
-            case '13':
-            case '25':
-                return "${ctx}/workcontentinvestmentcost/workContentInvestmentCost/getTableType";
-            case '31':
-                return "${ctx}/workcontent/workContentContprogram/form";
-            case '32':
-                return "${ctx}/workcontent/workContentBiddingplan/form";
-            case '23':
-                return "${ctx}/workcontent/workContentCtrlprice/getTableType";
-            case '41':
-                return "${ctx}/workcontent/workContentContractinfo/form";
-            case '42':
-                return "${ctx}/workcontent/workContentPricemanage/form";
-            case '43':
-                return "${ctx}/workcontent/workContentAltermanage/form";
-            case '45':
-                return "${ctx}/workcontent/workContentVisamanage/form";
-            case '46':
-                return "${ctx}/workcontent/workContentClaim/form";
-            case '47':
-                return "${ctx}/workcontent/workContentFundplan/form";
-            case '48':
-                return "${ctx}/workcontent/workContentProjectprice/form";
-            case '49':
-                return "${ctx}/workcontent/workContentPriceadjust/form";
-            case '52':
-                return "${ctx}/workcontent/workContentBudget/form";
-            case '53':
-                return "${ctx}/workcontent/workContentDocument/form";
-            /*case '400':
-                return "${ctx}/workcontent/workContentContractSum/form";*/
-            case '410':
-                return "${ctx}/workConcealProject/workConcealProject/getTableType";
-            case '411':
-                return "${ctx}/fiveDirectionsAffirm/workFiveDirectionsAffirm/getTableType";
-            /*新加代码*/
-            case '412':
-                return  "${ctx}/workcontentbranchaccount/workcontentBranchAccount/getTableType";
-            /*新加代码*/
-            case '510':
-                return  "${ctx}/workContent/workContentCompleteAccount/getTableType";
-            case '420':
-                return "${ctx}/workSchedule/workSchedule/getTableType";
-            case '421':
-                return "${ctx}/workMaterialsPrice/workMaterialsPrice/getTableType";
-            default:
-                return "";
-        }
-    }
-
-
-    function getDetailsNum(){
-        var list = [];
-        //获取当前多选选中的值
-        var selectArr = contentDetailType.getValue();
-        for (var i in selectArr){
-            list.push(selectArr[i].value);
-        }
-        $("#contentDetail").val("");
-        console.log(list);
-        var val = $("#projectContentDataSign").val();
-        var param2 = {'contentId':"${projectcontentinfo.projectContentData.id}",'projectId':"${projectcontentinfo.project.id}",'sign':list.toString(),'achievementParentId':val};
-        detailFlag=1;
-        switch (val){
-            case '22':
-                $("#contentDetail").load("${ctx}/workPreliminary/workPreliminaryDesignEstimate/list",param2);
-                break;
-            case '13':
-            case '25':
-                $("#contentDetail").load("${ctx}/workcontentinvestmentcost/workContentInvestmentCost/list",param2);
-                break;
-            case '31':
-                $("#contentDetail").load("${ctx}/workcontent/workContentContprogram/form",param2);
-                break;
-            case '32':
-                $("#contentDetail").load("${ctx}/workcontent/workContentBiddingplan/form",param2);
-                break;
-            case '23':
-                $("#contentDetail").load("${ctx}/workcontent/workContentCtrlprice/form",param2);
-                break;
-            case '41':
-                $("#contentDetail").load("${ctx}/workcontent/workContentContractinfo/form",param2);
-                break;
-            case '42':
-                $("#contentDetail").load("${ctx}/workcontent/workContentPricemanage/form",param2);
-                break;
-            case '43':
-                $("#contentDetail").load("${ctx}/workcontent/workContentAltermanage/form",param2);
-                break;
-            case '45':
-                $("#contentDetail").load("${ctx}/workcontent/workContentVisamanage/form",param2);
-                break;
-            case '46':
-                $("#contentDetail").load("${ctx}/workcontent/workContentClaim/form",param2);
-                break;
-            case '47':
-                $("#contentDetail").load("${ctx}/workcontent/workContentFundplan/form",param2);
-                break;
-            case '48':
-                $("#contentDetail").load("${ctx}/workcontent/workContentProjectprice/form",param2);
-                break;
-            case '49':
-                $("#contentDetail").load("${ctx}/workcontent/workContentPriceadjust/form",param2);
-                break;
-            case '52':
-                $("#contentDetail").load("${ctx}/workcontent/workContentBudget/form",param2);
-                break;
-            case '53':
-                $("#contentDetail").load("${ctx}/workcontent/workContentDocument/form",param2);
-                break;
-            /*case '400':
-                $("#contentDetail").load("${ctx}/workcontent/workContentContractSum/form",param2);
-                break;*/
-            case '410':
-                $("#contentDetail").load("${ctx}/workConcealProject/workConcealProject/list",param2);
-                break;
-            case '411':
-                $("#contentDetail").load("${ctx}/fiveDirectionsAffirm/workFiveDirectionsAffirm/list",param2);
-                break;
-            /*新加代码*/
-            case '412':
-                $("#contentDetail").load("${ctx}/workcontentbranchaccount/workcontentBranchAccount/list",param2);
-            /*新加代码*/
-            case '510':
-                $("#contentDetail").load("${ctx}/workContent/workContentCompleteAccount/list",param2);
-                break;
-            case '420':
-                $("#contentDetail").load("${ctx}/workSchedule/workSchedule/list",param2);
-                break;
-            case '421':
-                $("#contentDetail").load("${ctx}/workMaterialsPrice/workMaterialsPrice/list",param2);
-                break;
-            default:
-                detailFlag=0;
-                $("#contentDetail").html("");
-                break;
-        }
-
-    }
-
-    function modifyGetDetailsNum(list){
-        $("#contentDetailType").empty();
-        console.log(list);
-        var val = $("#projectContentDataSign").val();
-        var param2 = {'contentId':"${projectcontentinfo.projectContentData.id}",'projectId':"${projectcontentinfo.project.id}",'sign':list.toString(),'achievementParentId':val};
-        detailFlag=1;
-        switch (val){
-            case '22':
-                $("#contentDetail").load("${ctx}/workPreliminary/workPreliminaryDesignEstimate/list",param2);
-                break;
-            case '13':
-            case '25':
-                $("#contentDetail").load("${ctx}/workcontentinvestmentcost/workContentInvestmentCost/list",param2);
-                break;
-            case '31':
-                $("#contentDetail").load("${ctx}/workcontent/workContentContprogram/form",param2);
-                break;
-            case '32':
-                $("#contentDetail").load("${ctx}/workcontent/workContentBiddingplan/form",param2);
-                break;
-            case '23':
-                $("#contentDetail").load("${ctx}/workcontent/workContentCtrlprice/form",param2);
-                break;
-            case '41':
-                $("#contentDetail").load("${ctx}/workcontent/workContentContractinfo/form",param2);
-                break;
-            case '42':
-                $("#contentDetail").load("${ctx}/workcontent/workContentPricemanage/form",param2);
-                break;
-            case '43':
-                $("#contentDetail").load("${ctx}/workcontent/workContentAltermanage/form",param2);
-                break;
-            case '45':
-                $("#contentDetail").load("${ctx}/workcontent/workContentVisamanage/form",param2);
-                break;
-            case '46':
-                $("#contentDetail").load("${ctx}/workcontent/workContentClaim/form",param2);
-                break;
-            case '47':
-                $("#contentDetail").load("${ctx}/workcontent/workContentFundplan/form",param2);
-                break;
-            case '48':
-                $("#contentDetail").load("${ctx}/workcontent/workContentProjectprice/form",param2);
-                break;
-            case '49':
-                $("#contentDetail").load("${ctx}/workcontent/workContentPriceadjust/form",param2);
-                break;
-            case '52':
-                $("#contentDetail").load("${ctx}/workcontent/workContentBudget/form",param2);
-                break;
-            case '53':
-                $("#contentDetail").load("${ctx}/workcontent/workContentDocument/form",param2);
-                break;
-            /*case '400':
-                $("#contentDetail").load("${ctx}/workcontent/workContentContractSum/form",param2);
-                break;*/
-            case '410':
-                $("#contentDetail").load("${ctx}/workConcealProject/workConcealProject/list",param2);
-                break;
-            case '411':
-                $("#contentDetail").load("${ctx}/fiveDirectionsAffirm/workFiveDirectionsAffirm/list",param2);
-                break;
-
-            /*新加代码*/
-            case '412':
-                $("#contentDetail").load("${ctx}/workcontentbranchaccount/workcontentBranchAccount/list",param2);
-                break;
-            /*新加代码*/
-            case '510':
-                $("#contentDetail").load("${ctx}/workContent/workContentCompleteAccount/list",param2);
-                break;
-            case '420':
-                $("#contentDetail").load("${ctx}/workSchedule/workSchedule/list",param2);
-                break;
-            case '421':
-                $("#contentDetail").load("${ctx}/workMaterialsPrice/workMaterialsPrice/list",param2);
-                break;
-            default:
-                detailFlag=0;
-                $("#contentDetail").html("");
-                break;
-        }
-    }
-</script>
 </body>
 </html>