1

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditServiceImpl.java

@@ -117,16 +117,21 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
             criteria.eq("c.completed", vo.getCompleted());
         }
         if (Objects.nonNull(vo.getAssignState())) {
-            criteria.eq("c.calculate_score", vo.getAssignState());
+            criteria.eq("c.getAssignState", vo.getAssignState());
+        }
+        String scoreType = "c.calculate_score";
+        if (vo.getAuditType().equals(CommonEnum.auditType.talent.getCode())) {
+            scoreType = "c.average_score";
         }
         if (Objects.nonNull(vo.getScoreStart()) && Objects.isNull(vo.getScoreEnd())) {
-            criteria.ge("c.calculate_score", vo.getScoreStart());
+            criteria.ge(scoreType, vo.getScoreStart());
         }
         if (Objects.nonNull(vo.getScoreEnd()) && Objects.isNull(vo.getScoreStart())) {
-            criteria.le("c.calculate_score", vo.getScoreEnd());
+            criteria.le(scoreType, vo.getScoreEnd());
         }
         if (Objects.nonNull(vo.getScoreStart()) && Objects.nonNull(vo.getScoreEnd())) {
-            criteria.and(qw -> qw.ge("c.calculate_score", vo.getScoreStart()).le("c.calculate_score", vo.getScoreEnd()));
+            String finalScoreType = scoreType;
+            criteria.and(qw -> qw.ge(finalScoreType, vo.getScoreStart()).le(finalScoreType, vo.getScoreEnd()));
         }
         if (Objects.nonNull(vo.getProjState())) {
             criteria.eq("c.proj_state", vo.getProjState());

science-admin/src/main/resources/mapper/ComProjectAuditDAO.xml

@@ -97,7 +97,8 @@
 
     <select id="getTalentAuditListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
         SELECT
-        a.*,c.id talent_id,e.cert_id, e.person_name, e.sex, e.mobile, e.duty, e.title, e.spec, i.name as title_name, j.name as profession_name,
+        a.*,c.id talent_id,c.total_score,c.average_score,
+        e.cert_id, e.person_name, e.sex, e.mobile, e.duty, e.title, e.spec, i.name as title_name, j.name as profession_name,
         d.unit_name app_unit_name, (case when g.unit_name = d.unit_name then '直属' else REPLACE(g.unit_name,'卫生健康局','') end) as upUnitName
         FROM com_project_audit a
         left join com_talent_apply c on a.audit_object_id = c.id