复核标准自检以及审核(质量复核/报告签发)

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -57,7 +57,7 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String home;
 	private List<ProjectContentData> projectContentDataList;
 	private List<ProjectBasedData> projectBasedDataList;
-	private List<WorkReviewAudit> projectReviewList;
+	private List<WorkReviewAudit> projectReviewList;	//复核标准
 	private String reportId;
 	private String numberPath;
 	private String tempType;    //模板类型

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectContentDataService.java

@@ -194,6 +194,7 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
     public Integer countBased(String basedId) {
         return dao.countByBaseId(basedId);
     }
+
     public List<WorkReviewAudit> findListReviewAudit(String reviewId,String name,String infoId) {
         WorkReviewStandard workReviewStandard = new WorkReviewStandard();
         workReviewStandard.setStandardDetail(name);
@@ -298,5 +299,166 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         return projectRecordTreeDataList;
     }
 
+    /**
+     * 质量复核自检标准
+     * @param reviewId
+     * @param name
+     * @return
+     */
+    public List<WorkReviewAudit> findListReview(String reviewId,String name) {
+        WorkReviewStandard workReviewStandard = new WorkReviewStandard();
+        workReviewStandard.setStandardDetail(name);
+        String reviewIds = "0,"+reviewId+",";
+        workReviewStandard.setParentIds(reviewIds);
+        workReviewStandard.setType(reviewId);
+        List<WorkReviewStandard> workReviewStandards = workReviewStandardService.findListByType(workReviewStandard);
+        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
+        for (WorkReviewStandard reviewStandard:workReviewStandards){
+            int orderNum = Integer.parseInt(reviewStandard.getOrderNum());
+            if (orderNum>100100 && orderNum<200000){
+                WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                workReviewAudit.setSort(reviewStandard.getSort());
+                workReviewAudit.setId(reviewStandard.getId());
+                if (orderNum>100100 && orderNum<100199){
+                    workReviewAudit.setType("1");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setParentIds("0,");
+                }
+                if (StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    workReviewAudits.add(workReviewAudit);
+                }
+            }
+            if (orderNum>200100){
+                WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                workReviewAudit.setSort(reviewStandard.getSort());
+                workReviewAudit.setId(reviewStandard.getId());
+                if (orderNum>200100 && orderNum<200199){
+                    workReviewAudit.setType("1");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setParentIds("0,");
+                }
+                if (StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    workReviewAudits.add(workReviewAudit);
+                }
+            }
+        }
+        return workReviewAudits;
+    }
+    /**
+     * 质量复核审核标准
+     * @param review
+     * @param name
+     * @return
+     */
+    public List<WorkReviewStandard> findListReportReview(String review,String name) {
+        WorkReviewStandard workReviewStandard = new WorkReviewStandard();
+        workReviewStandard.setStandardDetail(name);
+        String reviewIds = "0,"+review+",";
+        workReviewStandard.setParentIds(reviewIds);
+        workReviewStandard.setType(review);
+        List<WorkReviewStandard> workReviewStandards = workReviewStandardService.findListByType(workReviewStandard);
+        List<WorkReviewStandard> workReviewAudits = new ArrayList<>();
+        for (WorkReviewStandard reviewStandard:workReviewStandards){
+            int orderNum = Integer.parseInt(reviewStandard.getOrderNum());
+            if (orderNum>110100 && orderNum<200000){
+                if (orderNum>110100 && orderNum<110199){
+                    workReviewAudits.add(reviewStandard);
+                }
+            }
+            if (orderNum>210100){
+                if (orderNum>210100 && orderNum<210199){
+                    workReviewAudits.add(reviewStandard);
+                }
+            }
+        }
+        return workReviewAudits;
+    }
+
+    /**
+     * 报告签发自检标准
+     * @param reviewId
+     * @param name
+     * @return
+     */
+    public List<WorkReviewAudit> findListIssue(String reviewId,String name) {
+        WorkReviewStandard workReviewStandard = new WorkReviewStandard();
+        workReviewStandard.setStandardDetail(name);
+        String reviewIds = "0,"+reviewId+",";
+        workReviewStandard.setParentIds(reviewIds);
+        workReviewStandard.setType(reviewId);
+        List<WorkReviewStandard> workReviewStandards = workReviewStandardService.findListByType(workReviewStandard);
+        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
+        for (WorkReviewStandard reviewStandard:workReviewStandards){
+            int orderNum = Integer.parseInt(reviewStandard.getOrderNum());
+            if (orderNum>100200 && orderNum<200000){
+                WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                workReviewAudit.setSort(reviewStandard.getSort());
+                workReviewAudit.setId(reviewStandard.getId());
+                if (orderNum>100200 && orderNum<100299){
+                    workReviewAudit.setType("1");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setParentIds("0,");
+                }
+                if (StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    workReviewAudits.add(workReviewAudit);
+                }
+            }
+            if (orderNum>200200){
+                WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                workReviewAudit.setSort(reviewStandard.getSort());
+                workReviewAudit.setId(reviewStandard.getId());
+                if (orderNum>200200 && orderNum<200299){
+                    workReviewAudit.setType("1");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setParentIds("0,");
+                }
+                if (StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    workReviewAudits.add(workReviewAudit);
+                }
+            }
+        }
+        return workReviewAudits;
+    }
 
+    /**
+     * 报告签发审核标准
+     * @param review
+     * @param name
+     * @return
+     */
+    public List<WorkReviewStandard> findListReportIssue(String review,String name) {
+        WorkReviewStandard workReviewStandard = new WorkReviewStandard();
+        workReviewStandard.setStandardDetail(name);
+        String reviewIds = "0,"+review+",";
+        workReviewStandard.setParentIds(reviewIds);
+        workReviewStandard.setType(review);
+        List<WorkReviewStandard> workReviewStandards = workReviewStandardService.findListByType(workReviewStandard);
+        List<WorkReviewStandard> workReviewAudits = new ArrayList<>();
+        for (WorkReviewStandard reviewStandard:workReviewStandards){
+            int orderNum = Integer.parseInt(reviewStandard.getOrderNum());
+            if (orderNum>110200 && orderNum<200000){
+                if (orderNum>110200 && orderNum<110299){
+                    workReviewAudits.add(reviewStandard);
+                }
+            }
+            if (orderNum>210200){
+                if (orderNum>210200 && orderNum<210299){
+                    workReviewAudits.add(reviewStandard);
+                }
+            }
+        }
+        return workReviewAudits;
+    }
 }

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

@@ -20,11 +20,11 @@ import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchDao;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
+import com.jeeplus.modules.projectcontentinfo.dao.ProjectContentChangeDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
-import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
-import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
-import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectcontentinfo.entity.*;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
@@ -67,6 +67,9 @@ import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import com.jeeplus.modules.workreview.dao.WorkReviewAuditDao;
+import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
+import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
+import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
@@ -140,6 +143,8 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
     @Autowired
     private WorkReviewAuditDao workReviewAuditDao;
     @Autowired
+    private ProjectContentChangeDao projectContentChangeDao;
+    @Autowired
     private ActTaskService actTaskService;
     @Autowired
     private ProjectRecordsService projectRecordsService;
@@ -154,6 +159,8 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
     @Autowired
     private RuralProjectRecordsService ruralProjectRecordsService;
     @Autowired
+    private ProjectContentDataService projectContentDataService;
+    @Autowired
     private HistoricalService historicalService;
     @Autowired
     private ProjectcontentinfoService projectcontentinfoService;
@@ -169,6 +176,8 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
     private UserService userService;
     @Autowired
     private WorkStaffBasicInfoService workStaffBasicInfoService;
+    @Autowired
+    private WorkReviewStandardService workReviewStandardService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -614,6 +623,9 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                 //获取项目信息
                 ProjectRecords projectRecord = this.getMasters(projectcontentinfo.getProject().getId());
                 projectcontentinfo.setProject(projectRecord);
+
+
+
                 if (type == 2) {
                     //启动流程
                     String str="";
@@ -622,6 +634,56 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                     }else{
                         str = this.saveRuralProject(projectReportData, variables, processInstanceId, projectcontentinfo.getProject().getProjectLeaders());
                     }
+
+                    //生成质量复核标准送审数据
+                    RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(projectRecord.getId());
+                    String reviewId="";
+                    if ("2".equals(records.getSubmitMoney())){
+                        reviewId="1";
+                    }else{
+                        reviewId="";
+                    }
+                    Boolean status = false;
+                    if (com.jeeplus.common.utils.StringUtils.isBlank(projectReportData.getId())){
+                        status = true;
+                    }
+                    List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
+                    if (projectReportData.getProjectReviewList()!=null && projectReportData.getProjectReviewList().size()!=0){
+                        infoId=projectReportData.getId();
+                        for (WorkReviewAudit workReviewAudit:projectReportData.getProjectReviewList()){
+                            String remarks = workReviewAudit.getRemarks();
+                            WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getId());
+                            if (reviewStandard==null){
+                                workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
+                                workReviewAudit.setRemarks(remarks);
+                                workReviewAudits.add(workReviewAudit);
+                            }else{
+                                workReviewAudit.setReportId(infoId);
+                                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                                workReviewAudit.setSort(reviewStandard.getSort());
+                                if (!status) {
+                                    workReviewAudit.setId(null);
+                                }
+                                workReviewAudit.setType("1");
+                                workReviewAudit.setParent(new WorkReviewAudit("0"));
+                                workReviewAudit.setRemarks(remarks);
+                                workReviewAudits.add(workReviewAudit);
+                            }
+                        }
+                    }
+                    if (!status) {
+                        workReviewStandardService.deleteAuditType(infoId);
+                    }
+                    if (workReviewAudits!=null && workReviewAudits.size()!=0){
+                        for (WorkReviewAudit workReviewAudit:workReviewAudits){
+                            workReviewStandardService.saveAudit(workReviewAudit);
+                        }
+                    }
+                    //保存tree数据
+                    saveReportTree(projectcontentinfo,status,infoId,reviewId,1);
+
                     if (!str.equals("true")){
                         return str;
                     }
@@ -679,11 +741,95 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                     workattachmentDao.delete(workattachment);
                 }
             }
+
         }
         return "true";
     }
