上报总审审核功能修改

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

@@ -683,6 +683,19 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         return "true";
     }
 
+
+    /**
+     * 紧急项目数据库添加操作
+     * @param projectReportData
+     */
+    @Transactional(readOnly = false)
+    public void exigenceProjectSave(ProjectReportData projectReportData){
+        //添加审核通过日期
+        projectReportData.setAuditPassDate(new Date());
+        projectReportData.setStatus("5");
+        projectReportDataDao.update(projectReportData);
+    }
+
     public String getReportToJson(Projectcontentinfo projectcontentinfo){
         RuralProjectcontentinfo info = new RuralProjectcontentinfo();
         try {
@@ -2441,7 +2454,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         User zsUser = UserUtils.get(projectReportData.getBzshbUserId());
         //判断审核增减率
         //判断审核增减率是否大于30%（大于则为false，否则为true）
-        if("10".equals(reported.getProjectType())){
+        if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
             if(Double.valueOf(reported.getJingHeJianLv())>30 ){
                 bmzrList = Lists.newArrayList();
                 bmzrList.add(zsUser);

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

@@ -1450,7 +1450,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
             }else if ("modifyApply".equals(taskDefKey)){
                 //判断审核增减率
                 //判断审核增减率是否大于30%（大于则为false，否则为true）
-                if("10".equals(reported.getProjectType())){
+                if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
                     if(Double.valueOf(reported.getJingHeJianLv())>30) {
                         //获取项目信息
                         ProjectRecords projectRecords = projectRecordsServices.getRuralMasters(reported.getProjectId());

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

@@ -1455,7 +1455,7 @@ public class RuralProjectMessageNewController extends BaseController {
             }else if ("modifyApply".equals(taskDefKey)){
                 //判断审核增减率
                 //判断审核增减率是否大于30%（大于则为false，否则为true）
-                if("10".equals(reported.getProjectType())){
+                if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
                     if(Double.valueOf(reported.getJingHeJianLv())>30) {
                         //获取项目信息
                         ProjectRecords projectRecords = projectRecordsServices.getRuralMasters(reported.getProjectId());

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

@@ -1737,7 +1737,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						model.addAttribute("identification", "projectReported");
 						model.addAttribute("identificationName","项目上报审核意见");
-						if("10".equals(reported.getProjectType())){
+						if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
 							if(Double.valueOf(reported.getJingHeJianLv())>30){
 								return "modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit";
 							}