Browse Source

热心居民申请-申请表新增数据、行为记录表更新数据

master
sunyuchao 5 years ago
parent
commit
d15cb49cac
  1. 10
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java
  2. 11
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java
  3. 5
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java
  4. 10
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java
  5. 10
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java
  6. 65
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java
  7. 2
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java
  8. 23
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java
  9. 10
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java
  10. 3
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java
  11. 4
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java
  12. 14
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java
  13. 11
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java
  14. 44
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
  15. 26
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java
  16. 40
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml
  17. 12
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedVisitDao.xml

10
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java

@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.feign.fallback.ResiPartymemberFeignClientFallBack;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
* @Description 居民端陌生人导览 调用epmet-user服务
* @Author sun
*/
@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class)
@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class,url="http://localhost:8096")
public interface ResiPartymemberFeignClient {
/**
@ -22,4 +23,11 @@ public interface ResiPartymemberFeignClient {
**/
@PostMapping(value = "resi/partymember/resiwarmheartedapply/init")
Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO);
/**
* @Author sun
* @Description 居民端-热心居民申请-提交申请数据
**/
@PostMapping(value = "resi/partymember/resiwarmheartedapply/submit")
Result submit(ResiWarmheartedSubmitFormDTO formDTO);
}

11
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java

@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.feign.ResiPartymemberFeignClient;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.springframework.stereotype.Component;
@ -26,4 +27,14 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC
public Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "init", formDTO);
}
/**
* @Author sun
* @Description 居民端-热心居民申请-提交申请数据
* @Date 2020/3/30
**/
@Override
public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "submit", formDTO);
}
}

5
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java

@ -5,6 +5,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@ -39,8 +40,8 @@ public class ResiWarmheartedController {
* @Description 居民端-热心居民申请-提交申请数据
**/
@PostMapping("submit")
public Result<ResiWarmheartedResultDTO> submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO) {
return resiWarmheartedService.init(tokenDTO, resiWarmheartedFormDTO);
public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedSubmitFormDTO formDTO) {
return resiWarmheartedService.submit(tokenDTO, formDTO);
}

10
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java

@ -3,6 +3,7 @@ package com.epmet.modules.warmhearted.service;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
/**
@ -21,4 +22,13 @@ public interface ResiWarmheartedService {
*/
Result<ResiWarmheartedResultDTO> init(TokenDto tokenDTO, ResiWarmheartedFormDTO formDTO);
/**
* 居民端-热心居民申请-提交申请数据
*
* @param
* @return void
* @author sun
*/
Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO);
}

10
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java

@ -6,6 +6,7 @@ import com.epmet.modules.feign.ResiPartymemberFeignClient;
import com.epmet.modules.utils.ModuleConstant;
import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -30,4 +31,13 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
formDTO.setUserId(tokenDTO.getUserId());
return resiPartymemberFeignClient.init(formDTO);
}
@Override
public Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO) {
if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
}
formDTO.setUserId(tokenDTO.getUserId());
return resiPartymemberFeignClient.submit(formDTO);
}
}

65
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java

@ -0,0 +1,65 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.partymember.dto.warmhearted.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 居民端-热心居民申请-提交申请数据-配置入参
* @author sun
*/
@Data
public class ResiWarmheartedSubmitFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户Id CUSTOMER.id
*/
@NotBlank(message = "客户ID不能为空")
private String customerId;
/**
* 网格Id
*/
@NotBlank(message = "网格ID不能为空")
private String gridId;
/**
* 热心居民申请行为记录表Id
*/
@NotBlank(message = "行为记录表ID不能为空")
private String resiWarmVisitId;
/**
* 申请理由(300字)
*/
@NotBlank(message = "申请理由不能为空")
private String reason;
/**
* 用户Id
*/
@NotBlank(message = "用户ID不能为空")
private String userId;
}

2
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java

@ -40,6 +40,6 @@ public class ResiWarmheartedResultDTO implements Serializable {
/**
* 热心居民申请访问记录表(resi_warmhearted_visit)Id
*/
private String resiWarmheartedVisitId;
private String resiWarmVisitId;
}

23
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java

@ -10,6 +10,7 @@ package com.epmet.modules.warmhearted.constant;
/**
* 常量
*
* @author sun
* @since 1.0.0
*/
@ -28,5 +29,25 @@ public interface ResiWarmheartedVisitConstant {
/**
* 最后一次操作行为-提交失败
*/
String FAILD="faild";
String FAILD = "faild";
/**
* 热心居民申请-审核状态-待审核
*/
String UNDER_AUDITTING = "under_auditting";
/**
* 热心居民申请-审核状态-审核通过
*/
String APPROVED = "approved";
/**
* 热心居民申请-审核状态-未通过
*/
String REJECTED = "rejected";
/**
* 数据库操作异常
*/
String OPERATION_EXCEPTION = "数据库操作异常!";
}