+    @Transactional(readOnly = false)
+    public Boolean saveReportTree(Projectcontentinfo projectcontentinfo,Boolean save,String infoId,String review,int type) {
+        if (!save){
+            Projectcontentinfo info = new Projectcontentinfo();
+            info.setInfoId(infoId);
+            info.setProject(projectcontentinfo.getProject());
+            deleteChange(info);
+            workReviewStandardService.deleteAudit(infoId);
+        }
+        WorkReviewStandard workReviewStandard = new WorkReviewStandard();
+        workReviewStandard.setStandardDetail(projectcontentinfo.getName());
+        List<WorkReviewStandard> workReviewStandards =projectContentDataService.findListReportReview(review,"总审复核");
+        List<WorkReviewStandard> workReviewStandardList = new ArrayList<>();
+        Map<String,String> map = new HashMap<>();
+        for (WorkReviewStandard reviewStandard:workReviewStandards){
+            int orderNum = Integer.parseInt(reviewStandard.getOrderNum());
+            if (orderNum>110100 && orderNum<200000){
+                WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+                workReviewAudit.setReportId(infoId);
+                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                workReviewAudit.setSort(reviewStandard.getSort());
+                if (orderNum>110100 && orderNum<110199){
+                    workReviewAudit.setId(null);
+                    map.put(reviewStandard.getId(),workReviewAudit.getId());
+                    workReviewAudit.setType("4");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setParentIds("0,");
+                }else {
+                    workReviewStandardList.add(reviewStandard);
+                }
+                if (com.jeeplus.common.utils.StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    workReviewStandardService.saveAudit(workReviewAudit);
+                }
+            }
+            if (orderNum>210100){
+                WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+                workReviewAudit.setReportId(infoId);
+                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                workReviewAudit.setSort(reviewStandard.getSort());
+                if (orderNum>210100 && orderNum<210199){
+                    workReviewAudit.setId(null);
+                    map.put(reviewStandard.getId(),workReviewAudit.getId());
+                    workReviewAudit.setType("4");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setParentIds("0,");
+                }else {
+                    workReviewStandardList.add(reviewStandard);
+                }
+                if (com.jeeplus.common.utils.StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    workReviewStandardService.saveAudit(workReviewAudit);
+                }
+            }
+        }
+        if (workReviewStandardList!=null && workReviewStandardList.size()!=0) {
+            for ( int i=0;i< workReviewStandardList.size();i++) {
+                WorkReviewStandard reviewStandard = workReviewStandardList.get(i);
+                if (reviewStandard.getParent() != null && com.jeeplus.common.utils.StringUtils.isNotBlank(reviewStandard.getParent().getId())) {
+                    String id = map.get(reviewStandard.getParent().getId());
+                    if (com.jeeplus.common.utils.StringUtils.isNotBlank(id)){
+                        WorkReviewAudit reviewAudit = new WorkReviewAudit();
+                        reviewAudit.setReportId(infoId);
+                        reviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                        reviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                        reviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                        reviewAudit.setSort(reviewStandard.getSort());
+                        reviewAudit.setParent(new WorkReviewAudit(id));
+                        reviewAudit.setParentIds("0,"+id+",");
+                        reviewAudit.setType("5");
+                        reviewAudit.preInsert();
+                        workReviewStandardService.saveAudit(reviewAudit);
+                    }
+                }
 
-
+            }
+        }
+        return true;
+    }
+    @Transactional(readOnly = false)
+    public void deleteChange(Projectcontentinfo projectcontentinfo) {
+        projectContentChangeDao.deleteChange(projectcontentinfo);
+    }
     /**
      * 紧急项目数据库添加操作
      * @param projectReportData

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

@@ -13,12 +13,14 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchDao;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
+import com.jeeplus.modules.projectcontentinfo.dao.ProjectContentChangeDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataTwoDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataTwoService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
@@ -58,6 +60,9 @@ import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import com.jeeplus.modules.workreview.dao.WorkReviewAuditDao;
+import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
+import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
+import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.activiti.engine.ActivitiObjectNotFoundException;
 import org.activiti.engine.HistoryService;
@@ -140,6 +145,12 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
     private ProjectFilingbatchRelationDao filingbatchRelationDao;
     @Autowired
     private ProjectFilingBatchDao projectFilingBatchDao;
+    @Autowired
+    private WorkReviewStandardService workReviewStandardService;
+    @Autowired
+    private ProjectContentChangeDao projectContentChangeDao;
+    @Autowired
+    private ProjectContentDataService projectContentDataService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -215,9 +226,61 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                 //获取项目信息
                 ProjectRecords projectRecord = this.getMasters(projectcontentinfo.getProjectReportDataTwo().getProject().getId());
                 projectcontentinfo.setProject(projectRecord);
+
                 if (type == 2) {
                     //启动流程
                     String str = this.saveRuralProject(projectReportData, variables, processInstanceId, projectcontentinfo.getProject().getProjectLeaders());
+
+                    //生成质量复核标准送审数据
+                    RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(projectRecord.getId());
+                    String reviewId="";
+                    if ("2".equals(records.getSubmitMoney())){
+                        reviewId="1";
+                    }else{
+                        reviewId="2";
+                    }
+                    Boolean status = false;
+                    if (com.jeeplus.common.utils.StringUtils.isBlank(projectReportData.getId())){
+                        status = true;
+                    }
+                    List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
+                    if (projectReportData.getProjectReviewList()!=null && projectReportData.getProjectReviewList().size()!=0){
+                        infoId=projectReportData.getId();
+                        for (WorkReviewAudit workReviewAudit:projectReportData.getProjectReviewList()){
+                            String remarks = workReviewAudit.getRemarks();
+                            WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getId());
+                            if (reviewStandard==null){
+                                workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
+                                workReviewAudit.setRemarks(remarks);
+                                workReviewAudits.add(workReviewAudit);
+                            }else{
+                                workReviewAudit.setReportId(infoId);
+                                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                                workReviewAudit.setSort(reviewStandard.getSort());
+                                if (!status) {
+                                    workReviewAudit.setId(null);
+                                }
+                                workReviewAudit.setType("1");
+                                workReviewAudit.setParent(new WorkReviewAudit("0"));
+                                workReviewAudit.setRemarks(remarks);
+                                workReviewAudits.add(workReviewAudit);
+                            }
+                        }
+                    }
+                    if (!status) {
+                        workReviewStandardService.deleteAuditType(infoId);
+                    }
+                    if (workReviewAudits!=null && workReviewAudits.size()!=0){
+                        for (WorkReviewAudit workReviewAudit:workReviewAudits){
+                            workReviewStandardService.saveAudit(workReviewAudit);
+                        }
+                    }
+                    //保存tree数据
+                    saveReportTree(projectcontentinfo,status,infoId,reviewId,1);
+
+
                     if (!str.equals("true")){
                         return str;
                     }
@@ -278,7 +341,91 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
         }
         return "true";
     }
+    @Transactional(readOnly = false)
+    public Boolean saveReportTree(Projectcontentinfo projectcontentinfo,Boolean save,String infoId,String review,int type) {
+        if (!save){
+            Projectcontentinfo info = new Projectcontentinfo();
+            info.setInfoId(infoId);
+            info.setProject(projectcontentinfo.getProject());
+            deleteChange(info);
+            workReviewStandardService.deleteAudit(infoId);
+        }
+        WorkReviewStandard workReviewStandard = new WorkReviewStandard();
+        workReviewStandard.setStandardDetail(projectcontentinfo.getName());
+        List<WorkReviewStandard> workReviewStandards =projectContentDataService.findListReportIssue(review,"总审复核");
+        List<WorkReviewStandard> workReviewStandardList = new ArrayList<>();
+        Map<String,String> map = new HashMap<>();
+        for (WorkReviewStandard reviewStandard:workReviewStandards){
+            int orderNum = Integer.parseInt(reviewStandard.getOrderNum());
+            if (orderNum>110200 && orderNum<200000){
+                WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+                workReviewAudit.setReportId(infoId);
+                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                workReviewAudit.setSort(reviewStandard.getSort());
+                if (orderNum>110200 && orderNum<110299){
+                    workReviewAudit.setId(null);
+                    map.put(reviewStandard.getId(),workReviewAudit.getId());
+                    workReviewAudit.setType("4");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setParentIds("0,");
+                }else {
+                    workReviewStandardList.add(reviewStandard);
+                }
+                if (com.jeeplus.common.utils.StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    workReviewStandardService.saveAudit(workReviewAudit);
+                }
+            }
+            if (orderNum>210200){
+                WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+                workReviewAudit.setReportId(infoId);
+                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                workReviewAudit.setSort(reviewStandard.getSort());
+                if (orderNum>210200 && orderNum<210299){
+                    workReviewAudit.setId(null);
+                    map.put(reviewStandard.getId(),workReviewAudit.getId());
+                    workReviewAudit.setType("4");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setParentIds("0,");
+                }else {
+                    workReviewStandardList.add(reviewStandard);
+                }
+                if (com.jeeplus.common.utils.StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    workReviewStandardService.saveAudit(workReviewAudit);
+                }
+            }
+        }
+        if (workReviewStandardList!=null && workReviewStandardList.size()!=0) {
+            for ( int i=0;i< workReviewStandardList.size();i++) {
+                WorkReviewStandard reviewStandard = workReviewStandardList.get(i);
+                if (reviewStandard.getParent() != null && com.jeeplus.common.utils.StringUtils.isNotBlank(reviewStandard.getParent().getId())) {
+                    String id = map.get(reviewStandard.getParent().getId());
+                    if (com.jeeplus.common.utils.StringUtils.isNotBlank(id)){
+                        WorkReviewAudit reviewAudit = new WorkReviewAudit();
+                        reviewAudit.setReportId(infoId);
+                        reviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                        reviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                        reviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                        reviewAudit.setSort(reviewStandard.getSort());
+                        reviewAudit.setParent(new WorkReviewAudit(id));
+                        reviewAudit.setParentIds("0,"+id+",");
+                        reviewAudit.setType("5");
+                        reviewAudit.preInsert();
+                        workReviewStandardService.saveAudit(reviewAudit);
+                    }
+                }
 
+            }
+        }
+        return true;
+    }
+    @Transactional(readOnly = false)
+    public void deleteChange(Projectcontentinfo projectcontentinfo) {
+        projectContentChangeDao.deleteChange(projectcontentinfo);
+    }
     public String getReportToJson(Projectcontentinfo projectcontentinfo){
         RuralProjectcontentinfo info = new RuralProjectcontentinfo();
         try {

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

@@ -16,10 +16,7 @@ import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectReportRecordService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectcontentinfo.service.*;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
@@ -37,6 +34,7 @@ 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.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
@@ -73,6 +71,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
     @Autowired
     private ProjectReportDataService projectReportDataService;
     @Autowired
+    private ProjectContentDataService projectContentDataService;
+    @Autowired
     private ProjectcontentinfoService projectcontentinfoService;
     @Autowired
     private ProjectReportChangeService projectReportChangeService;
@@ -150,8 +150,19 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if(null != reviewFee){
             projectReportData.setReviewFee(String.valueOf(reviewFee));
         }
+        //获取自检的质量复核标准
+        String reviewId="";
+        if ("2".equals(records.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            reviewId="";
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        if (null!=workReviewAudits){
+            projectReportData.setProjectReviewList(workReviewAudits);
+            model.addAttribute("workReviewAudits", workReviewAudits);
+        }
         projectcontentinfo.setProjectReportData(projectReportData);
-
         ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
         //添加项目类型
         relateInfo.setAttachmentProjectType(records.getProjectType());
@@ -331,6 +342,19 @@ public class RuralCostProjectMessageNewController extends BaseController {
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         projectReportData = projectReportDataService.get(projectReportData.getId());
+        RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
+
+        //获取自检的质量复核标准
+        String reviewId="";
+        if ("2".equals(records.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            reviewId="";
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        if (null!=workReviewAudits){
+            projectReportData.setProjectReviewList(workReviewAudits);
+        }
         RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
         // 将项目负责人替换为项目中的负责人
         if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
@@ -1516,6 +1540,18 @@ public class RuralCostProjectMessageNewController extends BaseController {
         projectcontentinfo.setProject(records);
         //根据项目id查询报告信息
         ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(records.getId());
+        //获取自检的质量复核标准
+        String reviewId="";
+        if ("2".equals(records.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            reviewId="";
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        if (null!=workReviewAudits){
+            projectReportData.setProjectReviewList(workReviewAudits);
+            model.addAttribute("workReviewAudits", workReviewAudits);
+        }
         if(null == projectReportData){
             projectReportData = new ProjectReportData();
         }else{

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

@@ -17,10 +17,7 @@ import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectReportRecordService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectcontentinfo.service.*;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
@@ -38,6 +35,7 @@ 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.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
@@ -74,6 +72,8 @@ public class RuralProjectMessageNewController extends BaseController {
     @Autowired
     private ProjectReportDataService projectReportDataService;
     @Autowired
+    private ProjectContentDataService projectContentDataService;
+    @Autowired
     private ProjectcontentinfoService projectcontentinfoService;
     @Autowired
     private ProjectReportChangeService projectReportChangeService;
@@ -156,12 +156,28 @@ public class RuralProjectMessageNewController extends BaseController {
         if(null != reviewFee){
             projectReportData.setReviewFee(String.valueOf(reviewFee));
         }
+
+        //获取自检的质量复核标准
+        String reviewId="";
+        if ("2".equals(records.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            reviewId="";
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        if (null!=workReviewAudits){
+            projectReportData.setProjectReviewList(workReviewAudits);
+            model.addAttribute("workReviewAudits", workReviewAudits);
+        }
+
         projectcontentinfo.setProjectReportData(projectReportData);
 
         ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
         //添加项目类型
         relateInfo.setAttachmentProjectType(records.getProjectType());
         relateInfo.setAttachmentProjectSort(records.getAttachmentProjectSort());
+
+
         //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
         String money=projectcontentinfo.getProject().getSubmitMoney();
         Integer approvalMoney=null;
@@ -340,6 +356,20 @@ public class RuralProjectMessageNewController extends BaseController {
             projectReportData.setPrincipal(user);
         }
         Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
+
+        //获取自检的质量复核标准
+        String reviewId="";
+        if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            reviewId="";
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        if (null!=workReviewAudits){
+            projectReportData.setProjectReviewList(workReviewAudits);
+
+        }
+
         projectcontent.setProjectReportData(projectReportData);
         List<RuralReportConsultant> consultants = Lists.newArrayList();
         //将自己添加到咨询员数据中
@@ -403,6 +433,7 @@ public class RuralProjectMessageNewController extends BaseController {
         //添加项目类型
         relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
         relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+
         //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
@@ -1522,6 +1553,18 @@ public class RuralProjectMessageNewController extends BaseController {
         projectcontentinfo.setProject(records);
         //根据项目id查询报告信息
         ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(records.getId());
+        //获取自检的质量复核标准
+        String reviewId="";
+        if ("2".equals(records.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            reviewId="";
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        if (null!=workReviewAudits){
+            projectReportData.setProjectReviewList(workReviewAudits);
+            model.addAttribute("workReviewAudits", workReviewAudits);
+        }
         if(null == projectReportData){
             projectReportData = new ProjectReportData();
         }else{

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

@@ -31,6 +31,7 @@ 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.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
@@ -68,6 +69,8 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
     @Autowired
     private ProjectReportDataTwoService projectReportDataService;
     @Autowired
+    private ProjectContentDataService projectContentDataService;
+    @Autowired
     private ProjectReportDataService reportDataService;
     @Autowired
     private ProjectcontentinfoService projectcontentinfoService;
@@ -144,6 +147,18 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
         if(null != reviewFee){
             projectReportData.setReviewFee(String.valueOf(reviewFee));
         }
+
+        //获取自检的质量复核标准
+        String reviewId="";
+        if ("2".equals(records.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            reviewId="2";
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListIssue(reviewId,"自检");
+        if (null!=workReviewAudits){
+            projectReportData.setProjectReviewList(workReviewAudits);
+        }
         projectcontentinfo.setProjectReportDataTwo(projectReportData);
 
         ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();

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

@@ -43,6 +43,8 @@ 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.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
@@ -106,7 +108,8 @@ public class RuralProjectViewController extends BaseController {
     private ActTaskService actTaskService;
     @Autowired
     private ProjectEngineeringService engineeringService;
-
+    @Autowired
+    private WorkReviewStandardService workReviewStandardService;
     /**
      * 项目查看
      * 传参：项目id
@@ -436,7 +439,13 @@ public class RuralProjectViewController extends BaseController {
                 consultants.add(bzshbConsultant);
             }
         }
-
+        WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+        String type = "4";
+        workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+        workReviewAudit.setType(type);
+        workReviewAudit.setReportId(projectReportData.getId());
+        List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
+        model.addAttribute("list", workReviewAudits);
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
@@ -919,7 +928,13 @@ public class RuralProjectViewController extends BaseController {
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
-
+        WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+        String type = "4";
+        workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+        workReviewAudit.setType(type);
+        workReviewAudit.setReportId(projectReportDataTwo.getId());
+        List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
+        model.addAttribute("list", workReviewAudits);
         model.addAttribute("processInstanceId",projectReportDataTwo.getProcessInstanceId());
         model.addAttribute("projectReportData",projectReportData);
         model.addAttribute("projectReportDataTwo",projectReportDataTwo);

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -365,6 +365,8 @@ public class WorkProjectNotifyController extends BaseController {
     private ProjectRecordsService projectRecordsService;
     @Autowired
     private RuralProjectRecordsService ruralProjectRecordsService;
+    @Autowired
+	private ProjectContentDataService projectContentDataService;
 	@Autowired
 	private RuralPeojectRecordChooseCheckService ruralPeojectRecordChooseCheckService;
 	@Autowired
@@ -2650,25 +2652,25 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("workContractInfo", workContractInfo);
 					model.addAttribute("projectRecordPlans", projectRecordPlans);
 					WorkReviewAudit workReviewAudit = new WorkReviewAudit();
-					String type = "";
-					if ("master".equals(act.getTaskDefKey())) {
-						type = "2";
-					} else if ("bmzr".equals(act.getTaskDefKey())) {
-						type = "3";
-					} else if ("bzshbyg".equals(act.getTaskDefKey())) {
-						type = "4";
-					} else if ("bzshb".equals(act.getTaskDefKey())) {
-						if(null == projectReportData.getTechnicist())
-							projectReportData.setTechnicist(UserUtils.getUser());
-						type = "4";
-					}
-					model.addAttribute("projectReportData", projectReportData);
+					String type = "4";
 					workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
 					workReviewAudit.setType(type);
 					workReviewAudit.setReportId(workProjectNotify.getNotifyId());
 					List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
 					model.addAttribute("type", type);
 					model.addAttribute("list", workReviewAudits);
+					//获取自检的质量复核标准
+					String reviewId="";
+					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+						reviewId="1";
+					}else{
+						reviewId="2";
+					}
+					List<WorkReviewAudit> workReview = projectContentDataService.findListReview(reviewId,"自检");
+					if (null!=workReview){
+						projectReportData.setProjectReviewList(workReview);
+					}
+					model.addAttribute("projectReportData", projectReportData);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						//查询总审人员信息
 						RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
@@ -2806,6 +2808,7 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 						model.addAttribute("info", consultants);
 						model.addAttribute("consultantCount", consultants.size());
+
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify";
 					} else {
 						//查询总审人员信息
@@ -3009,19 +3012,7 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("workContractInfo", workContractInfo);
 					model.addAttribute("projectRecordPlans", projectRecordPlans);
 					WorkReviewAudit workReviewAudit = new WorkReviewAudit();
-					String type = "";
-					if ("master".equals(act.getTaskDefKey())) {
-						type = "2";
-					} else if ("bmzr".equals(act.getTaskDefKey())) {
-						type = "3";
-					} else if ("bzshbyg".equals(act.getTaskDefKey())) {
-						type = "4";
-					} else if ("bzshb".equals(act.getTaskDefKey())) {
-						if (null == projectReportDataTwo.getTechnicist())
-							projectReportDataTwo.setTechnicist(UserUtils.getUser());
-						type = "4";
-					}
-					model.addAttribute("projectReportDataTwo", projectReportDataTwo);
+					String type = "4";
 					workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
 					workReviewAudit.setType(type);
 					workReviewAudit.setReportId(workProjectNotify.getNotifyId());

src/main/java/com/jeeplus/modules/workreview/service/WorkReviewStandardService.java

@@ -197,6 +197,7 @@ public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao
         if (StringUtils.isNotBlank(workReviewAudit.getId())){
             workReviewAuditDao.update(workReviewAudit);
         }else {
+            workReviewAudit.preInsert();
             workReviewAuditDao.insert(workReviewAudit);
         }
 	}

src/main/java/com/jeeplus/modules/workreview/web/WorkReviewStandardController.java

@@ -88,7 +88,22 @@ public class WorkReviewStandardController extends BaseController {
 		model.addAttribute("workReviewStandard", workReviewStandard);
 		return "modules/workreview/workReviewStandardForm";
 	}
-
+	/**
+	 * 查看，增加，编辑复核标准表单页面
+	 */
+	@RequiresPermissions(value={"workreview:workReviewStandard:view","workreview:workReviewStandard:add","workreview:workReviewStandard:edit"},logical=Logical.OR)
+	@RequestMapping(value = "formFu")
+	public String formFu(WorkReviewStandard workReviewStandard, Model model) {
+		if(workReviewStandard!=null&&workReviewStandard.getParent()!=null&&StringUtils.isNotBlank(workReviewStandard.getParent().getId())){
+			WorkReviewStandard parent = workReviewStandardService.get(workReviewStandard.getParent().getId());
+			workReviewStandard.setParent(parent);
+			List<WorkReviewStandard> list = new ArrayList<>();
+			list.add(workReviewStandard);
+			workReviewStandardService.queryProofread(list);
+		}
+		model.addAttribute("workReviewStandard", workReviewStandard);
+		return "modules/workreview/workReviewStandardFormFu";
+	}
     /**
      * 查看，增加，编辑复核标准表单页面
      */

src/main/resources/mappings/modules/workreview/WorkReviewStandardDao.xml

@@ -80,7 +80,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY a.update_date DESC
+				ORDER BY a.order_num
 			</otherwise>
 		</choose>
 	</select>

src/main/webapp/webpage/modules/projectcontentinfo/workReviewStandardList.jsp

@@ -23,7 +23,7 @@
 			<tr>
 				<th  class="sort-column standardDetail" width="70%">复核内容</th>
 				<c:if test="${type == 4}">
-					<th  class="sort-column maxDeduct" width="15%">最多扣分</th>
+					<th  class="sort-column maxDeduct" width="15%">最多打分</th>
 					<th  class="sort-column standardDetail" width="15%">审核记录</th>
 				</c:if>
 				<c:if test="${type != 4}">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -153,6 +153,20 @@
 								}
 							}
 						}
+						var info = false;
+						if(dataList == undefined){
+							dataList = ${fns:toJson(workReviewAudits)}
+						}
+						for (var i=0; i<dataList.length; i++){
+							console.log($("#audit"+dataList[i].id).val())
+							if($("#audit"+dataList[i].id).val() == 0){
+								info = true;
+							}
+						}
+						if (info){
+							parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+							return false;
+						}
 						var flags=judgment();
 						if (flags){
 							$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/saveReport");
@@ -179,6 +193,18 @@
 			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
+				layui.form.on('checkbox(checkAll)', function(data){
+					var s=$(this).prop("checked");
+					var length=$(".checks").length;
+					for (var i=0;i<length;i++){
+						if (s){
+							$(".checks").eq(i).prop("checked",true);
+						}else{
+							$(".checks").eq(i).prop("checked",false);
+						}
+					}
+					form.render();
+				})
 			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -427,7 +453,20 @@
 				top.layer.msg("已确认！", {icon: 1});
 			return false;
 		}
