diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java index 39bf673..3ff16d0 100644 --- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java +++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java @@ -28,7 +28,6 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -import static com.sun.xml.internal.ws.spi.db.BindingContextFactory.LOGGER; /** * 说明：安全环保检查 diff --git a/src/main/java/com/zcloud/controller/eduArchives/ArchivesStudentController.java b/src/main/java/com/zcloud/controller/eduArchives/ArchivesStudentController.java index 873acd0..57bf940 100644 --- a/src/main/java/com/zcloud/controller/eduArchives/ArchivesStudentController.java +++ b/src/main/java/com/zcloud/controller/eduArchives/ArchivesStudentController.java @@ -1,11 +1,13 @@ package com.zcloud.controller.eduArchives; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.service.eduArchives.ArchivesPdfFileService; import com.zcloud.service.eduArchives.ArchivesStudentService; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.eduStudy.ClassService; import com.zcloud.util.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -29,6 +31,8 @@ public class ArchivesStudentController extends BaseController { private ArchivesStudentService archivesstudentService; @Autowired private ArchivesPdfFileService archivesPdfFileService; + @Autowired + private ClassService classService; /** * 新增 * @@ -220,4 +224,79 @@ public class ArchivesStudentController extends BaseController { archivesPdfFileService.registerform(pd); return map; } + + /** + * @Description: 一人一档用户 以班级维度批量导出 + * STUDENT + * @Author: + * @Date: 2023/3/17/017 16:34 + * @Param: + * @Return: + */ + @RequestMapping("/batchDownByClass") + @ResponseBody + public Object batchDownByClass(HttpServletResponse response, Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + PageData apf = new PageData(); + apf.put("ARCHIVES_PDF_FILE_ID", this.get32UUID()); + apf.put("TABLE_NAME", "bus_student"); + apf.put("TABLE_ID", pd.get("STUDENT_ID")); + apf.put("TYPE", "1"); + apf.put("STATUS", "0"); + apf.put("CREATOR", Jurisdiction.getUsername()); + apf.put("CREATTIME", DateUtil.date2Str(new Date())); + PageData classInfo = classService.findById(pd); + apf.put("DESCR", classInfo.getString("NAME") + "-班级档案"); + apf.put("METHOD_NAME", "batchDownByClass"); //方法名 + apf.put("CLASS_NAME", PageData.class.getName()); //方法名中参数的类型 --如方法类型有多个，使类型用逗号连接，格式：xx,yyy + pd.put("ARCHIVES_PDF_FILE_ID", apf.get("ARCHIVES_PDF_FILE_ID")); + map.put("result", errInfo); + pd.put("projectPath", PathUtil.getProjectpath()); + apf.put("PARAM_NAME", JSONObject.toJSON(pd).toString());//方法名中参数的值 --如方法中参数有多个，使参数用逗号连接，格式：{"a":a},{"b":b} + archivesPdfFileService.save(apf); + // 异步生成档案 + archivesPdfFileService.batchDownByClass(pd); + return map; + } + /** + * @Description: 一人一档班级 批量 导出 + * STUDENT + * @Author: + * @Date: 2023/3/17/017 16:34 + * @Param: + * @Return: + */ + @RequestMapping("/archivepersonnel") + @ResponseBody + public Object archivepersonnel(HttpServletResponse response) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + List classList = JSONArray.parseArray((String) pd.get("curriculum"), PageData.class); + pd.put("STUDENT_ID", classList.get(0).get("STUDENT_ID")); + pd.put("CLASS_ID", classList.get(0).get("CLASS_ID")); + pd.put("STUDENT_NAME", classList.get(0).get("STUDENT_NAME")); + + PageData apf = new PageData(); + apf.put("ARCHIVES_PDF_FILE_ID", this.get32UUID()); + apf.put("TABLE_NAME", "bus_student"); + apf.put("TABLE_ID", pd.get("STUDENT_ID")); + apf.put("TYPE", "1"); + apf.put("STATUS", "0"); + apf.put("CREATOR", Jurisdiction.getUsername()); + apf.put("CREATTIME", DateUtil.date2Str(new Date())); + apf.put("DESCR", pd.get("STUDENT_NAME") + "-班级详情"); + apf.put("METHOD_NAME", "archivepersonnel"); //方法名 + apf.put("CLASS_NAME", PageData.class.getName()); //方法名中参数的类型 --如方法类型有多个，使类型用逗号连接，格式：xx,yyy + pd.put("ARCHIVES_PDF_FILE_ID", apf.get("ARCHIVES_PDF_FILE_ID")); + map.put("result", errInfo); + pd.put("projectPath", PathUtil.getProjectpath()); + apf.put("PARAM_NAME", JSONObject.toJSON(pd).toString());//方法名中参数的值 --如方法中参数有多个，使参数用逗号连接，格式：{"a":a},{"b":b} + archivesPdfFileService.save(apf); + // 异步生成档案 + archivesPdfFileService.archivepersonnel(pd); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/eduStudy/StudentController.java b/src/main/java/com/zcloud/controller/eduStudy/StudentController.java index 71bc975..8c22c0e 100644 --- a/src/main/java/com/zcloud/controller/eduStudy/StudentController.java +++ b/src/main/java/com/zcloud/controller/eduStudy/StudentController.java @@ -165,10 +165,10 @@ public class StudentController extends BaseController { } } PageData editClass = new PageData(); - editClass.put("CLASS_ID",pd.getString("CLASS_ID")); - editClass.put("RELEASE_TYPE",pd.getString("RELEASE_TYPE")); - editClass.put("PERSONNEL_TYPES",pd.getString("PERSONNEL_TYPES")); - editClass.put("EXAMINATION",pd.getString("EXAMINATION")); + editClass.put("CLASS_ID", pd.getString("CLASS_ID")); + editClass.put("RELEASE_TYPE", pd.getString("RELEASE_TYPE")); + editClass.put("PERSONNEL_TYPES", pd.getString("PERSONNEL_TYPES")); + editClass.put("EXAMINATION", pd.getString("EXAMINATION")); classService.edit(editClass); map.put("result", errInfo); return map; @@ -299,6 +299,7 @@ public class StudentController extends BaseController { map.put("result", errInfo); return map; } + /** * 列表 * @@ -322,28 +323,6 @@ public class StudentController extends BaseController { return map; } - /** - * 列表 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/exportStudentList") - @ResponseBody - public Object exportStudentList() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - List varList = studentService.listAllByExoprt(pd); //列出PostPaper列表 - map.put("varList", varList); - map.put("result", errInfo); - return map; - } - /** * 列表 * @@ -362,59 +341,102 @@ public class StudentController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List varList = studentService.listAllByExoprt(pd); //列出PostPaper列表 - Map objMap = new HashMap<>(); - List> list = new ArrayList<>(); - if(varList.size()>0){ - for (PageData student: varList) { - //通过留言id去获取留言上传的图片列表 + Map objMap = new LinkedHashMap<>(); + List> list = new ArrayList<>(); +// List list = new ArrayList<>(); + if (varList.size() > 0) { + for (PageData student : varList) { StudentMessageExcel excelObj = new StudentMessageExcel(); excelObj.setUSER_ID_CARD(student.getString("USER_ID_CARD")); excelObj.setNAME(student.getString("NAME")); - excelObj.setSEX(student.getString("SEX")); + excelObj.setSEX("1".equals(student.getString("SEX")) ? "男" : "女"); excelObj.setPHONE(student.getString("PHONE")); excelObj.setDEPARTMENT_NAME(student.getString("DEPARTMENT_NAME")); excelObj.setPOST_NAME(student.getString("POST_NAME")); excelObj.setALL_CLASSHOUR(student.getString("ALL_CLASSHOUR")); excelObj.setCOMPLETE_CLASSHOUR(student.getString("COMPLETE_CLASSHOUR")); - excelObj.setPASSED(student.getString("PASSED")); + excelObj.setPASSED("0".equals(student.getString("STAGEEXAMSTATE")) ? "不考试" : student.getString("PASSED")); excelObj.setEXAMSCORE(student.getString("EXAMSCORE")); - excelObj.setSTUDYSTATE(student.getString("STUDYSTATE")); + switch (student.getString("STUDYSTATE")) { + case "1": + excelObj.setSTUDYSTATE("学习中"); + break; + case "2": + excelObj.setSTUDYSTATE("已学完"); + break; + case "3": + excelObj.setSTUDYSTATE("已完成"); + break; + case "4": + excelObj.setSTUDYSTATE("未完成"); + break; + case "5": + excelObj.setSTUDYSTATE("待评估"); + break; + case "6": + excelObj.setSTUDYSTATE("评估未合格"); + break; + case "0": + excelObj.setSTUDYSTATE("未学习"); + break; + } excelObj.setCLASS_NAME(student.getString("CLASS_NAME")); - File USER_SIGN = new File(PathUtil.getProjectpath() + Const.FILEPATHFILE + pd.getString("USER_SIGN_FILE_PATH")); +// if (Tools.notEmpty(pd.getString("USER_SIGN_FILE_PATH"))) { +// File USER_SIGN = new File(PathUtil.getProjectpath() + Const.FILEPATHFILE + pd.getString("USER_SIGN_FILE_PATH")); +// excelObj.setUSER_SIGN_FILE(USER_SIGN); +// } + File USER_SIGN = new File("D:\\图片\\11111.png"); excelObj.setUSER_SIGN_FILE(USER_SIGN); - File PORTRAIT = new File(PathUtil.getProjectpath() + Const.FILEPATHFILE + pd.getString("PORTRAIT")); - excelObj.setPORTRAIT(PORTRAIT); + if (Tools.notEmpty(pd.getString("PORTRAIT"))) { + File PORTRAIT = new File(PathUtil.getProjectpath() + Const.FILEPATHFILE + pd.getString("PORTRAIT")); + excelObj.setPORTRAIT(PORTRAIT); + } objMap = ImageExcelUtil.javaBean2Map(excelObj); list.add(objMap); } } Object[] objects = objMap.keySet().toArray(); String[] titles = new String[objects.length]; - Map titleName = new HashMap<>(); - titleName.put("USER_ID_CARD","身份证"); - titleName.put("NAME","姓名"); - titleName.put("SEX","性别"); - titleName.put("PHONE","手机号"); - titleName.put("DEPARTMENT_NAME","部门"); - titleName.put("POST_NAME","工种"); - titleName.put("ALL_CLASSHOUR","要求总学时"); - titleName.put("COMPLETE_CLASSHOUR","已完成学时"); - titleName.put("PASSED","是否考试通过"); - titleName.put("EXAMSCORE","考试分数"); - titleName.put("STUDYSTATE","学习状态"); - titleName.put("CLASS_NAME","班级名称"); - titleName.put("USER_SIGN_FILE","用户签字"); - titleName.put("PORTRAIT","人像照片"); + Map titleName = new LinkedHashMap<>(); + titleName.put("USER_ID_CARD", "身份证号"); + titleName.put("NAME", "姓名"); + titleName.put("SEX", "性别"); + titleName.put("PHONE", "手机号"); + titleName.put("DEPARTMENT_NAME", "部门"); + titleName.put("POST_NAME", "工种"); + titleName.put("ALL_CLASSHOUR", "要求总学时"); + titleName.put("COMPLETE_CLASSHOUR", "已完成学时"); + titleName.put("PASSED", "是否考试通过"); + titleName.put("EXAMSCORE", "考试分数"); + titleName.put("STUDYSTATE", "学习状态"); + titleName.put("CLASS_NAME", "班级名称"); + titleName.put("USER_SIGN_FILE", "用户签字"); + titleName.put("PORTRAIT", "人像照片"); - for(int i=0;i titles = new ArrayList<>(); +// titles.add("身份证号"); +// titles.add("姓名"); +// titles.add("性别"); +// titles.add("手机号"); +// titles.add("部门"); +// titles.add("工种"); +// titles.add("要求总学时"); +// titles.add("已完成学时"); +// titles.add("是否考试通过"); +// titles.add("考试分数"); +// titles.add("学习状态"); +// titles.add("班级名称"); +// titles.add("用户签字"); +// titles.add("人像照片"); String fileName = "学员学习记录"; response.setContentType("application/vnd.ms-excel"); response.addHeader("Content-Disposition", "attachment; filename=" + fileName); - ImageExcelUtil.excelOut(titles,list.size(),list,fileName, response, PathUtil.getProjectpath()); + ImageExcelUtil.excelOut(titles, list.size(), list, fileName, response, PathUtil.getProjectpath()); } @RequestMapping("/list") @@ -424,7 +446,7 @@ public class StudentController extends BaseController { try { PageData request = this.getPageData(); request.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - if ("0".equals(Jurisdiction.getIS_MAIN())){ + if ("0".equals(Jurisdiction.getIS_MAIN())) { request.put("USER_ID", Jurisdiction.getUSER_ID()); } page.setPd(request); diff --git a/src/main/java/com/zcloud/controller/eduStudy/TrainedUserSignController.java b/src/main/java/com/zcloud/controller/eduStudy/TrainedUserSignController.java index eb0401b..598d9e4 100644 --- a/src/main/java/com/zcloud/controller/eduStudy/TrainedUserSignController.java +++ b/src/main/java/com/zcloud/controller/eduStudy/TrainedUserSignController.java @@ -60,10 +60,11 @@ public class TrainedUserSignController extends BaseController { pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", 0); //签字方式以上传图片的形式存储数据 if (SIGN_PICTURE_2 != null) { - pd.put("SIGN_PICTURE", smb.saveFile(SIGN_PICTURE_2, pd.getString("ENTERPRISE_ID"))); + pd.put("SIGN_PICTURE", smb.saveFile(SIGN_PICTURE_2, pd.getString("CORPINFO_ID"))); } else { //签字方式以签字的形式存储数据 if (Tools.notEmpty(pd.getString("SIGN_PICTURE"))) { @@ -113,9 +114,9 @@ public class TrainedUserSignController extends BaseController { * @param * @throws Exception */ - @RequestMapping(value = "/isdelete") + @RequestMapping(value = "/delete") @ResponseBody - public Object isdelete() throws Exception { + public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -187,9 +188,10 @@ public class TrainedUserSignController extends BaseController { // } pd.put("OPERATOR", Jurisdiction.getUsername()); pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //签字方式以上传图片的形式存储数据 if (SIGN_PICTURE_2 != null) { - pd.put("SIGN_PICTURE", smb.saveFile(SIGN_PICTURE_2, pd.getString("ENTERPRISE_ID"))); + pd.put("SIGN_PICTURE", smb.saveFile(SIGN_PICTURE_2, pd.getString("CORPINFO_ID"))); } else { //签字方式以签字的形式存储数据 if (Tools.notEmpty(pd.getString("SIGN_PICTURE")) && pd.getString("SIGN_PICTURE").contains("data:image/png;base64,")) { @@ -207,5 +209,4 @@ public class TrainedUserSignController extends BaseController { map.put("result", errInfo); return map; } - } diff --git a/src/main/java/com/zcloud/controller/eightwork/EightWorkVideoManagerController.java b/src/main/java/com/zcloud/controller/eightwork/EightWorkVideoManagerController.java index 287505c..8d00a30 100644 --- a/src/main/java/com/zcloud/controller/eightwork/EightWorkVideoManagerController.java +++ b/src/main/java/com/zcloud/controller/eightwork/EightWorkVideoManagerController.java @@ -1,10 +1,10 @@ -package com.zcloud.controller.eightWork; +package com.zcloud.controller.eightwork; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.logs.LogAnno; -import com.zcloud.service.eightWork.EightWorkVideoManagerService; +import com.zcloud.service.eightwork.EightWorkVideoManagerService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.ObjectExcelView; diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkVideoManagerMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkVideoManagerMapper.java index 60b05d5..7e8a8fa 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkVideoManagerMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkVideoManagerMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.datasource.eightWork; +package com.zcloud.mapper.datasource.eightwork; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesPdfFileServiceImpl.java b/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesPdfFileServiceImpl.java index 5d10b9d..e0bece9 100644 --- a/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesPdfFileServiceImpl.java +++ b/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesPdfFileServiceImpl.java @@ -863,7 +863,7 @@ public class ArchivesPdfFileServiceImpl implements ArchivesPdfFileService { (Tools.notEmpty(stageStudent.getString("STAGEEXAMSTATE")) && Integer.parseInt(stageStudent.get("STAGEEXAMSTATE").toString()) > 1) && !("5".equals(stageStudent.get("STUDYSTATE"))) || (stageStudent.getString("STAGEEXAMSTATE").equals("0") && Integer.parseInt(stageStudent.get("STUDYSTATE").toString()) > 1)) { PageData para = new PageData(); - para.put("CORP_NAME", corpinfo.getString("NAME")); + para.put("CORP_NAME", corpinfo.getString("CORP_NAME")); para.put("ASSESSOR_SIGN", allSign.get(0).getString("ASSESSOR_SIGN")); //签字数据 para.put("RECORDOR_SIGN", allSign.get(0).getString("RECORDOR_SIGN")); //签字数据 para.put("SAFETYDEPTOR_SIGN", allSign.get(0).getString("SAFETYDEPTOR_SIGN")); //签字数据 diff --git a/src/main/java/com/zcloud/service/eightwork/EightWorkVideoManagerService.java b/src/main/java/com/zcloud/service/eightwork/EightWorkVideoManagerService.java index 5970e75..a6aab3e 100644 --- a/src/main/java/com/zcloud/service/eightwork/EightWorkVideoManagerService.java +++ b/src/main/java/com/zcloud/service/eightwork/EightWorkVideoManagerService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.eightWork; +package com.zcloud.service.eightwork; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/service/eightwork/impl/BlindBoardServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/BlindBoardServiceImpl.java index 99ca403..fe46982 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/BlindBoardServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/BlindBoardServiceImpl.java @@ -37,7 +37,7 @@ public class BlindBoardServiceImpl implements BlindBoardService { @Autowired private BlindBoardToMeasuresMapper blindboardToMeasuresMapper; @Autowired - private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + private EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private Smb smb; @Autowired diff --git a/src/main/java/com/zcloud/service/eightwork/impl/BreakGroundServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/BreakGroundServiceImpl.java index 909a4ee..cc0cc12 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/BreakGroundServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/BreakGroundServiceImpl.java @@ -35,7 +35,7 @@ public class BreakGroundServiceImpl implements BreakGroundService { @Autowired private BreakGroundToMeasuresMapper breakgroundToMeasuresMapper; @Autowired - private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + private EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private Smb smb; @Autowired diff --git a/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java index fff5c41..f449629 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java @@ -37,7 +37,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService { @Autowired private ConfinedSpaceGasMapper confinedspacegasMapper; @Autowired - private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + private EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private Smb smb; @Autowired diff --git a/src/main/java/com/zcloud/service/eightwork/impl/CutRoadServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/CutRoadServiceImpl.java index d1ae346..58da096 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/CutRoadServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/CutRoadServiceImpl.java @@ -35,7 +35,7 @@ public class CutRoadServiceImpl implements CutRoadService { @Autowired private CutRoadToMeasuresMapper cutroadToMeasuresMapper; @Autowired - private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + private EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private Smb smb; @Autowired diff --git a/src/main/java/com/zcloud/service/eightwork/impl/EightWorkVideoManagerServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/EightWorkVideoManagerServiceImpl.java index e94faf3..c0bf5ca 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/EightWorkVideoManagerServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/EightWorkVideoManagerServiceImpl.java @@ -1,9 +1,9 @@ -package com.zcloud.service.eightWork.impl; +package com.zcloud.service.eightwork.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper; -import com.zcloud.service.eightWork.EightWorkVideoManagerService; +import com.zcloud.mapper.datasource.eightwork.EightWorkVideoManagerMapper; +import com.zcloud.service.eightwork.EightWorkVideoManagerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java index dd7ce2d..5f30a6f 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java @@ -37,7 +37,7 @@ public class ElectricityServiceImpl implements ElectricityService { @Autowired private ElectricityGasMapper electricitygasMapper; @Autowired - private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + private EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private Smb smb; @Autowired diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java index bc0a3da..8dec994 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java @@ -36,7 +36,7 @@ public class HighworkServiceImpl implements HighworkService { @Autowired private HighworkToMeasuresMapper highworkToMeasuresMapper; @Autowired - private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + private EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private Smb smb; @Autowired diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java index 245553a..97ea6be 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java @@ -35,7 +35,7 @@ public class HoistingServiceImpl implements HoistingService { @Autowired private HoistingToMeasuresMapper hoistingToMeasuresMapper; @Autowired - private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + private EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private Smb smb; @Autowired diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java index bfa6ffd..371ae23 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightwork.*; import com.zcloud.service.eightwork.HotworkService; import com.zcloud.util.*; import org.springframework.beans.factory.annotation.Autowired; @@ -23,21 +24,21 @@ import java.util.stream.Collectors; public class HotworkServiceImpl implements HotworkService { @Autowired - private com.zcloud.mapper.datasource.eightwork.HotworkMapper hotworkMapper; + private HotworkMapper hotworkMapper; @Autowired - private com.zcloud.mapper.datasource.eightwork.EightWorkTaskFlowMapper eightWorkTaskFlowMapper; + private EightWorkTaskFlowMapper eightWorkTaskFlowMapper; @Autowired - private com.zcloud.mapper.datasource.eightwork.EightWorkFlowLogMapper eightWorkFlowLogMapper; + private EightWorkFlowLogMapper eightWorkFlowLogMapper; @Autowired - private com.zcloud.mapper.datasource.eightwork.HotworkSignMapper hotworkSignMapper; + private HotworkSignMapper hotworkSignMapper; @Autowired - private com.zcloud.mapper.datasource.eightwork.HotworkToMeasuresMapper hotworkToMeasuresMapper; + private HotworkToMeasuresMapper hotworkToMeasuresMapper; @Autowired - private com.zcloud.mapper.datasource.eightwork.HotworkGasMapper hotworkGasMapper; + private HotworkGasMapper hotworkGasMapper; @Autowired private Smb smb; @Autowired - private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + private EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private SendMessageUtil sendMessageUtil; diff --git a/src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java b/src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java index a18813a..d79298d 100644 --- a/src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java +++ b/src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java @@ -7,7 +7,7 @@ import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.video.VideoManagerMapper; import com.zcloud.service.video.VideoManagerService; import com.zcloud.util.Jurisdiction; -import com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper; +import com.zcloud.mapper.datasource.eightwork.EightWorkVideoManagerMapper; import com.zcloud.util.PLSUtil; import com.zcloud.util.ReturnMap; import com.zcloud.util.Tools; diff --git a/src/main/java/com/zcloud/util/ImageExcelUtil.java b/src/main/java/com/zcloud/util/ImageExcelUtil.java index e818787..f3677af 100644 --- a/src/main/java/com/zcloud/util/ImageExcelUtil.java +++ b/src/main/java/com/zcloud/util/ImageExcelUtil.java @@ -9,6 +9,7 @@ import org.apache.poi.hssf.usermodel.HSSFPatriarch; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.poifs.filesystem.Entry; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; @@ -23,271 +24,275 @@ import java.util.*; public class ImageExcelUtil { - private static final Log log = LogFactory.getLog(ImageExcelUtil.class); + private static final Log log = LogFactory.getLog(ImageExcelUtil.class); - /** - * excel工具类，可导出带图片或不带图片的数据 - * @date 2024/03/20 - * @param titles 第一行的标题列 - * @param rows 数据行量 - * @param maps 装载导出数据的封装了map的list数据集合，注意：此中的map尽量用本类中的方法 javaBean2Map直接生成，或自己拼接；但需与参数titles[]的标题相关数据对应上 - * @param fileName 导出到本地的文件路径和文件名 - * @param response response - * @param path 保存到本地的图片地址(我这里是为了删除该目录下的图片，因为我是把网络图片保存到到本地的，如果图片已经是本地图片的话就不需要删除) - */ - public static void excelOut(String[] titles, int rows, List> maps, String fileName, - HttpServletResponse response, String path){ + /** + * excel工具类，可导出带图片或不带图片的数据 + * + * @param titles 第一行的标题列 + * @param rows 数据行量 + * @param maps 装载导出数据的封装了map的list数据集合，注意：此中的map尽量用本类中的方法 javaBean2Map直接生成，或自己拼接；但需与参数titles[]的标题相关数据对应上 + * @param fileName 导出到本地的文件路径和文件名 + * @param response response + * @param path 保存到本地的图片地址(我这里是为了删除该目录下的图片，因为我是把网络图片保存到到本地的，如果图片已经是本地图片的话就不需要删除) + * @date 2024/03/20 + */ + public static void excelOut(String[] titles, int rows, List> maps, String fileName, + HttpServletResponse response, String path) { - OutputStream out = null; - BufferedImage bufferImg = null; - HSSFWorkbook wb = null; + OutputStream out = null; + BufferedImage bufferImg = null; + HSSFWorkbook wb = null; - try{ - //创建工作sheet - wb = new HSSFWorkbook(); - HSSFSheet sheet = wb.createSheet(fileName); - //设置单元格内容水平垂直居中 - HSSFCellStyle style = wb.createCellStyle(); + try { + //创建工作sheet + wb = new HSSFWorkbook(); + HSSFSheet sheet = wb.createSheet(fileName); + //设置单元格内容水平垂直居中 + HSSFCellStyle style = wb.createCellStyle(); // style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); // style.setAlignment(HSSFCellStyle.ALIGN_CENTER); - style.setWrapText(true); //设置内容自动换行 + style.setWrapText(true); //设置内容自动换行 - //画图的顶级管理器，一个sheet只能获取一个（一定要注意这点） - HSSFPatriarch patriarch = sheet.createDrawingPatriarch(); - HSSFRow row0 = sheet.createRow(0); - row0.setHeightInPoints(25); - if (titles.length == 0){ - return ; - } - HSSFCell cell = null; - //第一行、标题行列 - for (int i=0;i stringObjectMap = maps.get(i - 1); - for(Object value : stringObjectMap.keySet()){ - //行单元格 - cellRow = row.createCell(cellColumn); - cellRow.setCellStyle(style); - //如果行数据中有图片时候的处理 - if (value.equals("images")){ - File[] file = (File[]) stringObjectMap.get(value); - if (file == null || file.length == 0){ - cellRow.setCellValue(""); - continue; - }else{ - row.setHeightInPoints(50); + for (int i = 1; i <= rows; i++) { + int cellColumn = 0; + //创建行 + row = sheet.createRow(i); + //设置默认行高 + row.setHeightInPoints(15); + //行数据处理 + Map stringObjectMap = maps.get(i - 1); - for (int x=0;x0){ - cellRow = row.createCell(cellColumn); - cellRow.setCellStyle(style); - } - sheet.setColumnWidth(cellColumn,5000); - log.error("图片路径"+file[x]); - bufferImg = ImageIO.read(file[x]); - ImageIO.write(bufferImg, "jpg", byteArrayOut); - anchor = new HSSFClientAnchor(0, 0, 1023, 255,(short) cellColumn, i, (short) cellColumn, i); -// anchor.setAnchorType(3); - patriarch.createPicture(anchor, wb.addPicture(byteArrayOut.toByteArray(), HSSFWorkbook.PICTURE_TYPE_JPEG)); - cellColumn++; - } - continue; - } - } - cellRow.setCellValue(stringObjectMap.get(value).toString()); - cellColumn ++; - } + for (Object value : stringObjectMap.keySet()) { + //行单元格 + cellRow = row.createCell(cellColumn); + cellRow.setCellStyle(style); + //如果行数据中有图片时候的处理 + if ("USER_SIGN_FILE".equals(value) || "PORTRAIT".equals(value)) { + File file = (File) stringObjectMap.get(value); + if (file == null) { + cellRow.setCellValue(""); + continue; + } else { + row.setHeightInPoints(50); + ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); + cellRow = row.createCell(cellColumn); + cellRow.setCellStyle(style); + sheet.setColumnWidth(cellColumn, 5000); + log.error("图片路径" + file); + bufferImg = ImageIO.read(file); + ImageIO.write(bufferImg, "jpg", byteArrayOut); + anchor = new HSSFClientAnchor(0, 0, 1023, 255, (short) cellColumn, i, (short) cellColumn, i); + patriarch.createPicture(anchor, wb.addPicture(byteArrayOut.toByteArray(), HSSFWorkbook.PICTURE_TYPE_PNG)); + cellColumn++; + } + } + if (stringObjectMap.get(value) != null) { + cellRow.setCellValue(stringObjectMap.get(value).toString()); + } else { + cellRow.setCellValue(""); + } + cellColumn++; + } - } - if(wb!=null){ - out = response.getOutputStream(); - response.setContentType("application/x-msdownload"); - response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8") +".xls"); - // 写入excel文件 - wb.write(out); - } - }catch (Exception e){ - e.printStackTrace(); - }finally { - if(out != null){ - try { - out.close(); + } + if (wb != null) { + out = response.getOutputStream(); + response.setContentType("application/x-msdownload"); + response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xls"); + // 写入excel文件 + wb.write(out); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (out != null) { + try { + out.close(); - //执行删除生成的图片 TODO + //执行删除生成的图片 TODO // File file = new File("E:\\data\\nginxd\\sportsApplets");//输入要删除文件目录的绝对路径 // File file = new File("/data/nginxd/sportsApplets/excelDeleteImage/");//输入要删除文件目录的绝对路径 - File file = new File(path);//输入要删除文件目录的绝对路径 - deleteFile(file);//由于是保存网络图片到本地服务区，所以画完图片到excel就要删除文件 - } catch (IOException e) { - e.printStackTrace(); - } - } + File file = new File(path);//输入要删除文件目录的绝对路径 + deleteFile(file);//由于是保存网络图片到本地服务区，所以画完图片到excel就要删除文件 + } catch (IOException e) { + e.printStackTrace(); + } + } - } - } + } + } - /** - * 删除文件夹目录下的所有文件 （我是怕到时候本地服务器图片越来越多，占用资源，所以把图片洗完到excel里面就删除） - * @date 2021/01/11 - * @param file - */ - public static void deleteFile(File file){ - //判断文件不为null或文件目录存在 - if (file == null || !file.exists()){ - log.error("文件删除失败,请检查文件路径是否正确"); - return; - } - //取得这个目录下的所有子文件对象 - File[] files = file.listFiles(); - //遍历该目录下的文件对象 - for (File f: files){ - //打印文件名 - String name = file.getName(); - log.error("删除的文件名"+name); - //判断子目录是否存在子目录,如果是文件则删除 - if (f.isDirectory()){ - deleteFile(f); - }else { - f.delete(); - } - } - //删除空文件夹 for循环已经把上一层节点的目录清空。 - file.delete(); - } + /** + * 删除文件夹目录下的所有文件 （我是怕到时候本地服务器图片越来越多，占用资源，所以把图片洗完到excel里面就删除） + * + * @param file + * @date 2021/01/11 + */ + public static void deleteFile(File file) { + //判断文件不为null或文件目录存在 + if (file == null || !file.exists()) { + log.error("文件删除失败,请检查文件路径是否正确"); + return; + } + //取得这个目录下的所有子文件对象 + File[] files = file.listFiles(); + //遍历该目录下的文件对象 + for (File f : files) { + //打印文件名 + String name = file.getName(); + log.error("删除的文件名" + name); + //判断子目录是否存在子目录,如果是文件则删除 + if (f.isDirectory()) { + deleteFile(f); + } else { + f.delete(); + } + } + //删除空文件夹 for循环已经把上一层节点的目录清空。 + file.delete(); + } - /** - * 保存图片到本地 - * @date 2021/01/11 - * @param imageUrl - * @param path - * @return - */ - public static String saveFile(String imageUrl, String path){ - String filename = imageUrl.substring(imageUrl.lastIndexOf("/")+1, imageUrl.length()); - log.error("图片===="+filename); + /** + * 保存图片到本地 + * + * @param imageUrl + * @param path + * @return + * @date 2021/01/11 + */ + public static String saveFile(String imageUrl, String path) { + String filename = imageUrl.substring(imageUrl.lastIndexOf("/") + 1, imageUrl.length()); + log.error("图片====" + filename); // Random rand = new Random(); // int s = rand.nextInt(900)+ 100; - int s = (int) (Math.random() * 10000); - log.error("随机数=="+s); - filename = s + filename; //这里如果有文件名称重复的，就取一个随机数拼接文件名 - File sf= null; - OutputStream os = null; - InputStream is = null; - try { - // 构造URL - URL url = new URL(imageUrl); - // 打开连接 - URLConnection con = url.openConnection(); - //设置请求超时为5s - con.setConnectTimeout(5*1000); - // 输入流 - is = con.getInputStream(); + int s = (int) (Math.random() * 10000); + log.error("随机数==" + s); + filename = s + filename; //这里如果有文件名称重复的，就取一个随机数拼接文件名 + File sf = null; + OutputStream os = null; + InputStream is = null; + try { + // 构造URL + URL url = new URL(imageUrl); + // 打开连接 + URLConnection con = url.openConnection(); + //设置请求超时为5s + con.setConnectTimeout(5 * 1000); + // 输入流 + is = con.getInputStream(); - // 1K的数据缓冲 - byte[] bs = new byte[1024]; - // 读取到的数据长度 - int len; - // 输出的文件流 + // 1K的数据缓冲 + byte[] bs = new byte[1024]; + // 读取到的数据长度 + int len; + // 输出的文件流 // String path = "E:\\data\\nginxd\\sportsApplets"; // String path = "/data/nginxd/sportsApplets/excelDeleteImage/"; - sf = new File(path); - if(!sf.exists()){ - sf.mkdirs(); - } - os = new FileOutputStream(sf.getPath()+"/"+filename); - // 开始读取 - while ((len = is.read(bs)) != -1) { - os.write(bs, 0, len); - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - // 完毕，关闭所有链接 - try { - if(os!=null){ - os.close(); - } - if(is!=null){ - is.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - return sf.getPath()+"/"+filename; - } + sf = new File(path); + if (!sf.exists()) { + sf.mkdirs(); + } + os = new FileOutputStream(sf.getPath() + "/" + filename); + // 开始读取 + while ((len = is.read(bs)) != -1) { + os.write(bs, 0, len); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + // 完毕，关闭所有链接 + try { + if (os != null) { + os.close(); + } + if (is != null) { + is.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + return sf.getPath() + "/" + filename; + } - /** - * 将java类对象属性-值转换成map的键值对 去除getClass方法属性，以及自定义的file属性放置最后。 - * @date 2021/01/11 - * @param javaBean - * @return Map - * @throws Exception - */ - public static Map javaBean2Map(Object javaBean) throws Exception { - Map map = new LinkedHashMap<>(); - //反射的实现方式:第一种 + /** + * 将java类对象属性-值转换成map的键值对 去除getClass方法属性，以及自定义的file属性放置最后。 + * + * @param javaBean + * @return Map + * @throws Exception + * @date 2021/01/11 + */ + public static Map javaBean2Map(Object javaBean) throws Exception { + Map map = new LinkedHashMap<>(); + //反射的实现方式:第一种 /*Class studentClass = Student.class; studentClass.getClass();*/ - //第二种实现方式 - Method[] methods = javaBean.getClass().getMethods(); // 获取所有方法 - //第三种实现方式 - /*Class.forName("类路径");*/ - String fileName = null; - File[] files = null; - for (Method method : methods) { - if (method.getName().startsWith("get")) { - String field = method.getName(); // 拼接属性名 - if (field.contains("getClass")){ - continue; - } - field = field.substring(field.indexOf("get") + 3); - field = field.toLowerCase().charAt(0) + field.substring(1); - Object value = method.invoke(javaBean, (Object[]) null); // 执行方法 - if (field.equals("images")){ - fileName = field; - files = (File[]) value; - continue; - } - map.put(field, value); - } - } - if (fileName != null){ - map.put(fileName,files); - } - return map; - } + //第二种实现方式 + Method[] methods = javaBean.getClass().getMethods(); // 获取所有方法 + //第三种实现方式 + /*Class.forName("类路径");*/ + String fileName = null; + File file = null; + for (Method method : methods) { + if (method.getName().startsWith("get")) { + String field = method.getName(); // 拼接属性名 + if (field.contains("getClass")) { + continue; + } + field = field.substring(field.indexOf("get") + 3); + Object value = method.invoke(javaBean, (Object[]) null); // 执行方法 + if (field.equals("USER_SIGN_FILE") || field.equals("PORTRAIT")) { + fileName = field; + file = (File) value; + continue; + } + if (fileName != null) { + map.put(fileName, file); + fileName = null; + } else { + map.put(field, value); + } + } + } + return map; + } - /** - * 递归调用让字符串对中调换 - * @date 2021/01/11 - * @param originStr - * @return String - */ - public static String reverse(String originStr) { - if(originStr == null || originStr.length() <= 1) - return originStr; - String substring = originStr.substring(1); - String s = reverse(substring) + originStr.charAt(0); - return s; - } + /** + * 递归调用让字符串对中调换 + * + * @param originStr + * @return String + * @date 2021/01/11 + */ + public static String reverse(String originStr) { + if (originStr == null || originStr.length() <= 1) + return originStr; + String substring = originStr.substring(1); + String s = reverse(substring) + originStr.charAt(0); + return s; + } } diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkVideoManagerMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkVideoManagerMapper.xml index da25603..9457e7e 100644 --- a/src/main/resources/mybatis/datasource/eightwork/EightWorkVideoManagerMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkVideoManagerMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/datasource/task/CourseExamMapper.xml b/src/main/resources/mybatis/datasource/task/CourseExamMapper.xml deleted file mode 100644 index 29aa7f8..0000000 --- a/src/main/resources/mybatis/datasource/task/CourseExamMapper.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - BUS_COURSEEXAM - - - - - SYS_DICTIONARIES - - - - - f.CURRICULUM_ID, - f.COURSEPAPERS_ID, - f.USER_ID, - f.EXAMTIME, - f.EXAMQUESTIONNUM, - f.EXAMQUESTIONRIGHT, - f.EXAMQUESTIONWRONG, - f.EXAMSCORE, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, - f.CORPINFO_ID, - f.COURSEEXAM_ID - - - - - CURRICULUM_ID, - COURSEPAPERS_ID, - USER_ID, - EXAMTIME, - EXAMQUESTIONNUM, - EXAMQUESTIONRIGHT, - EXAMQUESTIONWRONG, - EXAMSCORE, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, - CORPINFO_ID, - COURSEEXAM_ID - - - - - #{CURRICULUM_ID}, - #{COURSEPAPERS_ID}, - #{USER_ID}, - #{EXAMTIME}, - #{EXAMQUESTIONNUM}, - #{EXAMQUESTIONRIGHT}, - #{EXAMQUESTIONWRONG}, - #{EXAMSCORE}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, - #{CORPINFO_ID}, - #{COURSEEXAM_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - COURSEEXAM_ID = #{COURSEEXAM_ID} - - - - - update - - set - CURRICULUM_ID = #{CURRICULUM_ID}, - COURSEPAPERS_ID = #{COURSEPAPERS_ID}, - USER_ID = #{USER_ID}, - EXAMTIME = #{EXAMTIME}, - EXAMQUESTIONNUM = #{EXAMQUESTIONNUM}, - EXAMQUESTIONRIGHT = #{EXAMQUESTIONRIGHT}, - EXAMQUESTIONWRONG = #{EXAMQUESTIONWRONG}, - EXAMSCORE = #{EXAMSCORE}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - COURSEEXAM_ID = COURSEEXAM_ID - where - COURSEEXAM_ID = #{COURSEEXAM_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - COURSEEXAM_ID in - - #{item} - - - - - - - diff --git a/src/main/resources/mybatis/datasource/task/CourseExamRecordMapper.xml b/src/main/resources/mybatis/datasource/task/CourseExamRecordMapper.xml deleted file mode 100644 index 4dd8c8a..0000000 --- a/src/main/resources/mybatis/datasource/task/CourseExamRecordMapper.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - BUS_COURSEEXAMRECORD - - - - - SYS_DICTIONARIES - - - - - f.CURRICULUM_ID, - f.COURSEPAPERS_ID, - f.COURSEEXAM_ID, - f.COURSEWARE_ID, - f.COURSEWARETYPE, - f.QUESTION_ID, - f.USER_ID, - f.ANSWER, - f.ANSWERRIGHT, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, - f.CORPINFO_ID, - f.COURSEEXAMRECORD_ID - - - - - CURRICULUM_ID, - COURSEPAPERS_ID, - COURSEEXAM_ID, - COURSEWARE_ID, - COURSEWARETYPE, - QUESTION_ID, - USER_ID, - ANSWER, - ANSWERRIGHT, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, - CORPINFO_ID, - COURSEEXAMRECORD_ID - - - - - #{CURRICULUM_ID}, - #{COURSEPAPERS_ID}, - #{COURSEEXAM_ID}, - #{COURSEWARE_ID}, - #{COURSEWARETYPE}, - #{QUESTION_ID}, - #{USER_ID}, - #{ANSWER}, - #{ANSWERRIGHT}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, - #{CORPINFO_ID}, - #{COURSEEXAMRECORD_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - COURSEEXAMRECORD_ID = #{COURSEEXAMRECORD_ID} - - - - - update - - set - CURRICULUM_ID = #{CURRICULUM_ID}, - COURSEPAPERS_ID = #{COURSEPAPERS_ID}, - COURSEEXAM_ID = #{COURSEEXAM_ID}, - COURSEWARE_ID = #{COURSEWARE_ID}, - COURSEWARETYPE = #{COURSEWARETYPE}, - QUESTION_ID = #{QUESTION_ID}, - USER_ID = #{USER_ID}, - ANSWE = #{ANSWE}, - ANSWERIGHT = #{ANSWERIGHT}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - COURSEEXAMRECORD_ID = COURSEEXAMRECORD_ID - where - COURSEEXAMRECORD_ID = #{COURSEEXAMRECORD_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - COURSEEXAMRECORD_ID in - - #{item} - - - - - - - - - - diff --git a/src/main/resources/mybatis/datasource/task/CourseStudyMapper.xml b/src/main/resources/mybatis/datasource/task/CourseStudyMapper.xml deleted file mode 100644 index 6f38c5f..0000000 --- a/src/main/resources/mybatis/datasource/task/CourseStudyMapper.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - BUS_COURSESTUDY - - - - - SYS_DICTIONARIES - - - - - f.CURRICULUM_ID, - f.USER_ID, - f.STUDYTIME, - f.STUDYQUESTIONNUM, - f.STUDYQUESTIONRIGHT, - f.STUDYQUESTIONWRONG, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, - f.CORPINFO_ID, - f.COURSESTUDY_ID - - - - - CURRICULUM_ID, - USER_ID, - STUDYTIME, - STUDYQUESTIONNUM, - STUDYQUESTIONRIGHT, - STUDYQUESTIONWRONG, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, - CORPINFO_ID, - COURSESTUDY_ID - - - - - #{CURRICULUM_ID}, - #{USER_ID}, - #{STUDYTIME}, - #{STUDYQUESTIONNUM}, - #{STUDYQUESTIONRIGHT}, - #{STUDYQUESTIONWRONG}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, - #{CORPINFO_ID}, - #{COURSESTUDY_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - COURSESTUDY_ID = #{COURSESTUDY_ID} - - - - - update - - set - CURRICULUM_ID = #{CURRICULUM_ID}, - USER_ID = #{USER_ID}, - STUDYTIME = #{STUDYTIME}, - STUDYQUESTIONNUM = #{STUDYQUESTIONNUM}, - STUDYQUESTIONRIGHT = #{STUDYQUESTIONRIGHT}, - STUDYQUESTIONWRONG = #{STUDYQUESTIONWRONG}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - COURSESTUDY_ID = COURSESTUDY_ID - where - COURSESTUDY_ID = #{COURSESTUDY_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - COURSESTUDY_ID in - - #{item} - - - - - - - diff --git a/src/main/resources/mybatis/datasource/task/CourseStudyRecordMapper.xml b/src/main/resources/mybatis/datasource/task/CourseStudyRecordMapper.xml deleted file mode 100644 index abaa1f3..0000000 --- a/src/main/resources/mybatis/datasource/task/CourseStudyRecordMapper.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - BUS_COURSESTUDYRECORD - - - - - SYS_DICTIONARIES - - - - - f.COURSESTUDY_ID, - f.CURRICULUM_ID, - f.COURSEWARE_ID, - f.COURSEWARETYPE, - f.QUESTION_ID, - f.USER_ID, - f.ANSWER, - f.ANSWERRIGHT, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, - f.CORPINFO_ID, - f.COURSESTUDYRECORD_ID - - - - - COURSESTUDY_ID, - CURRICULUM_ID, - COURSEWARE_ID, - COURSEWARETYPE, - QUESTION_ID, - USER_ID, - ANSWER, - ANSWERRIGHT, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, - CORPINFO_ID, - COURSESTUDYRECORD_ID - - - - - #{COURSESTUDY_ID}, - #{CURRICULUM_ID}, - #{COURSEWARE_ID}, - #{COURSEWARETYPE}, - #{QUESTION_ID}, - #{USER_ID}, - #{ANSWER}, - #{ANSWERRIGHT}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, - #{CORPINFO_ID}, - #{COURSESTUDYRECORD_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - COURSESTUDYRECORD_ID = #{COURSESTUDYRECORD_ID} - - - - - update - - set - COURSESTUDY_ID = #{COURSESTUDY_ID}, - CURRICULUM_ID = #{CURRICULUM_ID}, - COURSEWARE_ID = #{COURSEWARE_ID}, - COURSEWARETYPE = #{COURSEWARETYPE}, - QUESTION_ID = #{QUESTION_ID}, - USER_ID = #{USER_ID}, - ANSWER = #{ANSWER}, - ANSWERRIGHT = #{ANSWERRIGHT}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - COURSESTUDYRECORD_ID = COURSESTUDYRECORD_ID - where - COURSESTUDYRECORD_ID = #{COURSESTUDYRECORD_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - COURSESTUDYRECORD_ID in - - #{item} - - - - - - - diff --git a/src/main/resources/mybatis/datasource/task/CourseStudyVideoRecordMapper.xml b/src/main/resources/mybatis/datasource/task/CourseStudyVideoRecordMapper.xml deleted file mode 100644 index 37de5f2..0000000 --- a/src/main/resources/mybatis/datasource/task/CourseStudyVideoRecordMapper.xml +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - BUS_COURSESTUDYVIDEORECORD - - - - - SYS_DICTIONARIES - - - - - f.CURRICULUM_ID, - f.VIDEOCOURSEWARE_ID, - f.USER_ID, - f.RESOURCETIME, - f.PLAYCOUNT, - f.TYPE, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, - f.CORPINFO_ID, - f.STUDYTASK_ID, - f.COURSESTUDYVIDEORECORD_ID - - - - - CURRICULUM_ID, - VIDEOCOURSEWARE_ID, - USER_ID, - RESOURCETIME, - PLAYCOUNT, - TYPE, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, - CORPINFO_ID, - STUDYTASK_ID, - COURSESTUDYVIDEORECORD_ID - - - - - #{CURRICULUM_ID}, - #{VIDEOCOURSEWARE_ID}, - #{USER_ID}, - #{RESOURCETIME}, - #{PLAYCOUNT}, - #{TYPE}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, - #{CORPINFO_ID}, - #{STUDYTASK_ID}, - #{COURSESTUDYVIDEORECORD_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - COURSESTUDYVIDEORECORD_ID = #{COURSESTUDYVIDEORECORD_ID} - - - - - update - - set - CURRICULUM_ID = #{CURRICULUM_ID}, - VIDEOCOURSEWARE_ID = #{VIDEOCOURSEWARE_ID}, - USER_ID = #{USER_ID}, - RESOURCETIME = #{RESOURCETIME}, - PLAYCOUNT = #{PLAYCOUNT}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - COURSESTUDYVIDEORECORD_ID = COURSESTUDYVIDEORECORD_ID - where - COURSESTUDYVIDEORECORD_ID = #{COURSESTUDYVIDEORECORD_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - COURSESTUDYVIDEORECORD_ID in - - #{item} - - - - - - - - - - - update - - set - RESOURCETIME = #{RESOURCETIME}, - PLAYCOUNT = #{PLAYCOUNT}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - WHERE - COURSESTUDYVIDEORECORD_ID = #{COURSESTUDYVIDEORECORD_ID} - - diff --git a/src/main/resources/mybatis/datasource/task/StageExamMapper.xml b/src/main/resources/mybatis/datasource/task/StageExamMapper.xml deleted file mode 100644 index 971dbd2..0000000 --- a/src/main/resources/mybatis/datasource/task/StageExamMapper.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - BUS_STAGEEXAM - - - - - SYS_DICTIONARIES - - - - - f.CURRICULUM_ID, - f.STAGEEXAMPAPER_ID, - f.USER_ID, - f.EXAMTIMEBEGIN, - f.EXAMTIMEEND, - f.EXAMQUESTIONNUM, - f.EXAMQUESTIONRIGHT, - f.EXAMQUESTIONWRONG, - f.EXAMSCORE, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, - f.CORPINFO_ID, - f.STUDYTASK_ID, - f.STAGEEXAM_ID - - - - - CURRICULUM_ID, - STAGEEXAMPAPER_ID, - USER_ID, - EXAMTIMEBEGIN, - EXAMTIMEEND, - EXAMQUESTIONNUM, - EXAMQUESTIONRIGHT, - EXAMQUESTIONWRONG, - EXAMSCORE, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, - CORPINFO_ID, - STUDYTASK_ID, - STAGEEXAM_ID - - - - - #{CURRICULUM_ID}, - #{STAGEEXAMPAPER_ID}, - #{USER_ID}, - #{EXAMTIMEBEGIN}, - #{EXAMTIMEEND}, - #{EXAMQUESTIONNUM}, - #{EXAMQUESTIONRIGHT}, - #{EXAMQUESTIONWRONG}, - #{EXAMSCORE}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, - #{CORPINFO_ID}, - #{STUDYTASK_ID}, - #{STAGEEXAM_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - STAGEEXAM_ID = #{STAGEEXAM_ID} - - - - - update - - set - CURRICULUM_ID = #{CURRICULUM_ID}, - STAGEEXAMPAPER_ID = #{STAGEEXAMPAPER_ID}, - USER_ID = #{USER_ID}, - EXAMTIMEBEGIN = #{EXAMTIMEBEGIN}, - EXAMTIMEEND = #{EXAMTIMEEND}, - EXAMQUESTIONNUM = #{EXAMQUESTIONNUM}, - EXAMQUESTIONRIGHT = #{EXAMQUESTIONRIGHT}, - EXAMQUESTIONWRONG = #{EXAMQUESTIONWRONG}, - EXAMSCORE = #{EXAMSCORE}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - STAGEEXAM_ID = STAGEEXAM_ID - where - STAGEEXAM_ID = #{STAGEEXAM_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - STAGEEXAM_ID in - - #{item} - - - - - - - - - - - - diff --git a/src/main/resources/mybatis/datasource/task/StageExamRecordMapper.xml b/src/main/resources/mybatis/datasource/task/StageExamRecordMapper.xml deleted file mode 100644 index d701ae7..0000000 --- a/src/main/resources/mybatis/datasource/task/StageExamRecordMapper.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - BUS_STAGEEXAMRECORD - - - - - SYS_DICTIONARIES - - - - - f.STAGEEXAMPAPER_ID, - f.CURRICULUM_ID, - f.COURSEWARE_ID, - f.COURSEWARETYPE, - f.QUESTION_ID, - f.ANSWER, - f.USER_ID, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, - f.CORPINFO_ID, - f.STAGEEXAM_ID, - f.ANSWERRIGHT, - f.STUDYTASK_ID, - f.STAGEEXAMRECORD_ID - - - - - STAGEEXAMPAPER_ID, - CURRICULUM_ID, - COURSEWARE_ID, - COURSEWARETYPE, - QUESTION_ID, - ANSWER, - USER_ID, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, - CORPINFO_ID, - STAGEEXAM_ID, - ANSWERRIGHT, - STUDYTASK_ID, - STAGEEXAMRECORD_ID - - - - - #{STAGEEXAMPAPER_ID}, - #{CURRICULUM_ID}, - #{COURSEWARE_ID}, - #{COURSEWARETYPE}, - #{QUESTION_ID}, - #{ANSWER}, - #{USER_ID}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, - #{CORPINFO_ID}, - #{STAGEEXAM_ID}, - #{ANSWERRIGHT}, - #{STUDYTASK_ID}, - #{STAGEEXAMRECORD_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - STAGEEXAMRECORD_ID = #{STAGEEXAMRECORD_ID} - - - - - update - - set - STAGEEXAMPAPER_ID = #{STAGEEXAMPAPER_ID}, - CURRICULUM_ID = #{CURRICULUM_ID}, - COURSEWARE_ID = #{COURSEWARE_ID}, - COURSEWARETYPE = #{COURSEWARETYPE}, - QUESTION_ID = #{QUESTION_ID}, - ANSWER = #{ANSWER}, - USER_ID = #{USER_ID}, - STAGEEXAM_ID = #{STAGEEXAM_ID}, - ANSWERRIGHT = #{ANSWERRIGHT}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - STAGEEXAMRECORD_ID = STAGEEXAMRECORD_ID - where - STAGEEXAMRECORD_ID = #{STAGEEXAMRECORD_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - STAGEEXAMRECORD_ID in - - #{item} - - - - - - - - - - diff --git a/src/main/resources/mybatis/datasource/task/StageStudentRelationMapper.xml b/src/main/resources/mybatis/datasource/task/StageStudentRelationMapper.xml deleted file mode 100644 index 810e8bf..0000000 --- a/src/main/resources/mybatis/datasource/task/StageStudentRelationMapper.xml +++ /dev/null @@ -1,487 +0,0 @@ - - - - - - - BUS_STAGESTUDENTRELATION - - - - - SYS_DICTIONARIES - - - - - f.STAGEEXAMPAPER_ID, - f.USER_ID, - f.STAGEEXAMSTATE, - f.STAGEEXAMSCORE, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, - f.CORPINFO_ID, - f.STUDYTASK_ID, - f.COMPLETE_COURSEWARE, - f.COMPLETE_CLASSHOUR, - f.STAGESTUDENTRELATION_ID - - - - - STAGEEXAMPAPER_ID, - USER_ID, - STAGEEXAMSTATE, - STAGEEXAMSCORE, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, - CORPINFO_ID, - STUDYTASK_ID, - COMPLETE_COURSEWARE, - COMPLETE_CLASSHOUR, - STAGESTUDENTRELATION_ID - - - - - #{STAGEEXAMPAPER_ID}, - #{USER_ID}, - #{STAGEEXAMSTATE}, - #{STAGEEXAMSCORE}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, - #{CORPINFO_ID}, - #{STUDYTASK_ID}, - #{COMPLETE_COURSEWARE}, - #{COMPLETE_CLASSHOUR}, - #{STAGESTUDENTRELATION_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - STAGESTUDENTRELATION_ID = #{STAGESTUDENTRELATION_ID} - - - - - update - - set - STAGEEXAMPAPER_ID = #{STAGEEXAMPAPER_ID}, - USER_ID = #{USER_ID}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - STAGESTUDENTRELATION_ID = STAGESTUDENTRELATION_ID - where - STAGESTUDENTRELATION_ID = #{STAGESTUDENTRELATION_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - STAGESTUDENTRELATION_ID in - - #{item} - - - - - - - - - - - - update - - set - ISDELETE = '1', - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where ISDELETE = '0' - AND STAGEEXAMPAPER_ID = #{STAGEEXAMPAPER_ID} - - - - - - - - update - - set - - USER_SIGN_PATH = #{USER_SIGN_PATH}, - - STAGEEXAMSTATE = #{STAGEEXAMSTATE}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - STAGESTUDENTRELATION_ID = #{STAGESTUDENTRELATION_ID} - - - - - update - - set - - STAGEEXAMSCORE = #{STAGEEXAMSCORE}, - - - STAGEEXAMSTATE = #{STAGEEXAMSTATE}, - - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - STAGESTUDENTRELATION_ID = #{STAGESTUDENTRELATION_ID} - - - - - update - f - LEFT JOIN BUS_STAGEEXAMPAPER p ON p.STAGEEXAMPAPER_ID = f.STAGEEXAMPAPER_ID AND p.ISDELETE = '0' - set - f.STAGEEXAMSTATE = '4', - f.OPERATTIME = #{OPERATTIME} - where f.STAGEEXAMSTATE = '1' - AND SUBSTR(DATE_ADD(CONCAT_WS(':', p.EXAMTIME, '00'), INTERVAL p.ANSWERSHEETTIME MINUTE),1,10) = #{ENDTIME} - - - - - - - - - - - - - - - - - update - - set - COMPLETE_COURSEWARE = #{COMPLETE_COURSEWARE}, - COMPLETE_CLASSHOUR = #{COMPLETE_CLASSHOUR} - where - USER_ID = #{USER_ID} - and STUDYTASK_ID =#{STUDYTASK_ID} - - - diff --git a/src/main/resources/mybatis/datasource/task/StudyTaskMapper.xml b/src/main/resources/mybatis/datasource/task/StudyTaskMapper.xml deleted file mode 100644 index a3d36eb..0000000 --- a/src/main/resources/mybatis/datasource/task/StudyTaskMapper.xml +++ /dev/null @@ -1,515 +0,0 @@ - - - - - - - BUS_STUDYTASK - - - - - SYS_DICTIONARIES - - - - - f.STUDY_NAME, - f.TRAINTYPE, - f.POSTTYPE, - f.PEIXUE_START_TIME, - f.PEIXUE_END_TIME, - f.KJ_STATE, - f.GJ_STATE, - f.STAGEEXAMPAPER_ID, - f.STUDY_USER_ID, - f.STUDY_CURRICULUM_ID, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, - f.CORPINFO_ID, - f.STATE, - f.COURSEWARE_COUNT, - f.SUM_CLASSHOUR, - f.STUDYTASK_ID - - - - - STUDY_NAME, - TRAINTYPE, - POSTTYPE, - PEIXUE_START_TIME, - PEIXUE_END_TIME, - KJ_STATE, - GJ_STATE, - STAGEEXAMPAPER_ID, - STUDY_USER_ID, - STUDY_CURRICULUM_ID, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, - CORPINFO_ID, - STATE, - COURSEWARE_COUNT, - SUM_CLASSHOUR, - STUDYTASK_ID - - - - - #{STUDY_NAME}, - #{TRAINTYPE}, - #{POSTTYPE}, - #{PEIXUE_START_TIME}, - #{PEIXUE_END_TIME}, - #{KJ_STATE}, - #{GJ_STATE}, - #{STAGEEXAMPAPER_ID}, - #{STUDY_USER_ID}, - #{STUDY_CURRICULUM_ID}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, - #{CORPINFO_ID}, - #{STATE}, - #{COURSEWARE_COUNT}, - #{SUM_CLASSHOUR}, - #{STUDYTASK_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - delete from - - where - STUDYTASK_ID = #{STUDYTASK_ID} - - - - - update - - set - STUDY_NAME = #{STUDY_NAME}, - TRAINTYPE = #{TRAINTYPE}, - POSTTYPE = #{POSTTYPE}, - PEIXUE_START_TIME = #{PEIXUE_START_TIME}, - PEIXUE_END_TIME = #{PEIXUE_END_TIME}, - KJ_STATE = #{KJ_STATE}, - GJ_STATE = #{GJ_STATE}, - STAGEEXAMPAPER_ID = #{STAGEEXAMPAPER_ID}, - STUDY_USER_ID = #{STUDY_USER_ID}, - STUDY_CURRICULUM_ID = #{STUDY_CURRICULUM_ID}, - CREATOR = #{CREATOR}, - CREATTIME = #{CREATTIME}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - ISDELETE = #{ISDELETE}, - CORPINFO_ID = #{CORPINFO_ID}, - STUDYTASK_ID = STUDYTASK_ID - where - STUDYTASK_ID = #{STUDYTASK_ID} - - - - - - - - - - - - - - delete from - - where - STUDYTASK_ID in - - #{item} - - - - - - - - - - - - - - update - - set - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - STATE = #{STATE} - where - STUDYTASK_ID = #{STUDYTASK_ID} - - - - - - - - - - - - update - - set - PEIXUE_END_TIME = #{PEIXUE_END_TIME}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME} - where - STUDYTASK_ID = #{STUDYTASK_ID} - - - - - - - - - - - - diff --git a/src/main/resources/mybatis/datasource/task/StudytaskCurriculumMapper.xml b/src/main/resources/mybatis/datasource/task/StudytaskCurriculumMapper.xml deleted file mode 100644 index 61bc694..0000000 --- a/src/main/resources/mybatis/datasource/task/StudytaskCurriculumMapper.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - BUS_STUDYTASKCURRICULUM - - - - - SYS_DICTIONARIES - - - - - f.STUDYTASK_ID, - f.CURRICULUM_ID, - f.STUDYTASKCURRICULUM_ID - - - - - STUDYTASK_ID, - CURRICULUM_ID, - STUDYTASKCURRICULUM_ID - - - - - #{STUDYTASK_ID}, - #{CURRICULUM_ID}, - #{STUDYTASKCURRICULUM_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1' - where - STUDYTASKCURRICULUM_ID = #{STUDYTASKCURRICULUM_ID} - - - - - update - - set - STUDYTASK_ID = #{STUDYTASK_ID}, - CURRICULUM_ID = #{CURRICULUM_ID}, - STUDYTASKCURRICULUM_ID = STUDYTASKCURRICULUM_ID - where - STUDYTASKCURRICULUM_ID = #{STUDYTASKCURRICULUM_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1' - where - STUDYTASKCURRICULUM_ID in - - #{item} - - - - - diff --git a/src/main/resources/mybatis/datasource/task/StudytaskSignMapper.xml b/src/main/resources/mybatis/datasource/task/StudytaskSignMapper.xml deleted file mode 100644 index b9028da..0000000 --- a/src/main/resources/mybatis/datasource/task/StudytaskSignMapper.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - BUS_STUDYTASKSIGN - - - - - SYS_DICTIONARIES - - - - - f.USER_ID, - f.STUDYTASK_ID, - f.TYPE, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.CORPINFO_ID, - f.STUDYTASKSIGN_ID - - - - - USER_ID, - STUDYTASK_ID, - TYPE, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - CORPINFO_ID, - STUDYTASKSIGN_ID - - - - - #{USER_ID}, - #{STUDYTASK_ID}, - #{TYPE}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{CORPINFO_ID}, - #{STUDYTASKSIGN_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1' - where - STUDYTASKSIGN_ID = #{STUDYTASKSIGN_ID} - - - - - update - - set - USER_ID = #{USER_ID}, - STUDYTASK_ID = #{STUDYTASK_ID}, - TYPE = #{TYPE}, - CREATOR = #{CREATOR}, - CREATTIME = #{CREATTIME}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - STUDYTASKSIGN_ID = STUDYTASKSIGN_ID - where - STUDYTASKSIGN_ID = #{STUDYTASKSIGN_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1' - where - STUDYTASKSIGN_ID in - - #{item} - - - - - diff --git a/src/main/resources/mybatis/dsno3/eduStudy/PaperQuestionCacheMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/PaperQuestionCacheMapper.xml index 64c7a9a..29e0339 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/PaperQuestionCacheMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/PaperQuestionCacheMapper.xml @@ -195,6 +195,12 @@ WHERE f.ISDELETE = '0' and f.STAGEEXAMPAPERINPUT_ID = #{STAGEEXAMPAPERINPUT_ID} + + and f.QUESTIONDRY LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') + + + and f.QUESTIONTYPE = #{QUESTIONTYPE} + order by f.QUESTIONNUMBER diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml index f0bedd3..ae3c4f7 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml @@ -541,8 +541,7 @@ f.COMPLETE_CLASSHOUR, s.STUDENT_ID, s.POST_ID, - en.NAME ENTERPRISE_NAME, - ci.NAME as CORPINFO_NAME, + ci.CORP_NAME, od.NAME as DEPATEMENT_NAME, sp.NAME as POST_NAME, t.ISSTRENGTHEN, @@ -554,7 +553,6 @@ f INNER JOIN BUS_CLASS t ON t.CLASS_ID = f.CLASS_ID AND t.ISDELETE = '0' LEFT JOIN BUS_STUDENT s on s.CLASS_ID = f.CLASS_ID and s.USER_ID = f.USER_ID and s.ISDELETE = '0' - LEFT JOIN BUS_ENTERPRISE en ON en.ENTERPRISE_ID = s.ENTERPRISE_ID and en.ISDELETE = '0' LEFT JOIN bus_corp_info ci on ci.CORPINFO_ID = s.CORPINFO_ID and ci.ISDELETE = '0' LEFT JOIN oa_department od on od.DEPARTMENT_ID = s.DEPARTMENT_ID and od.ISDELETE = '0' LEFT JOIN sys_post sp on sp.POST_ID = s.POST_ID and sp.ISDELETE = '0' diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml index 6c05e48..5f636b4 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml @@ -1008,6 +1008,7 @@ ct.NAME CERTIFICATETYPE_NAME, doe.NAME DEGREE_OF_EDUCATION_NAME, ui.AUTHENTICATION, + ui.PORTRAIT, ( select sum(c.CLASSHOUR) @@ -1054,42 +1055,39 @@ AND ccc.isdelete = '0' where f.ISDELETE = '0' - - and c.STATE != '1' + + and f.NAME LIKE CONCAT(CONCAT('%', #{NAME}),'%') - - and f.NAME LIKE CONCAT(CONCAT('%', #{pd.NAME}),'%') + + and f.DEGREE_OF_EDUCATION = #{DEGREE_OF_EDUCATION} - - and f.DEGREE_OF_EDUCATION = #{pd.DEGREE_OF_EDUCATION} + + and f.PERSONNEL_TYPE = #{PERSONNEL_TYPE} - - and f.PERSONNEL_TYPE = #{pd.PERSONNEL_TYPE} + + and f.NAME LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') - - and f.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') + + and f.CORPINFO_ID = #{CORPINFO_ID} - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + and f.DEPARTMENT_ID = #{DEPARTMENT_ID} - - and f.DEPARTMENT_ID = #{pd.DEPARTMENT_ID} + + and f.POST_ID = #{POST_ID} - - and f.POST_ID = #{pd.POST_ID} + + and f.CREATTIME >= CONCAT(#{START_TIME}, ' 00:00:00') + and f.CREATTIME <= CONCAT(#{END_TIME}, ' 23:59:59') - - and f.CREATTIME >= CONCAT(#{pd.START_TIME}, ' 00:00:00') - and f.CREATTIME <= CONCAT(#{pd.END_TIME}, ' 23:59:59') + + and ssr.STUDYSTATE = #{STUDYSTATE} - - and ssr.STUDYSTATE = #{pd.STUDYSTATE} + + and ssr.STAGEEXAMSTATE = #{STAGEEXAMSTATE} - - and ssr.STAGEEXAMSTATE = #{pd.STAGEEXAMSTATE} - - - and f.CLASS_ID = #{pd.CLASS_ID} + + and f.CLASS_ID = #{CLASS_ID} group by f.STUDENT_ID order by f.OPERATTIME desc