Commit f92e0714 authored by tangwei's avatar tangwei

修改bug

parents 9649611e 7337bef2
...@@ -95,6 +95,9 @@ public class HouseholdPvDto extends BaseDto { ...@@ -95,6 +95,9 @@ public class HouseholdPvDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "是否长期有效(1 是 0 否)")
private String isPermanently;
/** 合同信息 */ /** 合同信息 */
private HouseholdPvContactDto contactInfo; private HouseholdPvContactDto contactInfo;
/** 租赁物信息 */ /** 租赁物信息 */
......
...@@ -147,4 +147,10 @@ public class HouseholdPv extends BaseEntity { ...@@ -147,4 +147,10 @@ public class HouseholdPv extends BaseEntity {
@TableField("create_time") @TableField("create_time")
private Date createTime; private Date createTime;
/**
* 是否长期有效(1 是 0 否, int类型组件回显不了)
*/
@TableField("is_permanently")
private String isPermanently;
} }
...@@ -120,6 +120,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -120,6 +120,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
BeanUtils.copyProperties(personUser,personBasic); BeanUtils.copyProperties(personUser,personBasic);
if(departmentModel!=null){ if(departmentModel!=null){
personBasic.setProjectOrgCode(departmentModel.getOrgCode()); personBasic.setProjectOrgCode(departmentModel.getOrgCode());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
}else{ }else{
personBasic.setProjectOrgCode(companyModel.getOrgCode()); personBasic.setProjectOrgCode(companyModel.getOrgCode());
} }
...@@ -135,7 +136,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -135,7 +136,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
//人员账号信息 //人员账号信息
personAccount.setPersonId(personBasic.getSequenceNbr()); personAccount.setPersonId(personBasic.getSequenceNbr());
personAccount.setPuserId(agencyUserModel.getUserId()); personAccount.setPuserId(agencyUserModel.getUserId());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
personAccount.setProjectName(companyModel.getCompanyName()); personAccount.setProjectName(companyModel.getCompanyName());
personAccountService.save(personAccount); personAccountService.save(personAccount);
} }
...@@ -196,6 +196,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -196,6 +196,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
BeanUtils.copyProperties(personUser, personBasic); BeanUtils.copyProperties(personUser, personBasic);
if(departmentModel!=null){ if(departmentModel!=null){
personBasic.setProjectOrgCode(departmentModel.getOrgCode()); personBasic.setProjectOrgCode(departmentModel.getOrgCode());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
}else{ }else{
personBasic.setProjectOrgCode(companyModel.getOrgCode()); personBasic.setProjectOrgCode(companyModel.getOrgCode());
} }
...@@ -211,7 +212,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -211,7 +212,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
personCertificateService.updateById(personCertificate); personCertificateService.updateById(personCertificate);
//人员账号信息 //人员账号信息
personAccount.setPersonId(sequenceNbr); personAccount.setPersonId(sequenceNbr);
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
personAccount.setProjectName(companyModel.getCompanyName()); personAccount.setProjectName(companyModel.getCompanyName());
personAccountService.updateById(personAccount); personAccountService.updateById(personAccount);
return model; return model;
......
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