-
+		function duoReviewAudits(mess,obj){
+        	var length=$(".checks").length;
+        	for (var i=0;i<length;i++){
+        		var falg=$(".checks").eq(i).prop("checked");
+        		if (falg){
+					var tr=$(".checks").eq(i).parent().parent();
+					$(tr).find("td").eq(1).find("input").eq(2).val("确认");
+					$(tr).find("td").eq(3).find("input").eq(0).val("1");
+					$(tr).find("td").eq(3).find(".check1").attr("style","display:none");
+					$(tr).find("td").eq(3).find(".check2").attr("style","display");;
+				}
+			}
+			top.layer.msg("已确认！", {icon: 1});
+		}
 		function getFee() {
 			var rf = $("#reviewFee").val();
 			var af = $("#approvalFee").val();
@@ -1758,6 +1797,61 @@
 					</td>
                 </tr>//-->
 			</script>
+
+			<div class="form-group layui-row">
+			<div class="form-group-label" style="overflow:hidden">
+				<h2 style="float: left">自检</h2>
+				<a onclick="return duoReviewAudits('确认要审核该质量复核内容吗？', this,'${projectReview.id}')"  style="color:#fff;float: right;margin-right: 50px;" class="layui-btn layui-btn-sm">多选确认</a>
+			</div>
+			<div class="layui-item layui-col-xs12 form-table-container">
+				<table id="contentTable2" class="table details table-bordered table-condensed">
+					<thead>
+					<tr>
+						<th style="text-align: center;width: 8%;"><input type="checkbox" id="checkAll" lay-filter="checkAll" lay-skin="primary" title=" "></th>
+						<th style="text-align: center;width:10%">序号</th>
+						<th style="text-align: center;width:70%">复核内容及评分标准</th>
+						<th style="text-align: center;width:10%">自检</th>
+					</tr>
+					</thead>
+					<tbody id="projectContentDataList2">
+					<c:forEach items="${workReviewAudits}" var="projectReview" varStatus="index">
+						<tr>
+							<td>
+								<input type="checkbox" class="checks" lay-skin="primary" title=" ">
+							</td>
+							<td>
+								<input id="projectReviewList${index.index}_id" name="projectReportData.projectReviewList[${index.index}].id" type="hidden" value="${projectReview.id}"/>
+								<input id="projectReviewList${index.index}_delFalg" name="projectReportData.projectReviewList[${index.index}].delFalg" type="hidden" value="1"/>
+								<input id="projectReviewList${index.index}_remarks" name="projectReportData.projectReviewList[${index.index}].remarks" type="hidden" value="${projectReview.remarks}"/>
+									${index.index+1}
+							</td>
+							<td>
+									${projectReview.standardDetail}
+							</td>
+
+							<td>
+								<c:choose>
+									<c:when test="${not empty projectReview.remarks}">
+										<div class="check-ok">
+											<i class="fa fa-check"></i>
+										</div>
+									</c:when>
+									<c:otherwise>
+										<div id = "check1${projectReview.id}" class="check1">
+											<input type="hidden" id="audit${projectReview.id}" value="0"/>
+											<a href="${ctx}/workreview/workReviewStandard/reviewAudit?auditId=${projectReview.id}" onclick="return reviewAudits('确认要审核该质量复核内容吗？', this.href,'${projectReview.id}','#projectReviewList${index.index}_remarks')"  style="color:#fff;" class="op-btn op-btn-edit">确认</a>
+										</div>
+										<div id = "check2${projectReview.id}" class="check-ok check2" style="display: none">
+											<i class="fa fa-check"></i>
+										</div>
+									</c:otherwise>
+								</c:choose>
+							</td>
+						</tr>
+					</c:forEach>
+					</tbody>
+				</table>
+			</div>
 		<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp

@@ -144,6 +144,20 @@
 						}
 					}
 				}
+				var info = false;
+				if(dataList == undefined){
+					dataList = ${fns:toJson(projectcontentinfo.projectReportData.projectReviewList)}
+				}
+				for (var i=0; i<dataList.length; i++){
+					console.log($("#audit"+dataList[i].id).val())
+					if($("#audit"+dataList[i].id).val() == 0){
+						info = true;
+					}
+				}
+				if (info){
+					parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+					return false;
+				}
 				if(boolFlag){
 					if(obj == 1){
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/reportAudit");
@@ -160,6 +174,18 @@
         $(document).ready(function() {
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
+				layui.form.on('checkbox(checkAll)', function(data){
+					var s=$(this).prop("checked");
+					var length=$(".checks").length;
+					for (var i=0;i<length;i++){
+						if (s){
+							$(".checks").eq(i).prop("checked",true);
+						}else{
+							$(".checks").eq(i).prop("checked",false);
+						}
+					}
+					form.render();
+				})
 			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -223,6 +249,16 @@
 				}
 			}
         });
+		function reviewAudits(mess, href,obj,remarks){
+			console.log(remarks);
+			var remark = $(remarks);
+			remark.val("确认");
+			$("#audit"+obj).val("1");
+			$("#check1"+obj).attr("style","display:none");
+			$("#check2"+obj).attr("style","display");
+			top.layer.msg("已确认！", {icon: 1});
+			return false;
+		}
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
                 if(id==$(idArr[i]).val()){
@@ -408,7 +444,20 @@
 				top.layer.msg("已确认！", {icon: 1});
 			return false;
 		}
-
+		function duoReviewAudits(mess,obj){
+			var length=$(".checks").length;
+			for (var i=0;i<length;i++){
+				var falg=$(".checks").eq(i).prop("checked");
+				if (falg){
+					var tr=$(".checks").eq(i).parent().parent();
+					$(tr).find("td").eq(1).find("input").eq(2).val("确认");
+					$(tr).find("td").eq(3).find("input").eq(0).val("1");
+					$(tr).find("td").eq(3).find(".check1").attr("style","display:none");
+					$(tr).find("td").eq(3).find(".check2").attr("style","display");;
+				}
+			}
+			top.layer.msg("已确认！", {icon: 1});
+		}
 		function getFee() {
 			var rf = $("#reviewFee").val();
 			var af = $("#approvalFee").val();
@@ -1538,7 +1587,60 @@
 					</td>
                 </tr>//-->
 			</script>
+			<div class="form-group layui-row">
+				<div class="form-group-label" style="overflow:hidden">
+					<h2 style="float: left">自检</h2>
+					<a onclick="return duoReviewAudits('确认要审核该质量复核内容吗？', this,'${projectReview.id}')"  style="color:#fff;float: right;margin-right: 50px;" class="layui-btn layui-btn-sm">多选确认</a>
+				</div>
+				<div class="layui-item layui-col-xs12 form-table-container">
+					<table id="contentTable2" class="table details table-bordered table-condensed">
+						<thead>
+						<tr>
+							<th style="text-align: center;width: 8%;"><input type="checkbox" id="checkAll" lay-filter="checkAll" lay-skin="primary" title=" "></th>
+							<th style="text-align: center;width:10%">序号</th>
+							<th style="text-align: center;width:70%">复核内容及评分标准</th>
+							<th style="text-align: center;width:10%">自检</th>
+						</tr>
+						</thead>
+						<tbody id="projectContentDataList2">
+						<c:forEach items="${projectcontentinfo.projectReportData.projectReviewList}" var="projectReview" varStatus="index">
+							<tr>
+								<td>
+									<input type="checkbox" class="checks" lay-skin="primary" title=" ">
+								</td>
+								<td>
+									<input id="projectReviewList${index.index}_id" name="projectReportData.projectReviewList[${index.index}].id" type="hidden" value="${projectReview.id}"/>
+									<input id="projectReviewList${index.index}_delFalg" name="projectReportData.projectReviewList[${index.index}].delFalg" type="hidden" value="1"/>
+									<input id="projectReviewList${index.index}_remarks" name="projectReportData.projectReviewList[${index.index}].remarks" type="hidden" value="${projectReview.remarks}"/>
+										${index.index+1}
+								</td>
+								<td>
+										${projectReview.standardDetail}
+								</td>
 
+								<td>
+									<c:choose>
+										<c:when test="${not empty projectReview.remarks}">
+											<div class="check-ok">
+												<i class="fa fa-check"></i>
+											</div>
+										</c:when>
+										<c:otherwise>
+											<div id = "check1${projectReview.id}" class="check1">
+												<input type="hidden" id="audit${projectReview.id}" value="0"/>
+												<a href="${ctx}/workreview/workReviewStandard/reviewAudit?auditId=${projectReview.id}" onclick="return reviewAudits('确认要审核该质量复核内容吗？', this.href,'${projectReview.id}','#projectReviewList${index.index}_remarks')"  style="color:#fff;" class="op-btn op-btn-edit">确认</a>
+											</div>
+											<div id = "check2${projectReview.id}" class="check-ok check2" style="display: none">
+												<i class="fa fa-check"></i>
+											</div>
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</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

@@ -1202,7 +1202,7 @@
 					}
 					if(d.projectReportStatus == 5){
 						if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核11</a>";
 						}
 					}
 				</shiro:hasPermission>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -149,6 +149,45 @@
 			obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
 			obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
 		}
