Inicio Explorar Axuda
Rexistro Iniciar sesión
user5
/
simple_xg_total_process_master
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

样式变更

user5 %!s(int64=3) %!d(string=hai) anos
pai
f5240c130a
achega
f7f8156b35
Modificáronse 3 ficheiros con 38 adicións e 4 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 2 2
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectSignatureOldMessageDisposeController.java
  2. 26 0
      src/main/resources/mappings/modules/statement/StatementCompanyComprehensiveDao.xml
  3. 10 2
      src/main/webapp/webpage/modules/statement/companyDataView.jsp

+ 2 - 2
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectSignatureOldMessageDisposeController.java
Ver ficheiro 

@@ -182,12 +182,12 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
 
         long l1 = System.currentTimeMillis();
 
         long l1 = System.currentTimeMillis();
 
         Integer month = c.get(Calendar.MONTH)+1; //第一个月从0开始，所以得到月份＋1
 
         Integer month = c.get(Calendar.MONTH)+1; //第一个月从0开始，所以得到月份＋1
 
         //当月最后一天
 
         //当月最后一天
 
-        /*logger.info("-----------公司级—月度报表（开始）------------------");
 
+        logger.info("-----------公司级—月度报表（开始）------------------");
 
         statementCompanyComprehensiveService.disposeStatementCompany(2022,2,2);
 
         statementCompanyComprehensiveService.disposeStatementCompany(2022,2,2);
 
         logger.info("------------公司级—月度报表（结束）------------------");
 
         logger.info("------------公司级—月度报表（结束）------------------");
 
         logger.info("-----------部门级—月度报表（开始）------------------");
 
         logger.info("-----------部门级—月度报表（开始）------------------");
 
         statementCompanyComprehensiveService.disposeStatementOffice(2022,2,2);
 
         statementCompanyComprehensiveService.disposeStatementOffice(2022,2,2);
 
-        logger.info("------------部门级—月度报表（结束）------------------");*/
 
+        logger.info("------------部门级—月度报表（结束）------------------");
 
         logger.info("-----------张静—月度报表（开始）------------------");
 
         logger.info("-----------张静—月度报表（开始）------------------");
 
         statementCompanyComprehensiveService.disposeReportDataStatementCompany(2022,2,7);
 
         statementCompanyComprehensiveService.disposeReportDataStatementCompany(2022,2,7);
 
         logger.info("------------张静—月度报表（结束）------------------");
 
         logger.info("------------张静—月度报表（结束）------------------");

+ 26 - 0
src/main/resources/mappings/modules/statement/StatementCompanyComprehensiveDao.xml
Ver ficheiro 

@@ -1860,5 +1860,31 @@
 
 		</where>
 
 		</where>
 
 	</select>
 
 	</select>
 
 
 
+	<delete id="deleteStatementReportDataInfo">
 
+		delete from statement_report_data_info
 
+		<where >
 
+			type = #{type}
 
+			and year = #{year}
 
+			and big_date_type = #{bigDateType}
 
+			and small_date_type = #{smallDateType}
 
+			and office_id = #{officeId}
 
+
 
+			<if test="field1 != null and field1 != ''">
 
+				and field1 = #{field1}
 
+			</if>
 
+
 
+			<if test="field2 != null and field2 != ''">
 
+				and field2 = #{field2}
 
+			</if>
 
+
 
+			<if test="field3 != null and field3 != ''">
 
+				and field3 = #{field3}
 
+			</if>
 
+
 
+			<if test="field4 != null and field4 != ''">
 
+				and field4 = #{field4}
 
+			</if>
 
+		</where>
 
+	</delete>
 
 
 
 </mapper>
 
 </mapper>

+ 10 - 2
src/main/webapp/webpage/modules/statement/companyDataView.jsp
Ver ficheiro 

@@ -877,6 +877,12 @@
 
 			background-color:rgba(255,255,255,0);
 
 			background-color:rgba(255,255,255,0);
 
 			height:100%;
 
 			height:100%;
 
 		}
 
 		}
 
+		.layui-form-radio{
 
+			padding-right: 0px;
 
+		}
 
+		.layui-form-radio i{
 
+			margin-right: 0px;
 
+		}
 
 	</style>
 
 	</style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -900,9 +906,11 @@
 
 <%--					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--%>
 
 <%--					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--%>
 
 <%--					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--%>
 
 <%--					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--%>
 
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 8px;margin: 0px;padding-left: 0px" >
 
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 8px;margin: 0px;padding-left: 0px" >
 
-						<input type="radio" name="projectReport" value="yearOne" lay-filter="projectReportMonth" style="margin: 0px;padding-left: 0px" id="yearOne" ><span style="font-size: 16px;font-weight: normal;margin: 0 auto" >年</span>
 
-						<input type="radio" name="projectReport" value="monthOne" lay-filter="projectReportMonth" style="margin: 0px;padding-left: 0px" checked id="monthOne"><span style="font-size: 16px;font-weight: normal;margin: 0 auto"  >月</span>
 
+						<input type="radio" title="年报" name="projectReport" value="yearOne" lay-filter="projectReportMonth" id="yearOne" >
 
+						<input type="radio" title="月报" name="projectReport" value="monthOne" lay-filter="projectReportMonth" checked id="monthOne">
 
+
 
 					</div>
 
 					</div>
 
+
 
 				</h2>
 
 				</h2>
 
 				</div>
 
 				</div>
 
 				<table class="oa-table layui-table" id="contentTable1" lay-filter="test"></table>
 
 				<table class="oa-table layui-table" id="contentTable1" lay-filter="test"></table>