diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java index 96df344..772ddf2 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java @@ -82,6 +82,21 @@ public class RentTenantInfoDTO implements Serializable { ) private Date updatedTime; + /** + * 政治面貌 + */ + private String politicalStatus; + + /** + * 是否服兵役【是:1 否:0】 + */ + private String isMilitary; + + /** + * 国籍 + */ + private String nation; + /** * 头像列表 */ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java index 64826f9..3173018 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java @@ -50,7 +50,8 @@ public class RentContractInfoController { public Result save(@RequestBody RentContractInfoDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - return rentContractInfoService.save(dto); + rentContractInfoService.save(dto); + return new Result(); } @NoRepeatSubmit diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java index 973d9ac..e45aefb 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java @@ -69,6 +69,21 @@ public class RentTenantInfoEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 政治面貌 + */ + private String politicalStatus; + + /** + * 是否服兵役【是:1 否:0】 + */ + private String isMilitary; + + /** + * 国籍 + */ + private String nation; + /** * 头像列表 */ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java index 5a552ea..64d9e37 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java @@ -55,7 +55,7 @@ public interface RentContractInfoService extends BaseService page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); + if (StringUtils.isNotBlank((String) params.get("dataFlag"))) { + params.put("createdBy", loginUserUtil.getLoginUserId()); + } IPage page = getPage(params); List list = baseDao.getContractInfoList(params); return new PageData<>(list, page.getTotal()); @@ -157,11 +160,12 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl params = new HashMap<>(8); params.put("contractId", contractId); params.put("referenceId", contractId); @@ -327,7 +331,6 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl AND i.SIGN_DATE <= #{endTime} + + AND i.CREATED_BY = #{createdBy} + AND DATE( i.END_DATE ) <= DATE_ADD( curdate(), INTERVAL 1 MONTH ) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml index fdd7959..b355a83 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml @@ -44,7 +44,10 @@ TYPE, STATE, CREATED_TIME, - UPDATED_TIME + UPDATED_TIME, + POLITICAL_STATUS, + IS_MILITARY, + NATION FROM pli_rent_tenant_info WHERE