Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp
#	src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

src/main/java/com/jeeplus/modules/projectFilingBatch/entity/ProjectFilingBatch.java

@@ -47,6 +47,7 @@ public class ProjectFilingBatch extends DataEntity<ProjectFilingBatch> {
     private String createId;     //创建人id
     private Integer notifyFlag; //代办判定条件
     private String notifyId; //代办判定条件
+    private String reportNumber; //报告号
 
     public String getProcessinstanceId() {
         return processinstanceId;
@@ -247,4 +248,12 @@ public class ProjectFilingBatch extends DataEntity<ProjectFilingBatch> {
     public void setNotifyId(String notifyId) {
         this.notifyId = notifyId;
     }
+
+    public String getReportNumber() {
+        return reportNumber;
+    }
+
+    public void setReportNumber(String reportNumber) {
+        this.reportNumber = reportNumber;
+    }
 }

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -401,13 +401,17 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         }else if (oldStatus== ProjectStatusEnum.RECALL.getValue() || oldStatus== ProjectStatusEnum.REJECTED.getValue() || oldStatus== ProjectStatusEnum.TSTORE.getValue()) {
             //获取归档批次的项目信息
             List<ProjectFilingBatch> filingBatches=this.findProjectIdByFiling(projectFilingBatch.getId());
+            String prefixStr = "";
             //通过批次归档id和项目id删除之前的信息
             for (ProjectFilingBatch filingBatch:filingBatches){
+                prefixStr +=filingBatch.getNumber()+ "、";
                 ProjectFilingbatchRelation filingbatchRelation=new ProjectFilingbatchRelation();
                 filingbatchRelation.setFilingBatch(filingBatch.getId());
                 filingbatchRelation.setProjectId(filingBatch.getProjectId());
                 projectFilingbatchRelationDao.deleteByprojectId(filingbatchRelation);
             }
+            prefixStr = prefixStr.substring(0, prefixStr.length()-1);
+            projectFilingBatch.setReportNumber(prefixStr);
             super.save(projectFilingBatch);
         }else{
             synchronized (SYN_BYTE) {
@@ -450,8 +454,8 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             identityService.setAuthenticatedUserId(projectFilingBatch.getCurrentUser().getId());
             Office office = projectFilingBatch.getOffice();
             office = officeService.get(office.getId());
-            String contentStr = "归档项目批次【"+ projectFilingBatch.getFilingBatch()+"】待审批，归档批次编号："+projectFilingBatch.getId();
-            String titleStr = "归档项目批次【"+ projectFilingBatch.getFilingBatch()+"】待审批";
+            String contentStr = "报告号"+projectFilingBatch.getReportNumber()+"。归档项目批次【"+ projectFilingBatch.getFilingBatch()+"】待审批，归档批次编号："+projectFilingBatch.getId();
+            String titleStr = "报告号"+projectFilingBatch.getReportNumber()+"。归档项目批次【"+ projectFilingBatch.getFilingBatch()+"】待审批";
             String businessKey = projectFilingBatch.getId();
             Activity activity = new Activity();
             WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("7854872f45b84acd893010e66a3db2c8", office);
@@ -619,11 +623,15 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         //获取详细信息
         List<RuralProjectRecords> ruralProjectRecordsList = new ArrayList<>();
         List<ProjectFilingBatch> projectFilingBatches = dao.findProjectIdByFiling(projectFilingBatch.getId());
+        String prefixStr = "";
         for (ProjectFilingBatch filingBatch : projectFilingBatches) {
+            prefixStr +=filingBatch.getNumber()+ "、";
             RuralProjectRecords ruralProjectRecords = ruralProjectRecordsDao.get(filingBatch.getProjectId());
             ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());
             ruralProjectRecordsList.add(ruralProjectRecords);
         }
+        prefixStr = prefixStr.substring(0, prefixStr.length()-1);
+        projectFilingBatch.setReportNumber(prefixStr);
         //获取归档人
         projectFilingBatch.setCreateBy(UserUtils.get(projectFilingBatch.getCreateBy().getId()));
         //项目信息
@@ -698,9 +706,9 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         Office office = projectFilingBatch.getCreateBy().getOffice();
         office = officeService.get(office.getId());
         projectFilingBatch.setOffice(office);
-        String notifyStr = "归档批次号："+projectFilingBatch.getFilingBatch();
+        String notifyStr = "报告号"+projectFilingBatch.getReportNumber()+"。归档批次号："+projectFilingBatch.getFilingBatch();
         String str = notifyStr+"，创建人："+projectFilingBatch.getCreateBy().getName()+"，所属部门："+projectFilingBatch.getOffice().getName();
-        String titleStr = "归档批次名称："+ projectFilingBatch.getFilingBatch();
+        String titleStr = "报告号"+projectFilingBatch.getReportNumber()+"。归档批次名称："+ projectFilingBatch.getFilingBatch();
         int key = 0;
         if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("projectFilingBatch")) {
             key = 1;
@@ -834,8 +842,8 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
                 }
             }
             //审核完成提示框