+		// 确认对话框
+		function reportMaxDeduct(maxDeduct,id,parentId){
+			var dataList = ${fns:toJson(list)};
+			var maxDeductTotal = 0;
+			var maxDeducts = 0;
+			var total=0;
+			for (var i=0; i<dataList.length; i++){
+				if(dataList[i].id == id){
+					maxDeducts = dataList[i].maxDeduct;
+				}
+				// if(dataList[i].id == parentId){
+				//     maxDeductTotal = dataList[i].maxDeduct;
+				// }
+			}
+			$.ajax({
+				url:"${ctx}/workreview/workReviewStandard/reportMaxDeduct",
+				data:{
+					"maxDeduct":maxDeduct,
+					"id":id,
+				},
+				type:"post",
+				success:function(data){
+					if(data.status){
+						var length=$("#treeTable2 tbody tr").length;
+						for (var i=0;i<length;i++){
+							var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+							if (undefined!=zhi && ''!=zhi){
+								total=total+parseInt(zhi);
+							}
+						}
+						$("#total").html(total);
+						parent.layer.msg('输入打分项成功',{icon:1});
+					}else {
+						parent.layer.msg('输入打分项失败',{icon:2});
+					}
+				}
+			});
+			return false;
+		}
 	</script>
 </head>
 <body >
@@ -1075,6 +1114,48 @@
 									<act:histoicFlow procInsId="${processInstanceId}"/>
 								</div>
 							</div>
+							<div>
+								<div class="form-group-label">
+									<h2>质量复核内容</h2>
+								</div>
+								<div>
+									<div class="layui-item layui-col-xs12" >
+										<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+											<thead>
+											<tr>
+													<%--<th width="25%">序号</th>--%>
+												<th width="40%">符合内容及评分标准</th>
+												<th width="10%">自校</th>
+												<th width="20%">打分</th>
+													<%--<th width="15%">操作</th>--%>
+											</tr>
+											</thead>
+											<tbody>
+											<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+												<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+														<%--<td title="${workReviewAudit.orderNum}">--%>
+														<%--${workReviewAudit.orderNum}--%>
+														<%--</td>--%>
+													<td title="${workReviewAudit.standardDetail}">
+															${workReviewAudit.standardDetail}
+													</td>
+													<td>
+														<i class="fa fa-check"></i>
+													</td>
+													<td class="input-td">
+														<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}')" placeholder="${workReviewAudit.maxDeduct}">
+													</td>
+												</tr>
+											</c:forEach>
+											<tr>
+												<td colspan="2" style="font-weight: bold">总分</td>
+												<td id="total"></td>
+											</tr>
+											</tbody>
+										</table>
+									</div>
+								</div>
+							</div>
 				</div>
 				<div class="form-group layui-row first hide" id="subProjectInfo">
 					<table class="oa-table layui-table" id="contentTable1">
@@ -1685,103 +1766,16 @@
 					</div>
 				</div>
 			</div>
-			<%--<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>咨询质量控制信息</h2></div>
-
-				<c:if test="${type ==3 || type ==4}">
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label">专业咨询员：</label>
-						<div class="layui-input-block  with-icon">
-							<input id="projectReportDataConsultantName" class="form-control layui-input" readonly="readonly" value="${projectReportData.consultant.name}">
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line">专业咨询员审核意见：</label>
-						<div class="layui-input-block">
-							<form:textarea path="projectReportData.consultantRemarks" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label">项目负责人：</label>
-						<div class="layui-input-block">
-							<input id="projectReportDataPrincipalName" class="form-control layui-input" readonly="readonly" value="${projectReportData.principal.name}">
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line">项目负责人审核意见：</label>
-						<div class="layui-input-block">
-							<form:textarea path="projectReportData.principalRemarks" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
-						</div>
-					</div>
-				</c:if>
-				<c:if test="${type == 4}">
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label"><span class="require-item">*</span>技术负责人：</label>
-						<div class="layui-input-block  with-icon">
-							<sys:treeselect id="consultant" name="projectReportData.technicist.id" value="${projectReportData.technicist.id}" labelName="projectReportData.technicist.name" labelValue="${projectReportData.technicist.name}"
-											title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line"><span class="require-item">*</span>技术负责人审核意见：</label>
-						<div class="layui-input-block">
-							<div class="layui-item layui-col-sm6 lw7 with-textarea">
-								<div class="layui-input-block" style="margin-left:0px;position: relative">
-									<form:textarea placeholder="请输入审批意见:" path="projectReportData.technicistRemarks" id="technicistRemarks" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="255" />
-									<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
-									<input type="file" name="upload_files" style="display: none;">
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm4 lw6 with-textarea">
-								<div class="layui-input-block" style="margin-left:10px;">
-									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
-									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
-									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
-									<div style="padding: 5px 0px;">
-										<form:select path="projectReportData.technicistRemarks" id="auditOpinion" lay-filter="zixunOpinion" lay-verify="zixunOpinion" class="form-control simple-select">
-											<form:option value=""/>
-											<form:options items="${fns:getMainDictListOnProjectAdvent('consultant_comments')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-										</form:select>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</c:if>
-			</div>--%>
-
-
-<%--			<div class="form-group layui-row">--%>
-<%--				<div class="form-group-label"><h2>审批意见</h2></div>--%>
-<%--				<div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
-<%--					<div class="layui-input-block" style="margin-left:10px;position: relative">--%>
-<%--						<form:textarea placeholder="请输入意见:" path="projectReportData.act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
-<%--						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-<%--						<input type="file" name="upload_files" style="display: none;">--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--				<div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-<%--					<div class="layui-input-block" style="margin-left:10px;">--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;">--%>
-<%--							<form:select path="projectReportData.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
-<%--								<form:option value=""/>--%>
-<%--								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-<%--							</form:select>--%>
-<%--						</div>--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--			</div>--%>
 
 		</form:form>
-
-		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
-			<h2>审批意见</h2>
+		<div>
+			<div class="form-group-label">
+				<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
+				<h2>审批意见</h2>
+			</div>
+			<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 		</div>
-		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+
 	</div>
 </div>
 <script>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -142,6 +142,45 @@
                 }
             });
         }
+		// 确认对话框
+		function reportMaxDeduct(maxDeduct,id,parentId){
+			var dataList = ${fns:toJson(list)};
+			var maxDeductTotal = 0;
+			var maxDeducts = 0;
+			var total=0;
+			for (var i=0; i<dataList.length; i++){
+				if(dataList[i].id == id){
+					maxDeducts = dataList[i].maxDeduct;
+				}
+				// if(dataList[i].id == parentId){
+				//     maxDeductTotal = dataList[i].maxDeduct;
+				// }
+			}
+			$.ajax({
+				url:"${ctx}/workreview/workReviewStandard/reportMaxDeduct",
+				data:{
+					"maxDeduct":maxDeduct,
+					"id":id,
+				},
+				type:"post",
+				success:function(data){
+					if(data.status){
+						var length=$("#treeTable2 tbody tr").length;
+						for (var i=0;i<length;i++){
+							var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+							if (undefined!=zhi && ''!=zhi){
+								total=total+parseInt(zhi);
+							}
+						}
+						$("#total").html(total);
+						parent.layer.msg('输入打分项成功',{icon:1});
+					}else {
+						parent.layer.msg('输入打分项失败',{icon:2});
+					}
+				}
+			});
+			return false;
+		}
 	</script>
 </head>
 <body >
@@ -941,6 +980,49 @@
 									<act:histoicFlow procInsId="${processInstanceId}"/>
 								</div>
 							</div>
+							<div>
+								<div class="form-group-label">
+									<h2>报告签发复核内容</h2>
+								</div>
+								<div>
+									<div class="layui-item layui-col-xs12" >
+										<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+											<thead>
+											<tr>
+													<%--<th width="25%">序号</th>--%>
+												<th width="40%">符合内容及评分标准</th>
+												<th width="10%">自校</th>
+												<th width="20%">打分</th>
+													<%--<th width="15%">操作</th>--%>
+											</tr>
+											</thead>
+											<tbody>
+											<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+												<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+														<%--<td title="${workReviewAudit.orderNum}">--%>
+														<%--${workReviewAudit.orderNum}--%>
+														<%--</td>--%>
+													<td title="${workReviewAudit.standardDetail}">
+															${workReviewAudit.standardDetail}
+													</td>
+													<td>
+														<i class="fa fa-check"></i>
+													</td>
+													<td class="input-td">
+														<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}')" placeholder="${workReviewAudit.maxDeduct}">
+													</td>
+												</tr>
+											</c:forEach>
+											<tr>
+												<td colspan="2" style="font-weight: bold">总分</td>
+												<td id="total"></td>
+											</tr>
+											</tbody>
+										</table>
+									</div>
+								</div>
+							</div>
+
 				</div>
 				<div class="form-group layui-row first hide" id="subProjectInfo">
 					<table class="oa-table layui-table" id="contentTable1">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp

@@ -23,6 +23,7 @@
             });
         }
         var validateForm;
+        var dataList;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
                 var projectId = '${projectcontentinfo.project.id}';
@@ -95,6 +96,20 @@
                         }
                     }
                 }
