修改bug
This commit is contained in:
parent
c8539dd296
commit
cec7ccc8c3
|
|
@ -0,0 +1,117 @@
|
|||
package org.jeecg.modules.kc.wjxDjxx.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 学生答卷信息
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-05-7
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value="wjx_djxx对象", description="学生答卷信息")
|
||||
public class WjxDjxxDj {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private String id;
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private Date createTime;
|
||||
@ApiModelProperty(value = "修改人")
|
||||
private String updateBy;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private Date updateTime;
|
||||
@ApiModelProperty(value = "vid")
|
||||
private String vid;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@Excel(name = "名称", width = 15)
|
||||
@ApiModelProperty(value = "名称")
|
||||
@TableField(exist = false)
|
||||
private String title;
|
||||
@Excel(name = "学号", width = 15)
|
||||
@ApiModelProperty(value = "学号")
|
||||
private String userId;
|
||||
@Excel(name = "学生", width = 15)
|
||||
@ApiModelProperty(value = "学生")
|
||||
private String userName;
|
||||
@Excel(name = "答卷时间", width = 15,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 openTime;
|
||||
@Excel(name = "交卷时间", width = 15,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 commitTime;
|
||||
@Excel(name = "答卷用时", width = 15)
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "问卷作答用时时分秒")
|
||||
private String answerSfm;
|
||||
@Excel(name = "学期学年", width = 15)
|
||||
@ApiModelProperty(value = "学期学年")
|
||||
@TableField(exist = false)
|
||||
private String xqxn;
|
||||
|
||||
|
||||
|
||||
@ApiModelProperty(value = "提交内容")
|
||||
private String submitData;
|
||||
@ApiModelProperty(value = "答卷编号")
|
||||
private String jid;
|
||||
@ApiModelProperty(value = "问卷作答用时")
|
||||
private int answerSeconds;
|
||||
@ApiModelProperty(value = "问卷类型")
|
||||
@TableField(exist = false)
|
||||
private String atype;
|
||||
@ApiModelProperty(value = "问卷描述")
|
||||
@TableField(exist = false)
|
||||
private String content;
|
||||
|
||||
@TableField(exist = false)
|
||||
private List<WjxDjxxTmxx> wjxDjxxTmxxList;
|
||||
|
||||
@ApiModelProperty(value = "任务编号")
|
||||
@TableField(exist = false)
|
||||
private String rwbh;
|
||||
@ApiModelProperty(value = "课程名称")
|
||||
@TableField(exist = false)
|
||||
private String kcmc;
|
||||
@ApiModelProperty(value = "开始时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@TableField(exist = false)
|
||||
private Date startTime;
|
||||
@ApiModelProperty(value = "结束时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@TableField(exist = false)
|
||||
private Date endTime;
|
||||
|
||||
@ApiModelProperty(value = "是否完成")
|
||||
@TableField(exist = false)
|
||||
private String isFinished;
|
||||
|
||||
}
|
||||
|
|
@ -303,7 +303,7 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
ZyCcjg zyCcjg = new ZyCcjg();
|
||||
zyCcjg.setZyStuId(zyInfoStudent.getId());
|
||||
zyCcjg.setPaperid(dataid);
|
||||
zyCcjg.setCcType("1");//查重类型（0外网 1内网 2aigc）
|
||||
zyCcjg.setCcType("3");//查重类型（0外网 1内网 2aigc）
|
||||
zyCcjg.setFilestateid("1");
|
||||
zyCcjg.setBdkbs(zyInfoStudent.getCateid());
|
||||
zyCcjgMapper.insert(zyCcjg);
|
||||
|
|
|
|||
|
|
@ -250,12 +250,12 @@ public class ZykServiceImpl extends ServiceImpl<ZykMapper, ZykInfo> implements I
|
|||
String namePath = dd + ".pdf";
|
||||
String pdfPath = global.getContractDickPath() + namePath;
|
||||
|
||||
// PDFUtil.office2PDF(downloadMap.get("data"),pdfPath);
|
||||
// Map<String,String> uploadMap = uploadFileToSftp("contract/"+namePath);
|
||||
// if(!uploadMap.get("code").equals("0")){
|
||||
// return uploadMap;
|
||||
// }
|
||||
// zykInfo.setPdfName(uploadMap.get("data"));
|
||||
PDFUtil.office2PDF(downloadMap.get("data"),pdfPath);
|
||||
Map<String,String> uploadMap = uploadFileToSftp("contract/"+namePath);
|
||||
if(!uploadMap.get("code").equals("0")){
|
||||
return uploadMap;
|
||||
}
|
||||
zykInfo.setPdfName(uploadMap.get("data"));
|
||||
|
||||
Map<String,String> map = fileHandleUtil.moveFiles(zykInfo);
|
||||
if(!map.get("code").equals("0")){
|
||||
|
|
|
|||
Loading…
Reference in New Issue