7月7日功能1.2.6

src/main/java/com/jeeplus/modules/bzshbExamine/dao/BzshbExaminDao.java

@@ -0,0 +1,51 @@
+package com.jeeplus.modules.bzshbExamine.dao;
+
+import com.jeeplus.common.persistence.CrudDao;
+import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.bzshbExamine.entity.BzshbExaminInfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+
+import java.util.List;
+
+/**
+ * @author: 徐滕
+ * @create: 2021-07-08 17:26
+ **/
+@MyBatisDao
+public interface BzshbExaminDao extends CrudDao<BzshbExaminInfo> {
+
+    /**
+     * 查询指定人的被检查总数
+     * @param bzshbExaminInfo
+     * @return
+     */
+    Integer getProjectNumber(BzshbExaminInfo bzshbExaminInfo);
+
+    /**
+     * 查询指定人时间区间内项目总数
+     * @param bzshbExaminInfo
+     * @return
+     */
+    Integer getProjectAllCount(BzshbExaminInfo bzshbExaminInfo);
+
+    /**
+     * 查询指定人时间区间内被检查项目总数
+     * @param bzshbExaminInfo
+     * @return
+     */
+    Integer getProjectCount(BzshbExaminInfo bzshbExaminInfo);
+
+    /**
+     * 根据项目责任人查询所负责的项目
+     * @param bzshbExaminInfo
+     * @return
+     */
+    List<BzshbExaminInfo> getProjectRecordsByMasterUser(BzshbExaminInfo bzshbExaminInfo);
+
+    /**
+     * 根据项目责任人查询所负责的项目
+     * @param bzshbExaminInfo
+     * @return
+     */
+    Integer getProjectCountByMasterUser(BzshbExaminInfo bzshbExaminInfo);
+}

src/main/java/com/jeeplus/modules/bzshbExamine/entity/BzshbExaminInfo.java

