Commit 9d4d2165e06d70118fdf0c8b226f68fde2cf1545
Merge branch 'eval-report' into 'main'
考评查询报错修改 See merge request !138
Showing
1 changed file
with
3 additions
and
4 deletions
fw-morax-dao/src/main/resources/mapper/eval/EvalGroupMapper.xml
| @@ -27,6 +27,7 @@ | @@ -27,6 +27,7 @@ | ||
| 27 | <result column="yn" property="yn"/> | 27 | <result column="yn" property="yn"/> |
| 28 | <result column="create_time" property="createTime"/> | 28 | <result column="create_time" property="createTime"/> |
| 29 | <result column="update_time" property="updateTime"/> | 29 | <result column="update_time" property="updateTime"/> |
| 30 | + <result column="group_id" property="groupId"/> | ||
| 30 | </resultMap> | 31 | </resultMap> |
| 31 | 32 | ||
| 32 | <select id="getAllEffectGroups" resultMap="BaseResultMap"> | 33 | <select id="getAllEffectGroups" resultMap="BaseResultMap"> |
| @@ -89,12 +90,10 @@ | @@ -89,12 +90,10 @@ | ||
| 89 | t1.eval_group_rank_id, | 90 | t1.eval_group_rank_id, |
| 90 | t1.eval_group_rank_stage_id, | 91 | t1.eval_group_rank_stage_id, |
| 91 | t1.egc, | 92 | t1.egc, |
| 92 | - t1.name, | ||
| 93 | - t1.post_id, | ||
| 94 | - t1.post_name, | 93 | + t1.post_ids, |
| 94 | + t1.post_names, | ||
| 95 | t1.shop_ids, | 95 | t1.shop_ids, |
| 96 | t1.shop_names, | 96 | t1.shop_names, |
| 97 | - t1.scope_type, | ||
| 98 | t1.indicator_num, | 97 | t1.indicator_num, |
| 99 | t1.group_id | 98 | t1.group_id |
| 100 | from eval_group t1 | 99 | from eval_group t1 |