开发区加操作结果

This commit is contained in:
majintao
2024-10-14 11:14:46 +08:00
parent 81dd83c870
commit 268eda7e23
7 changed files with 72 additions and 16 deletions
@@ -45,9 +45,9 @@ public class DevelopmentZoneController {
if (pager.getCurrentPage() > 100) {
pager.setCurrentPage(1);
}
long countDev = developmentZoneService.countDev(model.getProvince(), model.getCityName1(), model.getName(), model.getLevel());
long countDev = developmentZoneService.countDev(model.getProvince(), model.getCityName1(), model.getName(), model.getLevel(), model.getOperateResult());
pager.setTotalRows((int) countDev);
List<DevelopmentZone> developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getCityName1(), model.getName(), model.getLevel(), pager);
List<DevelopmentZone> developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getCityName1(), model.getName(), model.getLevel(), model.getOperateResult(), pager);
model.setDevelopmentZoneList(developmentZones);
model.setPager(pager);
return model;
@@ -131,6 +131,7 @@ public class DevelopmentZoneController {
Object coordinates = convertGeoList(model.getBdShape());
shape.put("coordinates", coordinates);
entity.setShape(shape);
entity.setOperateResult("已处理");
}
entity.setLevel(model.getLevel());
@@ -149,6 +150,7 @@ public class DevelopmentZoneController {
entity.setCityName1(StringUtils.isBlank(model.getCityName1()) ? "" : model.getCityName1());
entity.setDistrict(StringUtils.isBlank(model.getDistrict()) ? "" : model.getDistrict());
entity.setImgUrl(StringUtils.isBlank(model.getImgUrl()) ? "" : model.getImgUrl());
entity.setOperateResult(StringUtils.isBlank(model.getOperateResult()) ? "" : model.getOperateResult());
//记录操作人员
entity.setOperator(user.getRealName());
developmentZoneService.saveDevelopmentZone(entity);
@@ -190,6 +192,7 @@ public class DevelopmentZoneController {
Object coordinates = convertGeoList(model.getBdShape());
shape.put("coordinates", coordinates);
udata.put("shape", shape);
udata.put("operateResult", "已处理");
}
if (StringUtils.isNotBlank(model.getAlias())) {
String aliasString = model.getAlias().replaceAll(",", ",");
@@ -229,6 +232,9 @@ public class DevelopmentZoneController {
if (StringUtils.isNotBlank(model.getImgUrl())) {
udata.put("imgUrl", model.getImgUrl());
}
if (StringUtils.isNotBlank(model.getOperateResult())){
udata.put("operateResult", model.getOperateResult());
}
udata.put("createTime", new Date());
//记录操作人员
udata.put("operator", user.getRealName());
@@ -40,6 +40,8 @@ public class DevelopmentZoneModel extends BaseModel {
private File file;
private String operateResult;
public String getAlias() {
return alias;
}
@@ -215,4 +217,13 @@ public class DevelopmentZoneModel extends BaseModel {
public void setFile(File file) {
this.file = file;
}
public String getOperateResult() {
return operateResult;
}
public void setOperateResult(String operateResult) {
this.operateResult = operateResult;
}
}
@@ -30,11 +30,11 @@
</td>
<td>
<select id="province" name="province" onchange="updateCityAndDistrict()">
<#if developmentZone.province??>
<option value="${developmentZone.province}">${developmentZone.province}</option>
<#else>
<option value="">请选择省份</option>
</#if>
<#-- <#if developmentZone.province??>-->
<#-- <option value="${developmentZone.province}">${developmentZone.province}</option>-->
<#-- <#else>-->
<#-- <option value="">请选择省份</option>-->
<#-- </#if>-->
</select>
</td>
</tr>
@@ -172,6 +172,18 @@
value="<#if developmentZone??>${developmentZone.block!}</#if>"/><br/>
</td>
</tr>
<tr>
<td>
<label for="operateResult">操作结果:</label>
</td>
<td>
<select id="operateResult" name="operateResult">
<option value="" ></option>
<option value="已处理" >已处理</option>
<option value="无结果" >无结果</option>
</select>
</td>
</tr>
<tr>
<td></td>
<td>
@@ -30,6 +30,12 @@
<label for="name">开发区级别:</label>
<input type="text" name="level" id="level" class="input-medium" style="margin-top:9px;"
value="${level!}"></input>
操作结果:
<select id="operateResult" name="operateResult">
<option value="" ></option>
<option value="已处理" >已处理</option>
<option value="无结果" >无结果</option>
</select>
<input id="queryBtn" class="btn btn-primary" type="submit" value="查询"/>
@@ -46,6 +52,7 @@
<th>城市</th>
<th>区域</th>
<th>区块</th>
<th>操作结果</th>
<th>是否有围栏</th>
<th>操作人员</th>
<th>修改日期</th>
@@ -68,6 +75,7 @@
<td>${it.cityName1!}</td>
<td>${it.district!}</td>
<td>${it.block!}</td>
<td>${it.operateResult!}</td>
<td>
<#if it.bdShape?has_content>
已有围栏
@@ -40,6 +40,8 @@ public class DevelopmentZone implements MongoEntity {
private String imgUrl;
private String operateResult;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "_id")
@@ -227,4 +229,13 @@ public class DevelopmentZone implements MongoEntity {
public void setImgUrl(String imgUrl) {
this.imgUrl = imgUrl;
}
@Column(name = "operate_result")
public String getOperateResult() {
return operateResult;
}
public void setOperateResult(String operateResult) {
this.operateResult = operateResult;
}
}
@@ -51,9 +51,9 @@ public interface DevelopmentZoneService {
* @param pager
* @return
*/
public List<DevelopmentZone> findDevelopmentZone(String province,String city,String name,String level, Pager pager);
public List<DevelopmentZone> findDevelopmentZone(String province,String city,String name,String level,String operateResult, Pager pager);
public long countDev(String province,String city ,String name,String level);
public long countDev(String province,String city ,String name,String level,String operateResult);
public List<String> findProvinces();
public List<String> findCities(String province);
@@ -30,8 +30,8 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
}
@Override
public void updateDevelopmentZone(Map<String,Object> map,String id) {
developmentZoneDao.updateById(map,id);
public void updateDevelopmentZone(Map<String, Object> map, String id) {
developmentZoneDao.updateById(map, id);
}
@Override
@@ -41,7 +41,7 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
@Override
public List<DevelopmentZone> findDevelopmentZone(String province,String city ,String name,String level, Pager pager) {
public List<DevelopmentZone> findDevelopmentZone(String province, String city, String name, String level, String operateResult, Pager pager) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(province)) {
Pattern pattern = Pattern.compile(".*" + province + ".*");
@@ -60,12 +60,16 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
Pattern pattern = Pattern.compile(".*" + level + ".*");
params.add(new QueryParam("level", pattern));
}
if (StringUtils.isNotBlank(operateResult)) {
Pattern pattern = Pattern.compile(".*" + operateResult + ".*");
params.add(new QueryParam("operateResult", pattern));
}
return developmentZoneDao.findAllByParams(params, pager.getStartRow(), pager.getPageSize());
}
@Override
public long countDev(String province,String city, String name,String level) {
public long countDev(String province, String city, String name, String level, String operateResult) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(province)) {
Pattern pattern = Pattern.compile(".*" + province + ".*");
@@ -84,6 +88,10 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
Pattern pattern = Pattern.compile(".*" + level + ".*");
params.add(new QueryParam("level", pattern));
}
if (StringUtils.isNotBlank(operateResult)) {
Pattern pattern = Pattern.compile(".*" + operateResult + ".*");
params.add(new QueryParam("operateResult", pattern));
}
return developmentZoneDao.findCountByParams(params);
}
@@ -91,7 +99,7 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
public List<String> findProvinces() {
List<QueryParam> queryParams = new ArrayList<QueryParam>();
queryParams.add(new QueryParam("type", "Ê¡·Ý"));
List<AdministrativeMapping> allProvince = administrativeMappingDao.findAllByParams(queryParams,null,0,100,new String[]{"province"});
List<AdministrativeMapping> allProvince = administrativeMappingDao.findAllByParams(queryParams, null, 0, 100, new String[]{"province"});
List<String> provinces = new ArrayList<String>();
for (AdministrativeMapping mapping : allProvince) {
provinces.add(mapping.getProvince());
@@ -104,7 +112,7 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
List<QueryParam> queryParams = new ArrayList<QueryParam>();
queryParams.add(new QueryParam("type", "³ÇÊÐ"));
queryParams.add(new QueryParam("province", province));
List<AdministrativeMapping> allCity = administrativeMappingDao.findAllByParams(queryParams,null,0,1000,new String[]{"city"});
List<AdministrativeMapping> allCity = administrativeMappingDao.findAllByParams(queryParams, null, 0, 1000, new String[]{"city"});
List<String> cities = new ArrayList<String>();
for (AdministrativeMapping mapping : allCity) {
cities.add(mapping.getCity());
@@ -117,7 +125,7 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
List<QueryParam> queryParams = new ArrayList<QueryParam>();
queryParams.add(new QueryParam("type", "ÇøÓò"));
queryParams.add(new QueryParam("city", city));
List<AdministrativeMapping> allDistrict = administrativeMappingDao.findAllByParams(queryParams,null,0,1000,new String[]{"district"});
List<AdministrativeMapping> allDistrict = administrativeMappingDao.findAllByParams(queryParams, null, 0, 1000, new String[]{"district"});
List<String> districts = new ArrayList<String>();
for (AdministrativeMapping mapping : allDistrict) {
districts.add(mapping.getDistrict());