@@ -0,0 +1,190 @@
+package com.jeeplus.modules.bzshbExamine.entity;
+
+import com.jeeplus.common.persistence.DataEntity;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author: 徐滕
+ * @create: 2021-07-08 17:26
+ **/
+public class BzshbExaminInfo extends DataEntity<BzshbExaminInfo> {
+    private String userId;      //人员id
+    private String userName;    //人员名称
+    private Date startDate;     //开始时间
+    private Date endDate;       //结束时间
+    private String auditUserId;       //真实总审id
+    private List<String> auditUserIdList;   //总审id
+
+    private Integer projectAllNumber;   //项目总数量
+    private Integer projectNumber;      //项目检查数量
+    private Double sumPercent;          //百分比占比
+
+    private Integer projectAllCount;    //时间区间内项目总数量
+    private Integer projectCount;       //时间区间内项目检查数量
+    private Double percent;             //时间区间内百分比占比
+
+
+    private String projectId;       //项目id
+    private String projectName;     //项目名称
+    private String createName;      //项目创建人
+    private String masterName;      //项目责任人
+    private Integer examinFlag;     //是否检查标识（1：已查；0：未查）
+    private String examinFlagStr;   //是否检查
+    private String view;
+
+
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Integer getProjectAllNumber() {
+        return projectAllNumber;
+    }
+
+    public void setProjectAllNumber(Integer projectAllNumber) {
+        this.projectAllNumber = projectAllNumber;
+    }
+
+    public Integer getProjectNumber() {
+        return projectNumber;
+    }
+
+    public void setProjectNumber(Integer projectNumber) {
+        this.projectNumber = projectNumber;
+    }
+
+    public Double getSumPercent() {
+        return sumPercent;
+    }
+
+    public void setSumPercent(Double sumPercent) {
+        this.sumPercent = sumPercent;
+    }
+
+    public Integer getProjectAllCount() {
+        return projectAllCount;
+    }
+
+    public void setProjectAllCount(Integer projectAllCount) {
+        this.projectAllCount = projectAllCount;
+    }
+
+    public Integer getProjectCount() {
+        return projectCount;
+    }
+
+    public void setProjectCount(Integer projectCount) {
+        this.projectCount = projectCount;
+    }
+
+    public Double getPercent() {
+        return percent;
+    }
+
+    public void setPercent(Double percent) {
+        this.percent = percent;
+    }
+
+    public List<String> getAuditUserIdList() {
+        return auditUserIdList;
+    }
+
+    public void setAuditUserIdList(List<String> auditUserIdList) {
+        this.auditUserIdList = auditUserIdList;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getMasterName() {
+        return masterName;
+    }
+
+    public void setMasterName(String masterName) {
+        this.masterName = masterName;
+    }
+
+    public Integer getExaminFlag() {
+        return examinFlag;
+    }
+
+    public void setExaminFlag(Integer examinFlag) {
+        this.examinFlag = examinFlag;
+    }
+
+    public String getExaminFlagStr() {
+        return examinFlagStr;
+    }
+
+    public void setExaminFlagStr(String examinFlagStr) {
+        this.examinFlagStr = examinFlagStr;
+    }
+
+    public String getView() {
+        return view;
+    }
+
+    public void setView(String view) {
+        this.view = view;
+    }
+
+    public String getAuditUserId() {
+        return auditUserId;
+    }
+
+    public void setAuditUserId(String auditUserId) {
+        this.auditUserId = auditUserId;
+    }
+}

src/main/java/com/jeeplus/modules/bzshbExamine/service/BzshbExaminService.java

@@ -0,0 +1,149 @@
+package com.jeeplus.modules.bzshbExamine.service;
+
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.service.CrudService;
+import com.jeeplus.modules.bzshbExamine.dao.BzshbExaminDao;
+import com.jeeplus.modules.bzshbExamine.entity.BzshbExaminInfo;
+import com.jeeplus.modules.sys.dao.UserDao;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author: 徐滕
+ * @create: 2021-07-08 17:23
+ **/
+@Service
+@Transactional(readOnly = true)
+public class BzshbExaminService extends CrudService<BzshbExaminDao, BzshbExaminInfo> {
+
+    @Autowired
+    private UserDao userDao;
+
+    public BzshbExaminInfo get(String id) {
+        return super.get(id);
+    }
+
+    public Page<BzshbExaminInfo> findPage(Page<BzshbExaminInfo> page, BzshbExaminInfo bzshbExaminInfo) {
+        //查询当前登录人对应的所有总审id
+        List<String> auditUserIdList = userDao.getAuditUserListByRelevanceUserId(UserUtils.getUser().getId());
+        bzshbExaminInfo.setAuditUserIdList(auditUserIdList);
+        int userCount = dao.queryCount(bzshbExaminInfo);
+        page.setCount(userCount);
+        page.setCountFlag(false);
+        bzshbExaminInfo.setPage(page);
+        List<BzshbExaminInfo> recordsList = findList(bzshbExaminInfo);
+
+        //判定筛选条件中的日期是否选择，没选则添加当前年份的第一天作为筛选初始时间，当前时间作为筛选结束时间
+        if(null == bzshbExaminInfo.getStartDate()){
+            Date currYearFirst = getCurrYearFirst();
+            bzshbExaminInfo.setStartDate(currYearFirst);
+        }
+        if(null == bzshbExaminInfo.getEndDate()){
+            bzshbExaminInfo.setEndDate(new Date());
+        }
+
+        for (BzshbExaminInfo info: recordsList) {
+            //查询指定人的被检查总数
+            info.setProjectNumber(dao.getProjectNumber(info));
+            info.setStartDate(bzshbExaminInfo.getStartDate());
+            info.setEndDate(bzshbExaminInfo.getEndDate());
+            //查询指定人时间区间内项目总数
+            info.setProjectAllCount(dao.getProjectAllCount(info));
+            //查询指定人时间区间内被检查项目总数
+            info.setProjectCount(dao.getProjectCount(info));
+            if(0 != info.getProjectAllNumber()){
+                Double sumPercent = Double.valueOf(info.getProjectNumber())/Double.valueOf(info.getProjectAllNumber());
+                info.setSumPercent(convert(sumPercent)*100);
+            }else{
+                info.setSumPercent(0D);
+            }
+            if(0 != info.getProjectAllCount()){
+                Double percent = Double.valueOf(info.getProjectCount())/Double.valueOf(info.getProjectAllCount());
+                info.setPercent(convert(percent)*100);
+            }else{
+                info.setPercent(0D);
+            }
+        }
+
+
+        page.setList(recordsList);
+        return page;
+    }
+
+
+    /**
+     * 根据筛选人查询对应的项目信息
+     * @param page 分页对象
+     * @param bzshbExaminInfo
+     * @return
+     */
+    public Page<BzshbExaminInfo> findPageByUser(Page<BzshbExaminInfo> page, BzshbExaminInfo bzshbExaminInfo) {
+        Integer projectCount = dao.getProjectCountByMasterUser(bzshbExaminInfo);
+        page.setCount(projectCount);
+        page.setCountFlag(false);
+        bzshbExaminInfo.setPage(page);
+        //根据筛选人查询所做过的项目信息（责任人），按创建时间进行倒叙排序
+        List<BzshbExaminInfo> projectList = dao.getProjectRecordsByMasterUser(bzshbExaminInfo);
+        page.setList(projectList);
+        return page;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * 获取当年的第一天
+     * @return
+     */
+    public static Date getCurrYearFirst(){
+        Calendar currCal= Calendar.getInstance();
+        int currentYear = currCal.get(Calendar.YEAR);
+        return getYearFirst(currentYear);
+    }
+    /**
+     * 获取某年第一天日期
+     * @param year 年份
+     * @return Date
+     */
+    public static Date getYearFirst(int year){
+        Calendar calendar = Calendar.getInstance();
+        calendar.clear();
+        calendar.set(Calendar.YEAR, year);
+        Date currYearFirst = calendar.getTime();
+        return currYearFirst;
+    }
+    /**
+     * 取小数点后两位
+     * @param value
+     * @return
+     */
+    public static Double convert(Double value){
+        long l1 = Math.round(value*100); //四舍五入
+        Double ret = l1/100.0; //注意:使用 100.0 而不是 100
+        return ret;
+    }
+}

src/main/java/com/jeeplus/modules/bzshbExamine/web/BzshbExaminController.java

@@ -0,0 +1,393 @@
+package com.jeeplus.modules.bzshbExamine.web;
+
+import com.google.common.collect.Lists;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.MyBeanUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.bzshbExamine.entity.BzshbExaminInfo;
+import com.jeeplus.modules.bzshbExamine.service.BzshbExaminService;
+import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
+import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
+import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
+import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
+import com.jeeplus.modules.ruralprojectrecords.entity.SubProjectInfo;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.ruralprojectrecords.service.SubProjectInfoService;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.UserService;
+import com.jeeplus.modules.sys.utils.DictUtils;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
+import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * 总审检查B级紧急类项目Controller
+ * @author: 徐滕
+ * @create: 2021-07-08 17:20
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/bzshbExamin/bzshbExamin")
+public class BzshbExaminController extends BaseController {
+
+    @Autowired
+    private BzshbExaminService service;
+    @Autowired
+    private ProjectEngineeringService engineeringService;
+    @Autowired
+    private ProjectReportDataService projectReportDataService;
+    @Autowired
+    private RuralProjectRecordsService ruralProjectRecordsService;
+    @Autowired
+    private ProjectcontentinfoService projectcontentinfoService;
+    @Autowired
+    private RuralProjectMessageService ruralProjectMessageService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private ProjectTemplateService projectTemplateService;
+    @Autowired
+    private WorkClientInfoService workClientInfoService;
+    @Autowired
+    private WorkReviewStandardService workReviewStandardService;
+    @Autowired
+    private SubProjectInfoService subProjectInfoService;
+    @Autowired
+    private WorkContractInfoService workContractInfoService;
+    @Autowired
+    private ProjectPlanService projectPlanService;
+
+    /**
+     * 查询列表
+     */
+    @RequiresPermissions("bzshbExamin:bzshbExamin:list")
+    @RequestMapping(value = {"list", ""})
+    public String list(BzshbExaminInfo bzshbExaminInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<BzshbExaminInfo> page = service.findPage(new Page<BzshbExaminInfo>(request, response), bzshbExaminInfo);
+        model.addAttribute("page", page);
+        return "modules/bzshbExamin/bzshbExaminList";
+    }
+
+    @RequestMapping(value = {"formList"})
+    public String formList(BzshbExaminInfo bzshbExaminInfo, HttpServletRequest request, HttpServletResponse response, Model model){
+        Page<BzshbExaminInfo> page = service.findPageByUser(new Page<BzshbExaminInfo>(request, response), bzshbExaminInfo);
+        model.addAttribute("page", page);
+        return "modules/bzshbExamin/bzshbEaminUserProjectList";
+    }
+
+    /**
+     * 评分页面数据获取以及跳转
+     * @param bzshbExaminInfo
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = {"bzshbExamineForm"})
+    public String bzshbExamineForm(BzshbExaminInfo bzshbExaminInfo, Model model){
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(bzshbExaminInfo.getProjectId());
+        RuralProjectRecords ruralProjectRecords=ruralProjectRecordsService.getQueryProjectUsers(projectReportData.getProject().getId());
+        if(StringUtils.isBlank(ruralProjectRecords.getProjectMasterId())){
+            ruralProjectRecords.setProjectMasterId(projectReportData.getPrincipal().getId());
+            ruralProjectRecords.setProjectMasterName(projectReportData.getPrincipal().getName());
+        }
+        Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
+        projectcontentinfo.setProjectReportData(projectReportData);
+        //添加当前文件服务器类型
+        projectcontentinfo.setUploadMode(uploadMode);
+        List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
+        if(null != achievementTypes){
+            for (MainDictDetail achievementType:achievementTypes) {
+                if(achievementType.getValue().equals(projectReportData.getAchievementType())){
+                    projectReportData.setAchievementType(achievementType.getLabel());
+                    break;
+                }
+            }
+        }
+        //根据项目id查找咨询员信息
+        List<RuralReportConsultant> consultants = Lists.newArrayList();
+        //将自己添加到咨询员数据中
+        //根据用户查询技能信息
+        RuralReportConsultant currentConsultant = new RuralReportConsultant();
+        List<WorkStaffCertificate> userCertificateList = Lists.newArrayList();
+        if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+            userCertificateList = ruralProjectMessageService.getCertificateByUser(ruralProjectRecords.getProjectMasterId());
+        }
+        //获取专业类型
+        List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
+        for (WorkStaffCertificate certificateInfo: userCertificateList) {
+            currentConsultant.setZhucezigezhID(certificateInfo.getNum());
+            currentConsultant.setZhucezigezhKey(certificateInfo.getName());
+            for (MainDictDetail type : certificateMajor) {
+                if(certificateInfo.getMajor().equals(type.getValue())){
+                    currentConsultant.setMajor(type.getLabel());
+                }
+            }
+            User currentUser=userService.get(ruralProjectRecords.getProjectMasterId());
+            currentConsultant.setZixunyuanName(currentUser.getName());
+            currentConsultant.setZixunyuan(currentUser.getId());
+            currentConsultant.setRole("负责人");
+            consultants.add(currentConsultant);
+        }
+        //根据项目id查找报告咨询员信息
+        List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(projectReportData.getProject().getId());
+        //使用迭代器去除重复信息
+        //排除 重新申请|撤销
+        Iterator<RuralReportConsultant> it = consultantList.iterator();
+        while(it.hasNext()){
+            RuralReportConsultant consultant = it.next();
+            if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
+                try {
+                    MyBeanUtils.copyBeanNotNull2Bean(consultant, currentConsultant);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                it.remove();
+            }else{
+                //根据用户查询技能信息
+                List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                for (WorkStaffCertificate certificateInfo: certificateList) {
+                    if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+                        consultant.setZhucezigezhID(certificateInfo.getNum());
+                    }
+                    for (MainDictDetail type : certificateMajor) {
+                        if(certificateInfo.getMajor().equals(type.getValue())){
+                            consultant.setMajor(type.getLabel());
+                        }
+                    }
+                }
+                User user=userService.get(consultant.getZixunyuan());
+                consultant.setZixunyuanName(user.getName());
+                consultant.setRole("咨询员");
+            }
+        }
+        consultants.addAll(consultantList);
+
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+        relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(StringUtils.isBlank(money)){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
+
+        //添加报告类型
+        relateInfo.setRequiredStage(1);
+        relateInfo.setId(ruralProjectRecords.getId());
+        //查询报告文件、依据性文件、其他文件必填列表以及数据
+        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+        for (MainDictDetail mainDict : mainDictDetails) {
+            relateInfo.setAttachType(mainDict.getValue());
+            switch (mainDict.getValue()) {
+                case "11":
+                    List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: fileAttachmentList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                            if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
+                                }
+                            }
+                        }
+                    }
+                    projectcontentinfo.setFileAttachmentList(fileAttachmentList);
+                    break;
+                case "12":
+                    List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: projectTemplateList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                            if("投标文件、中标通知书、工程承包合同（协议书记专用条款部分）、补充协议".equals(info.getAttachName()) || "送审工程预算、结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
+                                }
+                            }
+                        }
+                    }
+                    projectcontentinfo.setFileGistdataList(projectTemplateList);
+                    break;
+                case "13":
+                    projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    break;
+            }
+
+        }
+        //获取子项目列表信息
+        List<SubProjectInfo> subProjectInfos=this.queryReportDetails(projectcontentinfo.getProject().getId());
+        //获取合同信息
+        WorkContractInfo workContractInfo=this.queryWorkContract(projectcontentinfo.getProject().getId());
+        //收费标准
+        //查询合同对应委托方客户信息
+        if(null != workContractInfo){
+            WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+            model.addAttribute("workClientInfo", clientInfo);
+            if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+                //收费标准
+                String [] biao=workContractInfo.getChargeCriterion().split(",");
+                List<String> chargeCriterionList=new ArrayList<>();
+                for (int i=0;i<biao.length;i++){
+                    chargeCriterionList.add(biao[i]);
+                }
+                projectcontentinfo.setChargeCriterionList(chargeCriterionList);
+            }
+        }
+        ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+        RuralProjectRecords projectRecordPlans=this.planView(projectcontentinfo.getProject().getId());
+        model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
+        model.addAttribute("projectId", projectcontentinfo.getProject().getId());
+        model.addAttribute("id", projectcontentinfo.getId());
+        model.addAttribute("projectcontentinfo", projectcontentinfo);
+        model.addAttribute("projectRecords", ruralProjectRecords);
+        model.addAttribute("consultantinfo", consultants);
+        model.addAttribute("consultantCount", consultants.size());
+        model.addAttribute("subProjectInfos", subProjectInfos);
+        model.addAttribute("workContractInfo", workContractInfo);
+        model.addAttribute("projectRecordPlans", projectRecordPlans);
+        WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+        model.addAttribute("projectReportData", projectReportData);
+        workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+        workReviewAudit.setReportId(projectReportData.getId());
+        List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
+        model.addAttribute("list", workReviewAudits);
+
+        model.addAttribute("consultantinfo", consultants);
+        model.addAttribute("consultantCount", consultants.size());
+        projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+        projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+        projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
+        if("view".equals(bzshbExaminInfo.getView())){
+            return "modules/bzshbExamin/bzshbExamineView";
+        }
+        return "modules/bzshbExamin/bzshbExamineform";
+    }
+
+    /**
+     * 查询报告审核子项目详细信息
+     */
+    public List<SubProjectInfo> queryReportDetails(String projectId){
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (null!=projectId){
+            projectRecords = ruralProjectRecordsService.get(projectId);
+        }
+        //获取子项目信息
+        SubProjectInfo subProjectInfo=new SubProjectInfo();
+        subProjectInfo.setParentProId(projectId);
+        subProjectInfo.setProjectType(projectRecords.getProjectType());
+        List<SubProjectInfo> recordsList = subProjectInfoService.findList(subProjectInfo);
+        for (SubProjectInfo info: recordsList) {
+            info.setProjectType(subProjectInfo.getProjectType());
+        }
+        return recordsList;
+    }
+    /**
+     * 查询报告审核客户合同详细信息
+     */
+    public WorkContractInfo queryWorkContract(String projectId){
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (null!=projectId){
+            projectRecords = ruralProjectRecordsService.get(projectId);
+        }
+        //获取合同信息
+        WorkContractInfo workContractInfo = workContractInfoService.get(projectRecords.getWorkContractInfo().getId());
+        return workContractInfo;
+    }
+    //获取项目计划
+    public RuralProjectRecords planView(String projectId) {
+        //获取项目信息
+        //如果没有id则为新增 添加创建人信息和当前创建时间信息
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (StringUtils.isNotBlank(projectId)) {
+            //projectRecords = ruralProjectRecordsService.get(projectRecords.getId());
+            projectRecords = ruralProjectRecordsService.getMasters(projectId);
+        }else {
+            projectRecords.setCreateBy(UserUtils.getUser());
+            projectRecords.setCreateDate(new Date());
+        }
+        ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+        //将项目id放入项目计划表中
+        projectPlanInfo.setProjectId(projectRecords.getId());
+        //获取项目计划信息
+        List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+        if(projectPlanList.size() == 0){
+            //获取项目计划信息
+            List<MainDictDetail> mainDictList = DictUtils.getMainDictList("projectPlan");
+            if(mainDictList.size()>0){
+                for (MainDictDetail mainDict : mainDictList) {
+                    ProjectPlanInfo projectPlan = new ProjectPlanInfo();
+                    projectPlan.setProjectStage(mainDict.getLabel());
+                    //将项目负责人添加到展示栏
+                    if(null != projectRecords.getProjectLeaders()) {
+                        projectPlan.setRemindName(projectRecords.getProjectLeaders().get(0).getName());
+                        projectPlan.setRemindId(projectRecords.getProjectLeaders().get(0).getId());
+                    }
+                    //将项目等级人信息添加到完成人控件中
+                    User user = UserUtils.get(projectRecords.getCreateBy().getId());
+                    projectPlan.setFinishId(user.getId());
+                    projectPlan.setFinishName(user.getName());
+                    projectPlanList.add(projectPlan);
+                }
+            }
+        }
+        //获取 项目计划附件信息
+        List<WorkClientAttachment> workAttachmentList = projectPlanService.getWorkAttachment(projectRecords.getId());
+        projectRecords.setProjectPlanList(projectPlanList);
+        projectRecords.setWorkAttachments(workAttachmentList);
+        projectRecords.setUploadMode(uploadMode);
+        return projectRecords;
+    }
+}

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordTreeData.java

@@ -84,6 +84,11 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     private Integer newReportedNotifyFlag; //新上报(审批)判定条件
     private String submitMoney; //项目类型
     private String submitMoneyStr; //项目类型Str
+    private String emergencyProject;  //是否紧急
+
+    private Integer reportAuditNotifyFlag; //新增报告代办(审批)判定条件
+    private Integer recordAuditNotifyFlag; //归档报告代办(审批)判定条件
+    private Integer reportedAuditNotifyFlag; //上报代办判(审批)定条件
 
 
 
@@ -662,4 +667,36 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     public void setSubmitMoneyStr(String submitMoneyStr) {
         this.submitMoneyStr = submitMoneyStr;
     }
+
+    public String getEmergencyProject() {
+        return emergencyProject;
+    }
+
+    public void setEmergencyProject(String emergencyProject) {
+        this.emergencyProject = emergencyProject;
+    }
+
+    public Integer getReportAuditNotifyFlag() {
+        return reportAuditNotifyFlag;
+    }
+
+    public void setReportAuditNotifyFlag(Integer reportAuditNotifyFlag) {
+        this.reportAuditNotifyFlag = reportAuditNotifyFlag;
+    }
+
+    public Integer getRecordAuditNotifyFlag() {
+        return recordAuditNotifyFlag;
+    }
+
+    public void setRecordAuditNotifyFlag(Integer recordAuditNotifyFlag) {
+        this.recordAuditNotifyFlag = recordAuditNotifyFlag;
+    }
+
+    public Integer getReportedAuditNotifyFlag() {
+        return reportedAuditNotifyFlag;
+    }
+
+    public void setReportedAuditNotifyFlag(Integer reportedAuditNotifyFlag) {
+        this.reportedAuditNotifyFlag = reportedAuditNotifyFlag;
+    }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -173,10 +173,13 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Integer notifyFlag; //代办判定条件
 	private String notifyId; //代办判定条件
 	private Integer reportNotifyFlag; //新增报告代办判定条件
+	private Integer reportAuditNotifyFlag; //新增报告代办(审批)判定条件
 	private String reportNotifyId; //新增报告代办判定条件
 	private Integer recordNotifyFlag; //归档报告代办判定条件
+	private Integer recordAuditNotifyFlag; //归档报告代办(审批)判定条件
 	private String recordNotifyId; //归档代办判定条件
 	private Integer reportedNotifyFlag; //上报代办判定条件
+	private Integer reportedAuditNotifyFlag; //上报代办判(审批)定条件
 	private String reportedNotifyId; //上报代办判定条件
 	private Integer checkNotifyFlag; //选查代办判定条件
 	private String checkNotifyId; //选查代办判定条件
@@ -1462,4 +1465,28 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setEmergencyProject(String emergencyProject) {
 		this.emergencyProject = emergencyProject;
 	}
+
+	public Integer getReportAuditNotifyFlag() {
+		return reportAuditNotifyFlag;
+	}
+
+	public void setReportAuditNotifyFlag(Integer reportAuditNotifyFlag) {
+		this.reportAuditNotifyFlag = reportAuditNotifyFlag;
+	}
+
+	public Integer getRecordAuditNotifyFlag() {
+		return recordAuditNotifyFlag;
+	}
+
+	public void setRecordAuditNotifyFlag(Integer recordAuditNotifyFlag) {
+		this.recordAuditNotifyFlag = recordAuditNotifyFlag;
+	}
+
+	public Integer getReportedAuditNotifyFlag() {
+		return reportedAuditNotifyFlag;
+	}
+
+	public void setReportedAuditNotifyFlag(Integer reportedAuditNotifyFlag) {
+		this.reportedAuditNotifyFlag = reportedAuditNotifyFlag;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -37,6 +37,7 @@ import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsReportedDa
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralWorkProjectUserDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.*;
 import com.jeeplus.modules.ruralprojectrecords.utils.RuralProjectReportedInfoUtil;
+import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.dao.WorkattachmentDao;
 import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.service.OfficeService;
@@ -169,6 +170,8 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
     private UserService userService;
     @Autowired
     private WorkStaffBasicInfoService workStaffBasicInfoService;
+    @Autowired
+    private UserDao userDao;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -613,17 +616,23 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                 projectReportData.setPrincipalDate(new Date());
                 //获取项目信息
                 ProjectRecords projectRecord = this.getMasters(projectcontentinfo.getProject().getId());
+                ruralProjectRecords = ruralProjectRecordsService.get(projectcontentinfo.getProject().getId());
                 projectcontentinfo.setProject(projectRecord);
                 if (type == 2) {
-                    //启动流程
-                    String str="";
-                    if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("reviewAgain")){
-                        str = this.saveReRural(projectReportData, variables, processInstanceId, projectcontentinfo.getProject().getProjectLeaders());
+                    //判定如果是B类紧急项目 则不进行流程，直接通过
+                    if("1".equals(ruralProjectRecords.getSubmitMoney()) && "1".equals(ruralProjectRecords.getEmergencyProject())){
+                        this.exigenceProjectSave(projectReportData);
                     }else{
-                        str = this.saveRuralProject(projectReportData, variables, processInstanceId, projectcontentinfo.getProject().getProjectLeaders());
-                    }
-                    if (!str.equals("true")){
-                        return str;
+                        //启动流程
+                        String str="";
+                        if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("reviewAgain")){
+                            str = this.saveReRural(projectReportData, variables, processInstanceId, projectcontentinfo.getProject().getProjectLeaders());
+                        }else{
+                            str = this.saveRuralProject(projectReportData, variables, processInstanceId, projectcontentinfo.getProject().getProjectLeaders());
+                        }
+                        if (!str.equals("true")){
+                            return str;
+                        }
                     }
                 }
             }
@@ -2240,7 +2249,12 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         List<User> bggdglys = UserUtils.getByRoleActivityEnname("bggdgly",3,office.getId(),"10",projectReportRecord.getCreateBy());
         //查询总审人员信息（新增报告选择得总审人员）
         List<User> zsUserList=Lists.newArrayList();
-        User zsUser = UserUtils.get(reportData.getBzshbUserId());
+        //查询总审人员Id
+        String bzshbUserId = userDao.getAuditUserListByBzshbUserId(reportData.getBzshbUserId());
+        User zsUser = null;
+        if(StringUtils.isNotBlank(bzshbUserId)){
+            zsUser = UserUtils.get(bzshbUserId);
+        }
         if(null == zsUser){
             return "流程审批总审人员下无用户,请联系管理员！";
         }
@@ -2451,7 +2465,11 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         //查询报告信息
         ProjectReportData projectReportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
         //查询报告审核总审人员
-        User zsUser = UserUtils.get(projectReportData.getBzshbUserId());
+        String bzshbUserId = userDao.getAuditUserListByBzshbUserId(projectReportData.getBzshbUserId());
+        User zsUser = null;
+        if(StringUtils.isNotBlank(bzshbUserId)){
+            zsUser = UserUtils.get(bzshbUserId);
+        }
         //判断审核增减率
         //判断审核增减率是否大于30%（大于则为false，否则为true）
         if(StringUtils.isNotBlank(reported.getJingHeJianLv())){

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -351,9 +351,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             for (WorkProjectNotify notify: notifyList) {
                 if(notify.getNotifyId().equals(records1.getPrdId())){
                     records1.setReportNotifyId(notify.getId());
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records1.setReportNotifyFlag(1);
                     }
+                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                        records1.setReportAuditNotifyFlag(1);
+                    }
                     break;
                 }
             }
