Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
63002f31 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 63546ee0 a5cfef3e
内嵌 并排
正在显示 14 个修改的文件 包含 314 行增加 和 50 行删除
sk-module-biz/src/main/java/com/skua/modules/edu/controller/PaperController.java
......@@ -89,6 +89,22 @@ public class PaperController {
}
@AutoLog(value = "在线考试-试卷-考试任务")
@ApiOperation(value="在线考试-试卷-考试任务", notes="在线考试-试卷-考试任务")
@GetMapping(value = "/paperTaskList")
public Result<IPage<Paper>> paperTaskList(Paper paper,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<Paper>> result = new Result<IPage<Paper>>();
Page<Paper> page = new Page<Paper>(pageNo, pageSize);
IPage<Paper> pageList = paperService.queryPaperTaskList(page, paper);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
@AutoLog(value = "在线考试-随机组卷试题")
@ApiOperation(value="在线考试-随机组卷试题", notes="在线考试-随机组卷试题")
@PostMapping(value = "/randomQuestion")
......@@ -152,7 +168,7 @@ public class PaperController {
}else {
paper.setSendStatus(sendStatus);
paper.setSendTime( new Date());
boolean ok = paperService.updateById(paper);
boolean ok = paperService.publishPaper(paper);
//TODO 返回false说明什么？
if(ok) {
if("1".equals(sendStatus)){
......
sk-module-biz/src/main/java/com/skua/modules/edu/controller/UserPaperController.java
package com.skua.modules.edu.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.util.DateUtils;
import com.skua.modules.common.service.ICommonSqlService;
import com.skua.modules.edu.entity.*;
import com.skua.modules.edu.service.IPaperService;
import com.skua.modules.edu.service.IUserPaperService;
import com.skua.modules.edu.vo.PaperVO;
import com.skua.modules.edu.vo.UserPaperVO;
import com.skua.modules.equipment.pojo.Equipment;
import com.skua.modules.equipment.util.EquipmentUtils;
import com.skua.modules.equipment.vo.EquipmentVO;
import com.skua.modules.guest.util.DateUtil;
import com.skua.tool.util.JoinSqlUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -37,9 +30,6 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigInteger;
import java.net.URLEncoder;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Slf4j
@Api(tags="在线考试-用户考试")
......@@ -71,33 +61,11 @@ public class UserPaperController {
paper.setUserId(BaseContextHandler.getUserId());
paper.setStartTime(DateUtils.now());
paper.setEndTime( DateUtils.now() );
paper.setExamStatus(0);//考试状态是未考试的
IPage<Paper> pageList = paperService.queryMyPaperByList(page ,paper);
result.setSuccess(true);
result.setResult(pageList);
return result;
/* String currentDate = DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss");
StringBuffer sql = new StringBuffer();
sql.append("select aaa.* from ( ");
sql.append(" select ifnull(up.user_id ,0) 'user_id', ifnull(count(up.id) ,0) as user_count, d.depart_name , p.* from edu_paper p ");
sql.append(" left join edu_user_paper up on p.id = up.paper_id ");
sql.append(" left join sys_depart d on p.depart_id = d.id");
sql.append(" where p.send_status =1 and p.exam_user_ids like '%"+BaseContextHandler.getUserId()+"%'");
if( paper.getDepartId() != null && paper.getDepartId().length() > 0){
sql.append(" and p.depart_id= '"+paper.getDepartId()+"' ");
}
if( paper.getPaperTitle() != null && paper.getPaperTitle().length() > 0){
sql.append(" and p.paper_title like '%"+paper.getPaperTitle()+"%' ");
}
if( paper.getDepartId() != null && paper.getDepartId().length() > 0){
sql.append(" and p.depart_id= '"+paper.getDepartId()+"' ");
}
sql.append(" and p.send_time >= '"+currentDate+"' and and p.send_time <= '"+currentDate+"'");
sql.append(" )aaa where aaa.user_id = 0 ");
// 分页查询
Page<Map<String, Object>> pageList = iCommonSqlService.queryForPage(page, sql.toString());
List<Paper> paperList = JoinSqlUtils.multiMaps2Beans(pageList.getRecords(), Paper.class);
//List<Paper> paperList = EquipmentUtils.equipEntities2VOs(dataList);
*/
}
......@@ -110,12 +78,29 @@ public class UserPaperController {
PaperVO paperVO = paperService.queryById(id);
if(paperVO == null) {
result.error500("未找到对应实体");
}else if( paperVO!= null && !"1".equals(paperVO.getSendStatus() ) ) {
result.error500("试卷未发布！");
}else{
result.setResult(paperVO);
result.setSuccess(true);
}
/* long currentTimeMillis = System.currentTimeMillis();
//校验试卷状态、开始时间、接受时间
if(paperVO!= null ){
if( !"1".equals(paperVO.getSendStatus() ) ) {
result.error500("试卷未发布！");
}
if(StringUtils.isNotBlank(paperVO.getStartTime())){
Long startTime = com.skua.tool.util.DateUtils.dateStr2Sec(paperVO.getStartTime(), "yyyy-MM-dd");
if(currentTimeMillis < startTime){
result.error500("试卷未开始！");
}
}
if(StringUtils.isNotBlank(paperVO.getStartTime())){
Long endTime = com.skua.tool.util.DateUtils.dateStr2Sec(paperVO.getStartTime(), "yyyy-MM-dd");
if(currentTimeMillis > endTime){
result.error500("试卷已经结束！");
}
}
}*/
/* Boolean flag = paperService.checkExamCount(id,BaseContextHandler.getUserId());
if(flag){
......
sk-module-biz/src/main/java/com/skua/modules/edu/entity/EduPaperTask.java 0 → 100644
package com.skua.modules.edu.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 考试任务
*/
@Data
@TableName("edu_paper_task")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="edu_paper_task对象", description="考试任务")
public class EduPaperTask {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private String id;
/**部门编号*/
@Excel(name = "部门编号", width = 15)
@ApiModelProperty(value = "部门编号")
private String departId;
/**试卷编号*/
@Excel(name = "试卷编号", width = 15)
@ApiModelProperty(value = "试卷编号")
private String paperId;
/**参考用户编号*/
@Excel(name = "参考用户编号", width = 15)
@ApiModelProperty(value = "参考用户编号")
private String userId;
/**状态（0 未完成 1 已完成）*/
@Excel(name = "状态（0 未完成 1 已完成）", width = 15)
@ApiModelProperty(value = "状态（0 未完成 1 已完成）")
private String status;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
/**上传人*/
@Excel(name = "上传人", width = 15)
@ApiModelProperty(value = "上传人")
private String createBy;
/**上传时间*/
@Excel(name = "上传时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上传时间")
private Date createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新时间*/
@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**厂站ID*/
@Excel(name = "厂站ID", width = 15)
@ApiModelProperty(value = "厂站ID")
private String createDept;
/**delFlag*/
@Excel(name = "delFlag", width = 15)
@ApiModelProperty(value = "delFlag")
private Integer delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/edu/entity/Paper.java
......@@ -131,11 +131,19 @@ public class Paper {
@ApiModelProperty(value = "delFlag")
private Integer delFlag;
@ApiModelProperty(value = "考试人次")
private Integer userCount ;
@TableField(exist=false)
@ApiModelProperty(value = "考试任务状态：0 未完成 1 已完成")
private Integer examStatus;
@TableField(exist=false)
@ApiModelProperty(value = "扩展：考试人员")
@Dict(dictTable = "sys_user", dicCode="id", dicText = "realname")
private String userId;
@TableField(exist=false)
......
sk-module-biz/src/main/java/com/skua/modules/edu/mapper/EduPaperTaskMapper.java 0 → 100644
package com.skua.modules.edu.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.edu.entity.EduPaperTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 考试任务
*/
public interface EduPaperTaskMapper extends BaseMapper<EduPaperTask> {
/***
* 根据试卷编号删除考试任务
* @param paperId
*/
void delByPaperId( @Param("paperId") String paperId);
/**
* 设置departId
* @param paperId
*/
void updateDepartIdByPaperId(@Param("paperId") String paperId);
/***
* 修改考试任务状态
* @param paperId
* @param userId
*/
void updateStatus(String paperId, String userId);
}
sk-module-biz/src/main/java/com/skua/modules/edu/mapper/PaperMapper.java
......@@ -35,4 +35,11 @@ public interface PaperMapper extends BaseMapper<Paper> {
*/
List<Paper> queryExamUserIds(@Param("startTime")String startTime,@Param("endTime") String endTime);
/***
* 分页查询考试任务
* @param page
* @param paper
* @return
*/
IPage<Paper> queryPaperTaskList(Page<Paper> page,@Param("param") Paper paper);
}
......
sk-module-biz/src/main/java/com/skua/modules/edu/mapper/xml/EduPaperTaskMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.edu.mapper.EduPaperTaskMapper">
<delete id="delByPaperId" >
delete from edu_paper_task where status = 0 and paper_id =#{paperId}
</delete>
<update id="updateDepartIdByPaperId">
update edu_paper_task t ,sys_user_depart ud set t.depart_id = ud.dep_id where t.user_id = ud.user_id and t.paper_id = #{paperId} and t.depart_id > '0'
</update>
<!-- 修改考试任务状态 -->
<update id="updateStatus">
update edu_paper_task set status = '1' where paper_id =#{paperId} and user_id =#{userId}
</update>
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/edu/mapper/xml/PaperMapper.xml
......@@ -2,6 +2,33 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.edu.mapper.PaperMapper">
<!-- 考试任务 -->
<select id="queryPaperTaskList" resultType="com.skua.modules.edu.entity.Paper">
select p.* ,t.status 'examStatus' ,t.user_id from edu_paper p ,edu_paper_task t
where p.id = t.paper_id and p.send_status =1
<if test="param.userId != null and param.userId !=''">
and t.user_id = #{param.userId}
</if>
<if test="param.departId != null and param.departId !=''">
and p.depart_id = #{param.departId}
</if>
<if test="param.paperTitle != null and param.paperTitle !=''">
and p.paper_title like CONCAT('%',#{param.paperTitle},'%')
</if>
<if test="param.departId != null and param.departId !=''">
and p.depart_id = #{param.departId}
</if>
<if test="param.startTime != null and param.startTime !=''">
and p.start_time &lt;= #{param.startTime}
</if>
<if test="param.endTime != null and param.endTime !=''">
and p.end_time &gt;= #{param.endTime}
</if>
</select>
<!-- 我的考试列表 -->
<select id="queryMyPaperByList" resultType="com.skua.modules.edu.entity.Paper">
select d.depart_name ,p.*
......
sk-module-biz/src/main/java/com/skua/modules/edu/service/IEduPaperTaskService.java 0 → 100644
package com.skua.modules.edu.service;
import com.skua.modules.edu.entity.EduPaperTask;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 考试任务
*/
public interface IEduPaperTaskService extends IService<EduPaperTask> {
}
sk-module-biz/src/main/java/com/skua/modules/edu/service/IPaperService.java
......@@ -82,4 +82,19 @@ public interface IPaperService extends IService<Paper> {
* @return
*/
List<Paper> queryExamUserIds(String startTime, String endTime);
/**
* 发布试卷
* @param paper
* @return
*/
boolean publishPaper(Paper paper);
/**
* 分页查询考试任务
* @param page
* @param paper
* @return
*/
IPage<Paper> queryPaperTaskList(Page<Paper> page, Paper paper);
}
......
sk-module-biz/src/main/java/com/skua/modules/edu/service/impl/EduPaperTaskServiceImpl.java 0 → 100644
package com.skua.modules.edu.service.impl;
import com.skua.modules.edu.entity.EduPaperTask;
import com.skua.modules.edu.mapper.EduPaperTaskMapper;
import com.skua.modules.edu.service.IEduPaperTaskService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 考试任务
*/
@Service
public class EduPaperTaskServiceImpl extends ServiceImpl<EduPaperTaskMapper, EduPaperTask> implements IEduPaperTaskService {
}
sk-module-biz/src/main/java/com/skua/modules/edu/service/impl/PaperServiceImpl.java
......@@ -42,6 +42,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
private UserPaperMapper userPaperMapper;
@Resource
private UserAnswerMapper userAnswerMapper;
@Resource
private EduPaperTaskMapper paperTaskMapper;
/***
* 添加试卷、试卷试题表
* @param paperVO
......@@ -172,7 +174,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
* @return
*/
public IPage<Paper> queryMyPaperByList(Page<Paper> page, Paper paper){
return this.baseMapper.queryMyPaperByList(page,paper) ;
// return this.baseMapper.queryMyPaperByList(page,paper) ;
return this.baseMapper.queryPaperTaskList(page,paper);
}
/***
* 我的试卷记录
......@@ -192,6 +195,42 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
public List<Paper> queryExamUserIds(String startTime, String endTime){
return this.baseMapper.queryExamUserIds(startTime,endTime) ;
}
/**
* 分页查询考试任务
* @param page
* @param paper
* @return
*/
public IPage<Paper> queryPaperTaskList(Page<Paper> page, Paper paper){
return this.baseMapper.queryPaperTaskList(page,paper);
}
/**
* 发布试卷
* @param paper
* @return
*/
@Transactional
public boolean publishPaper(Paper paper){
//根据试卷删除考试任务
this.paperTaskMapper.delByPaperId(paper.getId());
//重新生成考试任务
EduPaperTask paperTask = null;
String[] userIdList = paper.getExamUserIds().split(",");
for(String userId : userIdList){
paperTask = new EduPaperTask();
paperTask.setPaperId(paper.getId());
paperTask.setUserId(userId);
this.paperTaskMapper.insert(paperTask);
}
//批量修改考试任务表的部门编号
this.paperTaskMapper.updateDepartIdByPaperId(paper.getId());
//发布试卷
this.baseMapper.updateById(paper);
return true;
}
/***
* 交卷
......@@ -243,7 +282,10 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
paperMapper.updateById( paper ) ;
//计算分数
// answer.setScore( totalScore );
// answerMapper.updateById( answer ) ;
// answerMapper.updateById( answer )
// 修改考试任务的状态
paperTaskMapper.updateStatus(userPaper.getPaperId(),userPaper.getUserId());
return totalScore+"";
}
/* public String queryPaperScore(String paperId,String userId){
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/WorkAnalysisController.java
......@@ -312,21 +312,26 @@ public class WorkAnalysisController {
}
private String getSafeProgressSql( String departIds,String startTime, String endTime){
JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtils.getBean("master");
/* JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtils.getBean("master");
String userIdsSql = "select GROUP_CONCAT( DISTINCT exam_user_ids) 'user_ids' from edu_paper where end_time >='"+startTime+"' and end_time <= '"+endTime+"'";
String userIds = jdbcTemplate.queryForObject(userIdsSql , String.class);
if(StringUtils.isNotEmpty(userIds)){
userIds = JSUtils.quoteEach(userIds,",");
}else{
userIds = "''";
}
}*/
String sql = "";
//会议任务
sql += " left join( select depart_id , count(1) 'count' from ajh_meeting_send where meet_status =2 and meet_time >='"+startTime+"' and meet_time <= '"+endTime+"' group by depart_id )aaa on aaa.depart_id = d.id ";
sql += " left join (select depart_id , count(1) 'count' from ajh_meeting_send where meet_id in (select id from ajh_meeting where send_time >='"+startTime+"' and send_time <= '"+endTime+"') group by depart_id ) bbb on bbb.depart_id = d.id ";
// 考试任务
sql += " left join (select depart_id,count(user_id) 'count' from edu_user_paper where DATE_FORMAT(end_time,'%Y-%m-%d') >='"+startTime+"' and end_time <= '"+endTime+"' and user_id in("+userIds+") group by depart_id )ccc on ccc.depart_id = d.id";
sql += " left join ( select dep_id,count(user_id) 'count' from sys_user_depart where user_id in("+userIds+") group by dep_id )ddd on ddd.dep_id = d.id";
// sql += " left join (select depart_id,count(user_id) 'count' from edu_user_paper where DATE_FORMAT(end_time,'%Y-%m-%d') >='"+startTime+"' and end_time <= '"+endTime+"' and user_id in("+userIds+") group by depart_id )ccc on ccc.depart_id = d.id";
// sql += " left join ( select dep_id,count(user_id) 'count' from sys_user_depart where user_id in("+userIds+") group by dep_id )ddd on ddd.dep_id = d.id";
sql += " left join (select depart_id ,count(id) 'count' from edu_paper_task where DATE_FORMAT(end_time,'%Y-%m-%d') >='"+startTime+"' and DATE_FORMAT(end_time,'%Y-%m-%d') <= '"+endTime+"' and status=1 group by depart_id )ccc on ccc.depart_id = d.id";
sql += " left join ( select depart_id ,count(id) 'count' from edu_paper_task where DATE_FORMAT(create_time,'%Y-%m-%d') >='"+startTime+"' and DATE_FORMAT(end_time,'%Y-%m-%d') <= '"+endTime+"' group by depart_id )ddd on ddd.dep_id = d.id";
//风险排查任务
sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where status = '2' and report_date >= '"+startTime+" 00:00:00' and report_date <='"+endTime+" 23:59:59' group by depart_id ) eee on eee.depart_id = d.id ";
sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where report_date >= '"+startTime+" 00:00:00' and report_date <='"+endTime+" 23:59:59' group by depart_id ) ggg on ggg.depart_id = d.id ";
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/impl/InspectionAnalysisServiceImpl.java
......@@ -713,8 +713,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
if (inspectionPointFillGroupIdList.size() > 0) {
QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>();
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", inspectionTaskIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", inspectionPointFillGroupIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",inspectionFillGroupIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", new HashSet<>(inspectionPointFillGroupIdList));
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",new HashSet<>(inspectionFillGroupIdList));
inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id");
inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", "");
inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id");
......@@ -883,8 +883,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
if (inspectionPointFillGroupIdList.size() > 0) {
QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>();
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", tempInspectionTaskIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", inspectionPointFillGroupIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",inspectionFillGroupIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", new HashSet<>(inspectionPointFillGroupIdList));
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",new HashSet<>(inspectionFillGroupIdList));
inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id");
inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", "");
inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id");
......@@ -1172,8 +1172,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
if (inspectionPointFillGroupIdList.size() > 0) {
QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>();
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", inspectionTaskIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", inspectionPointFillGroupIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",inspectionFillGroupIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", new HashSet<>(inspectionPointFillGroupIdList));
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",new HashSet<>(inspectionFillGroupIdList));
inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id");
inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", "");
inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id");
......@@ -1321,8 +1321,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
if (inspectionPointFillGroupIdList.size() > 0) {
QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>();
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", tempInspectionTaskIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", inspectionPointFillGroupIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",inspectionFillGroupIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", new HashSet<>(inspectionPointFillGroupIdList));
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",new HashSet<>(inspectionFillGroupIdList));
inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id");
inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", "");
inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!