外部单位功能样式调整

src/main/java/com/jeeplus/modules/externalUnit/web/ExternalUnitProjectRecordsController.java

@@ -102,13 +102,13 @@ public class ExternalUnitProjectRecordsController extends BaseController {
         }
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(externalUnitProjectRecords.getToflag())){
-            request.getSession().removeAttribute("searchProjectRecord");
+            request.getSession().removeAttribute("externalUnitProjectRecords");
             ExternalUnitProjectRecords search=externalUnitProjectRecords;
-            request.getSession().setAttribute("searchProjectRecord",search);
+            request.getSession().setAttribute("externalUnitProjectRecords",search);
         }else{
-            if (request.getSession().getAttribute("searchProjectRecord")!=null){
-                externalUnitProjectRecords= (ExternalUnitProjectRecords) request.getSession().getAttribute("searchProjectRecord");
-                model.addAttribute("projectRecords", externalUnitProjectRecords);
+            if (request.getSession().getAttribute("externalUnitProjectRecords")!=null){
+                externalUnitProjectRecords= (ExternalUnitProjectRecords) request.getSession().getAttribute("externalUnitProjectRecords");
+                model.addAttribute("externalUnitProjectRecords", externalUnitProjectRecords);
             }
         }
         Page<ExternalUnitProjectRecords> page = unitProjectRecordsService.findPage(new Page<ExternalUnitProjectRecords>(request, response), externalUnitProjectRecords);
@@ -224,13 +224,13 @@ public class ExternalUnitProjectRecordsController extends BaseController {
         }
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(externalUnitProjectRecords.getToflag())){
-            request.getSession().removeAttribute("searchProjectRecord");
+            request.getSession().removeAttribute("externalUnitProjectRecords");
             ExternalUnitProjectRecords search=externalUnitProjectRecords;
-            request.getSession().setAttribute("searchProjectRecord",search);
+            request.getSession().setAttribute("externalUnitProjectRecords",search);
         }else{
-            if (request.getSession().getAttribute("searchProjectRecord")!=null){
-                externalUnitProjectRecords= (ExternalUnitProjectRecords) request.getSession().getAttribute("searchProjectRecord");
-                model.addAttribute("searchProjectRecord", externalUnitProjectRecords);
+            if (request.getSession().getAttribute("externalUnitProjectRecords")!=null){
+                externalUnitProjectRecords= (ExternalUnitProjectRecords) request.getSession().getAttribute("externalUnitProjectRecords");
+                model.addAttribute("externalUnitProjectRecords", externalUnitProjectRecords);
             }
         }
         Page<ExternalUnitWorkClientAttachment> page = unitProjectRecordsService.getProjectFile(new Page<ExternalUnitWorkClientAttachment>(request, response),projectRecords);

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

@@ -193,14 +193,14 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         System.out.println(c.getActualMaximum(Calendar.DATE));
         //if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)){
         long l1 = System.currentTimeMillis();
-        Integer month = 10; //第一个月从0开始，所以得到月份＋1
+        Integer month = 11; //第一个月从0开始，所以得到月份＋1
         //当月最后一天
         //projectRecordsService.getBatchArchiveNotify();
         logger.info("-----------公司级—月度报表（开始）------------------");
-        statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
+        //statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
         logger.info("------------公司级—月度报表（结束）------------------");
         logger.info("-----------部门级—月度报表（开始）------------------");
-        //statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
+        statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
         logger.info("------------部门级—月度报表（结束）------------------");
         logger.info("------------公司级—年度报表(月报中年度信息)（开始)------------------");
         //statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);

src/main/java/com/jeeplus/modules/statement/service/StatementCompanyComprehensiveService.java

@@ -829,9 +829,12 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
     }
 
     public StatementCompanyComprehensiveInfo allCollect(List<StatementCompanyComprehensiveInfo> statementCompanyComprehensiveInfos){
+        StatementCompanyComprehensiveInfo xminfo = new StatementCompanyComprehensiveInfo();
+        if(statementCompanyComprehensiveInfos.size() == 0){
+            return xminfo;
+        }
         //获取集合中的第一个,判断汇总的类型
         StatementCompanyComprehensiveInfo comprehensiveInfo = statementCompanyComprehensiveInfos.get(0);
-        StatementCompanyComprehensiveInfo xminfo = new StatementCompanyComprehensiveInfo();
         switch (comprehensiveInfo.getType()){
             case "1":
                 String xmnum1 = "0";

src/main/webapp/webpage/modules/externalUnit/externalUnitCapitalDemandList.jsp

@@ -205,9 +205,9 @@
 	<div class="tapfixed">
 		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 			<ul class="list-tabs" >
-				<li ><a href="${ctx}/externalUnit/externalUnit/projectFile?id=${projectRecords.id}">文件管理</a></li>
-				<li class="active"><a href="${ctx}/externalUnit/capitalDemand/capitalDemand?id=${projectRecords.id}">提资需求</a></li>
-				<li><a href="${ctx}/externalUnit/feedback/list?id=${projectRecords.id}">意见反馈</a></li>
+				<li style="padding-left: 2px;padding-right: 2px"><a href="${ctx}/externalUnit/externalUnit/projectFile?id=${projectRecords.id}" style="display: block;">文件管理</a></li>
+				<li style="padding-left: 2px;padding-right: 2px" class="active"><a href="${ctx}/externalUnit/capitalDemand/capitalDemand?id=${projectRecords.id}" style="display: block;">提资需求</a></li>
+				<li style="padding-left: 2px;padding-right: 2px"><a href="${ctx}/externalUnit/feedback/list?id=${projectRecords.id}" style="display: block;">意见反馈</a></li>
 			</ul>
 		</div>
 	</div>

src/main/webapp/webpage/modules/externalUnit/externalUnitFeedbackList.jsp

@@ -225,9 +225,9 @@
 	<div class="tapfixed">
 		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 			<ul class="list-tabs" >
-				<li ><a href="${ctx}/externalUnit/externalUnit/projectFile?id=${projectRecords.id}">文件管理</a></li>
-				<li ><a href="${ctx}/externalUnit/capitalDemand/capitalDemand?id=${projectRecords.id}">提资需求</a></li>
-				<li class="active"><a href="${ctx}/externalUnit/feedback/list?id=${projectRecords.id}">意见反馈</a></li>
+				<li style="padding-left: 2px;padding-right: 2px" ><a href="${ctx}/externalUnit/externalUnit/projectFile?id=${projectRecords.id}" style="display: block;">文件管理</a></li>
+				<li style="padding-left: 2px;padding-right: 2px" ><a href="${ctx}/externalUnit/capitalDemand/capitalDemand?id=${projectRecords.id}" style="display: block;">提资需求</a></li>
+				<li style="padding-left: 2px;padding-right: 2px" class="active"><a href="${ctx}/externalUnit/feedback/list?id=${projectRecords.id}" style="display: block;">意见反馈</a></li>
 			</ul>
 		</div>
 	</div>

src/main/webapp/webpage/modules/externalUnit/externalUnitProjectFile.jsp

@@ -159,9 +159,9 @@
 	<div class="tapfixed">
 		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 			<ul class="list-tabs" >
-				<li class="active"><a href="${ctx}/externalUnit/externalUnit/projectFile?id=${projectRecords.id}">文件管理</a></li>
-				<li><a href="${ctx}/externalUnit/capitalDemand/capitalDemand?id=${projectRecords.id}">提资需求</a></li>
-				<li><a href="${ctx}/externalUnit/feedback/list?id=${projectRecords.id}">意见反馈</a></li>
+				<li style="padding-left: 2px;padding-right: 2px" class="active"><a href="${ctx}/externalUnit/externalUnit/projectFile?id=${projectRecords.id}" style="display: block;">文件管理</a></li>
+				<li style="padding-left: 2px;padding-right: 2px"><a href="${ctx}/externalUnit/capitalDemand/capitalDemand?id=${projectRecords.id}" style="display: block;">提资需求</a></li>
+				<li style="padding-left: 2px;padding-right: 2px"><a href="${ctx}/externalUnit/feedback/list?id=${projectRecords.id}" style="display: block;">意见反馈</a></li>
 			</ul>
 		</div>
 	</div>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAllList.jsp

@@ -860,7 +860,7 @@
 								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/updateGiveDate?id=" + d.borrowId + "&home=contractAll&pageFlag=contractAll\" onclick=\"return confirmx('确认归还该合同信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-orange\"> 归还合同</a>";
 							}
 							//统计按钮
-							xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogView('数据统计', '${ctx}/workcontractinfo/workContractInfo/getWorkContractStatisticDetailList?id="+ d.id +"','95%','95%')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs\" > 统计</a>";
+							xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogView('开票数据统计', '${ctx}/workcontractinfo/workContractInfo/getWorkContractStatisticDetailList?id="+ d.id +"','95%','95%')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs\" > 统计</a>";
 						}
                         xml+="</div>"
                         return xml;

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -866,7 +866,7 @@
 								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/updateGiveDate?id=" + d.borrowId + "&home=contract\" onclick=\"return confirmx('确认归还该合同信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-orange\"> 归还合同</a>";
 							}
 							//统计按钮
-							xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogView('数据统计', '${ctx}/workcontractinfo/workContractInfo/getWorkContractStatisticDetailList?id="+ d.id +"','95%','95%')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs\" > 统计</a>";
+							xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogView('开票数据统计', '${ctx}/workcontractinfo/workContractInfo/getWorkContractStatisticDetailList?id="+ d.id +"','95%','95%')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs\" > 统计</a>";
 						}
                         //作废和删除
 						if (d.cancel != undefined && d.cancel == "1"){

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -612,9 +612,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">移动电话：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>移动电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="mobile" id="mobile" placeholder="请输入移动电话" htmlEscape="false" class="form-control layui-input isPhone"/>
+                        <form:input path="mobile" id="mobile" placeholder="请输入移动电话" htmlEscape="false" class="form-control required layui-input isPhone"/>
                         <span id="ph" style="color: #CC5965"></span>
                     </div>
                 </div>
@@ -766,7 +766,7 @@
                 </div>
 
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>区域备注：</label>
+                    <label class="layui-form-label">区域备注：</label>
                     <div class="layui-input-block ">
                         <form:input placeholder="请输入区域备注" path="areaRemark" htmlEscape="false" class="form-control layui-input" maxlength="64"/>
                     </div>