Skip to content

D
dd_school
Commit d732c006 by xuwenhao
Options

11.3测试问题修改

parent 4ebb050a
Showing with 239 additions and 99 deletions
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
...@@ -4,10 +4,12 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -4,10 +4,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import yangtz.cs.liu.dingding.controller.DingJiaXiaoController; import yangtz.cs.liu.dingding.controller.DingJiaXiaoController;
import yangtz.cs.liu.dingding.controller.dingDept.DdDeptController;
import yangtz.cs.liu.dingding.controller.dingUser.DingUserController;
/** /**
* 定时任务调度测试 * 定时任务调度测试
* *
* @author ruoyi * @author ruoyi
*/ */
@Component("ryTask") @Component("ryTask")
...@@ -15,6 +17,10 @@ public class RyTask ...@@ -15,6 +17,10 @@ public class RyTask
{ {
@Autowired @Autowired
DingJiaXiaoController dingJiaXiaoController; DingJiaXiaoController dingJiaXiaoController;
@Autowired
DdDeptController ddDeptController;
@Autowired
DingUserController dingUserController;
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
{ {
...@@ -31,13 +37,24 @@ public class RyTask ...@@ -31,13 +37,24 @@ public class RyTask
System.out.println("执行无参方法"); System.out.println("执行无参方法");
} }
//家校通讯录部门更新
public void updateLabClassYear(){ public void updateLabClassYear(){
dingJiaXiaoController.updateLabClassYear(); dingJiaXiaoController.updateLabClassYear();
} }
//家校通讯录人员更新
public void updateLabUser(){ public void updateLabUser(){
dingJiaXiaoController.updateLabUser(); dingJiaXiaoController.updateLabUser();
} }
//钉钉通讯录更新
public void syncDdDept(){
ddDeptController.syncDdDept();
}
//钉钉用户更新
public void syncDdUser(){
dingUserController.syncDdUser();
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/EquipmentLedgerController.java
...@@ -157,8 +157,8 @@ public class EquipmentLedgerController extends BaseController { ...@@ -157,8 +157,8 @@ public class EquipmentLedgerController extends BaseController {
* 打印设备条码信息 * 打印设备条码信息
*/ */
@GetMapping("/getEquipmentledger/{ids}") @GetMapping("/getEquipmentledger/{ids}")
public AjaxResult getEquipmentledger(@PathVariable Long[] ids){ public List<Map<String,Object>> getEquipmentledger(@PathVariable Long[] ids){
List<Map<String,Object>> mapList = equipmentLedgerService.getEquipmentledger(ids); List<Map<String,Object>> mapList = equipmentLedgerService.getEquipmentledger(ids);
return AjaxResult.success(mapList); return mapList;
} }
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDcwj/SchoolDcwjAnController.java
...@@ -27,6 +27,7 @@ import com.ruoyi.common.enums.BusinessType; ...@@ -27,6 +27,7 @@ import com.ruoyi.common.enums.BusinessType;
import yangtz.cs.liu.campus.domain.schoolDcwj.SchoolDcwj; import yangtz.cs.liu.campus.domain.schoolDcwj.SchoolDcwj;
import yangtz.cs.liu.campus.domain.schoolDcwj.SchoolDcwjAn; import yangtz.cs.liu.campus.domain.schoolDcwj.SchoolDcwjAn;
import yangtz.cs.liu.campus.domain.schoolDcwj.SchoolDcwjNr; import yangtz.cs.liu.campus.domain.schoolDcwj.SchoolDcwjNr;
import yangtz.cs.liu.campus.mapper.schoolDcwj.SchoolDcwjNrMapper;
import yangtz.cs.liu.campus.service.schoolDcwj.ISchoolDcwjAnService; import yangtz.cs.liu.campus.service.schoolDcwj.ISchoolDcwjAnService;
import yangtz.cs.liu.campus.service.schoolDcwj.ISchoolDcwjNrService; import yangtz.cs.liu.campus.service.schoolDcwj.ISchoolDcwjNrService;
import yangtz.cs.liu.campus.service.schoolDcwj.ISchoolDcwjRyService; import yangtz.cs.liu.campus.service.schoolDcwj.ISchoolDcwjRyService;
...@@ -64,11 +65,14 @@ public class SchoolDcwjAnController extends BaseController { ...@@ -64,11 +65,14 @@ public class SchoolDcwjAnController extends BaseController {
@Autowired @Autowired
private ISchoolStudentService schoolStudentService; private ISchoolStudentService schoolStudentService;
@Autowired
private ISchoolDcwjNrService schoolDcwjNrService;
@Value("${server.port}") @Value("${server.port}")
private String p; private String p;
/** /**
* 级部-问卷结果-明细数据-列表 * TODO 级部-问卷结果-明细数据-列表
*/ */
@GetMapping("/list/{dcwjId}") @GetMapping("/list/{dcwjId}")
public AjaxResult list(@PathVariable("dcwjId") Long dcwjId, SchoolDcwjAnVo vo) { public AjaxResult list(@PathVariable("dcwjId") Long dcwjId, SchoolDcwjAnVo vo) {
...@@ -79,9 +83,63 @@ public class SchoolDcwjAnController extends BaseController { ...@@ -79,9 +83,63 @@ public class SchoolDcwjAnController extends BaseController {
ajax.put("titles", titlesVo); ajax.put("titles", titlesVo);
//获取内容 //获取内容
List<SchoolDcwjAnVo> list = ryService.getAnData(dcwjId, vo); // List<SchoolDcwjAnVo> list = ryService.getAnData(dcwjId, vo);
//获取固定列的值,,获取到的list的id为ry表的id
startPage();
List<SchoolDcwjAnVo> list = ryService.getAnData1(dcwjId, vo);
//获取问卷调查题目
LambdaQueryWrapper<SchoolDcwjNr> nrlqw = new LambdaQueryWrapper<>();
nrlqw.eq(SchoolDcwjNr::getDcwjId, dcwjId).orderByAsc(SchoolDcwjNr::getNrPx).orderByDesc(SchoolDcwjNr::getCreateTime);
List<SchoolDcwjNr> nrs = schoolDcwjNrService.list(nrlqw);
LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
lqw
.eq(SchoolDcwjAn::getDcwjId, dcwjId)
;
//a里要么有1个值，要么没有值
List<SchoolDcwjAn> a = schoolDcwjAnService.list(lqw);
//学生家长调查问卷回答的内容
for (SchoolDcwjAnVo anVo : list) {
List<SchoolDcwjAn> ans = new ArrayList<>();
//设置空对象，是为了，通俗的说就是站位，如果不占位的话，就目前来说，如果用户第一题没写，第二题写了，那么第2题的答案会显示在第1题的位置
SchoolDcwjAn entity = new SchoolDcwjAn();
//获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值
for(SchoolDcwjNr nr : nrs){
// LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
// lqw
// .eq(SchoolDcwjAn::getDcwjId, dcwjId)
// .eq(SchoolDcwjAn::getRyId, anVo.getId())
// .eq(SchoolDcwjAn::getNrId, nr.getId())
// ;
// //a里要么有1个值，要么没有值
// List<SchoolDcwjAn> a = anMapper.selectList(lqw);
for (SchoolDcwjAn schoolDcwjAn : a) {
if (schoolDcwjAn.getRyId().equals(anVo.getId()) && schoolDcwjAn.getNrId().equals(nr.getId())){
ans.add(a.get(0));
}else {
ans.add(entity);
}
}
// if(StringUtils.isNotNull(a) && a.size() > 0){
// ans.add(a.get(0));
// }else {
// ans.add(entity);
// }
}
anVo.setList(ans);
}
// return list;
List<ViewDataVo> voList = nrService.turnData(list); List<ViewDataVo> voList = nrService.turnData(list);
ajax.put("data", voList); ajax.put("data", voList);
ajax.put("total",getDataTable(list).getTotal());
return ajax; return ajax;
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDcwj/SchoolDcwjController.java
...@@ -251,23 +251,42 @@ public class SchoolDcwjController extends BaseController { ...@@ -251,23 +251,42 @@ public class SchoolDcwjController extends BaseController {
luwClass.eq(SchoolClass::getGradeId, schoolDcwj.getGradeId()); luwClass.eq(SchoolClass::getGradeId, schoolDcwj.getGradeId());
List<SchoolClass> schoolClassList = schoolClassService.list(luwClass); List<SchoolClass> schoolClassList = schoolClassService.list(luwClass);
//查出所有学生
LambdaQueryWrapper<SchoolStudent> luwStudent = new LambdaQueryWrapper<>();
List<SchoolStudent> schoolStudents = schoolStudentService.list(luwStudent);
//接收人集合
List<SchoolDcwjRy> ryList = new ArrayList<>();
for (SchoolClass schoolClass : schoolClassList) { for (SchoolClass schoolClass : schoolClassList) {
//查出班级所有下所有学生 //查出班级所有下所有学生
LambdaQueryWrapper<SchoolStudent> luwStudent = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<SchoolStudent> luwStudent = new LambdaQueryWrapper<>();
luwStudent.eq(SchoolStudent::getClassId, schoolClass.getId()); // luwStudent.eq(SchoolStudent::getClassId, schoolClass.getId());
List<SchoolStudent> schoolStudents = schoolStudentService.list(luwStudent); // List<SchoolStudent> schoolStudents = schoolStudentService.list(luwStudent);
//把学生存到调查问卷的接收人
for (SchoolStudent schoolStudent : schoolStudents) { for (SchoolStudent schoolStudent : schoolStudents) {
SchoolDcwjRy schoolDcwjRy = new SchoolDcwjRy(); if (schoolStudent.getClassId().equals(schoolClass.getId())){
schoolDcwjRy.insert(); SchoolDcwjRy schoolDcwjRy = new SchoolDcwjRy();
schoolDcwjRy.setDcwjId(schoolDcwj.getId()); schoolDcwjRy.insert();
schoolDcwjRy.setStudentId(schoolStudent.getId()); schoolDcwjRy.setDcwjId(schoolDcwj.getId());
schoolDcwjRy.setRyZdzt(DcwjType.FILLINON); schoolDcwjRy.setStudentId(schoolStudent.getId());
schoolDcwjRyService.save(schoolDcwjRy); schoolDcwjRy.setRyZdzt(DcwjType.FILLINON);
ryList.add(schoolDcwjRy);
}
} }
// //把学生存到调查问卷的接收人
// for (SchoolStudent schoolStudent : schoolStudents) {
// SchoolDcwjRy schoolDcwjRy = new SchoolDcwjRy();
// schoolDcwjRy.insert();
// schoolDcwjRy.setDcwjId(schoolDcwj.getId());
// schoolDcwjRy.setStudentId(schoolStudent.getId());
// schoolDcwjRy.setRyZdzt(DcwjType.FILLINON);
// schoolDcwjRyService.save(schoolDcwjRy);
// }
}
//批量新增接收人
if (ryList.size() > 0){
schoolDcwjRyService.batchInsertDcwjRyStudent(ryList);
} }
//修改状态 //修改状态
LambdaUpdateWrapper<SchoolDcwj> luw = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<SchoolDcwj> luw = new LambdaUpdateWrapper<>();
luw.eq(SchoolDcwj::getId, id).set(SchoolDcwj::getDcwjZt, DcwjType.PUBLISHED); luw.eq(SchoolDcwj::getId, id).set(SchoolDcwj::getDcwjZt, DcwjType.PUBLISHED);
...@@ -602,14 +621,6 @@ public class SchoolDcwjController extends BaseController { ...@@ -602,14 +621,6 @@ public class SchoolDcwjController extends BaseController {
//获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值 //获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值
for(SchoolDcwjNr nr : nrs){ for(SchoolDcwjNr nr : nrs){
// LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
// lqw
// .eq(SchoolDcwjAn::getDcwjId, dcwjId)
// .eq(SchoolDcwjAn::getRyId, anVo.getId())
// .eq(SchoolDcwjAn::getNrId, nr.getId())
// ;
// //a里要么有1个值，要么没有值
// List<SchoolDcwjAn> a = anMapper.selectList(lqw);
for (SchoolDcwjAn schoolDcwjAn : a) { for (SchoolDcwjAn schoolDcwjAn : a) {
if (schoolDcwjAn.getRyId().equals(anVo.getId()) && schoolDcwjAn.getNrId().equals(nr.getId())){ if (schoolDcwjAn.getRyId().equals(anVo.getId()) && schoolDcwjAn.getNrId().equals(nr.getId())){
...@@ -618,12 +629,6 @@ public class SchoolDcwjController extends BaseController { ...@@ -618,12 +629,6 @@ public class SchoolDcwjController extends BaseController {
ans.add(entity); ans.add(entity);
} }
} }
// if(StringUtils.isNotNull(a) && a.size() > 0){
// ans.add(a.get(0));
// }else {
// ans.add(entity);
// }
} }
anVo.setList(ans); anVo.setList(ans);
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolXxfb/SchoolXxfbRy.java
...@@ -21,12 +21,15 @@ public class SchoolXxfbRy extends OurBaseEntity { ...@@ -21,12 +21,15 @@ public class SchoolXxfbRy extends OurBaseEntity {
private String studentName; private String studentName;
/** 身份证号 */ /** 身份证号 */
@Excel(name = "身份证号")
@NotNull(message = "身份证号不能为空")
private String idCard; private String idCard;
/** 学号 */
@Excel(name = "学号")
@NotNull(message = "学号不能为空")
private String schoolNo;
/** 学生ID(根据身份证去匹配学生的ID) */ /** 学生ID(根据身份证去匹配学生的ID) */
@Excel(name = "学生ID(根据身份证去匹配学生的ID)") @Excel(name = "学生ID(根据学号去匹配学生的ID)")
private Long studentId; private Long studentId;
/** 数据3 */ /** 数据3 */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/student/SchoolStudent.java
...@@ -30,7 +30,7 @@ public class SchoolStudent extends OurBaseEntity { ...@@ -30,7 +30,7 @@ public class SchoolStudent extends OurBaseEntity {
* 性别 * 性别
* */ * */
@Excel(name = "学生性别", readConverterExp = "0=男,1=女,2=未知") @Excel(name = "学生性别", readConverterExp = "0=男,1=女,2=未知")
@NotBlank(message = "学生性别不能为空") // @NotBlank(message = "学生性别不能为空")
private String sex; private String sex;
/* /*
...@@ -43,7 +43,7 @@ public class SchoolStudent extends OurBaseEntity { ...@@ -43,7 +43,7 @@ public class SchoolStudent extends OurBaseEntity {
* 身份证号 * 身份证号
* */ * */
@Excel(name = "身份证号",width = 25) @Excel(name = "身份证号",width = 25)
@NotBlank(message = "身份证号不能为空") // @NotBlank(message = "身份证号不能为空")
private String idCard; private String idCard;
/* /*
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolDcwj/SchoolDcwjRyServiceImpl.java
...@@ -136,6 +136,13 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch ...@@ -136,6 +136,13 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch
nrlqw.eq(SchoolDcwjNr::getDcwjId, dcwjId).orderByAsc(SchoolDcwjNr::getNrPx).orderByDesc(SchoolDcwjNr::getCreateTime); nrlqw.eq(SchoolDcwjNr::getDcwjId, dcwjId).orderByAsc(SchoolDcwjNr::getNrPx).orderByDesc(SchoolDcwjNr::getCreateTime);
List<SchoolDcwjNr> nrs = nrMapper.selectList(nrlqw); List<SchoolDcwjNr> nrs = nrMapper.selectList(nrlqw);
LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
lqw
.eq(SchoolDcwjAn::getDcwjId, dcwjId)
;
//a里要么有1个值，要么没有值
List<SchoolDcwjAn> a = anMapper.selectList(lqw);
//学生家长调查问卷回答的内容 //学生家长调查问卷回答的内容
for (SchoolDcwjAnVo anVo : list) { for (SchoolDcwjAnVo anVo : list) {
List<SchoolDcwjAn> ans = new ArrayList<>(); List<SchoolDcwjAn> ans = new ArrayList<>();
...@@ -144,19 +151,28 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch ...@@ -144,19 +151,28 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch
//获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值 //获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值
for(SchoolDcwjNr nr : nrs){ for(SchoolDcwjNr nr : nrs){
LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
lqw // lqw
.eq(SchoolDcwjAn::getDcwjId, dcwjId) // .eq(SchoolDcwjAn::getDcwjId, dcwjId)
.eq(SchoolDcwjAn::getRyId, anVo.getId()) // .eq(SchoolDcwjAn::getRyId, anVo.getId())
.eq(SchoolDcwjAn::getNrId, nr.getId()) // .eq(SchoolDcwjAn::getNrId, nr.getId())
; // ;
//a里要么有1个值，要么没有值 // //a里要么有1个值，要么没有值
List<SchoolDcwjAn> a = anMapper.selectList(lqw); // List<SchoolDcwjAn> a = anMapper.selectList(lqw);
if(StringUtils.isNotNull(a) && a.size() > 0){
ans.add(a.get(0)); for (SchoolDcwjAn schoolDcwjAn : a) {
}else { if (schoolDcwjAn.getRyId().equals(anVo.getId()) && schoolDcwjAn.getNrId().equals(nr.getId())){
ans.add(entity); ans.add(a.get(0));
}else {
ans.add(entity);
}
} }
// if(StringUtils.isNotNull(a) && a.size() > 0){
// ans.add(a.get(0));
// }else {
// ans.add(entity);
// }
} }
anVo.setList(ans); anVo.setList(ans);
} }
...@@ -2102,4 +2118,14 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch ...@@ -2102,4 +2118,14 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch
public List<SchoolDcwjAnVo> getAnData1(Long dcwjId, SchoolDcwjAnVo vo) { public List<SchoolDcwjAnVo> getAnData1(Long dcwjId, SchoolDcwjAnVo vo) {
return schoolDcwjRyMapper.getAnData(dcwjId,vo); return schoolDcwjRyMapper.getAnData(dcwjId,vo);
} }
/**
* 批量新增接收人（家长）
* @param schoolDcwjRyList
* @return
*/
@Override
public int batchInsertDcwjRyStudent(List<SchoolDcwjRy> schoolDcwjRyList) {
return schoolDcwjRyMapper.batchInsertDcwjRyStudent(schoolDcwjRyList);
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolXxfb/SchoolXxfbServiceImpl.java
...@@ -68,9 +68,9 @@ public class SchoolXxfbServiceImpl extends ServiceImpl<SchoolXxfbMapper, SchoolX ...@@ -68,9 +68,9 @@ public class SchoolXxfbServiceImpl extends ServiceImpl<SchoolXxfbMapper, SchoolX
if(titles.size() < 2){ if(titles.size() < 2){
throw new ServiceException("表头数量小于两列，不规范，请检查"); throw new ServiceException("表头数量小于两列，不规范，请检查");
} }
//如果第一列表头不是身份证号 //如果第一列表头不是学号
if (!("身份证号".equals(titles.get(0)))) { if (!("学号".equals(titles.get(0)))) {
throw new ServiceException("第1列表头应为身份证号"); throw new ServiceException("第1列表头应为学号");
} }
if (!("姓名".equals(titles.get(1)))) { if (!("姓名".equals(titles.get(1)))) {
throw new ServiceException("第2列表头应为姓名"); throw new ServiceException("第2列表头应为姓名");
...@@ -109,7 +109,7 @@ public class SchoolXxfbServiceImpl extends ServiceImpl<SchoolXxfbMapper, SchoolX ...@@ -109,7 +109,7 @@ public class SchoolXxfbServiceImpl extends ServiceImpl<SchoolXxfbMapper, SchoolX
Cell cell = row.getCell(k); Cell cell = row.getCell(k);
if(k<=1){ if(k<=1){
if (StringUtils.isNull(cell)) { if (StringUtils.isNull(cell)) {
throw new ServiceException("身份证号和姓名所在列，单元格内容不能为空"); throw new ServiceException("学号和姓名所在列，单元格内容不能为空");
} }
}else{ }else{
if (StringUtils.isNull(cell)) { if (StringUtils.isNull(cell)) {
...@@ -128,23 +128,23 @@ public class SchoolXxfbServiceImpl extends ServiceImpl<SchoolXxfbMapper, SchoolX ...@@ -128,23 +128,23 @@ public class SchoolXxfbServiceImpl extends ServiceImpl<SchoolXxfbMapper, SchoolX
//方式②,判断单元格是啥内容类型并获取返回的字符串 //方式②,判断单元格是啥内容类型并获取返回的字符串
String s = ""; String s = "";
//判断第一二列是否是姓名、身份证号 //判断第一二列是否是姓名、学号
if (k <= 1) { if (k <= 1) {
try{ try{
s = TemplateExcelUtils.getCellValue(cell, workbook); s = TemplateExcelUtils.getCellValue(cell, workbook);
}catch (Exception e){ }catch (Exception e){
throw new ServiceException("身份证号和姓名所在列，单元格内容不能为空"); throw new ServiceException("学号和姓名所在列，单元格内容不能为空");
} }
if (k == 0) { if (k == 0) {
if ("身份证号".equals(titles.get(0)) || "学生身份证号".equals(titles.get(0))) { if ("学号".equals(titles.get(0)) || "学生学号".equals(titles.get(0))) {
//if (StringUtils.isNull(cell.getStringCellValue().toString())) { //if (StringUtils.isNull(cell.getStringCellValue().toString())) {
if (StringUtils.isNull(s) || "".equals(s)) { if (StringUtils.isNull(s) || "".equals(s)) {
//throw new ServiceException("第"+ j+1 +"行，第"+k+1+"列" ) //throw new ServiceException("第"+ j+1 +"行，第"+k+1+"列" )
throw new ServiceException("身份证号所在列内容不能为空，请检查"); throw new ServiceException("学号所在列内容不能为空，请检查");
} }
ry.setIdCard(s); ry.setSchoolNo(s);
} else { } else {
throw new ServiceException("第1列表头应为身份证号"); throw new ServiceException("第1列表头应为学号");
} }
} else if (k == 1) { } else if (k == 1) {
if ("姓名".equals(titles.get(1)) || "学生姓名".equals(titles.get(1))) { if ("姓名".equals(titles.get(1)) || "学生姓名".equals(titles.get(1))) {
...@@ -164,11 +164,11 @@ public class SchoolXxfbServiceImpl extends ServiceImpl<SchoolXxfbMapper, SchoolX ...@@ -164,11 +164,11 @@ public class SchoolXxfbServiceImpl extends ServiceImpl<SchoolXxfbMapper, SchoolX
LambdaQueryWrapper<SchoolStudent> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SchoolStudent> lqw = new LambdaQueryWrapper<>();
lqw lqw
.eq(SchoolStudent::getStudentName, ry.getStudentName()) .eq(SchoolStudent::getStudentName, ry.getStudentName())
.eq(SchoolStudent::getIdCard, ry.getIdCard()); .eq(SchoolStudent::getSchoolNo, ry.getSchoolNo());
List<SchoolStudent> studentList = studentMapper.selectList(lqw); List<SchoolStudent> studentList = studentMapper.selectList(lqw);
if (StringUtils.isNull(studentList) || studentList.size() == 0) { if (StringUtils.isNull(studentList) || studentList.size() == 0) {
failureNum++; failureNum++;
failureMsg.append("<br/>姓名为" + ry.getStudentName() + "、身份证号为"+ry.getIdCard()+"的学生不存在。"); failureMsg.append("<br/>姓名为" + ry.getStudentName() + "、学号为"+ry.getSchoolNo()+"的学生不存在。");
} }
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolDcwj/ISchoolDcwjRyService.java
...@@ -95,4 +95,8 @@ public interface ISchoolDcwjRyService extends IService<SchoolDcwjRy> ...@@ -95,4 +95,8 @@ public interface ISchoolDcwjRyService extends IService<SchoolDcwjRy>
List<SchoolDcwjAnVo> getTeaAnData(Long dcwjId, SchoolDcwjAnVo vo); List<SchoolDcwjAnVo> getTeaAnData(Long dcwjId, SchoolDcwjAnVo vo);
List<SchoolDcwjAnVo> getAnData1(Long dcwjId, SchoolDcwjAnVo vo); List<SchoolDcwjAnVo> getAnData1(Long dcwjId, SchoolDcwjAnVo vo);
//批量新增接收人(家长)
int batchInsertDcwjRyStudent(List<SchoolDcwjRy> schoolDcwjRyList);
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolXxfb/ISchoolXxfbService.java
...@@ -17,7 +17,7 @@ public interface ISchoolXxfbService extends IService<SchoolXxfb> { ...@@ -17,7 +17,7 @@ public interface ISchoolXxfbService extends IService<SchoolXxfb> {
* */ * */
List<SchoolXxfb> queryList(List<Long> gradeIds,SchoolXxfb schoolXxfb); List<SchoolXxfb> queryList(List<Long> gradeIds,SchoolXxfb schoolXxfb);
//新增前校验表中姓名和身份证号对应的学生是否存在 //新增前校验表中姓名和学号对应的学生是否存在
public void checkImport(MultipartFile file); public void checkImport(MultipartFile file);
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/service/impl/dingDept/DdDeptServcieImpl.java
...@@ -6,6 +6,7 @@ import com.alibaba.fastjson2.JSONArray; ...@@ -6,6 +6,7 @@ import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dingtalk.api.response.OapiV2DepartmentGetResponse; import com.dingtalk.api.response.OapiV2DepartmentGetResponse;
import com.dingtalk.api.response.OapiV2DepartmentListsubResponse; import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -329,6 +330,12 @@ public class DdDeptServcieImpl implements IDdDeptService { ...@@ -329,6 +330,12 @@ public class DdDeptServcieImpl implements IDdDeptService {
for (String deptId : split) { for (String deptId : split) {
//获取部门详情 //获取部门详情
OapiV2DepartmentGetResponse.DeptGetResponse dept = dingDeptUtils.getDept(Long.valueOf(deptId), ""); OapiV2DepartmentGetResponse.DeptGetResponse dept = dingDeptUtils.getDept(Long.valueOf(deptId), "");
//判断是否家校通讯录过来的请求
if (StringUtils.isNotEmpty(dept.getTags())){
if (dept.getTags().equals("campus") || dept.getTags().equals("period") || dept.getTags().equals("period") || dept.getTags().equals("class") ){
return 1;
}
}
//获取父部门信息 //获取父部门信息
Long ddParentId = dept.getParentId(); Long ddParentId = dept.getParentId();
SysDdDept sysDdDept = ddDeptMapper.selectDeptByDdDeptId(ddParentId); SysDdDept sysDdDept = ddDeptMapper.selectDeptByDdDeptId(ddParentId);
...@@ -361,6 +368,12 @@ public class DdDeptServcieImpl implements IDdDeptService { ...@@ -361,6 +368,12 @@ public class DdDeptServcieImpl implements IDdDeptService {
for (String deptId : split) { for (String deptId : split) {
//获取部门详情 //获取部门详情
OapiV2DepartmentGetResponse.DeptGetResponse dept = dingDeptUtils.getDept(Long.valueOf(deptId), ""); OapiV2DepartmentGetResponse.DeptGetResponse dept = dingDeptUtils.getDept(Long.valueOf(deptId), "");
//判断是否家校通讯录过来的请求
if (StringUtils.isNotEmpty(dept.getTags())){
if (dept.getTags().equals("campus") || dept.getTags().equals("period") || dept.getTags().equals("period") || dept.getTags().equals("class") ){
return 1;
}
}
//获取父部门信息 //获取父部门信息
Long ddParentId = dept.getParentId(); Long ddParentId = dept.getParentId();
SysDdDept sysDdDept = ddDeptMapper.selectDeptByDdDeptId(ddParentId); SysDdDept sysDdDept = ddDeptMapper.selectDeptByDdDeptId(ddParentId);
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/service/impl/dingUser/DdUserServiceImpl.java
...@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dingtalk.api.response.OapiUserListidResponse; import com.dingtalk.api.response.OapiUserListidResponse;
import com.dingtalk.api.response.OapiV2DepartmentGetResponse;
import com.dingtalk.api.response.OapiV2UserGetResponse; import com.dingtalk.api.response.OapiV2UserGetResponse;
import com.ruoyi.common.core.domain.entity.SchoolTeacher; import com.ruoyi.common.core.domain.entity.SchoolTeacher;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
...@@ -45,6 +46,7 @@ import yangtz.cs.liu.dingding.mapper.dingUser.DdUserMapper; ...@@ -45,6 +46,7 @@ import yangtz.cs.liu.dingding.mapper.dingUser.DdUserMapper;
import yangtz.cs.liu.dingding.mapper.schoolTeacher.DdTeacherMapper; import yangtz.cs.liu.dingding.mapper.schoolTeacher.DdTeacherMapper;
import yangtz.cs.liu.dingding.service.dingUser.IDdUserService; import yangtz.cs.liu.dingding.service.dingUser.IDdUserService;
import yangtz.cs.liu.dingding.utils.AccessTokenUtils; import yangtz.cs.liu.dingding.utils.AccessTokenUtils;
import yangtz.cs.liu.dingding.utils.DingDeptUtils;
import yangtz.cs.liu.dingding.utils.DingUserUtils; import yangtz.cs.liu.dingding.utils.DingUserUtils;
import yangtz.cs.liu.dingding.vo.DingJiaXiaoVo; import yangtz.cs.liu.dingding.vo.DingJiaXiaoVo;
import yangtz.cs.liu.wechat.utils.AccessTokenUtil; import yangtz.cs.liu.wechat.utils.AccessTokenUtil;
...@@ -65,6 +67,8 @@ public class DdUserServiceImpl implements IDdUserService { ...@@ -65,6 +67,8 @@ public class DdUserServiceImpl implements IDdUserService {
private DdUserMapper ddUserMapper; private DdUserMapper ddUserMapper;
@Autowired @Autowired
private DdTeacherMapper ddTeacherMapper; private DdTeacherMapper ddTeacherMapper;
@Autowired
private DingDeptUtils dingDeptUtils;
//班主任和班级关系 //班主任和班级关系
@Autowired @Autowired
ISchoolClassHeadmasterService iSchoolClassHeadmasterService; ISchoolClassHeadmasterService iSchoolClassHeadmasterService;
...@@ -371,7 +375,6 @@ public class DdUserServiceImpl implements IDdUserService { ...@@ -371,7 +375,6 @@ public class DdUserServiceImpl implements IDdUserService {
for (String ddUserId : ddUserIdList1) { for (String ddUserId : ddUserIdList1) {
for (OapiV2UserGetResponse.UserGetResponse ddUser : ddUserAll) { for (OapiV2UserGetResponse.UserGetResponse ddUser : ddUserAll) {
if (ddUserId.equals(ddUser.getUserid())){ if (ddUserId.equals(ddUser.getUserid())){
//拿取钉钉用户部门id列表的第一个存在的部门id存到用户表中
//多部门任职信息 //多部门任职信息
List<OapiV2UserGetResponse.DeptPosition> deptPositionList = ddUser.getDeptPositionList(); List<OapiV2UserGetResponse.DeptPosition> deptPositionList = ddUser.getDeptPositionList();
...@@ -745,6 +748,15 @@ public class DdUserServiceImpl implements IDdUserService { ...@@ -745,6 +748,15 @@ public class DdUserServiceImpl implements IDdUserService {
for (String userId : split) { for (String userId : split) {
//查询钉钉用户详情 //查询钉钉用户详情
OapiV2UserGetResponse.UserGetResponse ddUser = dingUserUtils.getUser(userId); OapiV2UserGetResponse.UserGetResponse ddUser = dingUserUtils.getUser(userId);
//钉钉用户部门列表
List<Long> deptIdList = ddUser.getDeptIdList();
for (Long ddDeptId : deptIdList) {
//查询部门详情
OapiV2DepartmentGetResponse.DeptGetResponse dept = dingDeptUtils.getDept(ddDeptId, "");
if (dept.getName().equals("学生") || dept.getName().equals("家长")){
return 1;
}
}
//多部门任职信息 //多部门任职信息
List<OapiV2UserGetResponse.DeptPosition> deptPositionList = ddUser.getDeptPositionList(); List<OapiV2UserGetResponse.DeptPosition> deptPositionList = ddUser.getDeptPositionList();
//钉钉用户的钉钉部门id列表 //钉钉用户的钉钉部门id列表
...@@ -915,13 +927,17 @@ public class DdUserServiceImpl implements IDdUserService { ...@@ -915,13 +927,17 @@ public class DdUserServiceImpl implements IDdUserService {
for (String userId : split) { for (String userId : split) {
//查询钉钉用户详情 //查询钉钉用户详情
OapiV2UserGetResponse.UserGetResponse ddUser = dingUserUtils.getUser(userId); OapiV2UserGetResponse.UserGetResponse ddUser = dingUserUtils.getUser(userId);
//钉钉用户部门列表
List<Long> deptIdList = ddUser.getDeptIdList();
for (Long ddDeptId : deptIdList) {
//查询部门详情
OapiV2DepartmentGetResponse.DeptGetResponse dept = dingDeptUtils.getDept(ddDeptId, "");
if (dept.getName().equals("学生") || dept.getName().equals("家长")){
return 1;
}
}
//查询系统用户详情 //查询系统用户详情
SysDdUser sysDdUser = ddUserMapper.selectDdUserByDdUserId(userId); SysDdUser sysDdUser = ddUserMapper.selectDdUserByDdUserId(userId);
if (StringUtils.isNull(sysDdUser)){
return 1;
}
//钉钉用户的钉钉部门id列表
List<Long> deptIdList = ddUser.getDeptIdList();
//多部门任职信息 //多部门任职信息
List<OapiV2UserGetResponse.DeptPosition> deptPositionList = ddUser.getDeptPositionList(); List<OapiV2UserGetResponse.DeptPosition> deptPositionList = ddUser.getDeptPositionList();
//用户系统部门id列表 //用户系统部门id列表
...@@ -1472,8 +1488,6 @@ public class DdUserServiceImpl implements IDdUserService { ...@@ -1472,8 +1488,6 @@ public class DdUserServiceImpl implements IDdUserService {
return 0; return 0;
} }
public String getToUserId(String token,String fromUserId,String classId){ public String getToUserId(String token,String fromUserId,String classId){
String toUserId = null; String toUserId = null;
com.alibaba.fastjson2.JSONObject bjParme = new com.alibaba.fastjson2.JSONObject(); com.alibaba.fastjson2.JSONObject bjParme = new com.alibaba.fastjson2.JSONObject();
......
smart-campus/src/main/resources/mapper/ddDept/DdDeptMapper.xml
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<sql id="selectDdDeptVo"> <sql id="selectDdDeptVo">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dd_dept_id, d.dd_parent_id, d.del_flag, d.create_by, d.create_time select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dd_dept_id, d.dd_parent_id, d.del_flag, d.create_by, d.create_time
from sys_dd_dept d from sys_dept d
</sql> </sql>
<select id="selectDdDeptList" parameterType="SysDdDept" resultMap="SysDdDeptResult"> <select id="selectDdDeptList" parameterType="SysDdDept" resultMap="SysDdDeptResult">
...@@ -49,22 +49,22 @@ ...@@ -49,22 +49,22 @@
<select id="selectDeptByDdDeptId" parameterType="Long" resultMap="SysDdDeptResult"> <select id="selectDeptByDdDeptId" parameterType="Long" resultMap="SysDdDeptResult">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dd_dept_id, d.dd_parent_id, d.del_flag, d.create_by, d.create_time select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dd_dept_id, d.dd_parent_id, d.del_flag, d.create_by, d.create_time
from sys_dd_dept d from sys_dept d
where d.dd_dept_id = #{ddDeptId} where d.dd_dept_id = #{ddDeptId}
</select> </select>
<select id="selectDeptByDeptId" parameterType="Long" resultMap="SysDdDeptResult"> <select id="selectDeptByDeptId" parameterType="Long" resultMap="SysDdDeptResult">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dd_dept_id, d.dd_parent_id, d.del_flag, d.create_by, d.create_time select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dd_dept_id, d.dd_parent_id, d.del_flag, d.create_by, d.create_time
from sys_dd_dept d from sys_dept d
where d.dept_id = #{deptId} where d.dept_id = #{deptId}
</select> </select>
<select id="selectGradeList" resultType="Map"> <select id="selectGradeList" resultType="Map">
select id as gradeId, grade_year as gradeYear from school_grade_copy where del_flag = "0" order by grade_value ASC select id as gradeId, grade_year as gradeYear from school_grade where del_flag = "0" order by grade_value ASC
</select> </select>
<insert id="insertDdDept" parameterType="SysDdDept" useGeneratedKeys="true" keyProperty="deptId"> <insert id="insertDdDept" parameterType="SysDdDept" useGeneratedKeys="true" keyProperty="deptId">
insert into sys_dd_dept( insert into sys_dept(
<if test="deptId != null and deptId != 0">dept_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if>
<if test="parentId != null ">parent_id,</if> <if test="parentId != null ">parent_id,</if>
<if test="deptName != null and deptName != ''">dept_name,</if> <if test="deptName != null and deptName != ''">dept_name,</if>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</insert> </insert>
<update id="updateDdDept" parameterType="SysDdDept"> <update id="updateDdDept" parameterType="SysDdDept">
update sys_dd_dept update sys_dept
<set> <set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if> <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if> <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
</update> </update>
<update id="updateDdDeptByDdDeptId" parameterType="SysDdDept"> <update id="updateDdDeptByDdDeptId" parameterType="SysDdDept">
update sys_dd_dept update sys_dept
<set> <set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if> <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if> <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
...@@ -133,11 +133,11 @@ ...@@ -133,11 +133,11 @@
</update> </update>
<delete id="deleteDdDeptById" parameterType="Long"> <delete id="deleteDdDeptById" parameterType="Long">
update sys_dd_dept set del_flag = '2' where dept_id = #{deptId} and dept_id != 100 update sys_dept set del_flag = '2' where dept_id = #{deptId} and dept_id != 100
</delete> </delete>
<delete id="deleteDdDeptByDdDeptId" parameterType="Long"> <delete id="deleteDdDeptByDdDeptId" parameterType="Long">
update sys_dd_dept set del_flag = '2' where dd_dept_id = #{ddDeptId} update sys_dept set del_flag = '2' where dd_dept_id = #{ddDeptId}
</delete> </delete>
</mapper> </mapper>
smart-campus/src/main/resources/mapper/ddTeacher/DdTeacherMapper.xml
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</resultMap> </resultMap>
<insert id="addTeacherList" parameterType="SysDdTeacher" useGeneratedKeys="true" keyProperty="id"> <insert id="addTeacherList" parameterType="SysDdTeacher" useGeneratedKeys="true" keyProperty="id">
insert into sys_dd_teacher insert into sys_teacher
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if> <if test="id != null">id,</if>
<if test="teacherName != null">teacher_name,</if> <if test="teacherName != null">teacher_name,</if>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</insert> </insert>
<update id="updateDdTeacher" parameterType="SysDdTeacher"> <update id="updateDdTeacher" parameterType="SysDdTeacher">
update sys_dd_teacher update sys_teacher
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="teacherName != null">teacher_name = #{teacherName},</if> <if test="teacherName != null">teacher_name = #{teacherName},</if>
<if test="teacherTel != null">teacher_tel = #{teacherTel},</if> <if test="teacherTel != null">teacher_tel = #{teacherTel},</if>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<!--批量新增教师--> <!--批量新增教师-->
<insert id="batchInsertTeacher" parameterType="SysDdTeacher" useGeneratedKeys="true" keyProperty="id"> <insert id="batchInsertTeacher" parameterType="SysDdTeacher" useGeneratedKeys="true" keyProperty="id">
<foreach collection="list" item="data" separator=";"> <foreach collection="list" item="data" separator=";">
insert into sys_dd_teacher insert into sys_teacher
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="data.id != null">id,</if> <if test="data.id != null">id,</if>
<if test="data.teacherName != null">teacher_name,</if> <if test="data.teacherName != null">teacher_name,</if>
......
smart-campus/src/main/resources/mapper/ddUser/DdUserMapper.xml
...@@ -36,12 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -36,12 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectDdUserVo"> <sql id="selectDdUserVo">
select u.user_id, u.dept_id, u.user_name, u.login_name,u.user_type, u.user_login_type,u.email, u.avatar, u.phonenumber, u.password, u.salt,u.sex, u.status, u.del_flag, u.login_ip, u.login_date,u.pwd_update_date, u.create_by, u.create_time, u.remark,u.sign,u.employee_type,u.student_id, select u.user_id, u.dept_id, u.user_name, u.login_name,u.user_type, u.user_login_type,u.email, u.avatar, u.phonenumber, u.password, u.salt,u.sex, u.status, u.del_flag, u.login_ip, u.login_date,u.pwd_update_date, u.create_by, u.create_time, u.remark,u.sign,u.employee_type,u.student_id,
from sys_dd_user u from sys_user u
</sql> </sql>
<select id="selectDdUserList" parameterType="SysDdUser" resultMap="SysDdUserResult"> <select id="selectDdUserList" parameterType="SysDdUser" resultMap="SysDdUserResult">
select u.user_id, u.dept_id, u.login_name, u.user_name,u.user_type, u.user_login_type, u.email, u.avatar, u.phonenumber, u.sex,u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.union_id, u.dd_user_id, u.create_by, u.create_time, u.remark from sys_dd_user u select u.user_id, u.dept_id, u.login_name, u.user_name,u.user_type, u.user_login_type, u.email, u.avatar, u.phonenumber, u.sex,u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.union_id, u.dd_user_id, u.create_by, u.create_time, u.remark from sys_user u
where u.del_flag = '0' and user_login_type = '0' where u.del_flag = '0' and user_login_type = '0' and u.login_name != "admin"
<if test="userId != null and userId != 0"> <if test="userId != null and userId != 0">
AND u.user_id = #{userId} AND u.user_id = #{userId}
</if> </if>
...@@ -68,12 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -68,12 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectDdUserByDdUserId" parameterType="String" resultMap="SysDdUserResult"> <select id="selectDdUserByDdUserId" parameterType="String" resultMap="SysDdUserResult">
select u.user_id, u.dept_id, u.login_name, u.user_name,u.user_type, u.user_login_type, u.email, u.avatar, u.phonenumber, u.sex,u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.union_id, u.dd_user_id, u.create_by, u.create_time, u.remark from sys_dd_user u select u.user_id, u.dept_id, u.login_name, u.user_name,u.user_type, u.user_login_type, u.email, u.avatar, u.phonenumber, u.sex,u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.union_id, u.dd_user_id, u.create_by, u.create_time, u.remark from sys_user u
where u.del_flag = '0' and user_login_type = '0' and dd_user_id = #{ddUserId} where u.del_flag = '0' and user_login_type = '0' and dd_user_id = #{ddUserId}
</select> </select>
<insert id="insertDdUser" parameterType="SysDdUser" useGeneratedKeys="true" keyProperty="userId"> <insert id="insertDdUser" parameterType="SysDdUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_dd_user( insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if> <if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if> <if test="userName != null and userName != ''">user_name,</if>
...@@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert> </insert>
<update id="updateDdUser" parameterType="SysDdUser"> <update id="updateDdUser" parameterType="SysDdUser">
update sys_dd_user update sys_user
<set> <set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if> <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
<if test="userName != null and userName != ''">user_name = #{userName},</if> <if test="userName != null and userName != ''">user_name = #{userName},</if>
...@@ -154,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -154,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateUserList" parameterType="SysDdUser"> <update id="updateUserList" parameterType="SysDdUser">
<foreach collection="list" item="data" separator=";"> <foreach collection="list" item="data" separator=";">
update sys_dd_user update sys_user
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="data.userName != null and data.userName != ''"> <if test="data.userName != null and data.userName != ''">
user_name = #{data.userName}, user_name = #{data.userName},
...@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="addUserList" useGeneratedKeys="true" keyColumn="id" keyProperty="id"> <insert id="addUserList" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
<foreach collection="list" item="data" separator=";"> <foreach collection="list" item="data" separator=";">
insert into sys_dd_user insert into sys_user
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="data.userLoginType != null and data.userLoginType != ''"> <if test="data.userLoginType != null and data.userLoginType != ''">
user_login_type, user_login_type,
...@@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert> </insert>
<insert id="addDdUserList" parameterType="SysDdUser" useGeneratedKeys="true" keyProperty="userId"> <insert id="addDdUserList" parameterType="SysDdUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_dd_user( insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if> <if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if> <if test="userName != null and userName != ''">user_name,</if>
...@@ -247,7 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -247,7 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--批量新增钉钉用户--> <!--批量新增钉钉用户-->
<insert id="batchInsertDdUser" parameterType="SysDdUser" useGeneratedKeys="true" keyProperty="userId"> <insert id="batchInsertDdUser" parameterType="SysDdUser" useGeneratedKeys="true" keyProperty="userId">
<foreach collection="list" item="data" separator=";"> <foreach collection="list" item="data" separator=";">
insert into sys_dd_user( insert into sys_user(
<if test="data.userId != null and data.userId != 0">user_id,</if> <if test="data.userId != null and data.userId != 0">user_id,</if>
<if test="data.deptId != null and data.deptId != 0">dept_id,</if> <if test="data.deptId != null and data.deptId != 0">dept_id,</if>
<if test="data.userName != null and data.userName != ''">user_name,</if> <if test="data.userName != null and data.userName != ''">user_name,</if>
...@@ -298,28 +298,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -298,28 +298,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert> </insert>
<insert id="insertDdUserDept" parameterType="SysDdUserDept"> <insert id="insertDdUserDept" parameterType="SysDdUserDept">
insert into sys_dd_user_dept(user_id, dept_id) values (#{userId},#{deptId}) insert into sys_user_dept(user_id, dept_id) values (#{userId},#{deptId})
</insert> </insert>
<update id="deleteDdUser" parameterType="Long"> <update id="deleteDdUser" parameterType="Long">
update sys_dd_user set del_flag = "2" where user_id = #{userId} update sys_user set del_flag = "2" where user_id = #{userId}
</update> </update>
<delete id="deleteDdUserDept"> <delete id="deleteDdUserDept">
delete from sys_dd_user_dept where user_id = #{userId} delete from sys_user_dept where user_id = #{userId}
</delete> </delete>
<update id="deleteDdTeacher" parameterType="Long"> <update id="deleteDdTeacher" parameterType="Long">
update sys_dd_teacher set del_flag = "2" where id = #{userId} update sys_teacher set del_flag = "2" where id = #{userId}
</update> </update>
<select id="selectDeptIdByUserId" parameterType="Long" resultType="Long"> <select id="selectDeptIdByUserId" parameterType="Long" resultType="Long">
select dept_id from sys_dd_user_dept where user_id = #{userId} select dept_id from sys_user_dept where user_id = #{userId}
</select> </select>
<!--新增级部成员--> <!--新增级部成员-->
<insert id="insertGradeMentor" parameterType="SchoolGradeMentorCopy"> <insert id="insertGradeMentor" parameterType="SchoolGradeMentorCopy">
insert into school_grade_mentor_copy insert into school_grade_mentor
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="teacherId != null">teacher_id,</if> <if test="teacherId != null">teacher_id,</if>
<if test="gradeId != null">grade_id,</if> <if test="gradeId != null">grade_id,</if>
...@@ -339,7 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -339,7 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert> </insert>
<!--删除级部成员--> <!--删除级部成员-->
<update id="deleteGradeMentor" parameterType="Long"> <update id="deleteGradeMentor" parameterType="Long">
update school_grade_mentor_copy set del_flag = "1" where teacher_id = #{userId} update school_grade_mentor set del_flag = "1" where teacher_id = #{userId}
</update> </update>
</mapper> </mapper>
smart-campus/src/main/resources/mapper/schoolLab/SchoolExperimentPlanMapper.xml
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
AND gm.teacher_id = #{teacherId} AND gm.teacher_id = #{teacherId}
</if> </if>
</where> </where>
order by cy.create_time DESC order by ep.create_time DESC
</select> </select>
<select id="selectExperimentPlanListAdmin" parameterType="SchoolExperimentPlanVo" resultMap="SchoolExperimentPlanVoResult"> <select id="selectExperimentPlanListAdmin" parameterType="SchoolExperimentPlanVo" resultMap="SchoolExperimentPlanVoResult">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment