项目上报功能

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

@@ -21,6 +21,7 @@ import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
@@ -959,15 +960,29 @@ public class RuralCostProjectMessageController extends BaseController {
      * @return
      */
     @RequestMapping(value = "updateReported")
-    public String updateReported(RuralProjectRecords projectRecords,RedirectAttributes redirectAttributes) {
-        Integer reported = ruralProjectMessageService.updateReported(projectRecords);
-        if(1 == reported){
-            addMessage(redirectAttributes, "上报成功");
-        }else{
-            addMessage(redirectAttributes, "上报失败");
-        }
+    public String updateReported(RuralProjectRecords projectRecords, Model model) {
+        //查询上报信息表中是否含有数据，没有则进行获取基础数据
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if(reported == null){
+            RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(projectRecords.getId());
+            projectRecordsService.queryProjectDetail(records);
+            Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectRecords.getId());
+            ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+            records.setReportData(projectReportData);
+            reported = ruralProjectMessageService.disposeData(records);
+        }
+        model.addAttribute("ruralProjectRecordsReported", reported);
+        return "modules/ruralprojectrecords/cost/reportedForm";
+    }
 
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+    /**
+     * 保存报告归档
+     */
+    @RequestMapping(value = "saveReported")
+    public String saveReported(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) {
+        ruralProjectMessageService.saveReportedInfo(reported);
+        addMessage(redirectAttributes, "项目上报成功");
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
     }
 
 }

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -393,8 +393,16 @@
 
 						/*上报相关按钮*/
 						if(d.projectReportRecordStatus == 5 || d.projectReportStatus == 5){
-							if(d.reportedState == 0){
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" + d.id + "\" style='background-color: #5FB878' onclick=\"return confirmx('确认要上报吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
+							if(d.syncStatus == 0){
+								if(d.reportStatus == 0){
+									if(d.reportedState == 0 || d.reportedState == 6){
+										xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
+									}
+								}else{
+									if(d.reportedState == 2){
+										xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
+									}
+								}
 							}
 						}
 						if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
@@ -431,6 +439,8 @@
 					,"projectReportName":"${projectRecords.projectReportName}"
 					,"reportedState":"${projectRecords.reportedState}"
 					,"view":"${projectRecords.view}"
+					,"reportStatus":"${projectRecords.reportStatus}"
+					,"syncStatus":"${projectRecords.syncStatus}"
                     <c:choose>
                         <c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">
                             ,"canAdd":<c:choose>