修改bug
This commit is contained in:
parent
727ffeb9ef
commit
36ea17cf7d
|
@ -6,12 +6,12 @@
|
|||
SELECT * from (
|
||||
SELECT * from (
|
||||
select * from (
|
||||
select *,'1' as type,( SELECT count( DISTINCT usercode ) AS logcount from kc_gongkaikelog where gkkid=a.id ) as logcount
|
||||
select *,'1' as type,( SELECT count( * ) AS logcount from kc_gongkaikelog where gkkid=a.id ) as logcount
|
||||
from kc_gongkaike a where rq >= DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq asc,kssj asc limit 99999999999
|
||||
) a2
|
||||
union
|
||||
select * from (
|
||||
select *,'2' as type,( SELECT count( DISTINCT usercode ) AS logcount from kc_gongkaikelog where gkkid=a.id ) as logcount
|
||||
select *,'2' as type,( SELECT count( * ) AS logcount from kc_gongkaikelog where gkkid=a.id ) as logcount
|
||||
from kc_gongkaike a where rq < DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq desc,kssj desc limit 99999999999
|
||||
) a3
|
||||
) a ORDER BY type asc
|
||||
|
|
|
@ -129,5 +129,16 @@ public class ZyInfo implements Serializable {
|
|||
private String wtjnum;
|
||||
@TableField(exist = false)
|
||||
private String ytjnum;
|
||||
@TableField(exist = false)
|
||||
private String wpynum;
|
||||
@TableField(exist = false)
|
||||
private String ypynum;
|
||||
@TableField(exist = false)
|
||||
private String wwxsl;
|
||||
@TableField(exist = false)
|
||||
private String nwxsl;
|
||||
@TableField(exist = false)
|
||||
private String aigcxsl;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<mapper namespace="org.jeecg.modules.kc.zyInfo.mapper.ZyInfoMapper">
|
||||
|
||||
<select id="stuList" resultType="org.jeecg.modules.kc.zyInfo.entity.ZyInfo">
|
||||
select a.*,b.id as stuId ,b.file_path as stuFilePath,b.score
|
||||
select a.*,b.id as stuId ,b.file_path as stuFilePath,b.score,b.wwxsl,b.nwxsl,b.aigcxsl
|
||||
from zy_info a ,zy_info_student b
|
||||
${ew.customSqlSegment}
|
||||
|
||||
|
@ -13,11 +13,13 @@
|
|||
id, create_by, create_time, update_by, update_time, title, zy_type,
|
||||
content, start_time, end_time, zy_status, xnxq,
|
||||
wwcc, wwtgl, nwcc, nwtgl, aigccc, aigctgl, rwbh, file_path, xkxs,
|
||||
b.num as wtjnum,c.num as ytjnum
|
||||
ifnull(b.num,0) as wtjnum,ifnull(c.num,0) as ytjnum,ifnull(b.num,0) as wpynum,ifnull(c.num,0) as ypynum
|
||||
FROM
|
||||
zy_info a
|
||||
left join (select count(*) as num,main_id from zy_info_student where file_path is null GROUP BY main_id ) b on a.id = b.main_id
|
||||
left join (select count(*) as num,main_id from zy_info_student where file_path is not null GROUP BY main_id) c on a.id = c.main_id
|
||||
left join (select count(*) as num,main_id from zy_info_student where score is null GROUP BY main_id ) d on a.id = d.main_id
|
||||
left join (select count(*) as num,main_id from zy_info_student where score is not null GROUP BY main_id) e on a.id = e.main_id
|
||||
${ew.customSqlSegment}
|
||||
|
||||
</select>
|
||||
|
|
|
@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
|
|||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
|
@ -220,4 +221,17 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
|
||||
@AutoLog(value = "作业驳回")
|
||||
@ApiOperation(value="作业驳回", notes="作业驳回")
|
||||
@RequestMapping(value = "/editBohui", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public Result<String> editBohui(@RequestBody ZyInfoStudent zyInfoStudent) {
|
||||
UpdateWrapper<ZyInfoStudent> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.set("file_path",null);
|
||||
updateWrapper.set("pdf_path",null);
|
||||
updateWrapper.eq("id",zyInfoStudent.getId());
|
||||
zyInfoStudentService.update(updateWrapper);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue