上报添加暂存功能

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

@@ -2288,6 +2288,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         if(StringUtils.isBlank(reported.getJingHeJianLv())){
             reported.setJingHeJianLv(null);
         }
+        if(StringUtils.isBlank(reported.getZiXunBDE())){
+            reported.setZiXunBDE(null);
+        }
+        if(StringUtils.isBlank(reported.getBaoGaoShuQianFaDate())){
+            reported.setBaoGaoShuQianFaDate(null);
+        }
     }
 
     /**
@@ -2295,9 +2301,14 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
      * @param reported
      */
     @Transactional(readOnly = false)
-    public String saveReportedInfo(RuralProjectRecordsReported reported) {
+    public String saveReportedInfo(RuralProjectRecordsReported reported, ProjectStatusEnum projectStatus) {
         this.disposeList(reported);
         reported.setS3(reported.getS3().replaceAll(",",""));
+        Integer oldStatus = null;
+        if(StringUtils.isNotBlank(reported.getReportStatus())){
+            oldStatus = Integer.parseInt(reported.getReportStatus());
+        }
+        reported.setReportStatus(String.valueOf(projectStatus.getValue()));
         //查询是否已经上报项目信息
         if (StringUtils.isBlank(reported.getId())){
             reported.setCompany(UserUtils.getSelectCompany());
@@ -2346,7 +2357,17 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         }
 
         //启动审核
-        return this.startAudit(reported,reported.getProcessInstanceId());
+        if (Integer.parseInt(reported.getReportStatus())== ProjectStatusEnum.IN_APRL.getValue() &&(oldStatus==null|| ProjectStatusEnum.REJECTED.getValue()!=oldStatus)) {
+            this.startAudit(reported, reported.getProcessInstanceId());
+        }
+
+        //修改项目信息中的上报状态
+        RuralProjectRecords records = new RuralProjectRecords();
+        records.setId(reported.getId());
+        records.setReportedState(String.valueOf(projectStatus.getValue()));
+        dao.updateReported(records);
+
+        return null;
     }
 
 
@@ -2476,11 +2497,6 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         workProjectNotify.setProcessInstanceId(processInstance.getId());
         workProjectNotifyService.save(workProjectNotify);
 
-        //修改项目信息中的上报状态
-        RuralProjectRecords records = new RuralProjectRecords();
-        records.setId(reported.getId());
-        records.setReportedState(String.valueOf(ProjectStatusEnum.IN_APRL.getValue()));
-        dao.updateReported(records);
 
         return "";
     }
@@ -3076,17 +3092,19 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 }
             }
             User user=userService.get(consultant.getZixunyuan());
-            //查询用户身份证号
-            WorkStaffBasicInfo userInfo = workStaffBasicInfoService.getByUserId(user.getId());
-            if(null != userInfo){
-                consultant.setIdCard(userInfo.getIdCard());
-            }
-            if("1".equals(consultant.getRoleFlag())){
-                consultant.setRole("负责人");
-            }else{
-                consultant.setRole("咨询员");
+            if(null != user){
+                //查询用户身份证号
+                WorkStaffBasicInfo userInfo = workStaffBasicInfoService.getByUserId(user.getId());
+                if(null != userInfo){
+                    consultant.setIdCard(userInfo.getIdCard());
+                }
+                if("1".equals(consultant.getRoleFlag())){
+                    consultant.setRole("负责人");
+                }else{
+                    consultant.setRole("咨询员");
+                }
+                consultant.setZixunyuanName(user.getName());
             }
-            consultant.setZixunyuanName(user.getName());
             consultantInfoList.add(consultant);
         }
         return consultantInfoList;
@@ -3230,12 +3248,14 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 }
             }
             User user=userService.get(consultant.getZixunyuan());
-            //查询用户身份证号
-            WorkStaffBasicInfo userInfo = workStaffBasicInfoService.getByUserId(user.getId());
-            if(null != userInfo){
-                consultant.setIdCard(userInfo.getIdCard());
+            if(null != user){
+                //查询用户身份证号
+                WorkStaffBasicInfo userInfo = workStaffBasicInfoService.getByUserId(user.getId());
+                if(null != userInfo){
+                    consultant.setIdCard(userInfo.getIdCard());
+                }
+                consultant.setZixunyuanName(user.getName());
             }
-            consultant.setZixunyuanName(user.getName());
             consultantInfoList.add(consultant);
         }
         return consultantInfoList;
@@ -3359,6 +3379,10 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             if(null!= info) {
                 reported.setProjectType(info.getReportedKey());
             }
+            //判定项目类型是否为“工程结算审核”，若是则将审定价默认填写到咨询标的额中
+            if("10".equals(reported.getProjectType())){
+                reported.setZiXunBDE(reported.getShenDingJia());
+            }
         }
     }
 }