-            String title = "归档批次号【"+projectFilingBatch.getFilingBatch()+"】归档成功";
-            String content = "归档批次号【"+projectFilingBatch.getFilingBatch()+"】归档成功，归档批次编号："+projectFilingBatch.getId();
+            String title = "报告号"+projectFilingBatch.getReportNumber()+"。归档批次号【"+projectFilingBatch.getFilingBatch()+"】归档成功";
+            String content = "报告号"+projectFilingBatch.getReportNumber()+"。归档批次号【"+projectFilingBatch.getFilingBatch()+"】归档成功，归档批次编号："+projectFilingBatch.getId();
             if ("yes".equals(projectFilingBatch.getAct().getFlag())) {
                 projectFilingBatch.setFilingStatus(ProjectStatusEnum.SIGNED.getValue());
                 WorkProjectNotify notify = new WorkProjectNotify();
@@ -907,8 +915,8 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
                 }
             }else {
                 if (!"yes".equals(projectFilingBatch.getAct().getFlag())) {//驳回待办提醒
-                    str = "归档批次号【"+ projectFilingBatch.getFilingBatch()+"】归档申请被驳回，请选择重新申请或作废";
-                    titleStr = "归档批次号【"+ projectFilingBatch.getFilingBatch()+"】归档申请被驳回";
+                    str = "报告号"+projectFilingBatch.getReportNumber()+"。归档批次号【"+ projectFilingBatch.getFilingBatch()+"】归档申请被驳回，请选择重新申请或作废";
+                    titleStr = "报告号"+projectFilingBatch.getReportNumber()+"。归档批次号【"+ projectFilingBatch.getFilingBatch()+"】归档申请被驳回";
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(projectFilingBatch.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);
@@ -926,8 +934,8 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
                     workProjectNotifyService.save(workProjectNotify);
                 } else {
                     if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办信息
-                        str = "归档批次号【"+ projectFilingBatch.getFilingBatch()+"】重新归档，待审批，项目编号："+projectFilingBatch.getId();
-                        titleStr = "归档批次号【"+ projectFilingBatch.getFilingBatch()+"】重新归档，待审批";
+                        str = "报告号"+projectFilingBatch.getReportNumber()+"。归档批次号【"+ projectFilingBatch.getFilingBatch()+"】重新归档，待审批，项目编号："+projectFilingBatch.getId();
+                        titleStr = "报告号"+projectFilingBatch.getReportNumber()+"。归档批次号【"+ projectFilingBatch.getFilingBatch()+"】重新归档，待审批";
                         WorkProjectNotify notify = new WorkProjectNotify();
                         notify.setNotifyId(projectFilingBatch.getId());
                         userList = workProjectNotifyService.readByNotifyId(notify);

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

@@ -1149,8 +1149,8 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		List<User> userList = new ArrayList<>();
 
 		if (!state) {
-			String titleStr = "项目【"+ record.getProjectName()+"】归档完成";
-			String content = "项目【"+ record.getProjectName()+"】归档完成,案卷号：" + projectReportRecord.getFileNum();
+			String titleStr = "报告号："+reportRecord.getReport().getNumber()+"。项目【"+ record.getProjectName()+"】归档完成";
+			String content = "报告号："+reportRecord.getReport().getNumber()+"。项目【"+ record.getProjectName()+"】归档完成,案卷号：" + projectReportRecord.getFileNum();
 			if("3".equals(record.getProjectType())){
 				titleStr = "全过程项目【"+ record.getProjectName()+"】归档完成";
 				content = "全过程项目【"+ record.getProjectName()+"】归档完成,归档编号：" + projectReportRecord.getFileNum();
@@ -1248,8 +1248,8 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 
 			} else {
 				if (!"yes".equals(flag)) {//驳回待办信息
-					str = "项目【"+ record.getProjectName()+"】归档被驳回，请重新归档";
-					title = "项目【"+ record.getProjectName()+"】归档被驳回";
+					str = "报告号："+reportRecord.getReport().getNumber()+"。项目【"+ record.getProjectName()+"】归档被驳回，请重新归档";
+					title = "报告号："+reportRecord.getReport().getNumber()+"。项目【"+ record.getProjectName()+"】归档被驳回";
 					if("3".equals(record.getProjectType())){
 						title = "全过程项目【"+ record.getProjectName()+"】归档被驳回";
 						str = "全过程项目【"+ record.getProjectName()+"】归档被驳回，请重新归档";
@@ -1271,8 +1271,8 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 					users.add( projectReportRecord.getCreateBy());
 				} else {
 					if (StringUtils.isNotBlank(enname)) {//驳回重新归档
-						str = "项目【"+ record.getProjectName()+"】归档信息，待审批";
-						title = "项目【"+ record.getProjectName()+"】归档信息，待审批";
+						str = "报告号："+reportRecord.getReport().getNumber()+"。项目【"+ record.getProjectName()+"】归档信息，待审批";
+						title = "报告号："+reportRecord.getReport().getNumber()+"。项目【"+ record.getProjectName()+"】归档信息，待审批";
 						if("3".equals(record.getProjectType())){
 							title = "全过程项目【"+ record.getProjectName()+"】归档信息，待审批";
 							str = "全过程项目【"+ record.getProjectName()+"】归档信息，待审批";

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectMessageAllDao.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.ruralprojectrecords.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -26,8 +27,8 @@ public interface RuralProjectMessageAllDao extends CrudDao<RuralProjectRecords>
 
     /**
      * 根据项目id查询审核通过的缺失文件流程
-     * @param projectId
+     * @param projectIdList
      * @return
      */
-    List<RuralProjectRecords> getProjectMaterialList(List<String> projectId);
+    List<RuralProjectRecords> getProjectMaterialList(@Param("projectIdList") List<String> projectIdList);
 }

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

@@ -612,9 +612,17 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
         //根据已查询的项目id查询资料缺失流程信息
         if(projectIdList.size()>0){
             List<RuralProjectRecords> projectMaterialList = dao.getProjectMaterialList(projectIdList);
+
+            Iterator<RuralProjectRecords> iterator = recordsList.iterator();
             //将获取的数据和项目数据进行比对，对已提交资料缺失申请并通过的并且项目归档已经延期的从列表中删除
             for (RuralProjectRecords info : projectMaterialList) {
-
+                while (iterator.hasNext()) {
+                    RuralProjectRecords s = iterator.next();
+                    if (info.getId().equals(s.getId()) && 1 == s.getOverRecordStatus()) {
+                        iterator.remove();//使用迭代器的删除方法删除
+                        break;
+                    }
+                }
             }
         }
         page.setList(recordsList);

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

@@ -1091,13 +1091,18 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         // 提交流程任务
         actTaskService.complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
         boolean state = actTaskService.isProcessEnd(act.getProcInsId());
+        ProjectReportData projectReportDataInfo = projectReportDataService.get(projectReportData.getId());
         List<User> users = new ArrayList<>();
         List<User> userList = new ArrayList<>();
         if (!state) {
             users.add(projectReportData.getCreateBy());
             if ("yes".equals(flag)) {
                 String titleStr = "项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";
-                String content = "项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过，报告号：" + projectReportData.getNumber();
+                String content = "项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";
+                if(StringUtils.isNotBlank(projectReportData.getNumber())){
+                    titleStr = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";
+                    content = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";
+                }
                 str =  "报告名称:"+projectReportData.getName()+",工作内容类型:"+ WorkContentTypeController.getContentTypeName(projectReportData.getType(),"")+",项目所属部门:"+recordsOffice.getName();
                 projectReportData.setStatus("5");
                 WorkProjectNotify notify = new WorkProjectNotify();
@@ -1185,6 +1190,10 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                 if (!"yes".equals(flag)) {//报告驳回待办提醒
                     title = "项目【"+ projectRecords.getProjectName()+"】新增报告质量复核被驳回";
                     str = "项目【"+ projectRecords.getProjectName()+"】新增报告质量复核被驳回，请选择重新申请或删除报告";
+                    if(StringUtils.isNotBlank(projectReportData.getNumber())){
+                        title = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】新增报告质量复核被驳回";
+                        str = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】新增报告质量复核被驳回，请选择重新申请或删除报告";
+                    }
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(projectReportData.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);
@@ -1204,6 +1213,10 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                     if (com.jeeplus.common.utils.StringUtils.isNotBlank(enname)) {//驳回重新申请待办信息
                         str = "项目【"+ projectRecords.getProjectName()+"】报告质量复核待审批";
                         title = "项目【"+ projectRecords.getProjectName()+"】报告质量复核待审批";
+                        if(StringUtils.isNotBlank(projectReportData.getNumber())){
+                            title = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
+                            str = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
+                        }
                         WorkProjectNotify notify = new WorkProjectNotify();
                         notify.setNotifyId(projectReportData.getId());
                         userList = workProjectNotifyService.readByNotifyId(notify);
@@ -1554,8 +1567,13 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         }
         ProjectRecords projectRecords = dao.getRuralProjectRecords(projectReportData.getProject().getId());
         Office recordsOffice =officeService.get(projectRecords.getOffice());
+        ProjectReportData projectReportDataInfo = projectReportDataService.get(projectReportData.getId());
         String title = "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
         String str =  "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
+        if(StringUtils.isNotBlank(projectReportDataInfo.getNumber())){
+            title = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
+            str = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
+        }
         // 用来设置启动流程的人员ID，引擎会自动把用户ID保存到activiti:initiator中
         identityService.setAuthenticatedUserId(user.getId());
         // 启动流程
@@ -2375,8 +2393,8 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         //查询项目新增报告信息
         ProjectReportData reportData = projectReportDataService.get(record.getPrdId());
         //启动流程操作
-        String title = "项目【"+ record.getProjectName()+"】归档待审批";
-        String str = "项目【"+ record.getProjectName()+"】归档待审批";
+        String title = "报告号："+reportData.getNumber()+"。项目【"+ record.getProjectName()+"】归档待审批";
+        String str = "报告号："+reportData.getNumber()+"。项目【"+ record.getProjectName()+"】归档待审批";
         // 用来设置启动流程的人员ID，引擎会自动把用户ID保存到activiti:initiator中
         identityService.setAuthenticatedUserId(user.getId());
         // 启动流程

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

@@ -151,6 +151,8 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
     private ProjectContentChangeDao projectContentChangeDao;
     @Autowired
     private ProjectContentDataService projectContentDataService;
+    @Autowired
+    private ProjectReportDataService projectReportDataInfoService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -502,8 +504,13 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
 //        }
         ProjectRecords projectRecords = dao.getRuralProjectRecords(projectReportData.getProject().getId());
         Office recordsOffice =officeService.get(projectRecords.getOffice());
+        ProjectReportData projectReportDataInfo = projectReportDataInfoService.getReportDataByProjectId(projectReportData.getProject().getId());
         String title = "项目【"+projectRecords.getProjectName()+"】报告签发待审批";
         String str =  "项目【"+projectRecords.getProjectName()+"】报告签发待审批";
+        if(StringUtils.isNotBlank(projectReportDataInfo.getNumber())){
+            title = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
+            str = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
+        }
         // 用来设置启动流程的人员ID，引擎会自动把用户ID保存到activiti:initiator中
         identityService.setAuthenticatedUserId(user.getId());
         // 启动流程
@@ -669,6 +676,8 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                 reportData.setTechnicistRemarks(reportData.getTechnicistRemarks().substring(0,reportData.getTechnicistRemarks().length()-1));
             }
         }
+        ProjectReportData projectReportDataInfo = projectReportDataInfoService.getReportDataByProjectId(reportData.getProject().getId());
+
         String flag = reportData.getAct().getFlag();
         // 对不同环节的业务逻辑进行操作
         Act act = reportData.getAct();
@@ -822,7 +831,11 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
             users.add(projectReportData.getCreateBy());
             if ("yes".equals(flag)) {
                 String titleStr = "项目【"+projectRecords.getProjectName()+"】报告签发审批通过";
-                String content = "项目【"+projectRecords.getProjectName()+"】报告签发审批通过，报告号：" + projectReportData.getNumber();
+                String content = "项目【"+projectRecords.getProjectName()+"】报告签发审批通过";
+                if(StringUtils.isNotBlank(projectReportDataInfo.getNumber())){
+                    titleStr = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告签发审批通过";
+                    content = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告签发审批通过";
+                }
                 str =  "报告名称:"+projectReportData.getName()+",工作内容类型:"+ WorkContentTypeController.getContentTypeName(projectReportData.getType(),"")+",项目所属部门:"+recordsOffice.getName();
                 projectReportData.setStatus("5");
                 WorkProjectNotify notify = new WorkProjectNotify();
@@ -910,6 +923,10 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                 if (!"yes".equals(flag)) {//报告驳回待办提醒
                     title = "项目【"+ projectRecords.getProjectName()+"】报告签发被驳回";
                     str = "项目【"+ projectRecords.getProjectName()+"】报告签发被驳回，请选择重新申请或删除报告";
+                    if(StringUtils.isNotBlank(projectReportDataInfo.getNumber())){
+                        title = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告签发被驳回";
+                        str = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告签发被驳回，请选择重新申请或删除报告";
+                    }
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(projectReportData.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);
@@ -929,6 +946,10 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                     if (com.jeeplus.common.utils.StringUtils.isNotBlank(enname)) {//驳回重新申请待办信息
                         str = "项目【"+ projectRecords.getProjectName()+"】报告签发待审批";
                         title = "项目【"+ projectRecords.getProjectName()+"】报告签发待审批";
+                        if(StringUtils.isNotBlank(projectReportDataInfo.getNumber())){
+                            title = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告签发待审批";
+                            str = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告签发待审批";
+                        }
                         WorkProjectNotify notify = new WorkProjectNotify();
                         notify.setNotifyId(projectReportData.getId());
                         userList = workProjectNotifyService.readByNotifyId(notify);

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

@@ -487,6 +487,6 @@ public class RuralProjectMessageAllController extends BaseController {
             addMessage(redirectAttributes, "导出项目记录失败！失败信息："+e.getMessage());
             logger.error("Exception e:"+e);
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
     }
 }

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementAllService.java

@@ -143,7 +143,7 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
                     workAccount.setFinancialSubjectss(workAccount.getFinancialSubjects());
                     workAccount.setFinancialSubjects("");
                 }
-                if(null != workAccount.getProjectRadio() && workAccount.getProjectRadio() == 0){
+                if((null != workAccount.getProjectRadio() && workAccount.getProjectRadio() == 0)||(null != workAccount.getProjectRadio() && workAccount.getProjectRadio() ==2)){
                     workAccount.getProject().setProjectName(workAccount.getReimburseRemarks());
                 }
             }
@@ -209,6 +209,10 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
             }
             workReimbursement.setReimbursementBackList( workReimbursementBackDao.findList(workReimbursementBack));
         }
+        //添加当前文件服务器类型
+        workReimbursement.setUploadMode(uploadMode);
+        //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+        workattachmentService.clientAttachmentManageOnUrl(workReimbursement.getWorkAttachments());
         return workReimbursement;
     }
 
@@ -1425,7 +1429,13 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
                 }else if (null != workAccount.getType()) {
                     WorkReimbursementTypeInfo workReimbursementTypeInfo= workReimbursementTypeService.get(workAccount.getType());
                     if (null != workReimbursementTypeInfo){
-                        String pid=workReimbursementTypeInfo.getParentIds().split(",")[1];
+                        String [] pidlen=workReimbursementTypeInfo.getParentIds().split(",");
+                        String pid=null;
+                        if (pidlen.length!=1){
+                            pid=pidlen[1];
+                        }else{
+                            pid="2";
+                        }
                         if("1".equals(pid) ){
                             workAccount.setProjectRadio(1);
                         }else{

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementAllController.java

@@ -831,4 +831,4 @@ public class WorkReimbursementAllController extends BaseController {
 		model.addAttribute("page",page);
 		return "modules/sys/gridReimburProjectList";
 	}
-}
+}

src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -406,7 +406,8 @@
 		    ending_date,
 		    estimate_total_fees,
 			construction_unit,
-			construction_linkman
+			construction_linkman,
+			type_id
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -450,7 +451,8 @@
 			#{endingDate},
 			#{estimateTotalFees},
 			#{constructionUnit},
-			#{constructionLinkman}
+			#{constructionLinkman},
+			#{projectTypeId}
 		)
 	</insert>
 

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

@@ -543,7 +543,7 @@
 
 	<select id="getProjectMaterialList" resultType="RuralProjectRecords" >
 		select a.id,a.project_name as "projectName"
-		from rural_project_record a
+		from rural_project_records a
 		left join project_report_data prd on a.id = prd.project_id
 		left join project_material_defect_record pmdr on prd.id = pmdr.report_id
 		<where>
@@ -553,7 +553,7 @@
 					#{id}
 				</foreach>
 			</if>
-			and pmrd.status = 5
+			and pmdr.status = 5
 		</where>
 	</select>
 </mapper>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/downloadRecordForm.jsp

@@ -10,6 +10,21 @@
 	<script type="text/javascript">
 
 		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			var beginDateTime = $("#beginDate").val();
+			var endDateTime = $("#endDate").val();
+			if(beginDateTime != null && beginDateTime != undefined && beginDateTime != ''
+					&&endDateTime != null && endDateTime != undefined && endDateTime != ''){
+				var startDate = new Date(beginDateTime.replace(/-/g, "/"));
+				var endDate = new Date(endDateTime.replace(/-/g, "/"));
+				var time = endDate.getTime() - startDate.getTime();
+				var days = parseInt(time / (1000 * 60 * 60 * 24));
+				if(days<0){
+					parent.layer.msg("项目创建结束时间需大于开始时间!", {icon: 5});
+					$("#endDate").val('');
+					return;
+				}
+			}
+
 		   var recordTypeStr=$("#recordTypeStr").val();
 		   if(recordTypeStr==null||recordTypeStr==""){
                top.layer.msg('请选择归档状态！', {icon: 0});

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

@@ -96,13 +96,10 @@
             })
             var projectType = $("#projectTypeId").val()
             if (projectType == "10") {
-                $("#ptDiv").show();
                 $(".overallProcessDiv").hide();
             }else if(projectType == "19"){
                 $(".overallProcessDiv").show();
-                $("#ptDiv").hide();
             }else {
-                $("#ptDiv").hide();
             }
             var contents=${ruralProjectRecordsReported.contentsIncludeList}
             for(var i=0;i<contents.length;i++){
@@ -384,27 +381,26 @@
                     <span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
                 </div>
 
-                <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">合同价(元)：</label>
+                        <label class="layui-form-label double-line">合同价(万元)：</label>
                         <div class="layui-input-block with-icon">
                             <form:input path="HeTongJia" htmlEscape="false" readonly="true" class="form-control layui-input number"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">送审价(元)：</label>
+                        <label class="layui-form-label double-line">送审价(万元)：</label>
                         <div class="layui-input-block with-icon">
                             <form:input path="SongShenJia" placeholder="请输入送审价" readonly="true" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">审定价(元)：</label>
+                        <label class="layui-form-label double-line">审定价(万元)：</label>
                         <div class="layui-input-block with-icon">
                             <form:input path="ShenDingJia" placeholder="请输入审定价" readonly="true" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减额(元)：</label>
+                        <label class="layui-form-label double-line">审核增减额(万元)：</label>
                         <div class="layui-input-block with-icon">
                             <form:input path="JingHeJianE" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
                         </div>
@@ -415,7 +411,6 @@
                             <form:input path="JingHeJianLv" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
                         </div>
                     </div>
-                </div>
             </div>
 
 

src/main/webapp/webpage/modules/workcontent/workScheduleList.jsp

@@ -111,7 +111,7 @@
             </td>
 
             <td>
-                <input id="workScheduleList{{idx}}_currentShouldDeductMoney" subName="currentShouldDeductMoney" type="text"  value="{{row.currentShouldDeductMoney}}" class="form-control contentDetail"/>
+                <input id="workScheduleList{{idx}}_currentShouldDeductMoney" subName="currentShouldDeductMoney" type="text"  value="{{row.currentShouldDeductMoney}}" class="form-control number contentDetail money"/>
             </td>
             <td>
                 <input id="workScheduleList{{idx}}_currentPracticalPayMoney" subName="currentPracticalPayMoney" type="text"  value="{{row.currentPracticalPayMoney}}" class="form-control number contentDetail"/>
@@ -235,4 +235,4 @@
             return '';
         }
     </script>
-</form>
+</form>