Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_java
This commit is contained in:
commit
09f34cbada
|
@ -263,4 +263,7 @@ public class KcKetangbiao implements Serializable {
|
|||
private String xh;
|
||||
@TableField(exist = false)
|
||||
private String xjkssj;
|
||||
@TableField(exist = false)
|
||||
private String stars;
|
||||
|
||||
}
|
||||
|
|
|
@ -76,10 +76,16 @@
|
|||
|
||||
|
||||
<select id="getStudentKclblist" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
|
||||
SELECT id, kcbh,kcmc,f_skjs(skjs) as skjs,zc,xkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,week,
|
||||
SELECT kt.id, kcbh,kcmc,f_skjs(skjs) as skjs,zc,xkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,week,
|
||||
hhks,hhjs,dsz,wwks,wwjs,zbfs,hyh,hymm,kclj,beizhu,zbpx,kkdwid,skrq,kechengbiaoid,
|
||||
tingkecishu,sftk,tkyy,sfcj,skxs,sfxsk
|
||||
FROM kc_ketangbiao kt WHERE 1=1
|
||||
tingkecishu,sftk,tkyy,sfcj,skxs,sfxsk,st.stars
|
||||
FROM kc_ketangbiao kt
|
||||
LEFT JOIN kc_evaluationstudent st on kt.id = st.ketangbiaoid
|
||||
<if test="kcKetangbiao.xh!=null and kcKetangbiao.xh!=''">
|
||||
and st.sid = #{kcKetangbiao.xh}
|
||||
</if>
|
||||
|
||||
WHERE 1=1
|
||||
<if test="kcKetangbiao.hh!=null and kcKetangbiao.hh!=''">
|
||||
and kt.hh in
|
||||
<foreach item="item" index="index" collection="kcKetangbiao.hh.split(',')" open="(" separator="," close=")">
|
||||
|
|
|
@ -65,7 +65,6 @@ public class KcEvaluationstudentController extends JeecgController<KcEvaluations
|
|||
*/
|
||||
@AutoLog(value = "kc_evaluationstudent-添加")
|
||||
@ApiOperation(value="kc_evaluationstudent-添加", notes="kc_evaluationstudent-添加")
|
||||
@RequiresPermissions("qa:kc_evaluationstudent:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody KcEvaluationstudent kcEvaluationstudent) {
|
||||
kcEvaluationstudentService.save(kcEvaluationstudent);
|
||||
|
@ -80,7 +79,6 @@ public class KcEvaluationstudentController extends JeecgController<KcEvaluations
|
|||
*/
|
||||
@AutoLog(value = "kc_evaluationstudent-编辑")
|
||||
@ApiOperation(value="kc_evaluationstudent-编辑", notes="kc_evaluationstudent-编辑")
|
||||
@RequiresPermissions("qa:kc_evaluationstudent:edit")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody KcEvaluationstudent kcEvaluationstudent) {
|
||||
kcEvaluationstudentService.updateById(kcEvaluationstudent);
|
||||
|
@ -110,7 +108,6 @@ public class KcEvaluationstudentController extends JeecgController<KcEvaluations
|
|||
*/
|
||||
@AutoLog(value = "kc_evaluationstudent-批量删除")
|
||||
@ApiOperation(value="kc_evaluationstudent-批量删除", notes="kc_evaluationstudent-批量删除")
|
||||
@RequiresPermissions("qa:kc_evaluationstudent:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.kcEvaluationstudentService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
|
|
Loading…
Reference in New Issue