Merge remote-tracking branch 'origin/master'

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

@@ -2700,7 +2700,10 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
-                            String url = "http://comp.jszj.com.cn:8031/api/testAddProject";
+                            //测试接口
+                            //String url = "http://comp.jszj.com.cn:8031/api/testAddProject";
+                            //正式接口
+                            String url = "http://comp.jszj.com.cn:8031/api/project/addProject";
                             //发送请求
                             String returnResult = HttpPostTool.doPost(url, encryptByAes);
                             HashMap hashMap = JSON.parseObject(returnResult, HashMap.class);

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

@@ -1768,9 +1768,9 @@ public class RuralCostProjectMessageController extends BaseController {
             consultantList = ruralProjectMessageService.disposereportedConsultant(reportedConsultants);
         }
         RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(reported.getProjectId());
-        if(StringUtils.isBlank(reported.getProjectRecordId())){
+        /*if(StringUtils.isBlank(reported.getProjectRecordId())){
             reported.setProjectRecordId(records.getProjectId());
-        }
+        }*/
         model.addAttribute("ruralProjectRecordsReported", reported);
         //查询项目信息
         model.addAttribute("ruralProjectRecords", records);

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

@@ -1767,9 +1767,9 @@ public class RuralProjectMessageController extends BaseController {
             consultantList = ruralProjectMessageService.disposereportedConsultant(reportedConsultants);
         }
         RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(reported.getProjectId());
-        if(StringUtils.isBlank(reported.getProjectRecordId())){
+        /*if(StringUtils.isBlank(reported.getProjectRecordId())){
             reported.setProjectRecordId(records.getProjectId());
-        }
+        }*/
         model.addAttribute("ruralProjectRecordsReported", reported);
         //查询项目信息
         model.addAttribute("ruralProjectRecords", records);