A类项目质量复核咨询员数据处理

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

@@ -183,14 +183,17 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         Integer month = c.get(Calendar.MONTH)+1; //第一个月从0开始，所以得到月份＋1
         //当月最后一天
         logger.info("-----------公司级—月度报表（开始）------------------");
-        statementCompanyComprehensiveService.disposeStatementCompany(2022,2,2);
+        statementCompanyComprehensiveService.disposeStatementCompany(2022,2,3);
         logger.info("------------公司级—月度报表（结束）------------------");
         logger.info("-----------部门级—月度报表（开始）------------------");
-        statementCompanyComprehensiveService.disposeStatementOffice(2022,2,2);
+        statementCompanyComprehensiveService.disposeStatementOffice(2022,2,3);
         logger.info("------------部门级—月度报表（结束）------------------");
         logger.info("------------公司级—年度报表（开始)------------------");
-        statementCompanyComprehensiveService.disposeStatementCompanyByYear(2022,0,5);
+        statementCompanyComprehensiveService.disposeStatementCompanyByYear(2022,0,3);
         logger.info("------------公司级—年度报表（结束）------------------");
+        logger.info("-----------部门级—年度报表（开始）------------------");
+        statementCompanyComprehensiveService.disposeStatementOfficeByYear(2022,0,3);
+        logger.info("------------部门级—年度报表（结束）------------------");
         /*logger.info("-----------张静—月度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeReportDataStatementCompany(2022,2,7);
         logger.info("------------张静—月度报表（结束）------------------");*/
@@ -198,21 +201,21 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
 
         map.put("msgMonth","月度报表处理完成");
 
-        /*logger.info("-----------公司级—季度报表（开始）------------------");
+        logger.info("-----------公司级—季度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementCompany(2022,1,1);
         logger.info("------------公司级—季度报表（结束）------------------");
         logger.info("-----------部门级—季度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementOffice(2022,1,1);
-        logger.info("------------部门级—季度报表（结束）------------------");*/
+        logger.info("------------部门级—季度报表（结束）------------------");
 
         map.put("msgQuarter","季度报表处理完成");
 
-        /*logger.info("-----------公司级—年度报表（开始）------------------");
+        logger.info("-----------公司级—年度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementCompany(2022,0,0);
         logger.info("------------公司级—年度报表（结束）------------------");
         logger.info("-----------部门级—年度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementOffice(2022,0,0);
-        logger.info("------------部门级—年度报表（结束）------------------");*/
+        logger.info("------------部门级—年度报表（结束）------------------");
 
         map.put("msgYear","年度报表处理完成");
 

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -2244,11 +2244,11 @@
 
 			layui.form.on('select(bzshbUserIdFilter)', function(data){
 				console.log(data.value); //得到被选中的值
-
+				var submitMoney = '${projectRecords.submitMoney}'
 				//根据id查询咨询员列表现有数据量
 				var length = $("#reportedConsultantList").find("tr").length;
 				//行数超过一行则表示已经存在技术负责人列，则可进行替换
-				if(length>1){
+				if(length>1 && submitMoney == 1){
 					//根据审核人员id查询信息并对数据进行替换
 					$.ajax({
 						type:"post",

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

@@ -119,10 +119,10 @@
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:40}
                 ,{field:'projId',align:'center', title: '项目编号',width:150,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
+                        return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
                     }}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
                         return "<span title='"+ d.contract +"'>" + d.contract + "</span>";

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsShowFinishList.jsp

@@ -167,7 +167,7 @@
             ,cols: [[
                 {field:'index',align:'center', title: '序号',width:40}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
 				,{field:'projId',align:'center', title: '项目编号',  width:150}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsShowList.jsp

@@ -167,7 +167,7 @@
             ,cols: [[
                 {field:'index',align:'center', title: '序号',width:40}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
 				,{field:'projId',align:'center', title: '项目编号',  width:150}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementForm.jsp

@@ -1974,11 +1974,11 @@
 
 			layui.form.on('select(bzshbUserIdFilter)', function(data){
 				console.log(data.value); //得到被选中的值
-
+				var submitMoney = '${projectRecords.submitMoney}'
 				//根据id查询咨询员列表现有数据量
 				var length = $("#reportedConsultantList").find("tr").length;
 				//行数超过一行则表示已经存在技术负责人列，则可进行替换
-				if(length>1){
+				if(length>1 && submitMoney == 1){
 					//根据审核人员id查询信息并对数据进行替换
 					$.ajax({
 						type:"post",

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -1973,11 +1973,11 @@
 
 			layui.form.on('select(bzshbUserIdFilter)', function(data){
 				console.log(data.value); //得到被选中的值
-
+				var submitMoney = '${projectRecords.submitMoney}'
 				//根据id查询咨询员列表现有数据量
 				var length = $("#reportedConsultantList").find("tr").length;
 				//行数超过一行则表示已经存在技术负责人列，则可进行替换
-				if(length>1){
+				if(length>1 && submitMoney == 1){
 					//根据审核人员id查询信息并对数据进行替换
 					$.ajax({
 						type:"post",

src/main/webapp/webpage/modules/sys/sysHome.jsp

@@ -1272,7 +1272,7 @@
         var elem = $("#email-bord .bord-right ul");
         var xml = "";
         <c:forEach items="${projectCount}" var="project" varStatus="index">
-        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/ruralProject/ruralProjectRecords/view?id=${project.id}','95%','95%')\">";
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/ruralProject/ruralProjectView/view?id=${project.id}','95%','95%')\">";
         elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getDictLabel(project.projectType, 'project_type', '')}\">${fns:getDictLabel(project.projectType, 'project_type', '')}</span><span class=\"bord-record\" title=\"${project.projectName}\">${project.projectName}</span>" +
             '<span class="bord-record-time">' + '<fmt:formatDate value="${project.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
         <%--<c:if test="${index.index < 8}">