添加个人上报接口

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

@@ -2321,4 +2321,76 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             return "保存审核意见失败！！";
         }
     }
+
+
+
+    /**
+     * 保存上报数据并上报省站
+     * @param reported
+     */
+    @Transactional(readOnly = false)
+    public String saveReportedInfoByPerson(RuralProjectRecordsReported reported) {
+        this.disposeList(reported);
+        //查询是否已经上报项目信息
+        if (StringUtils.isBlank(reported.getId())){
+            reported.setCompany(UserUtils.getSelectCompany());
+            reported.setOffice(UserUtils.getSelectOffice());
+            reported.preInsert();
+            //将项目id设置为id
+            reported.setId(reported.getProjectId());
+            reported.setReportStatus("5");
+            ruralProjectRecordsReportedDao.insert(reported);
+        }else{
+            reported.preUpdate();
+            reported.setReportStatus("5");
+            ruralProjectRecordsReportedDao.update(reported);
+        }
+
+
+
+        //删除上报咨询员信息
+        ruralProjectRecordsReportedDao.deleteConsultant(reported);
+        //保存咨询员信息
+        for (ReportedConsultant info : reported.getReportedConsultantList()){
+            if (info.getId() == null){
+                continue;
+            }
+            //添加项目上报id
+            info.setReportedId(reported.getId());
+            info.preInsert();
+            ruralProjectRecordsReportedDao.insertConsultant(info);
+        }
+        RuralProjectRecordsReported ruralProjectRecordsReported = ruralProjectRecordsReportedDao.get(reported.getId());
+        try {
+            MyBeanUtils.copyBeanNotNull2Bean(reported, ruralProjectRecordsReported);//将编辑表单中的非NULL值覆盖数据库记录中的值
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //处理上报数据
+        Map<String,String> map  = RuralProjectReportedUtil.reportedDataManage(ruralProjectRecordsReported);
+        String mapStr = MapToXmlUtil.getMapToXML(map);
+        //进行上报
+        /*String client = RuralProjectReportedUtil.client(mapStr);
+        if(!"Success".equals(client)){
+            return "上报失败！";
+        }*/
+
+        //修改项目信息中的上报状态
+        RuralProjectRecords records = new RuralProjectRecords();
+        records.setId(reported.getId());
+        //获取项目信息
+        RuralProjectRecords record = ruralProjectRecordsService.get(records);
+        //修改项目表中上报状态
+        //判断项目是否超期，如果超期则将上报标志改为超期上报（7） 否则变更为正常上报数据
+        if(1 == record.getOverDueStatus()){
+            records.setReportedState("7");
+        }else{
+            records.setReportedState("5");
+        }
+
+        //修改项目表中字段信息
+        dao.updateReported(records);
+        //完成上报
+        return "上报成功";
+    }
 }

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

@@ -285,9 +285,10 @@ public class SubProjectInfoService extends CrudService<SubProjectInfoDao, SubPro
                                     //根据项目定义号查询项目
                                     SubProjectInfo decideRepeatInfo = dao.decideRepeat(subProject);
                                     if(null != decideRepeatInfo){
-                                        subProject.setId(decideRepeatInfo.getId());
                                         //删除原有项目的所有附件信息
                                         workattachmentDao.deleteByAttachmentId(decideRepeatInfo.getId());
+                                        //根据项目定义号删除原有子项目信息
+                                        dao.deleteByParentProId(decideRepeatInfo.getParentProId());
                                     }
                                     //进行新增操作
                                     this.save(subProject);

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

@@ -1292,4 +1292,59 @@ public class RuralCostProjectMessageController extends BaseController {
         }
         return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
     }
+
+
+
+
+
+    /**
+     * 项目个人直接上报省站
+     * @param projectRecords
+     * @return
+     */
+    @RequestMapping(value = "updateReportedByPerson")
+    public String updateReportedByPerson(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/reportedFormPerson";
+    }
+
+
+
+
+    /**
+     * 保存报告并上报到省站
+     * @param reported
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping(value = "saveReportedByPerson")
+    public String saveReportedByPerson(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        String str = "";
+        if(!reported.getIsNewRecord()){//编辑表单保存
+            ruralProjectMessageService.disposeList(reported);
+            RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
+            MyBeanUtils.copyBeanNotNull2Bean(reported, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+            str = ruralProjectMessageService.saveReportedInfoByPerson(t);
+        }else{//新增表单保存
+            str = ruralProjectMessageService.saveReportedInfoByPerson(reported);
+        }
+
+
+        if (StringUtils.isNotBlank(str)){
+            addMessage(redirectAttributes, "项目上报失败:"+str);
+        }else {
+            addMessage(redirectAttributes, "项目上报成功");
+        }
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+    }
 }

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

@@ -1320,4 +1320,58 @@ public class RuralProjectMessageController extends BaseController {
         }
         return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
     }
+
+
+
+
+    /**
+     * 项目个人直接上报省站
+     * @param projectRecords
+     * @return
+     */
+    @RequestMapping(value = "updateReportedByPerson")
+    public String updateReportedByPerson(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/ruralporjectmessage/reportedFormPerson";
+    }
+
+
+
+
+    /**
+     * 保存报告并上报到省站
+     * @param reported
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping(value = "saveReportedByPerson")
+    public String saveReportedByPerson(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        String str = "";
+        if(!reported.getIsNewRecord()){//编辑表单保存
+            ruralProjectMessageService.disposeList(reported);
+            RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
+            MyBeanUtils.copyBeanNotNull2Bean(reported, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+            str = ruralProjectMessageService.saveReportedInfoByPerson(t);
+        }else{//新增表单保存
+            str = ruralProjectMessageService.saveReportedInfoByPerson(reported);
+        }
+
+
+        if (StringUtils.isNotBlank(str)){
+            addMessage(redirectAttributes, "项目上报失败:"+str);
+        }else {
+            addMessage(redirectAttributes, "项目上报成功");
+        }
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+    }
 }

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

@@ -506,6 +506,7 @@
 								if(d.reportStatus == 0){
 									if(d.reportedAdd != undefined && d.reportedAdd =="1"){
 										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>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?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.reportedRecall != undefined && d.reportedRecall =="1"){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -505,6 +505,7 @@
 								if(d.reportStatus == 0){
 									if(d.reportedAdd != undefined && d.reportedAdd =="1"){
 										xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?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.reportedRecall != undefined && d.reportedRecall =="1"){

src/main/webapp/webpage/modules/ruralprojectrecords/subProjectInfo/subProjectFileForm.jsp

@@ -402,8 +402,8 @@
                         top.layer.msg("上传成功数据 "+result+" 条，压缩包或损坏，请检查后重新上传！", {icon: 0});
 
                         top.layer.close(index);
-                    }else if(undefined != result && null != result && "" != result && result>0){
-                        top.layer.msg("上传成功数据 "+result+" 条，上传成功！", {icon: 0});
+                    }else{
+                        top.layer.msg("数据上传成功！", {icon: 1});
                         top.layer.close(index);
                     }