10
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java

@ -29,6 +29,7 @@ import com.epmet.modules.warmhearted.excel.ResiWarmheartedApplyExcel;
import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -94,8 +95,13 @@ public class ResiWarmheartedApplyController {
}
@PostMapping("init")
public Result<ResiWarmheartedResultDTO> init(@RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO){
return resiWarmheartedApplyService.getResiWarmheartedApply(resiWarmheartedFormDTO);
public Result<ResiWarmheartedResultDTO> init(@RequestBody ResiWarmheartedFormDTO formDTO){
return resiWarmheartedApplyService.init(formDTO);
}
@PostMapping("submit")
public Result submit(@RequestBody ResiWarmheartedSubmitFormDTO formDTO){
return resiWarmheartedApplyService.submit(formDTO);
}
}

3
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java

@ -18,6 +18,7 @@
package com.epmet.modules.warmhearted.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
@ -38,4 +39,6 @@ public interface ResiWarmheartedApplyDao extends BaseDao<ResiWarmheartedApplyEnt
* @return
*/
ResiWarmheartedApplyDTO selectResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
void saveResiWarmApply(ResiWarmheartedApplyDTO entity);
}

4
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java

@ -18,10 +18,13 @@
package com.epmet.modules.warmhearted.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
import org.apache.ibatis.annotations.Mapper;
import javax.management.relation.RelationSupport;
/**
* 热心居民申请行为记录表
*
@ -32,4 +35,5 @@ import org.apache.ibatis.annotations.Mapper;
public interface ResiWarmheartedVisitDao extends BaseDao<ResiWarmheartedVisitEntity> {
void saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
void updateResiWarmVisitById(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
}

14
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java

@ -23,13 +23,14 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import java.util.List;
import java.util.Map;
/**
* 热心居民申请表
* 热心居民申请表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
@ -103,5 +104,14 @@ public interface ResiWarmheartedApplyService extends BaseService<ResiWarmhearted
* @return void
* @author sun
*/
Result<ResiWarmheartedResultDTO> getResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO);
/**
* 居民端-热心居民申请-提交申请数据
*
* @param
* @return void
* @author sun
*/
Result submit(ResiWarmheartedSubmitFormDTO formDTO);
}

11
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java

@ -19,9 +19,11 @@ package com.epmet.modules.warmhearted.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import java.util.List;
@ -103,4 +105,13 @@ public interface ResiWarmheartedVisitService extends BaseService<ResiWarmhearted
* @author sun
*/
ResiWarmheartedResultDTO saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO);
/**
* 居民端-热心居民申请提交-更新行为记录数据
*
* @param
* @return void
* @author sun
*/
void updateResiWarmVisit(ResiWarmheartedSubmitFormDTO formDTO);
}

44
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

@ -19,12 +19,14 @@ package com.epmet.modules.warmhearted.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
import com.epmet.modules.warmhearted.redis.ResiWarmheartedApplyRedis;
@ -32,6 +34,7 @@ import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -39,9 +42,13 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* 热心居民申请表
*
@ -51,6 +58,7 @@ import java.util.Map;
@Service
public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmheartedApplyDao, ResiWarmheartedApplyEntity> implements ResiWarmheartedApplyService {
private static final Logger log = LoggerFactory.getLogger(ResiWarmheartedApplyServiceImpl.class);
@Autowired
private ResiWarmheartedApplyRedis resiWarmheartedApplyRedis;
@Autowired
@ -112,7 +120,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
@Override
@Transactional(rollbackFor = Exception.class)
public Result<ResiWarmheartedResultDTO> getResiWarmheartedApply(ResiWarmheartedFormDTO formDTO) {
public Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO) {
//1:热心居民申请行为记录表新增数据
ResiWarmheartedResultDTO resiWarmheartedResultDTO = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
//2:查询是否已申请热心居民
@ -126,5 +134,39 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
return new Result<ResiWarmheartedResultDTO>().ok(resiWarmheartedResultDTO);
}
@Override
public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
//1:将申请记录存入热心居民申请表中
saveResiWarmApply(formDTO);
//2:将最后一次操作行为更新到热心居民申请行为记录表中
resiWarmheartedVisitService.updateResiWarmVisit(formDTO);
return new Result();
}
/**
* 热心居民申请表新增数据
* @param formDTO
* @return
*/
@Transactional(rollbackFor = Exception.class)
public void saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
Date date = new Date();
ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = new ResiWarmheartedApplyDTO();
resiWarmheartedApplyDTO.setCustomerId(formDTO.getCustomerId());
resiWarmheartedApplyDTO.setGridId(formDTO.getGridId());
resiWarmheartedApplyDTO.setUserId(formDTO.getUserId());
resiWarmheartedApplyDTO.setReason(formDTO.getReason());
resiWarmheartedApplyDTO.setResiWarmVisitId(formDTO.getResiWarmVisitId());
resiWarmheartedApplyDTO.setAuditStatus(ResiWarmheartedVisitConstant.UNDER_AUDITTING);
//UUID
resiWarmheartedApplyDTO.setId(IdWorker.get32UUID());
resiWarmheartedApplyDTO.setDelFlag(NumConstant.ZERO);
resiWarmheartedApplyDTO.setRevision(NumConstant.ZERO);
resiWarmheartedApplyDTO.setCreatedBy(formDTO.getUserId());
resiWarmheartedApplyDTO.setCreatedTime(date);
resiWarmheartedApplyDTO.setUpdatedBy(formDTO.getUserId());
resiWarmheartedApplyDTO.setUpdatedTime(date);
resiWarmheartedApplyDao.saveResiWarmApply(resiWarmheartedApplyDTO);
}
}

26
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java

@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
import com.epmet.modules.warmhearted.dao.ResiWarmheartedVisitDao;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
@ -32,6 +33,7 @@ import com.epmet.modules.warmhearted.redis.ResiWarmheartedVisitRedis;
import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -73,8 +75,8 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
return ConvertUtils.sourceToTarget(entityList, ResiWarmheartedVisitDTO.class);
}
private QueryWrapper<ResiWarmheartedVisitEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
private QueryWrapper<ResiWarmheartedVisitEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<ResiWarmheartedVisitEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@ -130,8 +132,26 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
resiWarmheartedVisitDTO.setUpdatedTime(date);
resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO);
ResiWarmheartedResultDTO resiWarmheartedResultDTO = new ResiWarmheartedResultDTO();
resiWarmheartedResultDTO.setResiWarmheartedVisitId(resiWarmheartedVisitDTO.getId());
resiWarmheartedResultDTO.setResiWarmVisitId(resiWarmheartedVisitDTO.getId());
return resiWarmheartedResultDTO;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateResiWarmVisit(ResiWarmheartedSubmitFormDTO formDTO) {
ResiWarmheartedVisitDTO resiWarmheartedVisitDTO = new ResiWarmheartedVisitDTO();
resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.SUCCESS);
/*if (true) {
//最后一次操作行为-提交成功
resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.SUCCESS);
} else {
//最后一次操作行为-提交失败
resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.FAILD);
}*/
resiWarmheartedVisitDTO.setId(formDTO.getResiWarmVisitId());
resiWarmheartedVisitDTO.setUpdatedBy(formDTO.getUserId());
resiWarmheartedVisitDTO.setUpdatedTime(new Date());
resiWarmheartedVisitDao.updateResiWarmVisitById(resiWarmheartedVisitDTO);
}
}

40
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml

@ -26,9 +26,9 @@
rw.grid_id AS "gridid",
rw.user_id AS "userid",
rw.reason AS "reason",
rw.audit_status AS "auditstatus",
rw.refuse_reason AS "refusereason",
rw.resi_warm_visit_id AS "resiwarmvisitid",
rw.audit_status AS "auditStatus",
rw.refuse_reason AS "refuseReason",
rw.resi_warm_visit_id AS "resiWarmVisitId",
rw.del_flag AS "delflag",
rw.revision AS "revision",
rw.created_by AS "createdby",
@ -37,6 +37,40 @@
rw.updated_time AS "updatedtime"
</sql>
<insert id="saveResiWarmApply" parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO">
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}
)
</insert>
<select id="selectResiWarmheartedApply" parameterType="com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO"
resultType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO">
SELECT

12
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedVisitDao.xml

@ -19,7 +19,8 @@
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<insert id="saveResiWarmheartedVisit" parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
<insert id="saveResiWarmheartedVisit"
parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
INSERT INTO resi_warmhearted_visit (
id,
customer_id,
@ -50,5 +51,14 @@
#{updatedTime}
)
</insert>
<update id="updateResiWarmVisitById"
parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
UPDATE resi_warmhearted_visit
SET operate_visit = #{operateVisit},
updated_by = #{updatedBy},
updated_time = #{updatedTime}
WHERE
id = #{id}
</update>
</mapper>
Loading…
Cancel
Save