Skip to content

F
fgqyxxlr
Commit 85080083 by liru
Options

统计表一修改

parent 9bd3ad62
Showing with 122 additions and 221 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/ReportController.java
...@@ -65,9 +65,9 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr ...@@ -65,9 +65,9 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
tmpResult = qiquMap.get(orhonFgqy.getDeptId()); tmpResult = qiquMap.get(orhonFgqy.getDeptId());
} }
tmpResult.setDwl(tmpResult.getDwl() + 1); tmpResult.setDwl(tmpResult.getDwl() + 1);
if ( orhonFgqy.getType().equals("1")) { if (orhonFgqy.getType()!=null && orhonFgqy.getType().equals("1")) {
tmpResult.setGmysfgqy(tmpResult.getGmysfgqy() + 1); tmpResult.setGmysfgqy(tmpResult.getGmysfgqy() + 1);
} else if ( orhonFgqy.getType().equals("2")) { } else if (orhonFgqy.getType()!=null && orhonFgqy.getType().equals("2")) {
tmpResult.setGmyxfgqy(tmpResult.getGmyxfgqy() + 1); tmpResult.setGmyxfgqy(tmpResult.getGmyxfgqy() + 1);
} }
...@@ -135,6 +135,10 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr ...@@ -135,6 +135,10 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
List<ReportOneResult> reportOneResultList = new ArrayList<>(areaList.size()); List<ReportOneResult> reportOneResultList = new ArrayList<>(areaList.size());
for (SysDictData dictData : areaList) { for (SysDictData dictData : areaList) {
ReportOneResult result = qiquMap.get(Long.parseLong(dictData.getDictValue())); ReportOneResult result = qiquMap.get(Long.parseLong(dictData.getDictValue()));
if(result == null){
result = new ReportOneResult();
this.initResult(result);
}
result.setAreaName(dictData.getDictLabel()); result.setAreaName(dictData.getDictLabel());
reportOneResultList.add(result); reportOneResultList.add(result);
......
ruoyi-admin/target/classes/templates/system/shzz/shzz.html
...@@ -12,232 +12,129 @@ ...@@ -12,232 +12,129 @@
margin: 5px 0px 0px 0px; margin: 5px 0px 0px 0px;
text-align:right; text-align:right;
} }
.select-width{
width: 169px;
height: 24px;
}
.time-width{
width: 70px;
}
</style> </style>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse" id="searchDiv">
<form id="formId">
<div class="select-list">
<ul>
<div class="row">
<div class="col-md-3">
<li>
<label>社会组织名称：</label>
<input type="text" name="mc"/>
</li>
</div>
<div class="col-md-3">
<li>
<label>社会组织类型：</label>
<select name="type" th:with="type=${@dict.getType('prhon_qylx')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
</div>
<div class="col-md-3">
<li>
<label>所在地：</label>
<input type="text" name="szd"/>
</li>
</div>
<div class="col-md-3">
<li>
<label>资产总额：</label>
<input type="text" name="zcze"/>
</li>
</div>
</div>
<div class="row">
<div class="col-md-3">
<li>
<label>从业人员数量：</label>
<input type="text" name="cyrs"/>
</li>
</div>
<div class="col-md-3">
<li>
<label>法定代表人：</label>
<input type="text" name="fddbr"/>
</li>
</div>
<div class="col-md-3">
<li>
<label>法定代表人电话：</label>
<input type="text" name="fddbrdh"/>
</li>
</div>
<div class="col-md-3">
<li>
<label>是否党员：</label>
<select name="isdy" th:with="type=${@dict.getType('orhon_isdy')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
</div>
</div>
<div class="row">
<div class="col-md-3">
<li>
<label>是否建立工会：</label>
<select name="isgh" th:with="type=${@dict.getType('is_gh')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
</div>
<div class="col-md-3">
<li>
<label>是否建立团组织：</label>
<select name="istzz" th:with="type=${@dict.getType('is_tzz')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
</div>
<div class="col-md-3">
<li>
<label>党组织类型：</label>
<select name="dzzlx" th:with="type=${@dict.getType('orhon_dzzlx')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
</div>
<div class="col-md-3">
<li>
<label>是否有活动阵地：</label>
<select name="ishdzd" th:with="type=${@dict.getType('is_hdzd')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
</div>
</div>
<div class="row">
<div class="col-md-3">
<li class="select-time">
<label>党组织建立时间：</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginDzzjlsj]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endDzzjlsj]"/>
</li>
</div>
<div class="col-md-3">
<li>
<label>上级党组织：</label>
<input type="text" name="sjdzz"/>
</li>
</div>
<div class="col-md-3">
<li>
<label>党组织书记姓名：</label>
<input type="text" name="dzzsjxm"/>
</li>
</div>
<div class="col-md-3">
<li>
<label>党组织书记电话：</label>
<input type="text" name="dzzsjdh"/>
</li>
</div>
</div>
<div class="row"> <div class="ui-layout-center">
<div class="col-md-3"> <div class="container-div">
<li> <div class="row">
<label>登记方式：</label> <div class="col-sm-12 search-collapse" id="searchDiv">
<input type="text" name="djfs"/> <form id="formId">
</li> <div class="select-list">
</div> <table class="select-list">
<div class="col-md-3"> <tr>
<li> <td width="120" height="43">社会组织名称：</td><td width="200" height="43"><input type="text" name="mc"/></td>
<label>区域划分：</label> <td width="120" height="43">社会组织类型：</td><td width="200" height="43"><select class="select-width" name="type" th:with="type=${@dict.getType('prhon_qylx')}">
<select name="deptId" th:with="type=${@dict.getType('orhon_qyfl')}"> <option value="">所有</option>
<option value="">所有</option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> </select></td>
</select> <td width="150" height="43">所在地：</td><td width="200" height="43"><input type="text" name="szd"/></td>
</li> </tr>
</div> <tr>
<div class="col-md-3"> <td width="100" height="43">资产总额：</td><td width="100" height="43"><input type="text" name="zcze"/></td>
<li> <td width="100" height="43">从业人员数量：</td><td width="100" height="43"><input type="text" name="cyrs"/></td>
<label>党员数：</label> <td width="100" height="43">法定代表人：</td><td width="100" height="43"><input type="text" name="fddbr"/></td>
<input type="text" name="dys"/> </tr>
</li> <tr>
</div> <td width="100" height="43">法定代表人电话：</td><td width="100" height="43"><input type="text" name="fddbrdh"/></td>
<div class="col-md-3"> <td width="100" height="43">是否党员：</td><td width="100" height="43"><select class="select-width" name="isdy" th:with="type=${@dict.getType('orhon_isdy')}">
<li> <option value="">所有</option>
<label>是否建立党组织：</label> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<select name="isdzz" th:with="type=${@dict.getType('is_dzz')}"> </select></td>
<option value="">所有</option> <td width="100" height="43">是否建立工会：</td><td width="100" height="43"><select class="select-width" name="isgh" th:with="type=${@dict.getType('is_gh')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option value="">所有</option>
</select> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</li> </select></td>
</div> </tr>
</div> <tr>
<td width="100" height="43">是否建立团组织：</td><td width="100" height="43"><select class="select-width" name="istzz" th:with="type=${@dict.getType('is_tzz')}">
<div class="row"> <option value="">所有</option>
<div class="col-md-3"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<li> </select></td>
<label>党建指导员姓名：</label> <td width="100" height="43">党组织类型： </td><td width="100" height="43"><select class="select-width" name="dzzlx" th:with="type=${@dict.getType('orhon_dzzlx')}">
<input type="text" name="djzdyxm"/> <option value="">所有</option>
</li> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</div> </select></td>
<div class="col-md-3"> <td width="100" height="43">是否有活动阵地：</td><td width="100" height="43"><select class="select-width" name="ishdzd" th:with="type=${@dict.getType('is_hdzd')}">
<li> <option value="">所有</option>
<label>党建指导员电话：</label> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<input type="text" name="djzdydh"/> </select></td>
</li> </tr>
</div> <tr>
<div class="col-md-3"> <td width="100" height="43">上级党组织：</td><td width="100" height="43"><input type="text" name="sjdzz"/></td>
<li> <td width="100" height="43">党组织书记姓名：</td><td width="100" height="43"><input type="text" name="dzzsjxm"/></td>
<label>是否双强六好：</label> <td width="100" height="43">是否为"六个好"党组织：</td><td width="100" height="43"><select class="select-width" name="issqlh" th:with="type=${@dict.getType('is_sqlh')}">
<select name="issqlh" th:with="type=${@dict.getType('is_sqlh')}"> <option value="">所有</option>
<option value="">所有</option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> </select></td>
</select> </tr>
</li> <tr>
</div> <td width="100" height="43">党组织书记电话：</td><td width="100" height="43"><input type="text" name="dzzsjdh"/></td>
</div> <td width="100" height="43">登记方式：</td><td width="100" height="43"><input type="text" name="djfs"/></td>
<td width="100" height="43">区域划分：</td><td width="100" height="43"><select class="select-width" name="deptId" th:with="type=${@dict.getType('orhon_qyfl')}">
<div class="row"> <option value="">所有</option>
<div class="col-md-6"></div> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<div class="col-md-6"> </select></td>
<li> </tr>
<tr>
<td width="100" height="43">党员数：</td><td width="100" height="43"><input type="text" name="dys"/></td>
<td width="100" height="43">是否建立党组织：</td><td width="100" height="43"><select class="select-width" name="isdzz" th:with="type=${@dict.getType('is_dzz')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select></td>
<td width="100" height="43">党建指导员姓名：</td><td width="100" height="43"><input type="text" name="djzdyxm"/></td>
</tr>
</table>
<table>
<tr>
<td width="120" height="43">党建指导员电话：</td><td width="170" height="43"><input type="text" name="djzdydh"/></td>
<td>
<li class="select-time">
<label>党组织建立时间：</label>
<input type="text" class="time-input time-width" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="time-input time-width" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
</td>
</tr>
</table>
<table>
<tr>
<td >
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li> </td>
</div> </tr>
</div> </table>
</div>
</form>
</div>
</ul> <div class="btn-group-sm" id="toolbar" role="group">
</div> <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:shzz:add">
</form> <i class="fa fa-plus"></i> 添加
</div> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="system:shzz:edit">
<div class="btn-group-sm" id="toolbar" role="group"> <i class="fa fa-edit"></i> 修改
<a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:shzz:add"> </a>
<i class="fa fa-plus"></i> 添加 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:shzz:remove">
</a> <i class="fa fa-remove"></i> 删除
<a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="system:shzz:edit"> </a>
<i class="fa fa-edit"></i> 修改 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:shzz:export">
</a> <i class="fa fa-download"></i> 导出
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:shzz:remove"> </a>
<i class="fa fa-remove"></i> 删除 </div>
</a> <div class="col-sm-12 select-table table-striped">
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:shzz:export"> <table id="bootstrap-table"></table>
<i class="fa fa-download"></i> 导出 </div>
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment