Browse Source

补充量化积分统计保存修改,mapData的sql查询字段

dev
HAHA 3 years ago
parent
commit
10ba0e04f6
  1. 6
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java
  2. 9
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java
  3. 10
      epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml

6
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java

@ -54,7 +54,8 @@ public class IcPartyMemberPointController {
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody IcPartyMemberPointDTO dto) {
public Result save(@RequestBody IcPartyMemberPointDTO dto,@LoginUser TokenDto tokenDto) {
dto.setCustomerId(tokenDto.getCustomerId());
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
icPartyMemberPointService.save(dto);
@ -63,7 +64,8 @@ public class IcPartyMemberPointController {
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody IcPartyMemberPointDTO dto) {
public Result update(@RequestBody IcPartyMemberPointDTO dto,@LoginUser TokenDto tokenDto) {
dto.setCustomerId(tokenDto.getCustomerId());
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icPartyMemberPointService.update(dto);

9
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java

@ -62,4 +62,13 @@ public class VolunteerPolyMapDataResultDTO implements Serializable {
* 人户状况
*/
private String rhzk;
private String longitude;
private String latitude;
/**
* 类别
*/
private String volunteerCategory;
}

10
epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml

@ -30,10 +30,14 @@
u.gzdw,
u.rhzk,
u.GRID_ID,
u.HOME_ID
u.HOME_ID,
p.LONGITUDE,
p.LATITUDE,
c.VOLUNTEER_CATEGORY
FROM
ic_volunteer p
LEFT JOIN ic_resi_user u ON p.IC_RESI_USER = u.id and u.del_flag = '0'
ic_volunteer_poly p
LEFT JOIN ic_resi_user u ON p.IC_RESI_USER = u.id and u.DEL_FLAG = '0'
left join ic_volunteer_poly_category c on c.ID_CARD = p.ID_CARD and c.DEL_FLAG = '0'
<where>
p.del_flag = '0'
AND p.CUSTOMER_ID = #{customerId}

Loading…
Cancel
Save