| @@ -33,7 +33,7 @@ | |||||
| "request": "launch", | "request": "launch", | ||||
| "mainClass": "com.ffii.lioner.LionerApplication", | "mainClass": "com.ffii.lioner.LionerApplication", | ||||
| "console": "internalConsole", | "console": "internalConsole", | ||||
| "projectName": "LIONER", | |||||
| // "projectName": "LIONER", | |||||
| "vmArgs": "-Xms2g -Xmx4g", | "vmArgs": "-Xms2g -Xmx4g", | ||||
| "args": "--spring.profiles.active=db-local,ldap-local,local" | "args": "--spring.profiles.active=db-local,ldap-local,local" | ||||
| } | } | ||||
| @@ -45,7 +45,7 @@ public class Client extends BaseEntity<Long>{ | |||||
| private String remarks; | private String remarks; | ||||
| @Column | @Column | ||||
| private LocalDateTime joinDate; | |||||
| private LocalDate joinDate; | |||||
| public String getFullname() { | public String getFullname() { | ||||
| return fullname; | return fullname; | ||||
| @@ -111,11 +111,11 @@ public class Client extends BaseEntity<Long>{ | |||||
| this.remarks = remarks; | this.remarks = remarks; | ||||
| } | } | ||||
| public LocalDateTime getJoinDate() { | |||||
| public LocalDate getJoinDate() { | |||||
| return joinDate; | return joinDate; | ||||
| } | } | ||||
| public void setJoinDate(LocalDateTime joinDate) { | |||||
| public void setJoinDate(LocalDate joinDate) { | |||||
| this.joinDate = joinDate; | this.joinDate = joinDate; | ||||
| } | } | ||||
| @@ -32,7 +32,13 @@ public class UpdateClientReq { | |||||
| String phone2; | String phone2; | ||||
| String remarks; | String remarks; | ||||
| LocalDate joinDate; | |||||
| Integer caseManagerId; | |||||
| Integer consultantId; | |||||
| public Long getId() { | public Long getId() { | ||||
| return id; | return id; | ||||
| } | } | ||||
| @@ -72,7 +78,7 @@ public class UpdateClientReq { | |||||
| public void setTitle(String title) { | public void setTitle(String title) { | ||||
| this.title = title; | this.title = title; | ||||
| } | } | ||||
| public String getEmail() { | public String getEmail() { | ||||
| return email; | return email; | ||||
| } | } | ||||
| @@ -104,5 +110,29 @@ public class UpdateClientReq { | |||||
| public void setRemarks(String remarks) { | public void setRemarks(String remarks) { | ||||
| this.remarks = remarks; | this.remarks = remarks; | ||||
| } | } | ||||
| public LocalDate getJoinDate() { | |||||
| return joinDate; | |||||
| } | |||||
| public void setJoinDate(LocalDate joinDate) { | |||||
| this.joinDate = joinDate; | |||||
| } | |||||
| public Integer getCaseManagerId() { | |||||
| return caseManagerId; | |||||
| } | |||||
| public void setCaseManagerId(Integer caseManagerId) { | |||||
| this.caseManagerId = caseManagerId; | |||||
| } | |||||
| public Integer getConsultantId() { | |||||
| return consultantId; | |||||
| } | |||||
| public void setConsultantId(Integer consultantId) { | |||||
| this.consultantId = consultantId; | |||||
| } | |||||
| } | } | ||||
| @@ -153,7 +153,7 @@ public class ClientService extends AbstractBaseEntityService<Client, Long, Clien | |||||
| // ); | // ); | ||||
| // } | // } | ||||
| // BeanUtils.copyProperties(req,instance); | |||||
| BeanUtils.copyProperties(req,instance); | |||||
| // if(!instance.getReminderFlag()){ | // if(!instance.getReminderFlag()){ | ||||
| // instance.setReminderThreshold((long) 0); | // instance.setReminderThreshold((long) 0); | ||||
| // instance.setReminderInterval((long) 0); | // instance.setReminderInterval((long) 0); | ||||
| @@ -173,7 +173,7 @@ public class ClientService extends AbstractBaseEntityService<Client, Long, Clien | |||||
| // } | // } | ||||
| // //=====GET OLD AUDIT LOG=====// | // //=====GET OLD AUDIT LOG=====// | ||||
| // instance = save(instance); | |||||
| instance = save(instance); | |||||
| // Long eventId = instance.getId(); | // Long eventId = instance.getId(); | ||||
| // updateSubDivision(req.getSubDivisionIds(),req.getSubDivisionRemoveIds(),eventId); | // updateSubDivision(req.getSubDivisionIds(),req.getSubDivisionRemoveIds(),eventId); | ||||