项目升级（B级改A级）

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectReportDataDao.java

@@ -31,6 +31,14 @@ public interface ProjectReportDataDao extends CrudDao<ProjectReportData> {
 
     int updateNumber(ProjectReportData projectReportData);
 
+    /**
+     * 项目升级 B级改A级
+     * 修改报告
+     * @param projectReportData
+     * @return
+     */
+    int updateStatus(ProjectReportData projectReportData);
+
     List<ProjectReportData> findInvalidList(ProjectReportData projectReportData);
 
     List<ProjectReportData> findInfoList(ProjectReportData projectReportData);

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectReportDataTwoDao.java

@@ -153,4 +153,12 @@ public interface ProjectReportDataTwoDao extends CrudDao<ProjectReportDataTwo> {
      * @return
      */
     ProjectReportDataTwo findTwoByProjectId(String projectId);
+
+    /**
+     * 项目升级 B级改A级
+     * 修改报告
+     * @param projectReportData
+     * @return
+     */
+    int updateStatus(ProjectReportDataTwo projectReportData);
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -153,6 +153,12 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @param projectRecords
      */
     void updateDate(RuralProjectRecords projectRecords);
+    /**
+     * 修改项目等级
+     * B级改为A级
+     * @param id
+     */
+    void projectUpgrade(String id);
 
     /**
      * 查询项目信息

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

@@ -23,6 +23,7 @@ import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
+import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataTwoDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
@@ -147,6 +148,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
     @Autowired
 	private ProjectReportDataDao projectReportDataDao;
     @Autowired
+	private ProjectReportDataTwoDao projectReportDataTwoDao;
+    @Autowired
 	private ProjectReportDataService projectReportDataService;
 	@Autowired
 	private ProjectAccessoryRelationService projectAccessoryRelationService;
@@ -2304,4 +2307,22 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		 Integer projectRecords = dao.getProjectByName(projectName);
 		 return projectRecords;
 	}
+	@Transactional(readOnly = false)
+	public void projectUpgrade(RuralProjectRecords ruralProjectRecords){
+		//修改项目等级
+		dao.projectUpgrade(ruralProjectRecords.getId());
+		//修改质量复核状态
+		ProjectReportData reportData = projectReportDataDao.getProjectReportData(ruralProjectRecords.getId());
+		if (null!=reportData){
+			if (StringUtils.isNotBlank(reportData.getStatus())){
+				reportData.setStatus("1");
+				projectReportDataDao.updateStatus(reportData);
+			}
+		}
+		ProjectReportDataTwo projectReportDataTwo=projectReportDataTwoDao.getProjectReportDataTwoByProjectId(ruralProjectRecords.getId());
+		if (null != projectReportDataTwo){
+			projectReportDataTwo.setStatus("1");
+			projectReportDataTwoDao.updateStatus(projectReportDataTwo);
+		}
+	}
 }

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

@@ -2236,4 +2236,14 @@ public class RuralCostProjectMessageController extends BaseController {
         boolean falg=BaseController.REPORTSWITCH;
         return falg;
     }
+    /**
+     * 修改项目等级
+     * B级改完A级
+     */
+    @RequestMapping(value = "projectUpgrade")
+    @ResponseBody
+    public String projectUpgrade(RuralProjectRecords projectRecords){
+        projectRecordsService.projectUpgrade(projectRecords);
+        return "升级成功";
+    }
 }

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -847,6 +847,14 @@
 			number = #{number}
 		WHERE id = #{id}
 	</update>
+	<update id="updateStatus">
+		UPDATE project_report_data SET
+			status = #{status}
+			<if test="processInstanceId != null and processInstanceId !='' ">
+				,process_instance_id = ''
+			</if>
+		WHERE id = #{id}
+	</update>
 
 	<update id="updateFileStatus">
 		UPDATE project_report_data SET

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataTwoDao.xml

@@ -802,5 +802,13 @@
 			bzshb_user_id =  #{bzshbUserId}
 		WHERE id = #{id}
 	</update>
+	<update id="updateStatus">
+		UPDATE project_report_data_two SET
+		status = #{status}
+		<if test="processInstanceId != null and processInstanceId !='' ">
+			,process_instance_id = ''
+		</if>
+		WHERE id = #{id}
+	</update>
 
 </mapper>

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -653,7 +653,11 @@
 		    ending_date =  #{endingDate}
 		WHERE id = #{id}
 	</update>
-
+	<update id="projectUpgrade">
+		UPDATE rural_project_records SET
+			submit_money ='2'
+		WHERE id = #{id}
+	</update>
 	<update id="adminUpdateProject">
 		UPDATE rural_project_records SET
 			update_by = #{updateBy.id},

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

@@ -439,6 +439,38 @@
 				}
 			});
 		}