@@ -361,9 +364,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             for (WorkProjectNotify notify: recordNotifyList) {
                 if(notify.getNotifyId().equals(records1.getPrrId())){
                     records1.setReportNotifyId(notify.getId());
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records1.setRecordNotifyFlag(1);
                     }
+                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                        records1.setRecordAuditNotifyFlag(1);
+                    }
                     break;
                 }
             }
@@ -371,9 +377,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             for (WorkProjectNotify notify: reportedNotifyList) {
                 if(notify.getNotifyId().equals(records1.getId())){
                     records1.setReportNotifyId(notify.getId());
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records1.setReportedNotifyFlag(1);
                     }
+                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                        records1.setReportedAuditNotifyFlag(1);
+                    }
                     break;
                 }
             }
@@ -589,10 +598,13 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         //父节点的pid设置为0
         projectRecordTreeData.setPid("0");
         projectRecordTreeData.setReportNotifyFlag(info.getReportNotifyFlag());
+        projectRecordTreeData.setReportAuditNotifyFlag(info.getReportAuditNotifyFlag());
         projectRecordTreeData.setReportNotifyId(info.getReportNotifyId());
         projectRecordTreeData.setRecordNotifyFlag(info.getRecordNotifyFlag());
+        projectRecordTreeData.setRecordAuditNotifyFlag(info.getRecordAuditNotifyFlag());
         projectRecordTreeData.setRecordNotifyId(info.getRecordNotifyId());
         projectRecordTreeData.setReportedNotifyFlag(info.getReportedNotifyFlag());
+        projectRecordTreeData.setReportedAuditNotifyFlag(info.getReportedAuditNotifyFlag());
         projectRecordTreeData.setReportedNotifyId(info.getReportedNotifyId());
         projectRecordTreeData.setNewReportNotifyFlag(info.getNewReportNotifyFlag());
         projectRecordTreeData.setNewReportAuditNotifyFlag(info.getNewReportAuditNotifyFlag());
@@ -604,7 +616,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         projectRecordTreeData.setNewReportedNotifyFlag(info.getNewReportedNotifyFlag());
         projectRecordTreeData.setSubmitMoney(info.getSubmitMoney());
         projectRecordTreeData.setSubmitMoneyStr(DictUtils.getMainDictLabel(info.getSubmitMoney(),"attachment_project_grade",""));
-
+        projectRecordTreeData.setEmergencyProject(info.getEmergencyProject());
         return projectRecordTreeData;
     }
     private ProjectRecordTreeData getSubInfo(SubProjectInfo reportData){

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -1394,25 +1394,11 @@ public class RuralCostProjectMessageController extends BaseController {
 
         //获取项目信息
         RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
-        //根据条件查询附件必填项
-        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
-        //Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
-
-        /*Boolean flag = false;
-        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
-        if(1 == projectSort || null != projectReportRecord.getReport().getReviewFee()){
-            flag = true;
-        }
-        if(flag) {*/
-            ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
-            //添加项目类型
-            relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
-            relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
-            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
-            //if(0 == projectSort){
-                //查看送审金额是否为500w以上金额
-//                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
-//        approvalMoney = 2;
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+        relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
         if(StringUtils.isBlank(money)){
@@ -1434,66 +1420,71 @@ public class RuralCostProjectMessageController extends BaseController {
                 relateInfo.setAttachmentProjectApprovalMoney("2");
                 break;
         }
-            /*}else{
-                relateInfo.setAttachmentProjectApprovalMoney(null);
-            }*/
 
-            //添加报告类型
-            relateInfo.setRequiredStage(2);
-            relateInfo.setId(ruralProjectRecords.getId());
-            //查询报告文件、依据性文件、其他文件必填列表以及数据
-            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-            for (MainDictDetail mainDict : mainDictDetails) {
-                relateInfo.setAttachType(mainDict.getValue());
-                switch (mainDict.getValue()) {
-                    case "11":
-                        List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
-                        for (ProjectTemplateInfo info: fileAttachmentList) {
-                            info.setAttachTypes(info.getAttachTypes().toLowerCase());
-                            if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
-                                if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
-                                    if(!info.getAttachTypes().contains("zip")){
-                                        info.setAttachTypes(info.getAttachTypes()+",zip");
-                                    }
-                                    if(!info.getAttachTypes().contains("rar")){
-                                        info.setAttachTypes(info.getAttachTypes()+",rar");
-                                    }
+        //添加报告类型
+        relateInfo.setRequiredStage(2);
+        relateInfo.setId(ruralProjectRecords.getId());
+        //查询报告文件、依据性文件、其他文件必填列表以及数据
+        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+        for (MainDictDetail mainDict : mainDictDetails) {
+            relateInfo.setAttachType(mainDict.getValue());
+            switch (mainDict.getValue()) {
+                case "11":
+                    List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: fileAttachmentList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                            if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
                                 }
                             }
                         }
-                        projectReportRecord.setFileAttachmentList(fileAttachmentList);
-                        break;
-                    case "12":
-                        List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
-                        for (ProjectTemplateInfo info: projectTemplateList) {
-                            info.setAttachTypes(info.getAttachTypes().toLowerCase());
-                            if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
-                                if("投标文件、中标通知书、工程承包合同（协议书记专用条款部分）、补充协议".equals(info.getAttachName()) || "送审工程预算、结算书".equals(info.getAttachName()) ){
-                                    if(!info.getAttachTypes().contains("zip")){
-                                        info.setAttachTypes(info.getAttachTypes()+",zip");
-                                    }
-                                    if(!info.getAttachTypes().contains("rar")){
-                                        info.setAttachTypes(info.getAttachTypes()+",rar");
-                                    }
+                    }
+                    projectReportRecord.setFileAttachmentList(fileAttachmentList);
+                    break;
+                case "12":
+                    List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: projectTemplateList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                            if("投标文件、中标通知书、工程承包合同（协议书记专用条款部分）、补充协议".equals(info.getAttachName()) || "送审工程预算、结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
                                 }
                             }
                         }
-                        projectReportRecord.setFileGistdataList(projectTemplateList);
-                        break;
-                    case "13":
-                        projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                        break;
-                }
-
+                    }
+                    projectReportRecord.setFileGistdataList(projectTemplateList);
+                    break;
+                case "13":
+                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    break;
             }
-        //}
 
+        }
+        ProjectRecords projectRecords = new ProjectRecords();
+        try {
+            MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords, projectRecords);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //获取合同信息
+        WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
+        projectRecords.setWorkContractInfo(projectContractInfo);
+        projectReportRecord.getReport().setProject(projectRecords);
         projectReportRecord.setView("modify");
         model.addAttribute("projectReportRecord", projectReportRecord);
+        model.addAttribute("workClientInfoName", projectReportRecord.getClientName());
         model.addAttribute("project", projectReportRecord.getReport().getProject());
-        if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("view")){
-            return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
-        }else if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("modiftApply")){
+
+        if(StringUtils.isNotBlank(projectReportRecord.getProcessInstanceId())){
             ProcessInstance processInstance = actTaskService.getProcIns(projectReportRecord.getProcessInstanceId());
             if (processInstance!=null) {
                 Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
@@ -1506,8 +1497,15 @@ public class RuralCostProjectMessageController extends BaseController {
                 act.setTask(taskInfok);
                 projectReportRecord.setAct(act);
             }
+        }
+        if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("view")){
+            return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
+        }else if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("modiftApply")){
             return "modules/projectcontentinfo/projectReportRecordModiftApply";
         }
+        if("1".equals(projectReportRecord.getStatus()) || "3".equals(projectReportRecord.getStatus())){
+            return "modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm";
+        }
         return "modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify";
     }
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -30,6 +30,7 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageNewService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
@@ -92,6 +93,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
     private RuralProjectMessageService ruralProjectMessageS;
     @Autowired
     private ProjectReportDataDao projectReportDataDao;
+    @Autowired
+    private UserDao userDao;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -229,7 +232,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         }
 
         //查询总审人员信息
-        List<User> auditUserList = userService.getAuditUserList();
+        List<User> auditUserList = userService.getAuditUserListByType(records.getSubmitMoney());
         records.setBzshbUserList(auditUserList);
         if(null == projectcontentinfo.getProjectReportData().getConsultant()){
             projectcontentinfo.getProjectReportData().setConsultant(UserUtils.getUser());
@@ -546,7 +549,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
 //                }
             }
             String str = ruralProjectMessageService.saveData(projectcontentinfo,2);
-            addMessage(redirectAttributes, "发起报告审批"+(str.equals("true")?"成功":"失败"));
+            addMessage(redirectAttributes, "发起质量复核"+(str.equals("true")?"成功":"失败"));
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
@@ -560,7 +563,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
-        addMessage(redirectAttributes, "发起报告审批失败");
+        addMessage(redirectAttributes, "发起发起质量复核失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
         return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
     }