+                var info = false;
+                if(dataList == undefined){
+                    dataList = ${fns:toJson(projectcontentinfo.projectReportData.projectReviewList)}
+                }
+                for (var i=0; i<dataList.length; i++){
+                    console.log($("#audit"+dataList[i].id).val())
+                    if($("#audit"+dataList[i].id).val() == 0){
+                        info = true;
+                    }
+                }
+                if (info){
+                    parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+                    return false;
+                }
                 if(boolFlag) {
                     if (obj == 1) {
                         $("#flag").val("yes");
@@ -118,6 +133,18 @@
             $("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
             layui.use(['form', 'layer'], function () {
                 var form = layui.form;
+                layui.form.on('checkbox(checkAll)', function(data){
+                    var s=$(this).prop("checked");
+                    var length=$(".checks").length;
+                    for (var i=0;i<length;i++){
+                        if (s){
+                            $(".checks").eq(i).prop("checked",true);
+                        }else{
+                            $(".checks").eq(i).prop("checked",false);
+                        }
+                    }
+                    form.render();
+                })
             })
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -190,7 +217,30 @@
                 $("#consultFee").val(af)
             }
         }
-
+        function reviewAudits(mess, href,obj,remarks){
+            console.log(remarks);
+            var remark = $(remarks);
+            remark.val("确认");
+            $("#audit"+obj).val("1");
+            $("#check1"+obj).attr("style","display:none");
+            $("#check2"+obj).attr("style","display");
+            top.layer.msg("已确认！", {icon: 1});
+            return false;
+        }
+        function duoReviewAudits(mess,obj){
+            var length=$(".checks").length;
+            for (var i=0;i<length;i++){
+                var falg=$(".checks").eq(i).prop("checked");
+                if (falg){
+                    var tr=$(".checks").eq(i).parent().parent();
+                    $(tr).find("td").eq(1).find("input").eq(2).val("确认");
+                    $(tr).find("td").eq(3).find("input").eq(0).val("1");
+                    $(tr).find("td").eq(3).find(".check1").attr("style","display:none");
+                    $(tr).find("td").eq(3).find(".check2").attr("style","display");;
+                }
+            }
+            top.layer.msg("已确认！", {icon: 1});
+        }
         function getApprovalFee() {
             var rf = $("#reviewFee").val();
             var af = $("#approvalFee").val();
@@ -1259,30 +1309,61 @@
                     </table>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label" style="overflow:hidden">
+                    <h2 style="float: left">自检</h2>
+                    <a onclick="return duoReviewAudits('确认要审核该质量复核内容吗？', this,'${projectReview.id}')"  style="color:#fff;float: right;margin-right: 50px;" class="layui-btn layui-btn-sm">多选确认</a>
+                </div>
+                <div class="layui-item layui-col-xs12 form-table-container">
+                    <table id="contentTable2" class="table details table-bordered table-condensed">
+                        <thead>
+                        <tr>
+                            <th style="text-align: center;width: 8%;"><input type="checkbox" id="checkAll" lay-filter="checkAll" lay-skin="primary" title=" "></th>
+                            <th style="text-align: center;width:10%">序号</th>
+                            <th style="text-align: center;width:70%">复核内容及评分标准</th>
+                            <th style="text-align: center;width:10%">自检</th>
+                        </tr>
+                        </thead>
+                        <tbody id="projectContentDataList2">
+                        <c:forEach items="${projectcontentinfo.projectReportData.projectReviewList}" var="projectReview" varStatus="index">
+                            <tr>
+                                <td>
+                                    <input type="checkbox" class="checks" lay-skin="primary" title=" ">
+                                </td>
+                                <td>
+                                    <input id="projectReviewList${index.index}_id" name="projectReportData.projectReviewList[${index.index}].id" type="hidden" value="${projectReview.id}"/>
+                                    <input id="projectReviewList${index.index}_delFalg" name="projectReportData.projectReviewList[${index.index}].delFalg" type="hidden" value="1"/>
+                                    <input id="projectReviewList${index.index}_remarks" name="projectReportData.projectReviewList[${index.index}].remarks" type="hidden" value="${projectReview.remarks}"/>
+                                        ${index.index+1}
+                                </td>
+                                <td>
+                                        ${projectReview.standardDetail}
+                                </td>
 
-<%--            <div class="form-group layui-row">--%>
-<%--                <div class="form-group-label"><h2>审批意见</h2></div>--%>
-<%--                <div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
-<%--                    <div class="layui-input-block" style="margin-left:10px;position: relative">--%>
-<%--                        <form:textarea path="projectReportData.act.comment"  placeholder="请输入意见"  id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
-<%--                        <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-<%--                        <input type="file" name="upload_files" style="display: none;">--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-<%--                    <div class="layui-input-block" style="margin-left:10px;">--%>
-<%--                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-<%--                        <div style="padding: 5px 0px;">--%>
-<%--                            <form:select path="projectReportData.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
-<%--                                <form:option value=""/>--%>
-<%--                                <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-<%--                            </form:select>--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--            </div>--%>
+                                <td>
+                                    <c:choose>
+                                        <c:when test="${not empty projectReview.remarks}">
+                                            <div class="check-ok">
+                                                <i class="fa fa-check"></i>
+                                            </div>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <div id = "check1${projectReview.id}" class="check1">
+                                                <input type="hidden" id="audit${projectReview.id}" value="0"/>
+                                                <a href="${ctx}/workreview/workReviewStandard/reviewAudit?auditId=${projectReview.id}" onclick="return reviewAudits('确认要审核该质量复核内容吗？', this.href,'${projectReview.id}','#projectReviewList${index.index}_remarks')"  style="color:#fff;" class="op-btn op-btn-edit">确认</a>
+                                            </div>
+                                            <div id = "check2${projectReview.id}" class="check-ok check2" style="display: none">
+                                                <i class="fa fa-check"></i>
+                                            </div>
+                                        </c:otherwise>
+                                    </c:choose>
+                                </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/projectcontentinfo/new/projectRecordsMessageModifyTwo.jsp

@@ -113,6 +113,18 @@
             $("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
             layui.use(['form', 'layer'], function () {
                 var form = layui.form;
+                layui.form.on('checkbox(checkAll)', function(data){
+                    var s=$(this).prop("checked");
+                    var length=$(".checks").length;
+                    for (var i=0;i<length;i++){
+                        if (s){
+                            $(".checks").eq(i).prop("checked",true);
+                        }else{
+                            $(".checks").eq(i).prop("checked",false);
+                        }
+                    }
+                    form.render();
+                })
             })
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -185,7 +197,30 @@
                 $("#consultFee").val(af)
             }
         }
-
+        function reviewAudits(mess, href,obj,remarks){
+            console.log(remarks);
+            var remark = $(remarks);
+            remark.val("确认");
+            $("#audit"+obj).val("1");
+            $("#check1"+obj).attr("style","display:none");
+            $("#check2"+obj).attr("style","display");
+            top.layer.msg("已确认！", {icon: 1});
+            return false;
+        }
+        function duoReviewAudits(mess,obj){
+            var length=$(".checks").length;
+            for (var i=0;i<length;i++){
+                var falg=$(".checks").eq(i).prop("checked");
+                if (falg){
+                    var tr=$(".checks").eq(i).parent().parent();
+                    $(tr).find("td").eq(1).find("input").eq(2).val("确认");
+                    $(tr).find("td").eq(3).find("input").eq(0).val("1");
+                    $(tr).find("td").eq(3).find(".check1").attr("style","display:none");
+                    $(tr).find("td").eq(3).find(".check2").attr("style","display");;
+                }
+            }
+            top.layer.msg("已确认！", {icon: 1});
+        }
         function getApprovalFee() {
             var rf = $("#reviewFee").val();
             var af = $("#approvalFee").val();
@@ -905,30 +940,61 @@
                     </table>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label" style="overflow:hidden">
+                    <h2 style="float: left">自检</h2>
+                    <a onclick="return duoReviewAudits('确认要审核该质量复核内容吗？', this,'${projectReview.id}')"  style="color:#fff;float: right;margin-right: 50px;" class="layui-btn layui-btn-sm">多选确认</a>
+                </div>
+                <div class="layui-item layui-col-xs12 form-table-container">
+                    <table id="contentTable2" class="table details table-bordered table-condensed">
+                        <thead>
+                        <tr>
+                            <th style="text-align: center;width: 8%;"><input type="checkbox" id="checkAll" lay-filter="checkAll" lay-skin="primary" title=" "></th>
+                            <th style="text-align: center;width:10%">序号</th>
+                            <th style="text-align: center;width:70%">复核内容及评分标准</th>
+                            <th style="text-align: center;width:10%">自检</th>
+                        </tr>
+                        </thead>
+                        <tbody id="projectContentDataList2">
+                        <c:forEach items="${projectcontentinfo.projectReportDataTwo.projectReviewList}" var="projectReview" varStatus="index">
+                            <tr>
+                                <td>
+                                    <input type="checkbox" class="checks" lay-skin="primary" title=" ">
+                                </td>
+                                <td>
+                                    <input id="projectReviewList${index.index}_id" name="projectReportDataTwo.projectReviewList[${index.index}].id" type="hidden" value="${projectReview.id}"/>
+                                    <input id="projectReviewList${index.index}_delFalg" name="projectReportDataTwo.projectReviewList[${index.index}].delFalg" type="hidden" value="1"/>
+                                    <input id="projectReviewList${index.index}_remarks" name="projectReportDataTwo.projectReviewList[${index.index}].remarks" type="hidden" value="${projectReview.remarks}"/>
+                                        ${index.index+1}
+                                </td>
+                                <td>
+                                        ${projectReview.standardDetail}
+                                </td>
 
-<%--            <div class="form-group layui-row">--%>
-<%--                <div class="form-group-label"><h2>审批意见</h2></div>--%>
-<%--                <div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
-<%--                    <div class="layui-input-block" style="margin-left:10px;position: relative">--%>
-<%--                        <form:textarea path="projectReportData.act.comment"  placeholder="请输入意见"  id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
-<%--                        <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-<%--                        <input type="file" name="upload_files" style="display: none;">--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-<%--                    <div class="layui-input-block" style="margin-left:10px;">--%>
-<%--                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-<%--                        <div style="padding: 5px 0px;">--%>
-<%--                            <form:select path="projectReportDataTwo.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
-<%--                                <form:option value=""/>--%>
-<%--                                <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-<%--                            </form:select>--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--            </div>--%>
+                                <td>
+                                    <c:choose>
+                                        <c:when test="${not empty projectReview.remarks}">
+                                            <div class="check-ok">
+                                                <i class="fa fa-check"></i>
+                                            </div>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <div id = "check1${projectReview.id}" class="check1">
+                                                <input type="hidden" id="audit${projectReview.id}" value="0"/>
+                                                <a href="${ctx}/workreview/workReviewStandard/reviewAudit?auditId=${projectReview.id}" onclick="return reviewAudits('确认要审核该质量复核内容吗？', this.href,'${projectReview.id}','#projectReviewList${index.index}_remarks')"  style="color:#fff;" class="op-btn op-btn-edit">确认</a>
+                                            </div>
+                                            <div id = "check2${projectReview.id}" class="check-ok check2" style="display: none">
+                                                <i class="fa fa-check"></i>
+                                            </div>
+                                        </c:otherwise>
+                                    </c:choose>
+                                </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/projectcontentinfo/new/reportForm.jsp

@@ -98,6 +98,20 @@
 						if (!flags){
 							return flags;
 						}else{
+							var info = false;
+							if(dataList == undefined){
+								dataList = ${fns:toJson(workReviewAudits)}
+							}
+							for (var i=0; i<dataList.length; i++){
+								console.log($("#audit"+dataList[i].id).val())
+								if($("#audit"+dataList[i].id).val() == 0){
+									info = true;
+								}
+							}
+							if (info){
+								parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+								return false;
+							}
 							$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessageNew/saveReport");
 						}
 					}else{
@@ -133,6 +147,18 @@
 			}
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
+				layui.form.on('checkbox(checkAll)', function(data){
+					var s=$(this).prop("checked");
+					var length=$(".checks").length;
+					for (var i=0;i<length;i++){
+						if (s){
+							$(".checks").eq(i).prop("checked",true);
+						}else{
+							$(".checks").eq(i).prop("checked",false);
+						}
+					}
+					form.render();
+				})
 			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -365,6 +391,20 @@
 				top.layer.msg("已确认！", {icon: 1});
 			return false;
 		}
