Skip to content

A
amos-boot-biz
Commit 20025645 authored by leizhan's avatar leizhan
Browse files
Options

优化项目地址字段的显示

parent 5e69df61
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 21 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PeasantHouseholdDto.java
View file @ 20025645
...@@ -57,8 +57,7 @@ public class PeasantHouseholdDto extends BaseDto { ...@@ -57,8 +57,7 @@ public class PeasantHouseholdDto extends BaseDto {
@ApiModelProperty(value = "常住是否相同") @ApiModelProperty(value = "常住是否相同")
@TableField(typeHandler = FastjsonTypeHandler.class) private String isPermanent;
private List<String> isPermanent;
@ApiModelProperty(value = "常住地址") @ApiModelProperty(value = "常住地址")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInformationDto.java
View file @ 20025645
...@@ -77,19 +77,27 @@ public class SurveyInformationDto extends BaseDto { ...@@ -77,19 +77,27 @@ public class SurveyInformationDto extends BaseDto {
@ApiModelProperty(value = "常住详细地址") @ApiModelProperty(value = "常住详细地址")
private String permanentAddressDetail; private String permanentAddressDetail;
@ApiModelProperty(value = "项目地址") @ApiModelProperty(value = "项目地址code")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Integer> projectAddress; private List<Integer> projectAddress;
@ApiModelProperty(value = "项目地址文字")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<String> projectAddressText;
@ApiModelProperty(value = "项目地址") @ApiModelProperty(value = "项目地址")
private String projectAddressName; private String projectAddressName;
@ApiModelProperty(value = "常住地址") @ApiModelProperty(value = "常住地址code")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Integer> permanentAddress; private List<Integer> permanentAddress;
@ApiModelProperty(value = "常住地址文字")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<String> permanentAddressText;
@ApiModelProperty(value = "常住是否相同") @ApiModelProperty(value = "常住是否相同")
private List<String> isPermanent; private String isPermanent;
@ApiModelProperty(value = "定金") @ApiModelProperty(value = "定金")
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java
View file @ 20025645
...@@ -79,7 +79,7 @@ public class PeasantHouseholdController extends BaseController { ...@@ -79,7 +79,7 @@ public class PeasantHouseholdController extends BaseController {
model.setProjectAddressName(area.substring(0, area.length() - 2)+"/"+model.getProjectAddressDetail()); model.setProjectAddressName(area.substring(0, area.length() - 2)+"/"+model.getProjectAddressDetail());
} }
if (model.getIsPermanent().size()>0) { if ("1".equals(model.getIsPermanent())) {
model.setPermanentAddress(model.getProjectAddress()); model.setPermanentAddress(model.getProjectAddress());
model.setPermanentAddressDetail(model.getProjectAddressDetail()); model.setPermanentAddressDetail(model.getProjectAddressDetail());
} }
...@@ -94,7 +94,7 @@ public class PeasantHouseholdController extends BaseController { ...@@ -94,7 +94,7 @@ public class PeasantHouseholdController extends BaseController {
if(StringUtils.isEmpty(model.getDeveloper())){ if(StringUtils.isEmpty(model.getDeveloper())){
model.setDeveloper(userInfo.getRealName()); model.setDeveloper(userInfo.getRealName());
} }
if(StringUtils.isEmpty((CharSequence) model.getCreationTime())){ if(model.getCreationTime() == null){
model.setCreationTime(new Date()); model.setCreationTime(new Date());
} }
PeasantHouseholdDto householdDto = peasantHouseholdServiceImpl.createWithModel(model); PeasantHouseholdDto householdDto = peasantHouseholdServiceImpl.createWithModel(model);
...@@ -114,21 +114,32 @@ public class PeasantHouseholdController extends BaseController { ...@@ -114,21 +114,32 @@ public class PeasantHouseholdController extends BaseController {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
JSONArray regionName = getRegionName(); JSONArray regionName = getRegionName();
List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class); List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
if(StringUtils.isEmpty(model.getProjectAddressName())){ if(model.getProjectAddress().size()>0){
// 处理地址 // 处理项目地址
String area = ""; String projectAddressName = "";
for (Integer reg : model.getProjectAddress()) for (Integer reg : model.getProjectAddress())
for (RegionModel re : list) { for (RegionModel re : list) {
if (re.getRegionCode().equals(Integer.valueOf(reg))) { if (re.getRegionCode().equals(Integer.valueOf(reg))) {
area = area + re.getRegionName() + "/"; projectAddressName = projectAddressName + re.getRegionName() + "/";
} }
} }
model.setProjectAddressName(area.substring(0, area.length() - 2)+"/"+model.getProjectAddressDetail()); model.setProjectAddressName(projectAddressName.substring(0, projectAddressName.length() - 2));
} }
if (model.getIsPermanent().size()>0) { if ("1".equals(model.getIsPermanent())) {
model.setPermanentAddress(model.getProjectAddress()); model.setPermanentAddress(model.getProjectAddress());
model.setPermanentAddressDetail(model.getProjectAddressDetail()); model.setPermanentAddressDetail(model.getProjectAddressDetail());
} }
if(model.getPermanentAddress().size()>0){
// 处理常驻地址
String permanentAddressName = "";
for (Integer reg : model.getPermanentAddress())
for (RegionModel re : list) {
if (re.getRegionCode().equals(Integer.valueOf(reg))) {
permanentAddressName = permanentAddressName + re.getRegionName() + "/";
}
}
model.setPermanentAddressName(permanentAddressName.substring(0, permanentAddressName.length() - 2));
}
return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.updateWithModel(model)); return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.updateWithModel(model));
} }
...@@ -156,9 +167,10 @@ public class PeasantHouseholdController extends BaseController { ...@@ -156,9 +167,10 @@ public class PeasantHouseholdController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个农户信息", notes = "根据sequenceNbr查询单个农户信息") @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个农户信息", notes = "根据sequenceNbr查询单个农户信息")
public ResponseModel<PeasantHouseholdDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<PeasantHouseholdDto> selectOne(@PathVariable Long sequenceNbr) {
PeasantHouseholdDto peasantHouseholdDto = peasantHouseholdServiceImpl.queryBySeq(sequenceNbr); PeasantHouseholdDto peasantHouseholdDto = peasantHouseholdServiceImpl.queryBySeq(sequenceNbr);
if(peasantHouseholdDto.getPermanentAddress() ==null){ if(JSON.toJSONString(peasantHouseholdDto.getProjectAddress()).equals(JSON.toJSONString(peasantHouseholdDto.getPermanentAddress()))){
peasantHouseholdDto.setPermanentAddress(JSON.parseArray("[]", Integer.class)); peasantHouseholdDto.setIsPermanent("1");
peasantHouseholdDto.setIsPermanent(JSON.parseArray("[1]", String.class)); }else {
peasantHouseholdDto.setIsPermanent("0");
} }
return ResponseHelper.buildResponse(peasantHouseholdDto); return ResponseHelper.buildResponse(peasantHouseholdDto);
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java
View file @ 20025645
...@@ -81,6 +81,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto ...@@ -81,6 +81,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
} else if (item.getSurveyOrNot() == 2) { } else if (item.getSurveyOrNot() == 2) {
item.setSurveyOrNotText("提交审核"); item.setSurveyOrNotText("提交审核");
} }
item.setProjectAddressName(item.getProjectAddressName()+"/"+item.getProjectAddressDetail());
return item; return item;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
peasantHouseholdDtoPage.setRecords(newRecords); peasantHouseholdDtoPage.setRecords(newRecords);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java
View file @ 20025645
...@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; ...@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -120,15 +121,24 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD ...@@ -120,15 +121,24 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
peasantHousehold.setPermanentAddressDetail(surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail()); peasantHousehold.setPermanentAddressDetail(surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail());
JSONArray regionName = getRegionName(); JSONArray regionName = getRegionName();
List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class); List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
// 处理地址 // 处理项目地址
String area = ""; String projectAddressName = "";
for (Integer reg : surveyInfoAllDto.getSurveyInformation().getProjectAddress()) for (Integer reg : surveyInfoAllDto.getSurveyInformation().getProjectAddress())
for (RegionModel re : list) { for (RegionModel re : list) {
if (re.getRegionCode().equals(Integer.valueOf(reg))) { if (re.getRegionCode().equals(Integer.valueOf(reg))) {
area = area + re.getRegionName() + "/"; projectAddressName = projectAddressName + re.getRegionName() + "/";
} }
} }
peasantHousehold.setProjectAddressName(area.substring(0, area.length() - 2)+"/"+surveyInfoAllDto.getSurveyInformation().getProjectAddressDetail()); peasantHousehold.setProjectAddressName(projectAddressName.substring(0, projectAddressName.length() - 2));
//常住地址
String permanentAddressName = "";
for (Integer reg : surveyInfoAllDto.getSurveyInformation().getPermanentAddress())
for (RegionModel re : list) {
if (re.getRegionCode().equals(Integer.valueOf(reg))) {
permanentAddressName = permanentAddressName + re.getRegionName() + "/";
}
}
peasantHousehold.setPermanentAddressName(permanentAddressName.substring(0, permanentAddressName.length() - 2));
peasantHouseholdServiceImpl.saveOrUpdate(peasantHousehold); peasantHouseholdServiceImpl.saveOrUpdate(peasantHousehold);
return surveyInfoAllDto; return surveyInfoAllDto;
} }
...@@ -146,10 +156,12 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD ...@@ -146,10 +156,12 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
peasantHouseholdQueryWrapper.eq("survey_information_id", surveyInformationId); peasantHouseholdQueryWrapper.eq("survey_information_id", surveyInformationId);
PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getBaseMapper().selectOne(peasantHouseholdQueryWrapper); PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getBaseMapper().selectOne(peasantHouseholdQueryWrapper);
BeanUtils.copyProperties(peasantHousehold, surveyInfoAllDto.getSurveyInformation()); BeanUtils.copyProperties(peasantHousehold, surveyInfoAllDto.getSurveyInformation());
surveyInfoAllDto.getSurveyInformation().setProjectAddressText(Arrays.asList(peasantHousehold.getProjectAddressName().split("/")));
surveyInfoAllDto.getSurveyInformation().setPermanentAddressText(Arrays.asList(peasantHousehold.getPermanentAddressName().split("/")));
if(peasantHousehold.getPermanentAddress() ==null){ if(peasantHousehold.getPermanentAddress() ==null){
surveyInfoAllDto.getSurveyInformation().setPermanentAddress(peasantHousehold.getProjectAddress()); surveyInfoAllDto.getSurveyInformation().setPermanentAddress(peasantHousehold.getProjectAddress());
surveyInfoAllDto.getSurveyInformation().setIsPermanent(JSON.parseArray("[1]", String.class)); surveyInfoAllDto.getSurveyInformation().setIsPermanent("1");
} }
surveyInfoAllDto.getSurveyInformation().setSequenceNbr(surveyInformation.getSequenceNbr()); surveyInfoAllDto.getSurveyInformation().setSequenceNbr(surveyInformation.getSequenceNbr());
......
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