Browse Source

量化积分统计回显

master
HAHA 3 years ago
parent
commit
b9a995fcbc
  1. 34
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberPointEchoFormDTO.java
  2. 55
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberPointEchoResultDTO.java
  3. 19
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java
  4. 5
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java
  5. 11
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java
  6. 29
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java
  7. 20
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml

34
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberPointEchoFormDTO.java

@ -0,0 +1,34 @@
package com.epmet.resi.partymember.dto.partymember.form;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class PartyMemberPointEchoFormDTO implements Serializable {
private static final long serialVersionUID = 6999955563137801002L;
/**
* 年份
*/
@NotBlank(message = "年份不能为空")
private String year;
/**
* 季度
*/
@NotBlank(message = "季度不能为空")
private String quarter;
/**
* 党员id
*/
@NotBlank(message = "党员id不能为空")
private String partyMemberId;
}

55
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberPointEchoResultDTO.java

@ -0,0 +1,55 @@
package com.epmet.resi.partymember.dto.partymember.result;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class PartyMemberPointEchoResultDTO implements Serializable {
private static final long serialVersionUID = 195601506560614702L;
/**
* 基础积分分值
*/
private Integer basePoint;
/**
* 基础积分选项 英文逗号隔开
*/
private String baseOptions;
/**
* 民主评议积分分值
*/
private Integer reviewPoint;
/**
* 民主评议积分选项
*/
private String reviewOptions;
/**
* 激励积分分值
*/
private Integer inspirePoint;
/**
* 激励积分选项
*/
private String inspireOptions;
/**
* 警示扣分分值
*/
private Integer warnPoint;
/**
* 警示扣分选项
*/
private String warnOptions;
}

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

@ -15,7 +15,9 @@ import com.epmet.modules.partymember.excel.IcPartyMemberPointExcel;
import com.epmet.modules.partymember.service.IcPartyMemberPointService;
import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPointDTO;
import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointEchoFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointListFormDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -92,8 +94,23 @@ public class IcPartyMemberPointController {
*/
@PostMapping("getList")
public Result<List<PartyMemberPointListResultDTO>> getList(@RequestBody PartyMemberPointListFormDTO form, @LoginUser TokenDto tokenDto) {
List<PartyMemberPointListResultDTO> dto = icPartyMemberPointService.getList(form,tokenDto);
List<PartyMemberPointListResultDTO> dto = icPartyMemberPointService.getList(form, tokenDto);
return new Result<List<PartyMemberPointListResultDTO>>().ok(dto);
}
/**
* 量化积分统计回显
*
* @param form
* @return com.epmet.commons.tools.utils.Result<com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO>
* @author LZN
* @date 2022/5/18 18:18
*/
@PostMapping("echoPartyMemberPoint")
public Result<PartyMemberPointEchoResultDTO> getEchoPartyMemberPoint(@RequestBody PartyMemberPointEchoFormDTO form) {
ValidatorUtils.validateEntity(form);
List<PartyMemberPointEchoResultDTO> dto = icPartyMemberPointService.getEchoPartyMemberPoint(form);
return new Result().ok(dto);
}
}

5
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java

@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.modules.partymember.entity.IcPartyMemberPointEntity;
import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -28,4 +29,8 @@ public interface IcPartyMemberPointDao extends BaseDao<IcPartyMemberPointEntity>
List<PartyMemberPointListCountDTO> getListCount(@Param("year") String year,
@Param("customerId") String customerId);
List<PartyMemberPointEchoResultDTO> getEchoPartyMemberPoint(@Param("partyMemberId") String partyMemberId,
@Param("quarter") String quarter,
@Param("year") String year);
}

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

@ -6,7 +6,9 @@ import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.modules.partymember.entity.IcPartyMemberPointEntity;
import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPointDTO;
import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointEchoFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointListFormDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO;
@ -91,4 +93,13 @@ public interface IcPartyMemberPointService extends BaseService<IcPartyMemberPoin
*/
List<PartyMemberPointListResultDTO> getList(PartyMemberPointListFormDTO form, TokenDto tokenDto);
/**
* 量化积分统计回显
*
* @param form
* @return java.util.List<com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO>
* @author LZN
* @date 2022/5/18 18:18
*/
List<PartyMemberPointEchoResultDTO> getEchoPartyMemberPoint(PartyMemberPointEchoFormDTO form);
}

29
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java

@ -15,7 +15,9 @@ import com.epmet.modules.partymember.redis.IcPartyMemberPointRedis;
import com.epmet.modules.partymember.service.IcPartyMemberPointService;
import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPointDTO;
import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointEchoFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointListFormDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO;
import jdk.nashorn.internal.parser.Token;
import org.apache.commons.lang3.StringUtils;
@ -91,11 +93,20 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* 量化积分统计
*
* @param form
* @param tokenDto
* @return java.util.List<com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO>
* @author LZN
* @date 2022/5/18 18:20
*/
@Override
public List<PartyMemberPointListResultDTO> getList(PartyMemberPointListFormDTO form, TokenDto tokenDto) {
List<PartyMemberPointListResultDTO> dto = baseDao.getList(form.getIdCard(), form.getMobile(), form.getName(),
form.getOrgId(), form.getYear(),tokenDto.getCustomerId());
List<PartyMemberPointListCountDTO> count = baseDao.getListCount(form.getYear(),tokenDto.getCustomerId());
form.getOrgId(), form.getYear(), tokenDto.getCustomerId());
List<PartyMemberPointListCountDTO> count = baseDao.getListCount(form.getYear(), tokenDto.getCustomerId());
// 处理统计的平均值
for (int i = 0; i < dto.size(); i++) {
// 基础积分分值平均值
@ -128,5 +139,19 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
return dto;
}
/**
* 量化积分统计回显
*
* @param form
* @return java.util.List<com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO>
* @author LZN
* @date 2022/5/18 18:20
*/
@Override
public List<PartyMemberPointEchoResultDTO> getEchoPartyMemberPoint(PartyMemberPointEchoFormDTO form) {
List<PartyMemberPointEchoResultDTO> dto = baseDao.getEchoPartyMemberPoint(form.getPartyMemberId(), form.getQuarter(), form.getYear());
return dto;
}
}

20
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml

@ -75,6 +75,26 @@
a.total_score ASC,
a.CREATED_TIME
</select>
<select id="getEchoPartyMemberPoint"
resultType="com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO">
SELECT
BASE_POINT,
BASE_OPTIONS,
REVIEW_POINT,
REVIEW_OPTIONS,
INSPIRE_POINT,
INSPIRE_OPTIONS,
WARN_POINT,
WARN_OPTIONS
FROM
ic_party_member_point
where
year = #{year}
AND PARTY_MEMBER_ID = #{partyMemberId}
AND QUARTER = #{quarter}
AND DEL_FLAG = '0'
order by CREATED_TIME
</select>
</mapper>
Loading…
Cancel
Save