Browse Source

refactor(supplierPerformance): 重构绩效打分待办统计功能

- 修改 myScoreReminder 接口参数传递方式,直接使用 data 对象属性
- 更新 Mapper 接口方法签名,将两个参数合并为单个查询对象
- 重写 SQL 查询逻辑,支持更复杂的条件过滤和去重统计
- 调整 Service 层实现,统一数据处理逻辑和默认状态设置
- 移除冗余的参数校验代码,优化业务逻辑一致性
- 增强查询灵活性,支持按多种条件筛选待办任务
master
qiankanghui 5 months ago
parent
commit
300fc02670
  1. 15
      src/main/java/com/xujie/modules/supplierPerformance/controller/PerEvaluateRequestController.java
  2. 9
      src/main/java/com/xujie/modules/supplierPerformance/mapper/PerEvaluateRequestMapper.java
  3. 8
      src/main/java/com/xujie/modules/supplierPerformance/service/PerEvaluateRequestService.java
  4. 17
      src/main/java/com/xujie/modules/supplierPerformance/service/impl/PerEvaluateRequestServiceImpl.java
  5. 44
      src/main/resources/mapper/supplierPerformance/PerEvaluateRequestMapper.xml

15
src/main/java/com/xujie/modules/supplierPerformance/controller/PerEvaluateRequestController.java

@ -223,19 +223,16 @@ public class PerEvaluateRequestController {
@PostMapping("/myScoreReminder") @PostMapping("/myScoreReminder")
@ResponseBody @ResponseBody
public R myScoreReminder(@RequestBody PerEvaluateRequestEntity data) { public R myScoreReminder(@RequestBody PerEvaluateRequestEntity data) {
// 从参数中获取 site 和 username(前端应该从 session 获取后传入)
String site = data.getSite();
String username = data.getUsername();
if (site == null || site.isEmpty()) {
if (data.getSite() == null || data.getSite().isEmpty()) {
return R.error("工厂编码不能为空"); return R.error("工厂编码不能为空");
} }
if (username == null || username.isEmpty()) {
if (data.getUsername() == null || data.getUsername().isEmpty()) {
return R.error("用户名不能为空"); return R.error("用户名不能为空");
} }
Integer count = perEvaluateRequestHeaderService.countMyScoreReminder(site, username);
Integer count = perEvaluateRequestHeaderService.countMyScoreReminder(data);
return R.ok().put("data", new java.util.HashMap<String, Object>() {{ return R.ok().put("data", new java.util.HashMap<String, Object>() {{
put("count", count); put("count", count);
}}); }});

9
src/main/java/com/xujie/modules/supplierPerformance/mapper/PerEvaluateRequestMapper.java

@ -50,11 +50,6 @@ public interface PerEvaluateRequestMapper extends BaseMapper<PerEvaluateRequestE
@Select("select * from sys_user_supplier where user_id = #{userId} ") @Select("select * from sys_user_supplier where user_id = #{userId} ")
SupplierPerformanceTheYearEntity getUserSupplierByUsernameAndSite(SupplierPerformanceTheYearEntity data); SupplierPerformanceTheYearEntity getUserSupplierByUsernameAndSite(SupplierPerformanceTheYearEntity data);
/**
* 统计当前用户的绩效打分待办任务数
* @param site 工厂编码
* @param username 用户名(打分人)
* @return 待办任务数量
*/
Integer countMyScoreReminder(@Param("site") String site, @Param("username") String username);
Integer countMyScoreReminder(@Param("query") PerEvaluateRequestEntity query);
} }

8
src/main/java/com/xujie/modules/supplierPerformance/service/PerEvaluateRequestService.java

@ -43,11 +43,5 @@ public interface PerEvaluateRequestService extends IService<PerEvaluateRequestEn
ResponseData getSupplierNo(SupplierPerformanceTheYearEntity data); ResponseData getSupplierNo(SupplierPerformanceTheYearEntity data);
/**
* 统计当前用户的绩效打分待办任务数
* @param site 工厂编码
* @param username 用户名
* @return 待办任务数量
*/
Integer countMyScoreReminder(String site, String username);
Integer countMyScoreReminder(PerEvaluateRequestEntity query);
} }

17
src/main/java/com/xujie/modules/supplierPerformance/service/impl/PerEvaluateRequestServiceImpl.java

@ -443,9 +443,20 @@ public class PerEvaluateRequestServiceImpl extends ServiceImpl<PerEvaluateReques
} }
@Override @Override
public Integer countMyScoreReminder(String site, String username) {
Integer count = baseMapper.countMyScoreReminder(site, username);
return count != null ? count : 0;
public Integer countMyScoreReminder(PerEvaluateRequestEntity query) {
// ===== 1. 默认状态(统一口径)=====
if (query.getStatusList() == null || query.getStatusList().isEmpty()) {
query.setStatusList(Arrays.asList("未开始", "进行中", "已完成"));
}
// ===== 2. 统计范围控制(统一逻辑)=====
query.setSelectType(3); // 强制与列表一致(关键点)
query.setCreateBy(query.getUsername()); // 保持一致口径
// ===== 3. 调用 mapper =====
Integer count = baseMapper.countMyScoreReminder(query);
return count == null ? 0 : count;
} }
private ResponseData buildError(String msg){ private ResponseData buildError(String msg){

44
src/main/resources/mapper/supplierPerformance/PerEvaluateRequestMapper.xml

@ -163,10 +163,44 @@
<!-- 统计当前用户的绩效打分待办任务数 --> <!-- 统计当前用户的绩效打分待办任务数 -->
<select id="countMyScoreReminder" resultType="java.lang.Integer"> <select id="countMyScoreReminder" resultType="java.lang.Integer">
SELECT COUNT(*)
FROM per_evaluate_request
WHERE site = #{site}
AND create_by = #{username}
AND status IN ('未开始', '进行中', '已完成')
SELECT COUNT(DISTINCT a.id)
FROM per_evaluate_request a
<if test="query.selectType == 3">
INNER JOIN per_evaluate_request_owner o
ON o.site = a.site
AND o.request_no = a.request_no
AND o.owner = #{query.username}
</if>
LEFT JOIN srm_supplier ss
ON ss.site = a.site
AND ss.supplier_no = a.supplier_no
WHERE a.site = #{query.site}
<if test="query.createBy != null and query.createBy != ''">
AND a.create_by = #{query.createBy}
</if>
<if test="query.statusList != null and query.statusList.size > 0">
AND a.status IN
<foreach collection="query.statusList" item="st" open="(" separator="," close=")">
#{st}
</foreach>
</if>
<if test="query.requestNo != null and query.requestNo != ''">
AND a.request_no LIKE CONCAT('%', #{query.requestNo}, '%')
</if>
<if test="query.supplierNo != null and query.supplierNo != ''">
AND a.supplier_no LIKE CONCAT('%', #{query.supplierNo}, '%')
</if>
<if test="query.supplierName != null and query.supplierName != ''">
AND ss.supplier_name LIKE CONCAT('%', #{query.supplierName}, '%')
</if>
</select> </select>
</mapper> </mapper>
Loading…
Cancel
Save