src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
@@ -58,12 +58,6 @@ */ @ApiModelProperty(value = "地址名称") private String addressName; /** * 门牌地址名称 */ @ApiModelProperty(value = "门牌地址名称") private String doorplateAddressName; /** * 经度 */ @@ -219,11 +213,6 @@ */ @ApiModelProperty(value = "门牌类型") private String doorplateType; /** * 门牌类型编码 */ @ApiModelProperty(value = "门牌类型编码") private Integer doorplateTypeCode; /** * 门牌号 */ src/main/java/org/springblade/modules/house/controller/HouseLabelController.java
@@ -139,7 +139,7 @@ */ @PostMapping("/removeHouseLabel") @ApiOperationSupport(order = 7) public R remove(@RequestBody HouseLabelEntity houseLabel) { public R removeHouseLabel(@RequestBody HouseLabelEntity houseLabel) { QueryWrapper<HouseLabelEntity> wrapper = new QueryWrapper<>(); wrapper.eq("label_id",houseLabel.getLabelId()) .eq("house_code",houseLabel.getHouseCode()); src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -60,6 +60,17 @@ HouseholdEntity detail = householdService.getOne(Condition.getQueryWrapper(household)); return R.data(HouseholdWrapper.build().entityVO(detail)); } /** * 住户 自定义查询详情 * @param household * @return */ @GetMapping("/getDetail") @ApiOperation(value = "详情", notes = "传入household") public R getDetail(HouseholdEntity household) { return R.data(householdService.getDetail(household)); } /** * 住户 分页 */ @@ -113,6 +124,17 @@ } /** * 住户 自定义新增或修改 * @param household * @return */ @PostMapping("/saveOrUpdateHousehold") @ApiOperation(value = "自定义新增或修改", notes = "传入household") public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdEntity household) { return R.status(householdService.saveOrUpdateHousehold(household)); } /** * 住户 删除 */ @PostMapping("/remove") src/main/java/org/springblade/modules/house/controller/HouseholdLabelController.java
@@ -16,6 +16,7 @@ */ package org.springblade.modules.house.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -135,4 +136,17 @@ } /** * 住户-标签 自定义删除 */ @PostMapping("/removeHouseholdLabel") public R removeHouseholdLabel(@RequestBody HouseholdLabelEntity householdLabel) { QueryWrapper<HouseholdLabelEntity> wrapper = new QueryWrapper<>(); wrapper.eq("household_id",householdLabel.getHouseholdId()) .eq("label_id",householdLabel.getLabelId()); // 返回 return R.status(householdLabelService.remove(wrapper)); } } src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -29,6 +29,7 @@ import java.io.Serializable; import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; import sun.rmi.runtime.Log; /** * 住户 实体类 @@ -76,25 +77,34 @@ @ApiModelProperty(value = "绑定用户名称") private String associatedUserName; /** * 角色 0: 业主 1：出租户 2：空挂户 3：其他 */ @ApiModelProperty(value = "角色 0: 业主 1：出租户 2：空挂户 3：其他") private Integer roleType; /** * 与角色关系 */ @ApiModelProperty(value = "与角色关系") private String relationship; /** * 主要联系人 * 是否主要联系人 1：是 0：否 */ @ApiModelProperty(value = "主要联系人") private String primaryContact; @ApiModelProperty(value = "是否主要联系人 1：是 0：否") private Integer isPrimaryContact; /** * 居住状态（WGCCP_RESIDENTIAL_STATUS） * 居住状态 1: 是 0：否 */ @ApiModelProperty(value = "居住状态（WGCCP_RESIDENTIAL_STATUS）") private String residentialStatus; @ApiModelProperty(value = "居住状态 1: 是 0：否") private Integer residentialStatus; /** * 性别（SEX） * 性别 1: 男 0：女 2: 未知 */ @ApiModelProperty(value = "性别（SEX）") @ApiModelProperty(value = "性别 1: 男 0：女 2: 未知") private Short gender; /** * 生日 */ @@ -167,23 +177,19 @@ */ @ApiModelProperty(value = "残疾证") private String disabilityCert; /** * 角色 * 是否党员 1：党员 2：群众 */ @ApiModelProperty(value = "角色") private String roleType; /** * 是否党员 */ @ApiModelProperty(value = "是否党员") private String partyEmber; @ApiModelProperty(value = "是否党员 1：党员 2：群众") private Integer partyEmber; /** * 创建人 */ @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty("创建人") private String createUser; private Long createUser; /** * 创建时间 @@ -198,7 +204,7 @@ */ @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty("更新人") private String updateUser; private Long updateUser; /** * 更新时间 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -55,4 +55,11 @@ * @return */ List<HouseholdVO> getHouseholdListByCode(@Param("code") String code); /** * 住户 自定义查询详情 * @param household * @return */ HouseholdVO getHouseholdListById(@Param("household") HouseholdEntity household); } src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -44,6 +44,7 @@ <collection property="householdLabelList" javaType="java.util.List" ofType="org.springblade.modules.house.vo.HouseholdLabelVO" autoMapping="true"> <id property="id" column="cid"/> <result property="remark" column="cremark"/> </collection> </resultMap> @@ -64,12 +65,23 @@ <select id="getHouseholdListByCode" resultMap="householdAndLabelMap" > select jh.*, jhl.id as cid,jhl.* jhl.id as cid,jhl.*,jhl.remark as cremark from jczz_household jh left join jczz_household_label jhl on jh.id = jhl.household_id where 1=1 where 1=1 and is_deleted = 0 and house_code = #{code} </select> <!--查询房屋集合信息-按id--> <select id="getHouseholdListById" resultMap="householdAndLabelMap" > select jh.*, jhl.id as cid,jhl.*,jhl.remark as cremark from jczz_household jh left join jczz_household_label jhl on jh.id = jhl.household_id where 1=1 and is_deleted = 0 and jh.id = #{household.id} </select> </mapper> src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -55,4 +55,18 @@ * @return */ List<HouseholdVO> getHouseholdListByCode(String code); /** * 住户 自定义新增或修改 * @param household * @return */ boolean saveOrUpdateHousehold(HouseholdEntity household); /** * 住户 自定义查询详情 * @param household * @return */ Object getDetail(HouseholdEntity household); } src/main/java/org/springblade/modules/house/service/impl/HouseholdLabelServiceImpl.java
@@ -67,6 +67,7 @@ .eq("label_id",householdLabel.getLabelId()); HouseholdLabelEntity one = getOne(queryWrapper); if (null != one){ householdLabel.setId(one.getId()); // 更新 return updateById(householdLabel); } src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.common.node.TreeNode; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.modules.house.entity.HouseholdEntity; import org.springblade.modules.house.vo.HouseholdVO; import org.springblade.modules.house.mapper.HouseholdMapper; @@ -26,6 +27,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.Date; import java.util.List; /** @@ -61,4 +63,36 @@ public List<HouseholdVO> getHouseholdListByCode(String code) { return baseMapper.getHouseholdListByCode(code); } /** * 住户 自定义新增或修改 * @param household * @return */ @Override public boolean saveOrUpdateHousehold(HouseholdEntity household) { boolean flag = false; household.setUpdateTime(new Date()); household.setUpdateUser(AuthUtil.getUserId()); if (null!=household.getId()){ // 更新 flag = updateById(household); }else { // 新增 household.setCreateTime(new Date()); household.setCreateUser(AuthUtil.getUserId()); flag = save(household); } return flag; } /** * 住户 自定义查询详情 * @param household * @return */ @Override public Object getDetail(HouseholdEntity household) { return baseMapper.getHouseholdListById(household); } }