@@ -1457,7 +1460,11 @@ public class RuralCostProjectMessageNewController extends BaseController {
                         //查询报告信息
                         ProjectReportData projectReportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
                         //查询报告审核总审人员
-                        User zsUser = UserUtils.get(projectReportData.getBzshbUserId());
+                        String bzshbUserId = userDao.getAuditUserListByBzshbUserId(projectReportData.getBzshbUserId());
+                        User zsUser = null;
+                        if(org.apache.commons.lang3.StringUtils.isNotBlank(bzshbUserId)){
+                            zsUser = UserUtils.get(bzshbUserId);
+                        }
                         users = Lists.newArrayList();
                         users.add(zsUser);
                     }else{

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -1407,28 +1407,14 @@ public class RuralProjectMessageController extends BaseController {
             projectReportRecord.setCreateDate(new Date());
             projectReportRecord.setCreateBy(UserUtils.getUser());
         }
-        projectReportRecord.setView("modify");
+
         //获取项目信息
         RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
-        //根据条件查询附件必填项
-        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
-        /*Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
-
-        Boolean flag = false;
-        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
-        if(1 == projectSort || null != projectReportRecord.getReport().getReviewFee()){
-            flag = true;
-        }
-        if(flag) {*/
-            ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
-            //添加项目类型
-            relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
-            relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
-            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
-            //if(0 == projectSort){
-                //查看送审金额是否为500w以上金额
-//                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
-//        approvalMoney = 2;
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+        relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
         if(StringUtils.isBlank(money)){
@@ -1450,65 +1436,71 @@ public class RuralProjectMessageController extends BaseController {
                 relateInfo.setAttachmentProjectApprovalMoney("2");
                 break;
         }
-            /*}else{
-                relateInfo.setAttachmentProjectApprovalMoney(null);
-            }*/
 
-            //添加报告类型
-            relateInfo.setRequiredStage(2);
-            relateInfo.setId(ruralProjectRecords.getId());
-            //查询报告文件、依据性文件、其他文件必填列表以及数据
-            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-            for (MainDictDetail mainDict : mainDictDetails) {
-                relateInfo.setAttachType(mainDict.getValue());
-                switch (mainDict.getValue()) {
-                    case "11":
-                        List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
-                        for (ProjectTemplateInfo info: fileAttachmentList) {
-                            info.setAttachTypes(info.getAttachTypes().toLowerCase());
-                            if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
-                                if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
-                                    if(!info.getAttachTypes().contains("zip")){
-                                        info.setAttachTypes(info.getAttachTypes()+",zip");
-                                    }
-                                    if(!info.getAttachTypes().contains("rar")){
-                                        info.setAttachTypes(info.getAttachTypes()+",rar");
-                                    }
+        //添加报告类型
+        relateInfo.setRequiredStage(2);
+        relateInfo.setId(ruralProjectRecords.getId());
+        //查询报告文件、依据性文件、其他文件必填列表以及数据
+        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+        for (MainDictDetail mainDict : mainDictDetails) {
+            relateInfo.setAttachType(mainDict.getValue());
+            switch (mainDict.getValue()) {
+                case "11":
+                    List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: fileAttachmentList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                            if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
                                 }
                             }
                         }
-                        projectReportRecord.setFileAttachmentList(fileAttachmentList);
-                        break;
-                    case "12":
-                        List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
-                        for (ProjectTemplateInfo info: projectTemplateList) {
-                            info.setAttachTypes(info.getAttachTypes().toLowerCase());
-                            if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
-                                if("投标文件、中标通知书、工程承包合同（协议书记专用条款部分）、补充协议".equals(info.getAttachName()) || "送审工程预算、结算书".equals(info.getAttachName()) ){
-                                    if(!info.getAttachTypes().contains("zip")){
-                                        info.setAttachTypes(info.getAttachTypes()+",zip");
-                                    }
-                                    if(!info.getAttachTypes().contains("rar")){
-                                        info.setAttachTypes(info.getAttachTypes()+",rar");
-                                    }
+                    }
+                    projectReportRecord.setFileAttachmentList(fileAttachmentList);
+                    break;
+                case "12":
+                    List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: projectTemplateList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                            if("投标文件、中标通知书、工程承包合同（协议书记专用条款部分）、补充协议".equals(info.getAttachName()) || "送审工程预算、结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
                                 }
                             }
                         }
-                        projectReportRecord.setFileGistdataList(projectTemplateList);
-                        break;
-                    case "13":
-                        projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                        break;
-                }
-
+                    }
+                    projectReportRecord.setFileGistdataList(projectTemplateList);
+                    break;
+                case "13":
+                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    break;
             }
-        //}
 
+        }
+        ProjectRecords projectRecords = new ProjectRecords();
+        try {
+            MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords, projectRecords);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //获取合同信息
+        WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
+        projectRecords.setWorkContractInfo(projectContractInfo);
+        projectReportRecord.getReport().setProject(projectRecords);
+        projectReportRecord.setView("modify");
         model.addAttribute("projectReportRecord", projectReportRecord);
+        model.addAttribute("workClientInfoName", projectReportRecord.getClientName());
         model.addAttribute("project", projectReportRecord.getReport().getProject());
-        if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("view")){
-            return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
-        }else if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("modiftApply")){
+
+        if(StringUtils.isNotBlank(projectReportRecord.getProcessInstanceId())){
             ProcessInstance processInstance = actTaskService.getProcIns(projectReportRecord.getProcessInstanceId());
             if (processInstance!=null) {
                 Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
@@ -1521,8 +1513,18 @@ public class RuralProjectMessageController extends BaseController {
                 act.setTask(taskInfok);
                 projectReportRecord.setAct(act);
             }
+        }
+
+        model.addAttribute("projectReportRecord", projectReportRecord);
+        model.addAttribute("project", projectReportRecord.getReport().getProject());
+        if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("view")){
+            return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
+        }else if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("modiftApply")){
             return "modules/projectcontentinfo/projectReportRecordModiftApply";
         }
+        if("1".equals(projectReportRecord.getStatus()) || "3".equals(projectReportRecord.getStatus())){
+            return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordForm";
+        }
         return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordModify";
     }
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java