+		function projectUpgrade(id,projectReportRecordStatus,filingProjectStatus,projectReportStatus,projectReportStatusTwo) {
+			if (projectReportRecordStatus == '2' || projectReportRecordStatus == '4'){
+				top.layer.msg("电子归档流程正在运行当中,请撤回流程！", {icon: 0});
+				return ;
+			}
+			if (filingProjectStatus == '2' || filingProjectStatus == '4' || filingProjectStatus == '5'){
+				top.layer.msg("纸质归档(批量归档)流程已发起！", {icon: 0});
+				return ;
+			}
+			//质量复核状态
+			if (projectReportStatus == '2' || projectReportStatus == '4'){
+				top.layer.msg("质量复核流程正在运行当中,请撤回流程！", {icon: 0});
+				return ;
+			}
+			//报告签发状态
+			if (projectReportStatusTwo == '2' || projectReportStatusTwo == '4'){
+				top.layer.msg("报告签发流程正在运行当中,请撤回流程！", {icon: 0});
+				return ;
+			}
+			$.ajax({
+				url: "${ctx}/ruralProject/ruralCostProjectMessage/projectUpgrade",
+				data:{
+					"id":id,
+					"projectReportStatus":projectReportStatus,
+					"projectReportStatusTwo":projectReportStatusTwo,
+				},
+				success: function (data) {
+					parent.layer.msg(data,{icon:1});
+					window.location.reload();
+				}
+			})
+		}
 	</script>
 	<style>
 		body{
@@ -1032,6 +1064,12 @@
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";
 							}
 						}
+						//项目升级按钮
+						if (d.submitMoney==1){
+							if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
+								xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 项目升级</a>";
+							}
+						}
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 							if(d.reportedState == 5 || d.reportedState == 7){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -529,6 +529,38 @@
 			});
 
 		}
+		function projectUpgrade(id,projectReportRecordStatus,filingProjectStatus,projectReportStatus,projectReportStatusTwo) {
+			if (projectReportRecordStatus == '2' || projectReportRecordStatus == '4'){
+				top.layer.msg("电子归档流程正在运行当中,请撤回流程！", {icon: 0});
+				return ;
+			}
+			if (filingProjectStatus == '2' || filingProjectStatus == '4' || filingProjectStatus == '5'){
+				top.layer.msg("纸质归档(批量归档)流程已发起！", {icon: 0});
+				return ;
+			}
+			//质量复核状态
+			if (projectReportStatus == '2' || projectReportStatus == '4'){
+				top.layer.msg("质量复核流程正在运行当中,请撤回流程！", {icon: 0});
+				return ;
+			}
+			//报告签发状态
+			if (projectReportStatusTwo == '2' || projectReportStatusTwo == '4'){
+				top.layer.msg("报告签发流程正在运行当中,请撤回流程！", {icon: 0});
+				return ;
+			}
+			$.ajax({
+				url: "${ctx}/ruralProject/ruralCostProjectMessage/projectUpgrade",
+				data:{
+					"id":id,
+					"projectReportStatus":projectReportStatus,
+					"projectReportStatusTwo":projectReportStatusTwo,
+				},
+				success: function (data) {
+					parent.layer.msg(data,{icon:1});
+					window.location.reload();
+				}
+			})
+		}
 	</script>
 	<style>
 		body{
@@ -901,6 +933,12 @@
 							if(d.paperFilingStatus == 5){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +"&view=allfiling ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
 							}
+							//项目升级按钮
+							if (d.submitMoney==1){
+								if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
+									xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 项目升级</a>";
+								}
+							}
 						</shiro:hasPermission>
 						xml+="</div>";
 						return[xml].join('');

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

@@ -440,6 +440,38 @@
 				}
 			});
 		}
+		function projectUpgrade(id,projectReportRecordStatus,filingProjectStatus,projectReportStatus,projectReportStatusTwo) {
+			if (projectReportRecordStatus == '2' || projectReportRecordStatus == '4'){
+				top.layer.msg("电子归档流程正在运行当中,请撤回流程！", {icon: 0});
+				return ;
+			}
+			if (filingProjectStatus == '2' || filingProjectStatus == '4' || filingProjectStatus == '5'){
+				top.layer.msg("纸质归档(批量归档)流程已发起！", {icon: 0});
+				return ;
+			}
+			//质量复核状态
+			if (projectReportStatus == '2' || projectReportStatus == '4'){
+				top.layer.msg("质量复核流程正在运行当中,请撤回流程！", {icon: 0});
+				return ;
+			}
+			//报告签发状态
+			if (projectReportStatusTwo == '2' || projectReportStatusTwo == '4'){
+				top.layer.msg("报告签发流程正在运行当中,请撤回流程！", {icon: 0});
+				return ;
+			}
+			$.ajax({
+				url: "${ctx}/ruralProject/ruralCostProjectMessage/projectUpgrade",
+				data:{
+					"id":id,
+					"projectReportStatus":projectReportStatus,
+					"projectReportStatusTwo":projectReportStatusTwo,
+				},
+				success: function (data) {
+					parent.layer.msg(data,{icon:1});
+					window.location.reload();
+				}
+			})
+		}
 	</script>
 	<style>
 		body{
@@ -1027,6 +1059,12 @@
 						if(d.paperFilingStatus == 5){
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
 						}
+						//项目升级按钮
+						if (d.submitMoney==1){
+							if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
+								xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 项目升级</a>";
+							}
+						}
 						if(d.projectReportStatus == 5){
 							if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";