+		function duoReviewAudits(mess,obj){
+			var length=$(".checks").length;
+			for (var i=0;i<length;i++){
+				var falg=$(".checks").eq(i).prop("checked");
+				if (falg){
+					var tr=$(".checks").eq(i).parent().parent();
+					$(tr).find("td").eq(1).find("input").eq(2).val("确认");
+					$(tr).find("td").eq(3).find("input").eq(0).val("1");
+					$(tr).find("td").eq(3).find(".check1").attr("style","display:none");
+					$(tr).find("td").eq(3).find(".check2").attr("style","display");;
+				}
+			}
+			top.layer.msg("已确认！", {icon: 1});
+		}
 
 		function getFee() {
 			var rf = $("#reviewFee").val();
@@ -1691,6 +1731,61 @@
 					</td>
                 </tr>//-->
 			</script>
+			<div class="form-group layui-row">
+				<div class="form-group-label" style="overflow:hidden">
+					<h2 style="float: left">自检</h2>
+					<a onclick="return duoReviewAudits('确认要审核该质量复核内容吗？', this,'${projectReview.id}')"  style="color:#fff;float: right;margin-right: 50px;" class="layui-btn layui-btn-sm">多选确认</a>
+				</div>
+				<div class="layui-item layui-col-xs12 form-table-container">
+					<table id="contentTable2" class="table details table-bordered table-condensed">
+						<thead>
+						<tr>
+							<th style="text-align: center;width: 8%;"><input type="checkbox" id="checkAll" lay-filter="checkAll" lay-skin="primary" title=" "></th>
+							<th style="text-align: center;width:10%">序号</th>
+							<th style="text-align: center;width:70%">复核内容及评分标准</th>
+							<th style="text-align: center;width:10%">自检</th>
+						</tr>
+						</thead>
+						<tbody id="projectContentDataList2">
+						<c:forEach items="${workReviewAudits}" var="projectReview" varStatus="index">
+							<tr>
+								<td>
+									<input type="checkbox" class="checks" lay-skin="primary" title=" ">
+								</td>
+								<td>
+									<input id="projectReviewList${index.index}_id" name="projectReportData.projectReviewList[${index.index}].id" type="hidden" value="${projectReview.id}"/>
+									<input id="projectReviewList${index.index}_delFalg" name="projectReportData.projectReviewList[${index.index}].delFalg" type="hidden" value="1"/>
+									<input id="projectReviewList${index.index}_remarks" name="projectReportData.projectReviewList[${index.index}].remarks" type="hidden" value="${projectReview.remarks}"/>
+										${index.index+1}
+								</td>
+								<td>
+										${projectReview.standardDetail}
+								</td>
+
+								<td>
+									<c:choose>
+										<c:when test="${not empty projectReview.remarks}">
+											<div class="check-ok">
+												<i class="fa fa-check"></i>
+											</div>
+										</c:when>
+										<c:otherwise>
+											<div id = "check1${projectReview.id}" class="check1">
+												<input type="hidden" id="audit${projectReview.id}" value="0"/>
+												<a  onclick="return reviewAudits('确认要审核该质量复核内容吗？', this.href,'${projectReview.id}','#projectReviewList${index.index}_remarks')"  style="color:#fff;" class="op-btn op-btn-edit">确认</a>
+											</div>
+											<div id = "check2${projectReview.id}" class="check-ok check2" style="display: none">
+												<i class="fa fa-check"></i>
+											</div>
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
 		<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>
@@ -1702,7 +1797,6 @@
 			for(var i=0;i<s;i++){
 				$("input[name='sh']").attr("checked",false)
 				layui.form.render();
-
 			}
 			$("#zixunOpinion").val("");
 		})

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportFormTwo.jsp

@@ -94,6 +94,20 @@
 								}
 							}
 						}
+						var info = false;
+						if(dataList == undefined){
+							dataList = ${fns:toJson(projectcontentinfo.projectReportDataTwo.projectReviewList)}
+						}
+						for (var i=0; i<dataList.length; i++){
+							console.log($("#audit"+dataList[i].id).val())
+							if($("#audit"+dataList[i].id).val() == 0){
+								info = true;
+							}
+						}
+						if (info){
+							parent.layer.msg("请先确认报告签发符合内容!", {icon: 2});
+							return false;
+						}
 						var flags=judgment();
 						if (!flags){
 							return flags;
@@ -133,6 +147,18 @@
 			}
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
+				layui.form.on('checkbox(checkAll)', function(data){
+					var s=$(this).prop("checked");
+					var length=$(".checks").length;
+					for (var i=0;i<length;i++){
+						if (s){
+							$(".checks").eq(i).prop("checked",true);
+						}else{
+							$(".checks").eq(i).prop("checked",false);
+						}
+					}
+					form.render();
+				})
 			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -365,7 +391,20 @@
 				top.layer.msg("已确认！", {icon: 1});
 			return false;
 		}
-
+		function duoReviewAudits(mess,obj){
+			var length=$(".checks").length;
+			for (var i=0;i<length;i++){
+				var falg=$(".checks").eq(i).prop("checked");
+				if (falg){
+					var tr=$(".checks").eq(i).parent().parent();
+					$(tr).find("td").eq(1).find("input").eq(2).val("确认");
+					$(tr).find("td").eq(3).find("input").eq(0).val("1");
+					$(tr).find("td").eq(3).find(".check1").attr("style","display:none");
+					$(tr).find("td").eq(3).find(".check2").attr("style","display");;
+				}
+			}
+			top.layer.msg("已确认！", {icon: 1});
+		}
 		function getFee() {
 			var rf = $("#reviewFee").val();
 			var af = $("#approvalFee").val();
@@ -1251,6 +1290,60 @@
 					</td>
                 </tr>//-->
 			</script>
+			<div class="form-group layui-row">
+				<div class="form-group-label" style="overflow:hidden">
+					<h2 style="float: left">自检</h2>
+					<a onclick="return duoReviewAudits('确认要审核该质量复核内容吗？', this,'${projectReview.id}')"  style="color:#fff;float: right;margin-right: 50px;" class="layui-btn layui-btn-sm">多选确认</a>
+				</div>
+				<div class="layui-item layui-col-xs12 form-table-container">
+					<table id="contentTable2" class="table details table-bordered table-condensed">
+						<thead>
+						<tr>
+							<th style="text-align: center;width: 8%;"><input type="checkbox" id="checkAll" lay-filter="checkAll" lay-skin="primary" title=" "></th>
+							<th style="text-align: center;width:10%">序号</th>
+							<th style="text-align: center;width:70%">复核内容及评分标准</th>
+							<th style="text-align: center;width:10%">自检</th>
+						</tr>
+						</thead>
+						<tbody id="projectContentDataList2">
+						<c:forEach items="${projectcontentinfo.projectReportDataTwo.projectReviewList}" var="projectReview" varStatus="index">
+							<tr>
+								<td>
+									<input type="checkbox" class="checks" lay-skin="primary" title=" ">
+								</td>
+								<td>
+									<input id="projectReviewList${index.index}_id" name="projectReportDataTwo.projectReviewList[${index.index}].id" type="hidden" value="${projectReview.id}"/>
+									<input id="projectReviewList${index.index}_delFalg" name="projectReportDataTwo.projectReviewList[${index.index}].delFalg" type="hidden" value="1"/>
+									<input id="projectReviewList${index.index}_remarks" name="projectReportDataTwo.projectReviewList[${index.index}].remarks" type="hidden" value="${projectReview.remarks}"/>
+										${index.index+1}
+								</td>
+								<td>
+										${projectReview.standardDetail}
+								</td>
+
+								<td>
+									<c:choose>
+										<c:when test="${not empty projectReview.remarks}">
+											<div class="check-ok">
+											</div>
+										</c:when>
+										<c:otherwise>
+											<div id = "check1${projectReview.id}"  class="check1">
+												<input type="hidden" id="audit${projectReview.id}" value="0"/>
+<%--												<i class="fa fa-close"></i>--%>
+												<a  onclick="return reviewAudits('确认要审核该报告签发内容吗？', this.href,'${projectReview.id}','#projectReviewList${index.index}_remarks')"  style="color:#fff;" class="op-btn op-btn-edit">确认</a>
+											</div>
+											<div id = "check2${projectReview.id}" class="check-ok check2" style="display: none">
+												<i class="fa fa-check"></i>
+											</div>
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
 		<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageTwoView.jsp

@@ -48,6 +48,15 @@
 					$("#contractRate").parent().parent().hide();
 				}
 			}
+			var length=$("#treeTable2 tbody tr").length;
+			var total=0;
+			for (var i=0;i<length;i++){
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				if (undefined!=zhi && ''!=zhi){
+					total=total+parseInt(zhi);
+				}
+			}
+			$("#total").html(total);
 		});
 
 		function readOpenInfo(value) {
@@ -867,7 +876,48 @@
 				</div>
 			</div>
 
-
+			<div>
+				<div class="form-group-label">
+					<h2>质量复核内容</h2>
+				</div>
+				<div>
+					<div class="layui-item layui-col-xs12" >
+						<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+							<thead>
+							<tr>
+									<%--<th width="25%">序号</th>--%>
+								<th width="40%">符合内容及评分标准</th>
+								<th width="10%">自校</th>
+								<th width="20%">打分</th>
+									<%--<th width="15%">操作</th>--%>
+							</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+								<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+										<%--<td title="${workReviewAudit.orderNum}">--%>
+										<%--${workReviewAudit.orderNum}--%>
+										<%--</td>--%>
+									<td title="${workReviewAudit.standardDetail}">
+											${workReviewAudit.standardDetail}
+									</td>
+									<td>
+										<i class="fa fa-check"></i>
+									</td>
+									<td class="input-td">
+										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
+									</td>
+								</tr>
+							</c:forEach>
+							<tr>
+								<td colspan="2" style="font-weight: bold">总分</td>
+								<td id="total" style="background-color: #F1f1f1"></td>
+							</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
 			<c:if test="${not empty processInstanceId}">
 				<div class="form-group layui-row">
 					<div class="form-group-label"><h2>审批流程</h2></div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -48,6 +48,15 @@
 					$("#contractRate").parent().parent().hide();
 				}
 			}