@@ -31,6 +31,7 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageNewService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
@@ -97,6 +98,8 @@ public class RuralProjectMessageNewController extends BaseController {
     private RuralProjectMessageService ruralProjectMessageS;
     @Autowired
     private ProjectReportDataDao projectReportDataDao;
+    @Autowired
+    private UserDao userDao;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -235,7 +238,7 @@ public class RuralProjectMessageNewController extends BaseController {
         }
 
         //查询总审人员信息
-        List<User> auditUserList = userService.getAuditUserList();
+        List<User> auditUserList = userService.getAuditUserListByType(records.getSubmitMoney());
         records.setBzshbUserList(auditUserList);
         if(null == projectcontentinfo.getProjectReportData().getConsultant()){
             projectcontentinfo.getProjectReportData().setConsultant(UserUtils.getUser());
@@ -552,7 +555,7 @@ public class RuralProjectMessageNewController extends BaseController {
             }
             String str = ruralProjectMessageService.saveData(projectcontentinfo,2);
             if(str.equals("true") || str.equals("false")){
-                addMessage(redirectAttributes, "发起报告审批"+(str.equals("true")?"成功":"失败"));
+                addMessage(redirectAttributes, "发起质量复核"+(str.equals("true")?"成功":"失败"));
             } else{
                 addMessage(redirectAttributes, str);
             }
@@ -569,7 +572,7 @@ public class RuralProjectMessageNewController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
-        addMessage(redirectAttributes, "发起报告审批失败");
+        addMessage(redirectAttributes, "发起发起质量复核失败");
         return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
     }
 
@@ -1462,7 +1465,11 @@ public class RuralProjectMessageNewController extends BaseController {
                         //查询报告信息
                         ProjectReportData projectReportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
                         //查询报告审核总审人员
-                        User zsUser = UserUtils.get(projectReportData.getBzshbUserId());
+                        String bzshbUserId = userDao.getAuditUserListByBzshbUserId(projectReportData.getBzshbUserId());
+                        User zsUser = null;
+                        if(org.apache.commons.lang3.StringUtils.isNotBlank(bzshbUserId)){
+                            zsUser = UserUtils.get(bzshbUserId);
+                        }
                         users = Lists.newArrayList();
                         users.add(zsUser);
                     }else{

src/main/java/com/jeeplus/modules/sys/dao/UserDao.java

@@ -278,4 +278,25 @@ public interface UserDao extends CrudDao<User> {
 	 * @return
 	 */
 	public List<User> findUserByOfficeIdAndNameOnReportedZXY(User user);
+
+
+	/**
+	 * 根据项目等级查询总审人员信息(真实总审)
+	 * @param
+	 * @return
+	 */
+	public List<User> getAuditUserListByProjectGrade();
+	/**
+	 * 根据项目报告总审人员id查询对应的真实总审信息
+	 * @param
+	 * @return
+	 */
+	String getAuditUserListByBzshbUserId(String bzshbUserId);
+
+	/**
+	 * 根据真实总审id查询对应的所有总审id
+	 * @param relevanceUserId
+	 * @return
+	 */
+	List<String> getAuditUserListByRelevanceUserId(@Param("relevanceUserId") String relevanceUserId);
 }

src/main/java/com/jeeplus/modules/sys/service/UserService.java

@@ -568,4 +568,21 @@ public class UserService extends BaseController {
         List<User> userList = UserUtils.getByRoleActivityEnname("xxgdydyhu",3,recordsOffice.getId(),"10",UserUtils.getUser());
         return userList;
     }
+    /**
+     * 根据项目等级查询总审人员信息(真是总审、虚拟总审)
+     * @return
+     */
+    public List<User> getAuditUserListByType(String projectGrade){
+        Office recordsOffice =officeService.get(UserUtils.getUser().getOffice());
+        List<User> userList = UserUtils.getAuditUserList("bzshb",3,recordsOffice.getId(),"12",UserUtils.getUser());
+        switch (projectGrade){
+            case "2"://真实总审
+                userList = userDao.getAuditUserListByProjectGrade();
+                break;
+            case "1"://真实或虚拟总审
+                break;
+        }
+        return userList;
+    }
+
 }

src/main/resources/mappings/modules/bzshbExamin/BzshbExaminDao.xml

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.bzshbExamine.dao.BzshbExaminDao">
+
+	<sql id="projectRecordsColumns">
+
+	</sql>
+
+	<sql id="projectRecordsJoins">
+		LEFT JOIN sys_area area ON area.id = a.area_id
+	</sql>
+
+	<select id="findList" resultType="com.jeeplus.modules.bzshbExamine.entity.BzshbExaminInfo" >
+		select wpu.user_id as "userId", su.name as "userName",count(a.create_by) as "projectAllNumber"
+		from project_report_data a
+		left join work_project_user wpu on wpu.project_id = a.project_id
+		left join sys_user su on su.id = wpu.user_id
+		left join rural_project_records rpr on rpr.id = a.project_id
+		where a.bzshb_user_id in
+			<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
+				#{auditUserId}
+			</foreach>
+		and rpr.emergency_project = '1' and a.del_flag = 0
+		and a.status = 5
+		and wpu.is_master = 1
+		<if test="startDate != null and endDate != null and startDate != '' and endDate != ''">
+			AND a.audit_pass_date BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
+		</if>
+		<if test="(userId != null and userId != '') or (userName != null and userName != '')">
+			AND (wpu.user_id = #{userId} or su.name like concat('%',#{userName},'%'))
+		</if>
+		group by wpu.user_id
+		order by a.audit_pass_date desc
+	</select>
+
+    <select id="queryCount" resultType="int" >
+        select count(1)
+		from (
+		select wpu.user_id as "userId", su.name as "userName",count(a.create_by) as "projectAllNumber"
+		from project_report_data a
+		left join work_project_user wpu on wpu.project_id = a.project_id
+		left join sys_user su on su.id = wpu.user_id
+		left join rural_project_records rpr on rpr.id = a.project_id
+		where a.bzshb_user_id in
+			<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
+				#{auditUserId}
+			</foreach>
+		and rpr.emergency_project = '1' and a.del_flag = 0
+		and a.status = 5
+		and wpu.is_master = 1
+		<if test="startDate != null and endDate != null and startDate != '' and endDate != ''">
+			AND a.audit_pass_date BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
+		</if>
+		<if test="(userId != null and userId != '') or (userName != null and userName != '')">
+			AND (wpu.user_id = #{userId} or su.name like concat('%',#{userName},'%'))
+		</if>
+		group by wpu.user_id) z
+    </select>
+
+	<select id="getProjectNumber" resultType="java.lang.Integer">
+		select count(1) from project_report_data a
+		left join work_project_user wpu on wpu.project_id = a.project_id
+		where wpu.user_id = #{userId} and wpu.is_master = 1
+		and a.examin_flag = 1 and a.status = 5
+		and a.del_flag = 0
+	</select>
+
+	<select id="getProjectAllCount" resultType="java.lang.Integer">
+
+		select count(1) from project_report_data a
+		left join work_project_user wpu on wpu.project_id = a.project_id
+		left join rural_project_records rpr on rpr.id = a.project_id
+		where wpu.user_id = #{userId} and rpr.emergency_project = '1'
+		and a.del_flag = 0 and wpu.is_master = 1 and a.status = 5
+		<if test="startDate != null and endDate != null and startDate != '' and endDate != ''">
+			AND a.audit_pass_date BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
+		</if>
+	</select>
+
+	<select id="getProjectCount" resultType="java.lang.Integer">
+		select count(1) from project_report_data a
+		left join work_project_user wpu on wpu.project_id = a.project_id
+		where wpu.user_id = #{userId}
+		and a.examin_flag = 1
+		and a.del_flag = 0 and wpu.is_master = 1 and a.status = 5
+		<if test="startDate != null and endDate != null and startDate != '' and endDate != ''">
+			AND a.audit_pass_date BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
+		</if>
+	</select>
+
+	<select id="getProjectRecordsByMasterUser" resultType="com.jeeplus.modules.bzshbExamine.entity.BzshbExaminInfo">
+		select a.id as "projectId",
+			a.project_name as "projectName",
+			a.create_date as "createDate",
+			a.create_by as "createBy.id",
+			wpu.user_id as "userId",
+			su.name as "createName",
+			suw.name as "masterName",
+			prd.examin_flag as "examinFlag",
+			if(prd.examin_flag=1,"已查","未查") as examinFlagStr
+		from rural_project_records a
+		left join work_project_user wpu on wpu.project_id = a.id
+		left join project_report_data prd on prd.project_id = a.id
+		left join sys_user su on su.id = a.create_by
+		left join sys_user suw on suw.id =wpu.user_id
+		where wpu.user_id = #{userId}
+		and a.emergency_project = '1'
+
+		<if test="projectName != null and projectName != ''">
+			AND a.project_name like concat('%',#{projectName},'%')
+		</if>
+		<if test="startDate != null and endDate != null and startDate != '' and endDate != ''">
+			AND a.create_date BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
+		</if>
+		order by a.create_date desc
+	</select>
+
+	<select id="getProjectCountByMasterUser" resultType="java.lang.Integer">
+		select count(1)
+		from rural_project_records a
+		left join work_project_user wpu on wpu.project_id = a.id
+		left join project_report_data prd on prd.project_id = a.id
+		left join sys_user su on su.id = a.create_by
+		left join sys_user suw on suw.id =wpu.user_id
+		where wpu.user_id = #{userId}
+		and a.emergency_project = '1'
+		<if test="projectName != null and projectName != ''">
+			AND a.project_name like concat('%',#{projectName},'%')
+		</if>
+		<if test="startDate != null and endDate != null and startDate != '' and endDate != ''">
+			AND a.create_date BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
+		</if>
+	</select>
+</mapper>

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -44,7 +44,8 @@
 		a.install_unit_fees AS "installUnitFees",
 		a.total_fees AS "totalFees",
 		ifnull(a.reported_state,0) as "reportedState",
-		a.over_due_status as "overDueStatus"
+		a.over_due_status as "overDueStatus",
+		a.emergency_project as "emergencyProject"
 	</sql>
 
 	<sql id="projectReportDataColumns">

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -1249,4 +1249,34 @@
 		WHERE a.company_id = #{companyId} AND a.del_flag = 0
 	</select>
 
+	<select id="getAuditUserListByProjectGrade" resultType="User">
+		SELECT
+		a.id,a.name,a.photo,a.login_name AS "loginName"
+		FROM sys_user a
+		JOIN sys_user_role ur ON ur.user_id = a.id
+		JOIN project_audit_user_info pau ON pau.user_id = a.id
+		JOIN sys_role r ON ur.role_id = r.id
+		WHERE a.office_id is not null and pau.real_flag=1
+		order by a.name = '郑炎基' desc
+				,a.name = '王年生' desc
+				,a.name = '秦美' desc
+	</select>
+
+	<select id="getAuditUserListByBzshbUserId" resultType="java.lang.String">
+		SELECT
+		a.relevance_user_id
+		FROM project_audit_user_info a
+		WHERE a.user_id = #{bzshbUserId}
+	</select>
+
+	<select id="getAuditUserListByRelevanceUserId" resultType="java.lang.String">
+		SELECT
+		a.user_id
+		FROM project_audit_user_info a
+		<where>
+			<if test="null != relevanceUserId and '' != relevanceUserId">
+				and a.relevance_user_id = #{relevanceUserId}
+			</if>
+		</where>
+	</select>
 </mapper>

src/main/webapp/webpage/modules/bzshbExamin/bzshbEaminUserProjectList.jsp

@@ -0,0 +1,378 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>子项目列表</title>
+	<meta name="decorator" content="default"/>
+	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
+	<script type="text/javascript">
+        $(document).ready(function() {
+			//搜索框收放
+			$('#moresee').click(function(){
+				if($('#moresees').is(':visible'))
+				{
+					$('#moresees').slideUp(0,resizeListWindow2);
+					$('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+				}else{
+					$('#moresees').slideDown(0,resizeListWindow2);
+					$('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+				}
+			});
+			laydate.render({
+				elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+        });
+
+        function reset() {
+            $("#searchForm").resetForm();
+        }
+        function openDialog(title,url,width,height,target,formId,tableId) {
+
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端，根据用户设置的width和height显示。
+
+            }
+
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"two-btns",
+				maxmin: false, //开启最大化最小化按钮
+				content: url ,
+				btn: ['确定','关闭'],
+				yes: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					inputForm.attr("action","${ctx}/subProject/subProject/save");//表单提交成功后，从服务器返回的url在当前tab中展示
+					var $document = iframeWin.contentWindow.document;
+
+					formSubmit2($document,formId,index,tableId);
+
+				},
+				cancel: function(index){
+				}
+			});
+        }
+
+			function formSubmit2($document,inputForm,index,tableId){
+
+				var validateForm = $($document.getElementById(inputForm)).validate({
+					submitHandler: function(form){
+						loading('正在提交，请稍等...');
+						form.submit();
+					},
+					errorContainer: "#messageBox",
+					errorPlacement: function(error, element) {
+						$($document.getElementById("#messageBox")).text("输入有误，请先更正。");
+						if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+							error.appendTo(element.parent().parent());
+						} else {
+							error.insertAfter(element);
+						}
+					}
+				});
+				if(validateForm.form()){
+					$($document.getElementById(inputForm)).ajaxSubmit({
+						success:function(data) {
+							var d = data;
+							//输出提示信息
+							if(d.str.length>0){
+								parent.layer.msg(d.str,{icon:1});
+							}
+							window.location.reload();
+							//关闭当前页
+							top.layer.close(index)
+						}
+					});
+				}
+			}
+        function openDialogre(title,url,width,height,target,formId,tableId) {
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"two-btns",
+				maxmin: false, //开启最大化最小化按钮
+				content: url ,
+				btn: ['确定','关闭'],
+				yes: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					inputForm.attr("action","${ctx}/subProject/subProject/save");//表单提交成功后，从服务器返回的url在当前tab中展示
+					var $document = iframeWin.contentWindow.document;
+
+					formSubmit2($document,formId,index,tableId);
+
+				},
+				cancel: function(index){
+				}
+			});
+        }
+
+		// 确认对话框
+		function subConfirmx(mess, href, closed){
+
+			top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+				//do something
+				if (typeof href == 'function') {
+					href();
+				}else{
+					$.ajax({
+						type:"post",
+						url:href,
+						dataType:"json",
+						success:function(data){
+							if(data.success) {
+								top.layer.msg(data.str, {icon: 1});
+								window.location.reload();
+							}else {
+								top.layer.msg(data.str, {icon: 0});
+							}
+						}
+					})
+				}
+				top.layer.close(index);
+			});
+			return false;
+		}
+
+		function btnImport(){
+			var parentProId = $("#parentProId").val();
+			top.layer.open({
+				type: 2,
+				area: ['25%', '50%'],
+				title: "上传文件",
+				content: "${ctx}/subProject/subProject/importFile?parentProId="+parentProId+"&projectType=${subProjectInfo.projectType}",
+				//  btn: ['确定', '关闭'],
+				yes: function (index, layero) {
+					var body = top.layer.getChildFrame('body', index);
+					var inputForm = body.find('#inputForm');
+					var top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					inputForm.attr("target", top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					inputForm.validate();
+					if (inputForm.valid()) {
+						loading("正在提交，请稍等...");
+						inputForm.submit();
+					} else {
+						return;
+					}
+					top.layer.close(index);//关闭对话框。
+				},
+				cancel: function (index) {
+				}
+				,end: function () {
+					location.reload();
+				}
+			});
+		}
+
+		function btnImportTable(){
+			var parentProId = $("#parentProId").val();
+			top.layer.open({
+				type: 2,
+				area: ['25%', '50%'],
+				title: "上传文件",
+				content: "${ctx}/subProject/subProject/exportTableFile?parentProId="+parentProId+"&projectType=${subProjectInfo.projectType}",
+				//  btn: ['确定', '关闭'],
+				yes: function (index, layero) {
+					var body = top.layer.getChildFrame('body', index);
+					var inputForm = body.find('#inputForm');
+					var top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					inputForm.attr("target", top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					inputForm.validate();
+					if (inputForm.valid()) {
+						loading("正在提交，请稍等...");
+						inputForm.submit();
+					} else {
+						return;
+					}
+					top.layer.close(index);//关闭对话框。
+				},
+				cancel: function (index) {
+				}
+				,end: function () {
+					location.reload();
+				}
+			});
+		}
+
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="bzshbExaminInfo" action="${ctx}/bzshbExamin/bzshbExamin/formList?id=${bzshbExaminInfo.id}&userId=${bzshbExaminInfo.userId}" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目名称：</label>
+							<div class="layui-input-block">
+								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">创建时间：</label>
+							<div class="layui-input-block">
+								<input id="startDate" name="startDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${bzshbExaminInfo.startDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${bzshbExaminInfo.endDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+							</div>
+						</div>
+						<div class="layui-item fr">
+							<div class="input-group">
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm  layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
+								</div>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+					<div id="moresees" style="clear:both;display:none;" class="lw6">
+
+						<div style="clear:both;"></div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<div class="layui-btn-group ">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新">&nbsp;刷新</button>
+					</div>
+					<div style="clear: both;"></div>
+				</div>
+				<table class="oa-table layui-table" id="contentTable1"></table>
+
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
+			</div>
+		</div>
+	</div>
+	<div id="changewidth"></div>
+</div>
+
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+    layui.use('table', function(){
+        layui.table.render({
+            limit:${ page.pageSize }
+            ,elem: '#contentTable1'
+            ,page: false
+            ,cols: [[
+                // {checkbox: true, fixed: true},
+                {field:'index',align:'center', title: '序号',width:40}
+                ,{field:'projectName',align:'center', title: '项目名称',templet:function(d){
+                        return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.projectId +"','95%', '95%')\">" + d.projectName + "</a>";
+                    }}
+				,{field:'createDate',align:'center', title: '创建时间'}
+				,{field:'createName',align:'center', title: '创建人'}
+				,{field:'masterName',align:'center', title: '责任人'}
+				,{field:'examinFlagStr',align:'center', title: '抽查状态'}
+				,{field:'randomScore',align:'center', title: '抽查分数'}
+                ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
+                        ////对操作进行初始化
+                        var xml="";
+						if(d.examine != undefined && d.examine !=null && "" != d.examine && d.examine == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"openDialogre('项目评分', '${ctx}/bzshbExamin/bzshbExamin/bzshbExamineForm?projectId=" + d.projectId + "','95%', '95%','','inputForm','layui-border-box')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 抽查</a>";
+						}else{
+							xml+="<a href=\"#\" onclick=\"openDialogView('查看项目', '${ctx}/bzshbExamin/bzshbExamin/bzshbExamineForm?projectId=" + d.projectId + "&view=view','95%', '95%','','inputForm','layui-border-box')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 查看</a>";
+						}
+                        return xml;
+
+                    }}
+            ]]
+            ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="bzshbExamin" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "index":"${index.index+1}"
+                    ,"id":"${bzshbExamin.id}"
+                    ,"projectId":"${bzshbExamin.projectId}"
+					,"createDate":"<fmt:formatDate value="${bzshbExamin.createDate}" pattern="yyyy-MM-dd"/>"
+                    ,"projectName":"<c:out value="${bzshbExamin.projectName}" escapeXml="true"/>"
+					,"createName":"${bzshbExamin.createName}"
+					,"masterName":"${bzshbExamin.masterName}"
+					,"examinFlagStr":"${bzshbExamin.examinFlagStr}"
+					,"examinFlag":"${bzshbExamin.examinFlag}"
+					,"randomScore":"${bzshbExamin.examinFlag}"
+					,"examine":<c:choose><c:when test="${bzshbExamin.examinFlag == 0}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+				}
+                </c:forEach>
+                </c:if>
+            ]
+            // ,even: true
+            // ,height: 315
+        });
+    })
+
+    resizeListTable();
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/bzshbExamin/bzshbExaminList.jsp

