diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java index de03c5259e..843eac1b54 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java @@ -40,5 +40,4 @@ public interface ResiWarmheartedApplyDao extends BaseDao { - boolean saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO); boolean updateResiWarmVisitById(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index f3ce755213..9096be4679 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -155,24 +155,14 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO) { - Date date = new Date(); - ResiWarmheartedVisitDTO resiWarmheartedVisitDTO = new ResiWarmheartedVisitDTO(); - resiWarmheartedVisitDTO.setCustomerId(formDTO.getCustomerId()); - resiWarmheartedVisitDTO.setGridId(formDTO.getGridId()); - resiWarmheartedVisitDTO.setUserId(formDTO.getUserId()); - resiWarmheartedVisitDTO.setVisitFrom(formDTO.getVisitFrom()); + ResiWarmheartedVisitEntity entity = new ResiWarmheartedVisitEntity(); + entity.setCustomerId(formDTO.getCustomerId()); + entity.setGridId(formDTO.getGridId()); + entity.setUserId(formDTO.getUserId()); + entity.setVisitFrom(formDTO.getVisitFrom()); //最后一次操作行为(initialize:初始化 sms_code:获取验证码 success:提交成功 faild:提交失败) - resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.INITIALIZE); - resiWarmheartedVisitDTO.setVisitTime(date); - //UUID - resiWarmheartedVisitDTO.setId(IdWorker.get32UUID()); - resiWarmheartedVisitDTO.setDelFlag(NumConstant.ZERO); - resiWarmheartedVisitDTO.setRevision(NumConstant.ZERO); - resiWarmheartedVisitDTO.setCreatedBy(formDTO.getUserId()); - resiWarmheartedVisitDTO.setCreatedTime(date); - resiWarmheartedVisitDTO.setUpdatedBy(formDTO.getUserId()); - resiWarmheartedVisitDTO.setUpdatedTime(date); - if(!resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO)){ - log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION); - } + entity.setOperateVisit(ResiWarmheartedVisitConstant.INITIALIZE); + entity.setVisitTime(new Date()); + baseDao.insert(entity); ResiWarmheartedResultDTO resiWarmheartedResultDTO = new ResiWarmheartedResultDTO(); - resiWarmheartedResultDTO.setResiWarmVisitId(resiWarmheartedVisitDTO.getId()); + resiWarmheartedResultDTO.setResiWarmVisitId(entity.getId()); return new Result().ok(resiWarmheartedResultDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml index 3947be348a..e4f87e4f27 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml @@ -37,40 +37,6 @@ rw.updated_time AS "updatedtime" - - INSERT INTO resi_warmhearted_apply ( - id, - customer_id, - grid_id, - user_id, - reason, - audit_status, - refuse_reason, - resi_warm_visit_id, - del_flag, - revision, - created_by, - created_time, - updated_by, - updated_time - )VALUES( - #{id}, - #{customerId}, - #{gridId}, - #{userId}, - #{reason}, - #{auditStatus}, - #{refuseReason}, - #{resiWarmVisitId}, - #{delFlag}, - #{revision}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime} - ) - - SELECT * diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index 5db6fd0047..5d68dcef31 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -38,44 +38,6 @@ uri.updated_time AS "updatedtime" - - INSERT INTO user_resi_info ( - id, - user_id, - reg_mobile, - surname, - `name`, - street, - district, - building_address, - resi_visit_id, - del_flag, - revision, - created_by, - created_time, - updated_by, - updated_time - ) - VALUES - ( - #{id}, - #{userId}, - #{regMobile}, - #{surname}, - #{name}, - #{street}, - #{district}, - #{buildingAddress}, - #{resiVisitId}, - #{delFlag}, - #{revision}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime} - ) - -