+			var length=$("#treeTable2 tbody tr").length;
+			var total=0;
+			for (var i=0;i<length;i++){
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				if (undefined!=zhi && ''!=zhi){
+					total=total+parseInt(zhi);
+				}
+			}
+			$("#total").html(total);
 		});
 
 		function readOpenInfo(value) {
@@ -965,7 +974,48 @@
 					</table>
 				</div>
 			</div>
-
+			<div>
+				<div class="form-group-label">
+					<h2>质量复核内容</h2>
+				</div>
+				<div>
+					<div class="layui-item layui-col-xs12" >
+						<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+							<thead>
+							<tr>
+									<%--<th width="25%">序号</th>--%>
+								<th width="40%">符合内容及评分标准</th>
+								<th width="10%">自校</th>
+								<th width="20%">打分</th>
+									<%--<th width="15%">操作</th>--%>
+							</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+								<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+										<%--<td title="${workReviewAudit.orderNum}">--%>
+										<%--${workReviewAudit.orderNum}--%>
+										<%--</td>--%>
+									<td title="${workReviewAudit.standardDetail}">
+											${workReviewAudit.standardDetail}
+									</td>
+									<td>
+										<i class="fa fa-check"></i>
+									</td>
+									<td class="input-td">
+										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
+									</td>
+								</tr>
+							</c:forEach>
+							<tr>
+								<td colspan="2" style="font-weight: bold">总分</td>
+								<td id="total" style="background-color: #F1f1f1"></td>
+							</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
 
 			<c:if test="${not empty processInstanceId}">
 				<div class="form-group layui-row">

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportIssueView.jsp

@@ -63,6 +63,15 @@
 					}
 				})
 			})
+			var length=$("#treeTable2 tbody tr").length;
+			var total=0;
+			for (var i=0;i<length;i++){
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				if (undefined!=zhi && ''!=zhi){
+					total=total+parseInt(zhi);
+				}
+			}
+			$("#total").html(total);
 		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
@@ -282,6 +291,49 @@
 					</div>
 				</div>
 			</div>
+			<div>
+				<div class="form-group-label">
+					<h2>质量复核内容</h2>
+				</div>
+				<div>
+					<div class="layui-item layui-col-xs12" >
+						<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+							<thead>
+							<tr>
+									<%--<th width="25%">序号</th>--%>
+								<th width="40%">符合内容及评分标准</th>
+								<th width="10%">自校</th>
+								<th width="20%">打分</th>
+									<%--<th width="15%">操作</th>--%>
+							</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+								<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+										<%--<td title="${workReviewAudit.orderNum}">--%>
+										<%--${workReviewAudit.orderNum}--%>
+										<%--</td>--%>
+									<td title="${workReviewAudit.standardDetail}">
+											${workReviewAudit.standardDetail}
+									</td>
+									<td>
+										<i class="fa fa-check"></i>
+									</td>
+									<td class="input-td">
+										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
+									</td>
+								</tr>
+							</c:forEach>
+							<tr>
+								<td colspan="2" style="font-weight: bold">总分</td>
+								<td id="total" style="background-color: #F1f1f1"></td>
+							</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+
 			<c:if test="${not empty processInstanceId}">
 				<div class="form-group layui-row">
 					<div class="form-group-label"><h2>审批流程</h2></div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -63,6 +63,15 @@
 					}
 				})
 			})
+			var length=$("#treeTable2 tbody tr").length;
+			var total=0;
+			for (var i=0;i<length;i++){
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				if (undefined!=zhi && ''!=zhi){
+					total=total+parseInt(zhi);
+				}
+			}
+			$("#total").html(total);
 		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
@@ -350,6 +359,48 @@
 					</div>
 				</div>
 			</div>
+			<div>
+				<div class="form-group-label">
+					<h2>质量复核内容</h2>
+				</div>
+				<div>
+					<div class="layui-item layui-col-xs12" >
+						<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+							<thead>
+							<tr>
+									<%--<th width="25%">序号</th>--%>
+								<th width="40%">符合内容及评分标准</th>
+								<th width="10%">自校</th>
+								<th width="20%">打分</th>
+									<%--<th width="15%">操作</th>--%>
+							</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+								<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+										<%--<td title="${workReviewAudit.orderNum}">--%>
+										<%--${workReviewAudit.orderNum}--%>
+										<%--</td>--%>
+									<td title="${workReviewAudit.standardDetail}">
+											${workReviewAudit.standardDetail}
+									</td>
+									<td>
+										<i class="fa fa-check"></i>
+									</td>
+									<td class="input-td">
+										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
+									</td>
+								</tr>
+							</c:forEach>
+							<tr>
+								<td colspan="2" style="font-weight: bold">总分</td>
+								<td id="total" style="background-color: #F1f1f1"></td>
+							</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
 			<c:if test="${not empty processInstanceId}">
 				<div class="form-group layui-row">
 					<div class="form-group-label"><h2>审批流程</h2></div>

src/main/webapp/webpage/modules/workreview/workReviewStandardForm.jsp

@@ -46,20 +46,20 @@
             }
             setParentInfo($("#reviewParentId").val());
 		});
-        function setParentInfo(parentId){
-            $.ajax({
-                url:"${ctx}/workreview/workReviewStandard/jsonData",
-                dataType:"json",
-                data:{id:parentId},
-                success:function (data) {
-                    if(data.proofread==1&&data.grade==1){
-                        $("#maxDeductTr").show();
-                    }else {
-                        $("#maxDeductTr").hide();
-                    }
-                }
-            })
-        }
+        <%--function setParentInfo(parentId){--%>
+        <%--    $.ajax({--%>
+        <%--        url:"${ctx}/workreview/workReviewStandard/jsonData",--%>
+        <%--        dataType:"json",--%>
+        <%--        data:{id:parentId},--%>
+        <%--        success:function (data) {--%>
+        <%--            if(data.proofread==1&&data.grade==1){--%>
+        <%--                $("#maxDeductTr").show();--%>
+        <%--            }else {--%>
+        <%--                $("#maxDeductTr").hide();--%>
+        <%--            }--%>
+        <%--        }--%>
+        <%--    })--%>
+        <%--}--%>
 	</script>
 </head>
 <body>
@@ -82,12 +82,6 @@
 						<form:textarea path="standardDetail" htmlEscape="false"  rows="4" style="resize:none;" class="form-control required"/>
 					</div>
 				</div>
-				<div id="maxDeductTr" class="layui-item layui-col-sm12">
-					<label class="layui-form-label"><span class="require-item">*</span>最多扣分：</label>
-					<div class="layui-input-block">
-						<form:input path="maxDeduct" htmlEscape="false" max="100" min="0" class="form-control digits required layui-input"/>
-					</div>
-				</div>
 				<div class="layui-item layui-col-sm12">
 					<label class="layui-form-label">序号：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/workreview/workReviewStandardList.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>复核标准管理</title>
     <meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <%@include file="/webpage/include/treetable.jsp" %>
     <script type="text/javascript">
         $(document).ready(function() {
@@ -66,7 +68,6 @@
 						<thead>
 							<tr>
 								<th  width="40%">复核内容</th>
-								<th  >最多扣分</th>
 								<th >序号</th>
 								<th width="240px">操作</th>
 							</tr>
@@ -78,26 +79,30 @@
 										${workReviewStandard.standardDetail}
 								</a></td>
 								<td style="text-align: center">
-									${workReviewStandard.maxDeduct}
-								</td>
-								<td style="text-align: center">
 									${workReviewStandard.orderNum}
 								</td>
 								<td class="op-td text-center">
 									<div class="op-btn-box">
-										<c:if test="${workReviewStandard.grade == 1 or (workReviewStandard.grade==2 and workReviewStandard.proofread == 1)}">
-											<shiro:hasPermission name="workreview:workReviewStandard:add">
-												<a href="javascript:void(0);" onclick="openDialog('添加标准', '${ctx}/workreview/workReviewStandard/form?parent.id=${workReviewStandard.id}','95%','95%')" class="op-btn op-btn-add"><i class="fa fa-plus"></i> 添加下级标准</a>
-											</shiro:hasPermission>
-										</c:if>
-										<c:if test="${workReviewStandard.grade >=2}">
-										<shiro:hasPermission name="workreview:workReviewStandard:edit">
-											<a href="javascript:void(0);" onclick="openDialog('修改复核标准', '${ctx}/workreview/workReviewStandard/form?id=${workReviewStandard.id}','95%','95%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
-										</shiro:hasPermission>
-										<shiro:hasPermission name="workreview:workReviewStandard:del">
-											<a href="${ctx}/workreview/workReviewStandard/delete?id=${workReviewStandard.id}" onclick="return confirmx('确认要删除该复核标准及其子复核标准吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
-										</shiro:hasPermission>
-										</c:if>
+											<div class="layui-btn-group search-spacing">
+												<c:if test="${workReviewStandard.grade==2}">
+													<shiro:hasPermission name="workreview:workReviewStandard:add">
+														<a href="javascript:void(0);" onclick="openDialog('添加标准', '${ctx}/workreview/workReviewStandard/form?parent.id=${workReviewStandard.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-blue"> 添加下级标准</a>
+													</shiro:hasPermission>
+												</c:if>
+												<c:if test="${workReviewStandard.grade ==1}">
+													<shiro:hasPermission name="workreview:workReviewStandard:edit">
+														<a href="javascript:void(0);" onclick="openDialog('修改复核标准', '${ctx}/workreview/workReviewStandard/form?id=${workReviewStandard.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
+													</shiro:hasPermission>
+												</c:if>
+												<c:if test="${workReviewStandard.grade >=2}">
+													<shiro:hasPermission name="workreview:workReviewStandard:edit">
+														<a href="javascript:void(0);" onclick="openDialog('修改复核标准', '${ctx}/workreview/workReviewStandard/form?id=${workReviewStandard.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
+													</shiro:hasPermission>
+													<shiro:hasPermission name="workreview:workReviewStandard:del">
+														<a href="${ctx}/workreview/workReviewStandard/delete?id=${workReviewStandard.id}" onclick="return confirmx('确认要删除该复核标准及其子复核标准吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
+													</shiro:hasPermission>
+												</c:if>
+											</div>
 									</div>
 								</td>
 							</tr>