修改bug
This commit is contained in:
parent
59869baa6b
commit
d20bd4e4b3
|
@ -36,6 +36,8 @@ import org.jeecg.modules.kc.qa.entity.KcEvaluations;
|
|||
import org.jeecg.modules.kc.qa.service.IKcEvaluationService;
|
||||
import org.jeecg.modules.kc.qa.service.IKcEvaluationansService;
|
||||
import org.jeecg.modules.kc.qa.service.IKcEvaluationsService;
|
||||
import org.jeecg.modules.kc.tktj.entity.KcTingke;
|
||||
import org.jeecg.modules.kc.tktj.service.IKcTingkeService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
|
@ -79,6 +81,8 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
|
|||
@Autowired
|
||||
private IKcAssessuserService kcAssessuserService;
|
||||
|
||||
@Autowired
|
||||
private IKcTingkeService kcTingkeService;
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
|
@ -247,6 +251,14 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
|
|||
if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){
|
||||
KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0);
|
||||
|
||||
KcTingke kcTingke = new KcTingke();
|
||||
kcTingke.setTingketime(DateUtil.format(KcZzThpjbPar.getSksj(),"yyyy-MM-dd"));
|
||||
kcTingke.setKechengbiaoid(KcKetangbiao.getId());
|
||||
kcTingke.setUserid(KcZzThpjbPar.getPkjsbh());
|
||||
kcTingke.setUsername(KcZzThpjbPar.getPkjsxm());
|
||||
kcTingkeService.save(kcTingke);
|
||||
|
||||
|
||||
String ans1 = KcZzThpjbPar.getAns1();//
|
||||
String ans2 = KcZzThpjbPar.getAns2();//
|
||||
String ans3 = KcZzThpjbPar.getAns3();//
|
||||
|
|
|
@ -74,8 +74,8 @@ public class KcZzThpjb implements Serializable {
|
|||
@ApiModelProperty(value = "授课时间")
|
||||
private java.util.Date sksj;
|
||||
/**评价时间*/
|
||||
@Excel(name = "评价时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "评价时间", width = 20, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "评价时间")
|
||||
private java.util.Date pjsj;
|
||||
|
|
|
@ -34,6 +34,8 @@ import org.jeecg.modules.kc.qa.entity.KcEvaluations;
|
|||
import org.jeecg.modules.kc.qa.service.IKcEvaluationService;
|
||||
import org.jeecg.modules.kc.qa.service.IKcEvaluationansService;
|
||||
import org.jeecg.modules.kc.qa.service.IKcEvaluationsService;
|
||||
import org.jeecg.modules.kc.tktj.entity.KcTingke;
|
||||
import org.jeecg.modules.kc.tktj.service.IKcTingkeService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
|
@ -75,6 +77,8 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
|
|||
|
||||
@Autowired
|
||||
private ChangeTingKeTongJi changeTingKeTongJi;
|
||||
@Autowired
|
||||
private IKcTingkeService kcTingkeService;
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
|
@ -222,7 +226,6 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
|
|||
newList.remove(KcZzXstkbPar);
|
||||
errorRest += KcZzXstkbPar.getKcbh()+"-"+KcZzXstkbPar.getKcmc()+"-"+KcZzXstkbPar.getSkjs()+"-"+KcZzXstkbPar.getSkdd()+"-"+KcZzXstkbPar.getTkjsgh()+"-"+KcZzXstkbPar.getTkjsxm()+"<br/>";
|
||||
}else{
|
||||
{
|
||||
QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
|
||||
kcKetangbiaoQueryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh());
|
||||
kcKetangbiaoQueryWrapper.eq("kcmc",KcZzXstkbPar.getKcmc());
|
||||
|
@ -232,6 +235,14 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
|
|||
List<KcKetangbiao> kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper);
|
||||
if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){
|
||||
KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0);
|
||||
|
||||
KcTingke kcTingke = new KcTingke();
|
||||
kcTingke.setTingketime(DateUtil.format(KcZzXstkbPar.getSksj(),"yyyy-MM-dd"));
|
||||
kcTingke.setKechengbiaoid(KcKetangbiao.getId());
|
||||
kcTingke.setUserid(KcZzXstkbPar.getTkjsgh());
|
||||
kcTingke.setUsername(KcZzXstkbPar.getTkjsxm());
|
||||
kcTingkeService.save(kcTingke);
|
||||
|
||||
String ans1 = KcZzXstkbPar.getAns1();//
|
||||
String ans2 = KcZzXstkbPar.getAns2();//
|
||||
String ans3 = KcZzXstkbPar.getAns3();//
|
||||
|
@ -449,7 +460,6 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
|
|||
newList.remove(KcZzXstkbPar);
|
||||
errorRest += "未查到匹配课堂:"+KcZzXstkbPar.getKcmc()+"-"+KcZzXstkbPar.getSkjs()+"-"+KcZzXstkbPar.getSkdd()+"-"+KcZzXstkbPar.getTkjsgh()+"-"+KcZzXstkbPar.getTkjsxm()+"<br/>";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//update-begin-author:taoyan date:20190528 for:批量插入数据
|
||||
|
|
|
@ -37,6 +37,8 @@ import org.jeecg.modules.kc.qa.entity.KcEvaluations;
|
|||
import org.jeecg.modules.kc.qa.service.IKcEvaluationService;
|
||||
import org.jeecg.modules.kc.qa.service.IKcEvaluationansService;
|
||||
import org.jeecg.modules.kc.qa.service.IKcEvaluationsService;
|
||||
import org.jeecg.modules.kc.tktj.entity.KcTingke;
|
||||
import org.jeecg.modules.kc.tktj.service.IKcTingkeService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
|
@ -79,6 +81,8 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
|
|||
private ChangeTingKeTongJi changeTingKeTongJi;
|
||||
@Autowired
|
||||
private IKcAssessuserService kcAssessuserService;
|
||||
@Autowired
|
||||
private IKcTingkeService kcTingkeService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
|
@ -249,6 +253,14 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
|
|||
List<KcKetangbiao> kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper);
|
||||
if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){
|
||||
KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0);
|
||||
|
||||
KcTingke kcTingke = new KcTingke();
|
||||
kcTingke.setTingketime(DateUtil.format(KcZzYbtkbPar.getSkrq(),"yyyy-MM-dd"));
|
||||
kcTingke.setKechengbiaoid(KcKetangbiao.getId());
|
||||
kcTingke.setUserid(KcZzYbtkbPar.getTkjsbh());
|
||||
kcTingke.setUsername(KcZzYbtkbPar.getTkjsxm());
|
||||
kcTingkeService.save(kcTingke);
|
||||
|
||||
String ans1 = KcZzYbtkbPar.getAns1();//25 授课有启发性,能给予学生思考、联想、创造的启迪
|
||||
String ans2 = KcZzYbtkbPar.getAns2();//26 能有效利用各种教学媒体,课件或板书使用效果好
|
||||
String ans3 = KcZzYbtkbPar.getAns3();//27 仪表得体,按时上下课,严格要求学生
|
||||
|
|
|
@ -86,9 +86,9 @@ public class KcZzYbtkb implements Serializable {
|
|||
@ApiModelProperty(value = "听课教师姓名")
|
||||
private java.lang.String tkjsxm;
|
||||
/**评课时间*/
|
||||
@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")
|
||||
@Excel(name = "评课时间", width = 20, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "评课时间")
|
||||
private java.util.Date pksj;
|
||||
/**授课有启发性,能给予学生思考、联想、创造的启迪*/
|
||||
|
|
Loading…
Reference in New Issue