@@ -0,0 +1,431 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<html>
+<head>
+	<title>检查列表</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+        $(document).ready(function() {
+
+            //搜索框收放
+            $('#moresee').click(function(){
+                if($('#moresees').is(':visible'))
+                {
+                    $('#moresees').slideUp(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+                }else{
+                    $('#moresees').slideDown(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+                }
+            });
+            laydate.render({
+                elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+, trigger: 'click'
+            });
+            laydate.render({
+                elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+, trigger: 'click'
+            });
+        });
+
+        function reset() {
+            $("#searchForm").resetForm();
+        }
+
+        function openDialog(title,url,width,height,target) {
+
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端，根据用户设置的width和height显示。
+
+            }
+
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url,
+                skin: 'three-btns',
+                btn: ['送审', '暂存', '关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }else {
+                        return false;
+                    }
+                },
+                btn3: function (index) {
+                }
+            });
+        }
+
+        function openDialogre(title,url,width,height,target,buttons) {
+
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端，根据用户设置的width和height显示。
+
+            }
+            var split = buttons.split(",");
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                skin: 'three-btns',
+                content: url,
+                btn: split,
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    if(split.length==2){return}
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }else {
+                        return false;
+                    }
+                },
+                btn3: function (index) {
+                }
+            });
+        }
+
+		//打开对话框(查看)
+		function openDialogReportView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
+
+
+
+		function openDialogreReport(title,url,id,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						var split = buttons.split(",");
+						top.layer.open({
+							type: 2,
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							skin: 'three-btns',
+							content: url,
+							btn: split,
+							btn1: function(index, layero){
+								var body = top.layer.getChildFrame('body', index);
+								var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+								var inputForm = body.find('#inputForm');
+								var top_iframe;
+								if(target){
+									top_iframe = target;//如果指定了iframe，则在改frame中跳转
+								}else{
+									top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+								}
+								inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+								if(iframeWin.contentWindow.doSubmit(1) ){
+									// top.layer.close(index);//关闭对话框。
+									setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+								}
+							},
+							btn2:function(index,layero){
+								if(split.length==2){return}
+								var body = top.layer.getChildFrame('body', index);
+								var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+								var inputForm = body.find('#inputForm');
+								var top_iframe;
+								if(target){
+									top_iframe = target;//如果指定了iframe，则在改frame中跳转
+								}else{
+									top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+								}
+								inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+								if(iframeWin.contentWindow.doSubmit(2) ){
+									// top.layer.close(index);//关闭对话框。
+									setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+								}else {
+									return false;
+								}
+							},
+							btn3: function (index) {
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+		}
+		function blurSubmitterId(obj) {
+			var id = $("#userId").val();
+			if(undefined != obj.value && null != obj.value && '' != obj.value){
+				$.ajax({
+					url:'${ctx}/sys/user/getUserByName?name='+obj.value,
+					type:"post",
+					success:function(data){
+						var user = data.body.data;
+						if(undefined == user || null == user || '' == user){
+							$("#userId").val("");
+						}else{
+							if(data.body.data.id != id){
+								if(undefined != id && null != id && '' != id){
+									$("#userId").val("");
+								}
+							}
+						}
+					}
+				});
+			}else{
+				$("#userId").val("");
+			}
+
+		}
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="bzshbExaminInfo" action="${ctx}/bzshbExamin/bzshbExamin/list" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+					<div class="commonQuery lw6">
+						<%--<div class="layui-item query athird">
+							<label class="layui-form-label">项目编号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="userId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目名称：</label>
+							<div class="layui-input-block">
+								<form:input path="userId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>--%>
+							<div class="layui-item query athird">
+								<label class="layui-form-label">责任人：</label>
+								<div class="layui-input-block with-icon">
+									<sys:inquireselectUserNotReadolnyTow id="user" name="user" value="${bzshbExaminInfo.userId}" labelName="userName" labelValue="${bzshbExaminInfo.userName}" cssStyle="background-color: #fff"
+																		 title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+								</div>
+							</div>
+							<div class="layui-item query athird ">
+								<label class="layui-form-label">创建时间：</label>
+								<div class="layui-input-block">
+									<input id="startDate" name="startDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+										   value="<fmt:formatDate value="${bzshbExaminInfo.startDate}" pattern="yyyy-MM-dd"/>"/>
+									</input>
+									<span class="group-sep">-</span>
+									<input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+										   value="<fmt:formatDate value="${bzshbExaminInfo.endDate}" pattern="yyyy-MM-dd"/>"/>
+									</input>
+								</div>
+							</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+					<div id="moresees" style="clear:both;display:none;" class="lw6">
+
+						<div style="clear:both;"></div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div style="clear: both;"></div>
+				</div>
+				<table class="oa-table layui-table" id="contentTable1"></table>
+
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
+			</div>
+		</div>
+	</div>
+	<div id="changewidth"></div>
+</div>
+
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+    layui.use('table', function(){
+        layui.table.render({
+            limit:${ page.pageSize }
+            ,elem: '#contentTable1'
+            ,page: false
+            ,cols: [[
+                // {checkbox: true, fixed: true},
+                {field:'index',align:'center', fixed: 'left', title: '序号',width:40}
+                ,{field:'userName',align:'center', title: '项目责任人'}
+                ,{field:'projectAllNumber',align:'center', title: '总项目数'}
+                ,{field:'projectNumber',align:'center', title: '总抽查数'}
+                ,{field:'sumPercent',align:'center', title: '总抽查率(%)'}
+
+                ,{field:'projectAllCount',align:'center', title: '当前项目数'}
+                ,{field:'projectCount',align:'center', title: '当前抽查数'}
+                ,{field:'percent',align:'center', title: '当前抽查率(%)'}
+                ,{field:'op',align:'center',title:"操作", fixed: 'right',width:100,templet:function(d){
+                        ////对操作进行初始化
+                        var xml="";
+						xml+="<a href=\"#\" onclick=\"openDialogView('查看', '${ctx}/bzshbExamin/bzshbExamin/formList?id=" + d.id + "&userId=" + d.userId + "','95%', '95%','','查看,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 查看</a>";
+                        return xml;
+
+                    }}
+            ]]
+            ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="bzshbExamin" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "index":"${index.index+1}"
+                    ,"id":"${bzshbExamin.id}"
+                    ,"userId":"${bzshbExamin.userId}"
+                    ,"userName":"${bzshbExamin.userName}"
+					,"startDate":"<fmt:formatDate value="${bzshbExamin.startDate}" pattern="yyyy-MM-dd"/>"
+					,"endDate":"<fmt:formatDate value="${bzshbExamin.endDate}" pattern="yyyy-MM-dd"/>"
+                    ,"projectAllNumber":"${bzshbExamin.projectAllNumber}"
+                    ,"projectNumber":"${bzshbExamin.projectNumber}"
+                    ,"sumPercent":"${bzshbExamin.sumPercent}"
+                    ,"projectAllCount":"${bzshbExamin.projectAllCount}"
+                    ,"projectCount":"${bzshbExamin.projectCount}"
+                    ,"percent":"${bzshbExamin.percent}"
+                }
+                </c:forEach>
+                </c:if>
+            ]
+        });
+    })
+
+    resizeListTable();
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -28,12 +28,11 @@
 		}
 	</style>
 	<script type="text/javascript">
-        var validateForm;
+		var validateForm;
 		function listTr(obj){
 			var name=$(obj).attr("id");
 			var tiao="."+name;
 			var span=$(obj).find("td").eq(2);
-			// var ss=$(span).val().split(" ")[4];
 			$(span).toggle(function () {
 				$(tiao).hide();
 				$(span).find("span").eq(0).attr("class","default_shut")
@@ -42,140 +41,94 @@
 				$(span).find("span").eq(0).attr("class","default_open")
 			});
 		}
