功能优化

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -422,7 +422,7 @@ public class WorkInvoiceAllController extends BaseController {
 				if(workInvoice.getWorkInvoiceProjectRelationList().size()>0){
 					List<WorkInvoiceProjectRelation> workInvoiceProjectRelationList = workInvoice.getWorkInvoiceProjectRelationList();
 					for (WorkInvoiceProjectRelation workInvoiceProjectRelation : workInvoiceProjectRelationList) {
-						if(2 == workInvoiceProjectRelation.getIsProject()){
+						if(null == workInvoiceProjectRelation.getIsProject() || 2 == workInvoiceProjectRelation.getIsProject()){
 							//判定是否存在合同信息，若不存在，则合同名称展示------
 							if(StringUtils.isBlank(workInvoiceProjectRelation.getWorkContractName())){
 								workInvoiceProjectRelation.setWorkContractName("————————————");

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -10892,11 +10892,6 @@ public class WorkProjectNotifyController extends BaseController {
 			workInvoice.setInvoiceNumberStr(invoiceNumberStr);
 		}
 
-		//获取发票开户银行信息
-		/*String bankName = workInvoiceService.getBankNameByNameOrId(workInvoice.getBank());
-		if (StringUtils.isNotBlank(bankName)) {
-			workInvoice.setBank(bankName);
-		}*/
 		workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
 		String taskDefKey = workInvoice.getAct().getTaskDefKey();
 		model.addAttribute("workInvoice", workInvoice);
@@ -10932,6 +10927,12 @@ public class WorkProjectNotifyController extends BaseController {
 			return "modules/workinvoice/workInvoiceView";
 		} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 
+
+			//获取发票开户银行信息
+			String bankName = workInvoiceService.getBankNameByNameOrId(workInvoice.getBank());
+			if (StringUtils.isNotBlank(bankName)) {
+				workInvoice.setBank(bankName);
+			}
 			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
 			for (MainDictDetail dictDetail : billingContentList) {
 				if (workInvoice.getBillingContent().equals(dictDetail.getValue())) {

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

@@ -2816,7 +2816,7 @@
 		select
 		count(a.id)
 		FROM rural_project_records a
-		where a.project_name=#{projectName}  and a.`status`!=7
+		where a.project_name=#{projectName}  and a.`status`!=7 and a.del_flag = 0
 	</select>
 
     <update id="updateReportDataTwo">

src/main/resources/mappings/modules/sys/RoleDao.xml

@@ -206,7 +206,7 @@
 		FROM sys_role a
 		<include refid="roleJoins"/>
 		JOIN sys_office o ON o.id = a.office_id
-		WHERE a.name = #{name} AND a.del_flag = #{DEL_FLAG_NORMAL} AND a.company_id = #{company.id}
+		WHERE a.name = #{name} AND a.del_flag = #{DEL_FLAG_NORMAL} AND a.company_id = #{company.id} order by a.id asc limit 1
 	</select>
 	<select id="getByGlyCount" resultType="java.lang.Integer">
 		SELECT COUNT(*)

src/main/webapp/webpage/include/head.jsp

@@ -99,7 +99,7 @@
         {
              document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
             document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?13"><\/script>');
+            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?14"><\/script>');
             /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
         }
     }
@@ -107,7 +107,7 @@
     {
          document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
         document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?13"><\/script>');
+        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?14"><\/script>');
         /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
     }
 

src/main/webapp/webpage/include/ossTools.jsp

@@ -9,4 +9,4 @@
 <script type="text/javascript" src="${ctxStatic}/oss/lib/plupload-2.3.6/plupload-2.3.6/js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
 <script type="text/javascript" src="${ctxStatic}/oss/lib/plupload-2.3.6/plupload-2.3.6/js/plupload.dev.js"></script>
 <script type="text/javascript" src="${ctxStatic}/oss/upload.js"></script>
-<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?13"></script>
+<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?14"></script>

src/main/webapp/webpage/modules/projectcontentinfo/achievementFileDataForm.jsp

@@ -6,7 +6,7 @@
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/bootstrap-select-1.12.4/css/bootstrap-select.min.css" rel="stylesheet" />
 	<script src="${ctxStatic}/bootstrap-select-1.12.4/js/bootstrap-select.min.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?13"></script>
+	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?14"></script>
 	<style>
 		label.error{
 			top:40px;

src/main/webapp/webpage/modules/projectcontentinfo/basedDataForm.jsp

@@ -6,7 +6,7 @@
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/bootstrap-select-1.12.4/css/bootstrap-select.min.css" rel="stylesheet" />
 	<script src="${ctxStatic}/bootstrap-select-1.12.4/js/bootstrap-select.min.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?13"></script>
+	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?14"></script>
 	<style>
 		label.error{
 			top:40px;

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

@@ -1,5 +1,9 @@
+<%@ page import="com.jeeplus.modules.sys.utils.UserUtils" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
+<%
+	boolean admin = UserUtils.getUser().isAdmin();
+%>
 <html>
 <head>
 	<title>项目列表</title>
@@ -1030,14 +1034,14 @@
 			if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
 				xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralCostProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
 			}
-			if(d.paperFilingStatus == 5 || d.paperFilingStatus == 7){
+			/*if(d.paperFilingStatus == 5 || d.paperFilingStatus == 7){
 				xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +" ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改纸质归档</a>";
 			}
 			if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
-				if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
+				if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2 && !<%=admin%>){
 					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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新复核</a>";
 				}
-			}
+			}*/
 			//项目升级按钮
 			if (d.submitMoney==1){
 				if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
@@ -1047,7 +1051,9 @@
 			</shiro:hasPermission>
 			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 			if(d.reportedState == 5 || d.reportedState == 7){
-				xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 提交省站</a>";
+				if(!<%=admin%>){
+					xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 提交省站</a>";
+				}
 			}
 			</shiro:hasPermission>
 

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

@@ -1,6 +1,11 @@
+<%@ page import="com.jeeplus.modules.sys.utils.UserUtils" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+
+<%
+	boolean admin = UserUtils.getUser().isAdmin();
+%>
 <html>
 <head>
 	<title>项目列表</title>
@@ -961,25 +966,27 @@
 			if ('0'!=d.projectReportStatus && '6'!=d.projectReportStatus && '1'!=d.projectReportStatus){
 				xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
 			}
-			if(d.paperFilingStatus == 5 || d.paperFilingStatus == 7){
+			/*if(d.paperFilingStatus == 5 || d.paperFilingStatus == 7){
 				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\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改纸质归档</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\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 项目升级</a>";
 				}
 			}
-			if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
+			/*if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
 				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\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新复核</a>";
 				}
-			}
+			}*/
 			</shiro:hasPermission>
 
 			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 			if(d.reportedState == 5 || d.reportedState == 7){
-				xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;background-color: #1E9FFF'> 提交省站</a>";
+				if(!<%=admin%>){
+					xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;background-color: #1E9FFF'> 提交省站</a>";
+				}
 			}
 			</shiro:hasPermission>
 			//材料库处理按钮