-        function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
-            if(validateForm.form()){
+		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			if(validateForm.form()){
 				var projectId = '${project.id}';
 				var boolFlag = true;
-					if(obj == 2){
-						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/holdSaveRecord");
-					}else{
-						var leng = $("#file_attachment tr").length;
-						for(var i=0; i<leng; i++) {
-							var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
-							var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
-							var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
+				if(obj == 2){
+					$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/holdSaveRecord");
+				}else{
+					var leng = $("#file_attachment tr").length;
+					for(var i=0; i<leng; i++) {
+						var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
+						var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+						var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
+						if(second == 1){
+							if(numberStr != undefined && numberStr !=null && numberStr !=''){
+								if (fileFlag==1){
+
+								}else{
+									top.layer.msg("请上传成果文件！", {icon: 0});
+									return false;
+								}
+							}
+						}
+					}
+					if(boolFlag){
+						var gistdata = $("#file_gistdata tr").length;
+						for(var i=0; i<gistdata; i++) {
+							var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+							var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+							var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
 							if(second == 1){
 								if(numberStr != undefined && numberStr !=null && numberStr !=''){
 									if (fileFlag==1){
 
 									}else{
-										top.layer.msg("请上传成果文件！", {icon: 0});
+										top.layer.msg("请上传依据性文件！", {icon: 0});
 										return false;
 									}
-									<%--$.ajax({--%>
-									<%--	type: 'post',--%>
-									<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-									<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-									<%--	dataType: "json",--%>
-									<%--	async: false--%>
-									<%--}).success(function (result) {--%>
-									<%--	if(result == 0){--%>
-									<%--		boolFlag = false;--%>
-									<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
-									<%--		return false;--%>
-									<%--	}--%>
-									<%--}).error(function () {--%>
-									<%--	top.layer.msg("文件载入失败！");--%>
-									<%--});--%>
 								}
 							}
 						}
-						if(boolFlag){
-							var gistdata = $("#file_gistdata tr").length;
-							for(var i=0; i<gistdata; i++) {
-								var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
-								var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
-								var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
-								if(second == 1){
-									if(numberStr != undefined && numberStr !=null && numberStr !=''){
-										if (fileFlag==1){
-
-										}else{
-											top.layer.msg("请上传依据性文件！", {icon: 0});
-											return false;
-										}
-										<%--$.ajax({--%>
-										<%--	type: 'post',--%>
-										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-										<%--	dataType: "json",--%>
-										<%--	async: false--%>
-										<%--}).success(function (result) {--%>
-										<%--	if(result == 0){--%>
-										<%--		boolFlag = false;--%>
-										<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
-										<%--		return false;--%>
-										<%--	}--%>
-										<%--}).error(function () {--%>
-										<%--	top.layer.msg("文件载入失败！");--%>
-										<%--});--%>
-									}
-								}
-							}
-						}
-						if(boolFlag){
-							var other = $("#file_other tr").length;
-							for(var i=0; i<other; i++) {
-								var numberStr = $("#file_other tr").eq(i).find("td:first").html();
-								var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
-								var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
-								if(second == 1){
-									if(numberStr != undefined && numberStr !=null && numberStr !=''){
-										if (fileFlag==1){
+					}
+					if(boolFlag){
+						var other = $("#file_other tr").length;
+						for(var i=0; i<other; i++) {
+							var numberStr = $("#file_other tr").eq(i).find("td:first").html();
+							var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
+							var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
+							if(second == 1){
+								if(numberStr != undefined && numberStr !=null && numberStr !=''){
+									if (fileFlag==1){
 
-										}else{
-											top.layer.msg("请上传其它文件！", {icon: 0});
-											return false;
-										}
-										<%--$.ajax({--%>
-										<%--	type: 'post',--%>
-										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-										<%--	dataType: "json",--%>
-										<%--	async: false--%>
-										<%--}).success(function (result) {--%>
-										<%--	if(result == 0){--%>
-										<%--		boolFlag = false;--%>
-										<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
-										<%--		return false;--%>
-										<%--	}--%>
-										<%--}).error(function () {--%>
-										<%--	top.layer.msg("文件载入失败！");--%>
-										<%--});--%>
+									}else{
+										top.layer.msg("请上传其它文件！", {icon: 0});
+										return false;
 									}
 								}
 							}
 						}
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/saveRecord");
 					}
-					$("#inputForm").submit();
-					return true;
-            }else {
-                parent.layer.msg("信息未填写完整!", {icon: 5});
-            }
-            return false;
+					$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/saveRecord");
+				}
+				$("#inputForm").submit();
+				return true;
+			}else {
+				parent.layer.msg("信息未填写完整!", {icon: 5});
+			}
+			return false;
 
-        }
-        $(document).ready(function() {
-            validateForm = $("#inputForm").validate({
-                submitHandler: function(form){
-                    loading('正在提交，请稍等...');
-                    form.submit();
-                },
-                errorContainer: "#messageBox",
-                errorPlacement: function(error, element) {
-                    $("#messageBox").text("输入有误，请先更正。");
-                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-                        error.appendTo(element.parent().parent());
-                    } else {
-                        error.insertAfter(element);
-                    }
-                }
-            });
-            $("#attachment_btn").click(function () {
-                $("#attachment_file").click();
-            });
+		}
+		$(document).ready(function() {
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+			$("#attachment_btn").click(function () {
+				$("#attachment_file").click();
+			});
 			$(".tabMove").mouseover(function(){
 				//tips层-下
 				var td=$(this)
@@ -184,22 +137,22 @@
 					tips: 3
 				});
 			})
-        });
-        function insertTitle(tValue){
-            var list = "${projectReportRecord.workAttachments}";
-            var size = (list.split('url')).length-1;
-            var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
-            var attachmentId = "";
-            var attachmentFlag = "99";
-            console.log(file);
-            var timestamp=new Date().getTime();
+		});
+		function insertTitle(tValue){
+			var list = "${projectReportRecord.workAttachments}";
+			var size = (list.split('url')).length-1;
+			var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
+				var attachmentId = "";
+				var attachmentFlag = "99";
+				console.log(file);
+				var timestamp=new Date().getTime();
 
-            var storeAs = "projectRecords";
-            var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
-            var divId = "_attachment";
-            $("#addFile"+divId).show();
-            multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
-        }
+				var storeAs = "projectRecords";
+				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+				var divId = "_attachment";
+				$("#addFile"+divId).show();
+				multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
+		}
 	</script>
 </head>
 <body>
@@ -222,32 +175,6 @@
 						<form:input id="reportNumber" path="report.number" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</div>
 				</div>
-
-				<%--<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>归档申请编号：</label>
-					<div class="layui-input-block">
-						<input id="recordNum" name="recordNum"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="${projectReportRecord.recordNum}"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>签字造价师一：</label>
-					<div class="layui-input-block with-icon">
-						<sys:treeselect id="signCostOne" name="signCostOne.id" value="${projectReportRecord.signCostOne.id}" labelName="signCostOne.name" labelValue="${projectReportRecord.signCostOne.name}"
-										title="签字造价师一" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/></div>
-				</div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>签字造价师二：</label>
-					<div class="layui-input-block with-icon">
-						<sys:treeselect id="signCostTwo" name="signCostTwo.id" value="${projectReportRecord.signCostTwo.id}" labelName="signCostTwo.name" labelValue="${projectReportRecord.signCostTwo.name}"
-										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>报告名称：</label>
-					<div class="layui-input-block">
-						<form:input id="reportName" path="report.name" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
-					</div>
-				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告日期：</label>
 					<div class="layui-input-block">
@@ -290,25 +217,6 @@
 						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
-				<%--<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>申请日期：</label>
-					<div class="layui-input-block">
-						<input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
-							   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
-					</div>
-				</div>--%>
-					<%--<div class="layui-item layui-col-sm6">
-                        <label class="layui-form-label">档案号：</label>
-                        <div class="layui-input-block">
-                            <form:input path="fileNum" htmlEscape="false"    class="form-control  layui-input"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6">
-                        <label class="layui-form-label">档案名称：</label>
-                        <div class="layui-input-block">
-                            <form:input path="name" htmlEscape="false"    class="form-control  layui-input"/>
-                        </div>
-                    </div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档时间：</label>
 					<div class="layui-input-block">
@@ -316,13 +224,6 @@
 							   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<%--<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">归档完成日期：</label>
-					<div class="layui-input-block">
-						<input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date layui-input laydate-icon"
-							   value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
-					</div>
-				</div>--%>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
@@ -333,9 +234,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
 					<span id="_attachment" ></span>
@@ -348,14 +246,12 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -372,7 +268,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -400,7 +300,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -421,14 +331,26 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -447,8 +369,6 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
@@ -488,10 +408,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -504,14 +420,13 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -529,7 +444,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -557,7 +476,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -578,14 +507,26 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<!--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>-->
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -604,12 +545,9 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
-<%--								<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
 							</c:forEach>
 						</c:forEach>
 						</tbody>
@@ -646,10 +584,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--						&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>
 					<span id="_other" ></span>
@@ -662,14 +596,13 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -687,7 +620,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -715,7 +652,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -736,14 +683,26 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -762,12 +721,9 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
-<%--								<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
 							</c:forEach>
 						</c:forEach>
 						</tbody>
@@ -801,81 +757,6 @@
 					</td>
                 </tr>//-->
 			</script>
-
-			<%--<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息列表</h2></div>
-
-				<div class="layui-item layui-col-xs12 form-table-container">
-					<table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
-				</div>
-			</div>--%>
-
-			<%--<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息</h2></div>
-				<div class="layui-item nav-btns">
-					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-				</div>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
-						<thead>
-						<tr>
-								&lt;%&ndash; <th>序号</th>&ndash;%&gt;
-							<th>文件预览</th>
-							<th>上传人</th>
-							<th>上传时间</th>
-							<th width="150px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectReportRecord.workAttachments}" var = "workClientAttachment" varStatus="status">
-							<tr>
-									&lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
-								<c:choose>
-									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-												<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-											</c:when>
-											<c:otherwise>
-												<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-
-										<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-										</c:if>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>--%>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>
@@ -1154,7 +1035,6 @@
 
 	function confirmDelete(mess, href){
 		top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
-			//do something
 			if (typeof href == 'function') {
 				href();
 			}else{
@@ -1173,159 +1053,5 @@
 		return false;
 	}
 </script>
-<%--<script>
-	/*使用模块加载的方式 加载文件*/
-	layui.config({
-		base: '${ctx}/resoueces/css/layui/module/'
-	}).extend({
-		treetable: 'treetable-lay/treetable'
-	}).use(['layer', 'table', 'treetable'], function () {
-		var $ = layui.jquery;
-		var table = layui.table;
-		var layer = layui.layer;
-		var treetable = layui.treetable;
-
-		// 渲染表格
-		window.renderTable = function () {//树桩表格参考文档：https://gitee.com/whvse/treetable-lay
-			layer.load(2);
-			treetable.render({
-				treeColIndex: 1,//树形图标显示在第几列
-				treeSpid: 0,//最上级的父级id
-				treeIdName: 'permissionId',//id字段的名称
-				treePidName: 'pid',//pid字段的名称
-				treeDefaultClose: false,//是否默认折叠
-				treeLinkage: true,//父级展开时是否自动展开所有子级
-				elem: '#permissionTable',
-				url: '${ctx}/projectAccessory/projectAccessory/getProjectAccessoryTreeData?projectId=${project.id}',
-				page: false,
-				cols: [[
-					{type: 'numbers', title: '编号' ,width:80},
-					{field: 'type', title: '电子件名称'},
-					{field: 'workAttachments',title: '附件',templet:function(d){
-							if(d.pid !='0'){
-								if(null == d.workAttachments || '' == d.workAttachments){
-									return "<span style=\"color:red\" title='无附件'>无附件</span>";
-								}else{
-									var html = '';
-									for (var x in d.workAttachments) {
-										html += "<div style='display:inline;float:left;'><a style='width:100px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;' class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"preview('预览','"+d.workAttachments[x].url+"','90%','90%')\" title='"+d.workAttachments[x].attachmentName+"'>"+d.workAttachments[x].attachmentName+"</a></div>"
-										if(x != d.workAttachments.length-1){
-											html += "<div style='display:inline;float:left;'> ; </div>";
-										}
-									}
-									return html;
-								}
-							}else{
-								return "";
-							}
-						}},
-					{templet: complain, title: '附件管理',width:80}
-				]],
-				done: function () {
-					layer.closeAll('loading');
-				}
-			});
-		};
-
-		renderTable();
-
-		//触发三个button按钮
-		$('#btn-expand').click(function () {
-			treetable.expandAll('#permissionTable');
-		});
-
-		$('#btn-fold').click(function () {
-			treetable.foldAll('#permissionTable');
-		});
-
-		$('#btn-refresh').click(function () {
-			renderTable();
-		});
-
-
-		function complain(d){//操作中显示的内容
-			if(d.pid !=0){
-				return [
-					'<a href="javascript:void(0)"  onclick="openBill2(\'编辑附件\', \'${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId='+d.id+'&projectId='+d.projectId+'\',\'70%\',\'80%\',false,\'inputForm\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-				].join('');
-			}else{
-				return[''].join('');
-			}
-		}
-	});
-
-	function openBill2(title,url,width,height,target,formId){
-		var rows = $(this).parent().prevAll().length + 1;
-		var frameIndex = parent.layer.getFrameIndex(window.name);
-		var urls = url+"&index="+frameIndex;
-		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
-			width='auto';
-			height='auto';
-		}else{//如果是PC端，根据用户设置的width和height显示。
-
-		}
-		top.layer.open({
-			type: 2,
-			area: [width, height],
-			title: title,
-			skin:"two-btns",
-			maxmin: false, //开启最大化最小化按钮
-			content: urls ,
-			btn: ['确定','关闭'],
-			yes: function(index, layero){
-				var body = top.layer.getChildFrame('body', index);
-				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-				var inputForm = body.find('#inputForm');
-				var top_iframe;
-				if(target){
-					top_iframe = target;//如果指定了iframe，则在改frame中跳转
-				}else{
-					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-				}
-				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-				inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
-				var $document = iframeWin.contentWindow.document;
-
-				formSubmit2($document,formId,index);
-
-			},
-			cancel: function(index){
-			}
-		});
-	}
-	function formSubmit2($document,inputForm,index){
-
-		var validateForm = $($document.getElementById(inputForm)).validate({
-			submitHandler: function(form){
-				loading('正在提交，请稍等...');
-				form.submit();
-			},
-			errorContainer: "#messageBox",
-			errorPlacement: function(error, element) {
-				$($document.getElementById("#messageBox")).text("输入有误，请先更正。");
-				if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-					error.appendTo(element.parent().parent());
-				} else {
-					error.insertAfter(element);
-				}
-			}
-		});
-		if(validateForm.form()){
-			$($document.getElementById(inputForm)).ajaxSubmit({
-				success:function(data) {
-					var d = data;
-					//调用layui.use中的renderTable()方法刷新列表
-					renderTable()
-					//输出提示信息
-					if(d.str.length>0){
-						parent.layer.msg(d.str,{icon:1});
-					}
-					//关闭当前页
-					top.layer.close(index)
-				}
-			});
-		}
-	}
-</script>--%>
 </body>
 </html>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify.jsp

@@ -148,7 +148,7 @@
 								}
 							}
 						}
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/saveRecord");
+						$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/auditSave");
 					}
 					$("#inputForm").submit();
 					return true;
@@ -240,6 +240,13 @@
 			<form:hidden path="report.name"/>
 			<form:hidden path="report.project.id"/>
 			<input type="hidden" name="saveAuditFlag" value="1">
+			<form:hidden path="act.taskId"/>
+			<form:hidden path="act.taskName"/>
+			<form:hidden path="act.taskDefKey"/>
+			<form:hidden path="act.procInsId"/>
+			<form:hidden path="act.procDefId"/>
+			<form:hidden id="flag" path="act.flag"/>
+			<input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
@@ -369,9 +376,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
 					<span id="_attachment" ></span>
@@ -384,20 +388,18 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr  id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
+							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
@@ -408,7 +410,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -427,7 +433,8 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-													<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+													<td>
+													<img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
 												</c:when>
 												<c:otherwise>
 													<c:choose>
@@ -435,7 +442,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -456,14 +473,26 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -482,8 +511,6 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
@@ -523,10 +550,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -539,14 +562,13 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -564,16 +586,19 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
-
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 								<td style="display:none">${fileGistdata.fileFlag}</td>
-							</tr>
 
+							</tr>
 							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
 								<tr class="file_gistdata_${fileGistdata.id}_tr">
 									<td></td>
@@ -593,7 +618,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -614,17 +649,28 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
-
 												<%--附件下载删除--%>
 											<c:choose>
 												<c:when test="${projectReportRecord.uploadMode == 2}">
@@ -641,8 +687,6 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
@@ -682,10 +726,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--						&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>
 					<span id="_other" ></span>
@@ -698,14 +738,13 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -717,13 +756,17 @@
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -751,7 +794,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -772,14 +825,26 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -798,8 +863,6 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
@@ -836,82 +899,6 @@
 					</td>
                 </tr>//-->
 			</script>
-
-			<%--<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息列表</h2></div>
-
-				<div class="layui-item layui-col-xs12 form-table-container">
-					<table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
-				</div>
-			</div>--%>
-
-
-			<%--<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息</h2></div>
-				<div class="layui-item nav-btns">
-					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-				</div>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
-						<thead>
-						<tr>
-								&lt;%&ndash; <th>序号</th>&ndash;%&gt;
-							<th>文件预览</th>
-							<th>上传人</th>
-							<th>上传时间</th>
-							<th width="150px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectReportRecord.workAttachments}" var = "workClientAttachment" varStatus="status">
-							<tr>
-									&lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
-								<c:choose>
-									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-												<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-											</c:when>
-											<c:otherwise>
-												<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-
-										<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-										</c:if>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp

@@ -972,15 +972,15 @@
         function complain(d){//操作中显示的内容
         	var xml = '<div class=\"layui-btn-group\">';
 			if(d.pid=="0") {
-				if(d.reportNotifyFlag != undefined && d.reportNotifyFlag !=null && "" != d.reportNotifyFlag && d.reportNotifyFlag == 1)
+				if(d.reportAuditNotifyFlag != undefined && d.reportAuditNotifyFlag !=null && "" != d.reportAuditNotifyFlag && d.reportAuditNotifyFlag == 1)
 				{
 					xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=report','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
-				if(d.recordNotifyFlag != undefined && d.recordNotifyFlag !=null && "" != d.recordNotifyFlag && d.recordNotifyFlag == 1)
+				if(d.recordAuditNotifyFlag != undefined && d.recordAuditNotifyFlag !=null && "" != d.recordAuditNotifyFlag && d.recordAuditNotifyFlag == 1)
 				{
 					xml+="<a href=\"#\" onclick=\"notifyDialogre('电子归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=record','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
-				if(d.reportedNotifyFlag != undefined && d.reportedNotifyFlag !=null && "" != d.reportedNotifyFlag && d.reportedNotifyFlag == 1)
+				if(d.reportedAuditNotifyFlag != undefined && d.reportedAuditNotifyFlag !=null && "" != d.reportedAuditNotifyFlag && d.reportedAuditNotifyFlag == 1)
 				{
 					xml+="<a href=\"#\" onclick=\"notifyDialogre('上报审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=reported','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
@@ -1020,7 +1020,7 @@
 					}
 
 					//报告签发操作
-					if(d.projectReportStatus == 5 && (d.submitMoney == 2 || d.projectReportStatusTwo != 0)){
+					if(d.projectReportStatus == 5 && d.emergencyProject != 1){
 
 						if(d.projectReportStatusTwo == 0){
 							xml+="<a href=\"#\" onclick=\"openDialogre('报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id +"&view=costLiu','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 报告签发</a>";
@@ -1047,28 +1047,27 @@
 					//线上归档操作
 					if(d.projectReportStatusTwo == 0){
 						if(d.projectReportStatus == 5){
-							if(d.submitMoney != 2){
+							if(d.emergencyProject == 1){
 								/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 								if(d.projectReportRecordStatus == 0){
-									xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 								}
 								if(d.projectReportRecordStatus == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
 								}
 								if(d.projectReportRecordStatus == 2){
 									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回线上归档</a>";
 								}
 								if(d.projectReportRecordStatus == 3){
-									xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 								}
 								if(d.projectReportRecordStatus == 4){
 									//驳回操作
-									if(d.newRecordNotifyFlag == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-									}else{
+									if(d.recordNotifyFlag == 1){
 										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+									}else{
+										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 									}
-
 								}
 							}
 						}
@@ -1076,29 +1075,29 @@
 						if(d.projectReportStatusTwo == 5){
 							/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 							if(d.projectReportRecordStatus == 0){
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 2){
 								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 3){
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 4){
 								//驳回操作
-								if(d.newRecordNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-								}else{
+								if(d.recordNotifyFlag == 1){
 									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+								}else{
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 								}
-
 							}
 						}
 					}
 
+
 					//线下归档操作
 					/*if(d.projectReportStatus == 5){
 						if(d.downProjectReportRecordStatus == 0){
@@ -1121,7 +1120,7 @@
 					/*上报相关按钮*/
 					if(d.projectReportStatusTwo == 0){
 						if(d.projectReportStatus == 5){
-							if(d.submitMoney != 2){
+							if(d.emergencyProject == 1){
 								if(d.syncStatus == 0){
 									if(d.reportStatus == 0){
 										if(d.reportedState == 0 || d.reportedState == 6){
@@ -1178,6 +1177,7 @@
 											xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
 										}else{
 											xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
+
 										}
 									}
 								}

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordForm.jsp

@@ -337,9 +337,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
 					<span id="_attachment" ></span>
@@ -352,20 +349,18 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr  id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
+							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
@@ -376,14 +371,17 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 								<td style="display:none">${fileAttachment.fileFlag}</td>
-
 							</tr>
 							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
 								<tr class="file_attachment_${fileAttachment.id}_tr">
@@ -396,7 +394,8 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-													<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+													<td>
+													<img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
 												</c:when>
 												<c:otherwise>
 													<c:choose>
@@ -404,7 +403,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -425,14 +434,26 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -451,8 +472,6 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
@@ -471,10 +490,16 @@
                         0
                     </td>
                     <td style="text-align:center;">
-                        <span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>{{row.attachName}}
+                        {{row.attachName}}
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.attachLength}}
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachLength}}M；{{row.attachTypes}}
+                        {{row.attachTypes}}
+                    </td>
+                    <td style="text-align:center;">
+
                     </td>
 					<td class="op-td">
 						<div class="op-btn-box" >
@@ -486,10 +511,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -502,20 +523,19 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th  width="40%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr  id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
+							<tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
@@ -527,13 +547,18 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 								<td style="display:none">${fileGistdata.fileFlag}</td>
+
 							</tr>
 							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
 								<tr class="file_gistdata_${fileGistdata.id}_tr">
@@ -554,7 +579,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -575,14 +610,26 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -601,8 +648,6 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
@@ -621,10 +666,16 @@
                         0
                     </td>
                     <td style="text-align:center;">
-                        <span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>{{row.attachName}}
+                        {{row.attachName}}
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachLength}}M;{{row.attachTypes}}
+                        {{row.attachLength}}
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.attachTypes}}
+                    </td>
+                    <td style="text-align:center;">
+
                     </td>
 					<td class="op-td">
 						<div class="op-btn-box" >
@@ -636,10 +687,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--						&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>
 					<span id="_other" ></span>
@@ -652,41 +699,45 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr   id="file_gistdata_${fileOther.id}_tr" onclick="listTr(this)">
+							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 								<td style="display:none">${fileOther.fileFlag}</td>
+
 							</tr>
 							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_${fileOther.id}_tr">
+								<tr class="addFile_other_${fileOther.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectReportRecord.uploadMode == 2}">
@@ -704,7 +755,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -725,14 +786,26 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -751,8 +824,6 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
@@ -789,82 +860,6 @@
 					</td>
                 </tr>//-->
 			</script>
-
-
-			<%--<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息列表</h2></div>
-
-				<div class="layui-item layui-col-xs12 form-table-container">
-					<table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
-				</div>
-			</div>--%>
-
-			<%--<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息</h2></div>
-				<div class="layui-item nav-btns">
-					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-				</div>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
-						<thead>
-						<tr>
-								&lt;%&ndash; <th>序号</th>&ndash;%&gt;
-							<th>文件预览</th>
-							<th>上传人</th>
-							<th>上传时间</th>
-							<th width="150px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectReportRecord.workAttachments}" var = "workClientAttachment" varStatus="status">
-							<tr>
-									&lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
-								<c:choose>
-									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-												<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-											</c:when>
-											<c:otherwise>
-												<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-
-										<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-										</c:if>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>--%>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordModify.jsp

@@ -133,7 +133,7 @@
 								}
 							}
 						}
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/saveRecord");
+						$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/auditSave");
 					}
 					$("#inputForm").submit();
 					return true;
@@ -225,6 +225,13 @@
 			<form:hidden path="report.name"/>
 			<form:hidden path="report.project.id"/>
 			<input type="hidden" name="saveAuditFlag" value="1">
+			<form:hidden path="act.taskId"/>
+			<form:hidden path="act.taskName"/>
+			<form:hidden path="act.taskDefKey"/>
+			<form:hidden path="act.procInsId"/>
+			<form:hidden path="act.procDefId"/>
+			<form:hidden id="flag" path="act.flag"/>
+			<input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
 				<div class="layui-item layui-col-sm6">
@@ -353,9 +360,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
 					<span id="_attachment" ></span>
@@ -368,14 +372,12 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -392,11 +394,14 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
-<%--								<td></td>--%>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 								<td style="display:none">${fileAttachment.fileFlag}</td>
@@ -412,7 +417,8 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-													<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+													<td>
+													<img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
 												</c:when>
 												<c:otherwise>
 													<c:choose>
@@ -420,7 +426,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -441,34 +457,44 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
 											<c:choose>
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
-                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                            <a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                        </c:when>
-                                                        <c:otherwise>
-                                                            <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                        </c:otherwise>
-                                                    </c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														</c:when>
+														<c:otherwise>
+															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														</c:otherwise>
+													</c:choose>
 												</c:when>
 												<c:otherwise>
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
@@ -487,10 +513,16 @@
                         0
                     </td>
                     <td style="text-align:center;">
-                       <span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span> {{row.attachName}}
+                        {{row.attachName}}
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.attachLength}}
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.attachTypes}}
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachLength}}M；{{row.attachTypes}}
+
                     </td>
 					<td class="op-td">
 						<div class="op-btn-box" >
@@ -502,10 +534,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -518,14 +546,13 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -543,7 +570,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}M；${fileGistdata.attachTypes}</td>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -571,7 +602,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -592,35 +633,44 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
-
 												<%--附件下载删除--%>
 											<c:choose>
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
-                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                            <a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                        </c:when>
-                                                        <c:otherwise>
-                                                            <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                        </c:otherwise>
-                                                    </c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														</c:when>
+														<c:otherwise>
+															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														</c:otherwise>
+													</c:choose>
 												</c:when>
 												<c:otherwise>
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
@@ -639,10 +689,16 @@
                         0
                     </td>
                     <td style="text-align:center;">
-                        <span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>{{row.attachName}}
+                        {{row.attachName}}
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.attachLength}}
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachLength}}M；{{row.attachTypes}}
+                        {{row.attachTypes}}
+                    </td>
+                    <td style="text-align:center;">
+
                     </td>
 					<td class="op-td">
 						<div class="op-btn-box" >
@@ -654,10 +710,6 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--						&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>
 					<span id="_other" ></span>
@@ -670,14 +722,13 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -689,23 +740,27 @@
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-<%--								<td></td>--%>
-								<td>${fileOther.attachLength}M；${fileOther.attachTypes}</td>
+								<td>
+										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 								<td style="display:none">${fileOther.fileFlag}</td>
+
 							</tr>
 							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_other_${fileOther.id}_tr">
+								<tr class="addFile_other_${fileOther.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectReportRecord.uploadMode == 2}">
@@ -723,7 +778,17 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
@@ -744,35 +809,44 @@
 															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
 														</c:when>
 														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</c:otherwise>
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-<%--									</td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
 											<c:choose>
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
-                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                            <a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                        </c:when>
-                                                        <c:otherwise>
-                                                            <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                        </c:otherwise>
-                                                    </c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														</c:when>
+														<c:otherwise>
+															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														</c:otherwise>
+													</c:choose>
 												</c:when>
 												<c:otherwise>
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:otherwise>
 											</c:choose>
-
-<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
 										</div>
 									</td>
 								</tr>
@@ -791,12 +865,17 @@
                         0
                     </td>
                     <td style="text-align:center;">
-                       <span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span> {{row.attachName}}
+                        {{row.attachName}}
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachLength}}M；{{row.attachTypes}}
+                        {{row.attachLength}}
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.attachTypes}}
+                    </td>
+                    <td style="text-align:center;">
+
                     </td>
-                    <td style
 					<td class="op-td">
 						<div class="op-btn-box" >
 							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -804,83 +883,6 @@
 					</td>
                 </tr>//-->
 			</script>
-
-
-			<%--<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息列表</h2></div>
-
-				<div class="layui-item layui-col-xs12 form-table-container">
-					<table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
-				</div>
-			</div>--%>
-
-
-			<%--<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息</h2></div>
-				<div class="layui-item nav-btns">
-					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-				</div>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
-						<thead>
-						<tr>
-								&lt;%&ndash; <th>序号</th>&ndash;%&gt;
-							<th>文件预览</th>
-							<th>上传人</th>
-							<th>上传时间</th>
-							<th width="150px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectReportRecord.workAttachments}" var = "workClientAttachment" varStatus="status">
-							<tr>
-									&lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
-								<c:choose>
-									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-												<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-											</c:when>
-											<c:otherwise>
-												<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-
-										<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-										</c:if>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -973,15 +973,15 @@
         function complain(d){//操作中显示的内容
         	var xml = '<div class=\"layui-btn-group\">';
 			if(d.pid=="0") {
-				if(d.reportNotifyFlag != undefined && d.reportNotifyFlag !=null && "" != d.reportNotifyFlag && d.reportNotifyFlag == 1)
+				if(d.reportAuditNotifyFlag != undefined && d.reportAuditNotifyFlag !=null && "" != d.reportAuditNotifyFlag && d.reportAuditNotifyFlag == 1)
 				{
 					xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=report','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
-				if(d.recordNotifyFlag != undefined && d.recordNotifyFlag !=null && "" != d.recordNotifyFlag && d.recordNotifyFlag == 1)
+				if(d.recordAuditNotifyFlag != undefined && d.recordAuditNotifyFlag !=null && "" != d.recordAuditNotifyFlag && d.recordAuditNotifyFlag == 1)
 				{
 					xml+="<a href=\"#\" onclick=\"notifyDialogre('电子归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=record','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
-				if(d.reportedNotifyFlag != undefined && d.reportedNotifyFlag !=null && "" != d.reportedNotifyFlag && d.reportedNotifyFlag == 1)
+				if(d.reportedAuditNotifyFlag != undefined && d.reportedAuditNotifyFlag !=null && "" != d.reportedAuditNotifyFlag && d.reportedAuditNotifyFlag == 1)
 				{
 					xml+="<a href=\"#\" onclick=\"notifyDialogre('上报审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=reported','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
@@ -1020,7 +1020,7 @@
 					}
 
 					//报告签发操作
-                    if(d.projectReportStatus == 5 && (d.submitMoney == 2 || d.projectReportStatusTwo != 0)){
+                    if(d.projectReportStatus == 5 && d.emergencyProject != 1){
 						if(d.projectReportStatusTwo == 0){
 							xml+="<a href=\"#\" onclick=\"openDialogre('报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 报告签发</a>";
 						}
@@ -1047,26 +1047,26 @@
 					//线上归档操作
 					if(d.projectReportStatusTwo == 0){
 						if(d.projectReportStatus == 5){
-							if(d.submitMoney != 2){
+							if(d.emergencyProject == 1){
 								/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 								if(d.projectReportRecordStatus == 0){
-									xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 								}
 								if(d.projectReportRecordStatus == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 								}
 								if(d.projectReportRecordStatus == 2){
 									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
 								}
 								if(d.projectReportRecordStatus == 3){
-									xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 								}
 								if(d.projectReportRecordStatus == 4){
 									//驳回操作
-									if(d.newRecordNotifyFlag == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-									}else{
+									if(d.recordNotifyFlag == 1){
 										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+									}else{
+										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 									}
 								}
 							}
@@ -1075,23 +1075,23 @@
 						if(d.projectReportStatusTwo == 5){
 							/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 							if(d.projectReportRecordStatus == 0){
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 2){
 								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 3){
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 4){
 								//驳回操作
-								if(d.newRecordNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-								}else{
+								if(d.recordNotifyFlag == 1){
 									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+								}else{
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 								}
 							}
 						}
@@ -1119,7 +1119,7 @@
 					/*上报相关按钮*/
 					if(d.projectReportStatusTwo == 0){
 						if(d.projectReportStatus == 5){
-							if(d.submitMoney != 2){
+							if(d.emergencyProject == 1){
 								if(d.syncStatus == 0){
 									if(d.reportStatus == 0){
 										if(d.reportedState == 0 || d.reportedState == 6){