diff --git a/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java b/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java new file mode 100644 index 0000000..44975e6 --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java @@ -0,0 +1,111 @@ +package cn.com.tenlion.controller.api.apply; + +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.pojo.vos.apply.ApplyVO; +import cn.com.tenlion.service.apply.IApplyService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: ApplyController + * @Description: 报名信息 + * @Author: CodeFactory + * @Date: 2021-05-01 18:49:41 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "报名信息接口") +@RestController +@RequestMapping(ISystemConstant.API_PREFIX + "/apply") +public class ApplyController extends DefaultBaseController { + + @Autowired + private IApplyService applyService; + + @ApiOperation(value = "新增报名信息", notes = "新增报名信息接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestBody ApplyVO applyVO) { + applyService.save(applyVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除报名信息", notes = "删除报名信息接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove/{ids}") + public SuccessResult remove(@PathVariable("ids") String ids) { + applyService.remove(Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改报名信息", notes = "修改报名信息接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "applyId", value = "报名信息ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update/{applyId}") + @CheckRequestBodyAnnotation + public SuccessResult update(@PathVariable("applyId") String applyId, @RequestBody ApplyVO applyVO) { + applyService.update(applyId, applyVO); + return new SuccessResult(); + } + + @ApiOperation(value = "报名信息详情", notes = "报名信息详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "applyId", value = "报名信息ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{applyId}") + public ApplyDTO get(@PathVariable("applyId") String applyId) { + return applyService.get(applyId); + } + + @ApiOperation(value = "报名信息列表", notes = "报名信息列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list() { + Map params = requestParams(); + return applyService.list(params); + } + + @ApiOperation(value = "报名信息分页列表", notes = "报名信息分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage") + public SuccessResultList> listPage(ListPage page) { + Map params = requestParams(); + page.setParams(params); + return applyService.listPage(page); + } + + @ApiOperation(value = "报名信息统计", notes = "报名信息统计接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count") + SuccessResultData count() { + Map params = requestParams(); + return new SuccessResultData<>(applyService.count(params)); + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/controller/api/applyauditlog/ApplyAuditLogController.java b/src/main/java/cn/com/tenlion/controller/api/applyauditlog/ApplyAuditLogController.java new file mode 100644 index 0000000..4869054 --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/api/applyauditlog/ApplyAuditLogController.java @@ -0,0 +1,111 @@ +package cn.com.tenlion.controller.api.applyauditlog; + +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.applyauditlog.ApplyAuditLogDTO; +import cn.com.tenlion.pojo.vos.applyauditlog.ApplyAuditLogVO; +import cn.com.tenlion.service.applyauditlog.IApplyAuditLogService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: ApplyAuditLogController + * @Description: 报名信息审核日志 + * @Author: CodeFactory + * @Date: 2021-05-01 18:51:28 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "报名信息审核日志接口") +@RestController +@RequestMapping(ISystemConstant.API_PREFIX + "/applyauditlog") +public class ApplyAuditLogController extends DefaultBaseController { + + @Autowired + private IApplyAuditLogService applyAuditLogService; + + @ApiOperation(value = "新增报名信息审核日志", notes = "新增报名信息审核日志接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestBody ApplyAuditLogVO applyAuditLogVO) { + applyAuditLogService.save(applyAuditLogVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除报名信息审核日志", notes = "删除报名信息审核日志接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove/{ids}") + public SuccessResult remove(@PathVariable("ids") String ids) { + applyAuditLogService.remove(Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改报名信息审核日志", notes = "修改报名信息审核日志接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "applyAuditLogId", value = "报名信息审核日志ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update/{applyAuditLogId}") + @CheckRequestBodyAnnotation + public SuccessResult update(@PathVariable("applyAuditLogId") String applyAuditLogId, @RequestBody ApplyAuditLogVO applyAuditLogVO) { + applyAuditLogService.update(applyAuditLogId, applyAuditLogVO); + return new SuccessResult(); + } + + @ApiOperation(value = "报名信息审核日志详情", notes = "报名信息审核日志详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "applyAuditLogId", value = "报名信息审核日志ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{applyAuditLogId}") + public ApplyAuditLogDTO get(@PathVariable("applyAuditLogId") String applyAuditLogId) { + return applyAuditLogService.get(applyAuditLogId); + } + + @ApiOperation(value = "报名信息审核日志列表", notes = "报名信息审核日志列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list() { + Map params = requestParams(); + return applyAuditLogService.list(params); + } + + @ApiOperation(value = "报名信息审核日志分页列表", notes = "报名信息审核日志分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage") + public SuccessResultList> listPage(ListPage page) { + Map params = requestParams(); + page.setParams(params); + return applyAuditLogService.listPage(page); + } + + @ApiOperation(value = "报名信息审核日志统计", notes = "报名信息审核日志统计接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count") + SuccessResultData count() { + Map params = requestParams(); + return new SuccessResultData<>(applyAuditLogService.count(params)); + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/controller/api/worktype/WorkTypeController.java b/src/main/java/cn/com/tenlion/controller/api/worktype/WorkTypeController.java index fd90fe5..dc3dcfb 100644 --- a/src/main/java/cn/com/tenlion/controller/api/worktype/WorkTypeController.java +++ b/src/main/java/cn/com/tenlion/controller/api/worktype/WorkTypeController.java @@ -13,6 +13,7 @@ import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; import cn.com.tenlion.pojo.vos.worktype.WorkTypeVO; import cn.com.tenlion.service.worktype.IWorkTypeService; import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -36,24 +37,20 @@ public class WorkTypeController extends DefaultBaseController { private IWorkTypeService workTypeService; - - - - @ApiOperation(value = "工种类型树形列表", notes = "工种类型树形列表") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listztree") public List listZTree() { Map params = requestParams(); + String workTypeParentId = "0"; + if (!StringUtils.isBlank(params.get("id") == null ? null : params.get("id").toString())) { + workTypeParentId = params.get("id").toString(); + } + params.put("workTypeParentId",workTypeParentId); return workTypeService.listZTree(params); } - - - - - @ApiOperation(value = "新增工种类型", notes = "新增工种类型接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @PostMapping("save") @@ -92,8 +89,15 @@ public class WorkTypeController extends DefaultBaseController { }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("get/{workTypeId}") - public WorkTypeDTO get(@PathVariable("workTypeId") String workTypeId) { - return workTypeService.get(workTypeId); + public WorkTypeDTO get(@PathVariable("workTypeId") String workTypeId) { + WorkTypeDTO workTypeDTO = new WorkTypeDTO(); + if ("0".equals(workTypeId)){ + workTypeDTO.setWorkTypeName("根节点"); + workTypeDTO.setWorkTypeId("0"); + return workTypeDTO; + } + workTypeDTO = workTypeService.get(workTypeId); + return workTypeDTO; } @ApiOperation(value = "工种类型列表", notes = "工种类型列表接口") diff --git a/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java new file mode 100644 index 0000000..ed9cecb --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java @@ -0,0 +1,121 @@ +package cn.com.tenlion.controller.app.api.apply; + +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.pojo.vos.apply.ApplyVO; +import cn.com.tenlion.service.apply.IApplyService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: ApplyAppController + * @Description: 报名信息 + * @Author: CodeFactory + * @Date: 2021-05-01 18:49:41 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "报名信息接口") +@RestController +@RequestMapping(ISystemConstant.APP_PREFIX + "/apply") +public class ApplyAppController extends DefaultBaseController { + + @Autowired + private IApplyService applyService; + + @ApiOperation(value = "新增报名信息", notes = "新增报名信息接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestHeader("token") String token, @RequestBody ApplyVO applyVO) { + applyService.save(token, applyVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除报名信息(id列表)", notes = "删除报名信息(id列表)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove/{ids}") + public SuccessResult remove(@RequestHeader("token") String token, @PathVariable("ids") String ids) { + applyService.remove(token, Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改报名信息", notes = "修改报名信息接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "applyId", value = "报名信息ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("updateapply/{applyId}") + @CheckRequestBodyAnnotation + public SuccessResult updateApply(@RequestHeader("token") String token, @PathVariable("applyId") String applyId, @RequestBody ApplyVO applyVO) { + applyService.update(token, applyId, applyVO); + return new SuccessResult(); + } + + @ApiOperation(value = "报名信息详情(通过ID)", notes = "报名信息详情(通过ID)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "applyId", value = "报名信息ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{applyId}") + public ApplyDTO get(@RequestHeader("token") String token, @PathVariable("applyId") String applyId) { + return applyService.get(applyId); + } + + @ApiOperation(value = "报名信息列表", notes = "报名信息列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list(@RequestHeader("token") String token) { + Map params = requestParams(); + return applyService.list(params); + } + + @ApiOperation(value = "报名信息分页列表", notes = "报名信息分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpageapply") + public SuccessResultList> listPage(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return applyService.listPage(page); + } + + @ApiOperation(value = "报名信息统计", notes = "报名信息统计接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count") + SuccessResultData count() { + Map params = requestParams(); + return new SuccessResultData<>(applyService.count(params)); + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java new file mode 100644 index 0000000..266df21 --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java @@ -0,0 +1,121 @@ +package cn.com.tenlion.controller.app.api.applyauditlog; + +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.applyauditlog.ApplyAuditLogDTO; +import cn.com.tenlion.pojo.vos.applyauditlog.ApplyAuditLogVO; +import cn.com.tenlion.service.applyauditlog.IApplyAuditLogService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: ApplyAuditLogAppController + * @Description: 报名信息审核日志 + * @Author: CodeFactory + * @Date: 2021-05-01 18:51:28 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "报名信息审核日志接口") +@RestController +@RequestMapping(ISystemConstant.APP_PREFIX + "/applyauditlog") +public class ApplyAuditLogAppController extends DefaultBaseController { + + @Autowired + private IApplyAuditLogService applyAuditLogService; + + @ApiOperation(value = "新增报名信息审核日志", notes = "新增报名信息审核日志接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestHeader("token") String token, @RequestBody ApplyAuditLogVO applyAuditLogVO) { + applyAuditLogService.save(token, applyAuditLogVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除报名信息审核日志(id列表)", notes = "删除报名信息审核日志(id列表)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove/{ids}") + public SuccessResult remove(@RequestHeader("token") String token, @PathVariable("ids") String ids) { + applyAuditLogService.remove(token, Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改报名信息审核日志", notes = "修改报名信息审核日志接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "applyAuditLogId", value = "报名信息审核日志ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("updateapplyauditlog/{applyAuditLogId}") + @CheckRequestBodyAnnotation + public SuccessResult updateApplyAuditLog(@RequestHeader("token") String token, @PathVariable("applyAuditLogId") String applyAuditLogId, @RequestBody ApplyAuditLogVO applyAuditLogVO) { + applyAuditLogService.update(token, applyAuditLogId, applyAuditLogVO); + return new SuccessResult(); + } + + @ApiOperation(value = "报名信息审核日志详情(通过ID)", notes = "报名信息审核日志详情(通过ID)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "applyAuditLogId", value = "报名信息审核日志ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{applyAuditLogId}") + public ApplyAuditLogDTO get(@RequestHeader("token") String token, @PathVariable("applyAuditLogId") String applyAuditLogId) { + return applyAuditLogService.get(applyAuditLogId); + } + + @ApiOperation(value = "报名信息审核日志列表", notes = "报名信息审核日志列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list(@RequestHeader("token") String token) { + Map params = requestParams(); + return applyAuditLogService.list(params); + } + + @ApiOperation(value = "报名信息审核日志分页列表", notes = "报名信息审核日志分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpageapplyauditlog") + public SuccessResultList> listPage(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return applyAuditLogService.listPage(page); + } + + @ApiOperation(value = "报名信息审核日志统计", notes = "报名信息审核日志统计接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count") + SuccessResultData count() { + Map params = requestParams(); + return new SuccessResultData<>(applyAuditLogService.count(params)); + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/dao/apply/IApplyDao.java b/src/main/java/cn/com/tenlion/dao/apply/IApplyDao.java new file mode 100644 index 0000000..cd13c1d --- /dev/null +++ b/src/main/java/cn/com/tenlion/dao/apply/IApplyDao.java @@ -0,0 +1,120 @@ +package cn.com.tenlion.dao.apply; + +import ink.wgink.exceptions.RemoveException; +import ink.wgink.exceptions.SaveException; +import ink.wgink.exceptions.SearchException; +import ink.wgink.exceptions.UpdateException; +import cn.com.tenlion.pojo.bos.apply.ApplyBO; +import cn.com.tenlion.pojo.pos.apply.ApplyPO; +import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IApplyDao + * @Description: 报名信息 + * @Author: CodeFactory + * @Date: 2021-05-01 18:49:41 + * @Version: 3.0 + **/ +@Repository +public interface IApplyDao { + + /** + * 新增报名信息 + * + * @param params + * @throws SaveException + */ + void save(Map params) throws SaveException; + + /** + * 删除报名信息 + * + * @param params + * @throws RemoveException + */ + void remove(Map params) throws RemoveException; + + /** + * 删除报名信息（物理） + * + * @param params + * @throws RemoveException + */ + void delete(Map params) throws RemoveException; + + /** + * 修改报名信息 + * + * @param params + * @throws UpdateException + */ + void update(Map params) throws UpdateException; + + /** + * 报名信息详情 + * + * @param params + * @return + * @throws SearchException + */ + ApplyDTO get(Map params) throws SearchException; + + /** + * 报名信息详情 + * + * @param params + * @return + * @throws SearchException + */ + ApplyBO getBO(Map params) throws SearchException; + + /** + * 报名信息详情 + * + * @param params + * @return + * @throws SearchException + */ + ApplyPO getPO(Map params) throws SearchException; + + /** + * 报名信息列表 + * + * @param params + * @return + * @throws SearchException + */ + List list(Map params) throws SearchException; + + /** + * 报名信息列表 + * + * @param params + * @return + * @throws SearchException + */ + List listBO(Map params) throws SearchException; + + /** + * 报名信息列表 + * + * @param params + * @return + * @throws SearchException + */ + List listPO(Map params) throws SearchException; + + /** + * 报名信息统计 + * + * @param params + * @return + * @throws SearchException + */ + Integer count(Map params) throws SearchException; + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/dao/applyauditlog/IApplyAuditLogDao.java b/src/main/java/cn/com/tenlion/dao/applyauditlog/IApplyAuditLogDao.java new file mode 100644 index 0000000..921c70c --- /dev/null +++ b/src/main/java/cn/com/tenlion/dao/applyauditlog/IApplyAuditLogDao.java @@ -0,0 +1,120 @@ +package cn.com.tenlion.dao.applyauditlog; + +import ink.wgink.exceptions.RemoveException; +import ink.wgink.exceptions.SaveException; +import ink.wgink.exceptions.SearchException; +import ink.wgink.exceptions.UpdateException; +import cn.com.tenlion.pojo.bos.applyauditlog.ApplyAuditLogBO; +import cn.com.tenlion.pojo.pos.applyauditlog.ApplyAuditLogPO; +import cn.com.tenlion.pojo.dtos.applyauditlog.ApplyAuditLogDTO; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IApplyAuditLogDao + * @Description: 报名信息审核日志 + * @Author: CodeFactory + * @Date: 2021-05-01 18:51:28 + * @Version: 3.0 + **/ +@Repository +public interface IApplyAuditLogDao { + + /** + * 新增报名信息审核日志 + * + * @param params + * @throws SaveException + */ + void save(Map params) throws SaveException; + + /** + * 删除报名信息审核日志 + * + * @param params + * @throws RemoveException + */ + void remove(Map params) throws RemoveException; + + /** + * 删除报名信息审核日志（物理） + * + * @param params + * @throws RemoveException + */ + void delete(Map params) throws RemoveException; + + /** + * 修改报名信息审核日志 + * + * @param params + * @throws UpdateException + */ + void update(Map params) throws UpdateException; + + /** + * 报名信息审核日志详情 + * + * @param params + * @return + * @throws SearchException + */ + ApplyAuditLogDTO get(Map params) throws SearchException; + + /** + * 报名信息审核日志详情 + * + * @param params + * @return + * @throws SearchException + */ + ApplyAuditLogBO getBO(Map params) throws SearchException; + + /** + * 报名信息审核日志详情 + * + * @param params + * @return + * @throws SearchException + */ + ApplyAuditLogPO getPO(Map params) throws SearchException; + + /** + * 报名信息审核日志列表 + * + * @param params + * @return + * @throws SearchException + */ + List list(Map params) throws SearchException; + + /** + * 报名信息审核日志列表 + * + * @param params + * @return + * @throws SearchException + */ + List listBO(Map params) throws SearchException; + + /** + * 报名信息审核日志列表 + * + * @param params + * @return + * @throws SearchException + */ + List listPO(Map params) throws SearchException; + + /** + * 报名信息审核日志统计 + * + * @param params + * @return + * @throws SearchException + */ + Integer count(Map params) throws SearchException; + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/pojo/bos/apply/ApplyBO.java b/src/main/java/cn/com/tenlion/pojo/bos/apply/ApplyBO.java new file mode 100644 index 0000000..4f640e7 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/bos/apply/ApplyBO.java @@ -0,0 +1,213 @@ +package cn.com.tenlion.pojo.bos.apply; + +/** + * + * @ClassName: ApplyBO + * @Description: 报名信息 + * @Author: CodeFactory + * @Date: 2021-05-01 18:49:41 + * @Version: 3.0 + **/ +public class ApplyBO { + + private String applyId; + private String applyClassId; + private String applyName; + private String applySex; + private String applyDataBirth; + private String applyCardType; + private String applyCardNumber; + private Integer applyPhone; + private String applyAddress; + private String applyCultureLevel; + private String applyPostcode; + private String applyPhysicalState; + private String applyUnitName; + private Integer applyUnitPhone; + private String applyUnitAddress; + private String applyUserCardPhoto; + private Integer applyAuditState; + private String creator; + private String gmtCreate; + private String modifier; + private String gmtModified; + private Integer isDelete; + + public String getApplyId() { + return applyId == null ? "" : applyId.trim(); + } + + public void setApplyId(String applyId) { + this.applyId = applyId; + } + + public String getApplyClassId() { + return applyClassId == null ? "" : applyClassId.trim(); + } + + public void setApplyClassId(String applyClassId) { + this.applyClassId = applyClassId; + } + + public String getApplyName() { + return applyName == null ? "" : applyName.trim(); + } + + public void setApplyName(String applyName) { + this.applyName = applyName; + } + + public String getApplySex() { + return applySex == null ? "" : applySex.trim(); + } + + public void setApplySex(String applySex) { + this.applySex = applySex; + } + + public String getApplyDataBirth() { + return applyDataBirth == null ? "" : applyDataBirth.trim(); + } + + public void setApplyDataBirth(String applyDataBirth) { + this.applyDataBirth = applyDataBirth; + } + + public String getApplyCardType() { + return applyCardType == null ? "" : applyCardType.trim(); + } + + public void setApplyCardType(String applyCardType) { + this.applyCardType = applyCardType; + } + + public String getApplyCardNumber() { + return applyCardNumber == null ? "" : applyCardNumber.trim(); + } + + public void setApplyCardNumber(String applyCardNumber) { + this.applyCardNumber = applyCardNumber; + } + + public Integer getApplyPhone() { + return applyPhone == null ? 0 : applyPhone; + } + + public void setApplyPhone(Integer applyPhone) { + this.applyPhone = applyPhone; + } + + public String getApplyAddress() { + return applyAddress == null ? "" : applyAddress.trim(); + } + + public void setApplyAddress(String applyAddress) { + this.applyAddress = applyAddress; + } + + public String getApplyCultureLevel() { + return applyCultureLevel == null ? "" : applyCultureLevel.trim(); + } + + public void setApplyCultureLevel(String applyCultureLevel) { + this.applyCultureLevel = applyCultureLevel; + } + + public String getApplyPostcode() { + return applyPostcode == null ? "" : applyPostcode.trim(); + } + + public void setApplyPostcode(String applyPostcode) { + this.applyPostcode = applyPostcode; + } + + public String getApplyPhysicalState() { + return applyPhysicalState == null ? "" : applyPhysicalState.trim(); + } + + public void setApplyPhysicalState(String applyPhysicalState) { + this.applyPhysicalState = applyPhysicalState; + } + + public String getApplyUnitName() { + return applyUnitName == null ? "" : applyUnitName.trim(); + } + + public void setApplyUnitName(String applyUnitName) { + this.applyUnitName = applyUnitName; + } + + public Integer getApplyUnitPhone() { + return applyUnitPhone == null ? 0 : applyUnitPhone; + } + + public void setApplyUnitPhone(Integer applyUnitPhone) { + this.applyUnitPhone = applyUnitPhone; + } + + public String getApplyUnitAddress() { + return applyUnitAddress == null ? "" : applyUnitAddress.trim(); + } + + public void setApplyUnitAddress(String applyUnitAddress) { + this.applyUnitAddress = applyUnitAddress; + } + + public String getApplyUserCardPhoto() { + return applyUserCardPhoto == null ? "" : applyUserCardPhoto.trim(); + } + + public void setApplyUserCardPhoto(String applyUserCardPhoto) { + this.applyUserCardPhoto = applyUserCardPhoto; + } + + public Integer getApplyAuditState() { + return applyAuditState == null ? 0 : applyAuditState; + } + + public void setApplyAuditState(Integer applyAuditState) { + this.applyAuditState = applyAuditState; + } + + public String getCreator() { + return creator == null ? "" : creator.trim(); + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getGmtCreate() { + return gmtCreate == null ? "" : gmtCreate.trim(); + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getModifier() { + return modifier == null ? "" : modifier.trim(); + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getGmtModified() { + return gmtModified == null ? "" : gmtModified.trim(); + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + +} diff --git a/src/main/java/cn/com/tenlion/pojo/bos/applyauditlog/ApplyAuditLogBO.java b/src/main/java/cn/com/tenlion/pojo/bos/applyauditlog/ApplyAuditLogBO.java new file mode 100644 index 0000000..a4fcf28 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/bos/applyauditlog/ApplyAuditLogBO.java @@ -0,0 +1,87 @@ +package cn.com.tenlion.pojo.bos.applyauditlog; + +/** + * + * @ClassName: ApplyAuditLogBO + * @Description: 报名信息审核日志 + * @Author: CodeFactory + * @Date: 2021-05-01 18:51:28 + * @Version: 3.0 + **/ +public class ApplyAuditLogBO { + + private String applyAuditLogId; + private String applyId; + private Integer applyAuditState; + private String applyAuditExplain; + private String applyAuditUserId; + private String applyAuditUserName; + private String applyAuditTime; + private Integer isDelete; + + public String getApplyAuditLogId() { + return applyAuditLogId == null ? "" : applyAuditLogId.trim(); + } + + public void setApplyAuditLogId(String applyAuditLogId) { + this.applyAuditLogId = applyAuditLogId; + } + + public String getApplyId() { + return applyId == null ? "" : applyId.trim(); + } + + public void setApplyId(String applyId) { + this.applyId = applyId; + } + + public Integer getApplyAuditState() { + return applyAuditState == null ? 0 : applyAuditState; + } + + public void setApplyAuditState(Integer applyAuditState) { + this.applyAuditState = applyAuditState; + } + + public String getApplyAuditExplain() { + return applyAuditExplain == null ? "" : applyAuditExplain.trim(); + } + + public void setApplyAuditExplain(String applyAuditExplain) { + this.applyAuditExplain = applyAuditExplain; + } + + public String getApplyAuditUserId() { + return applyAuditUserId == null ? "" : applyAuditUserId.trim(); + } + + public void setApplyAuditUserId(String applyAuditUserId) { + this.applyAuditUserId = applyAuditUserId; + } + + public String getApplyAuditUserName() { + return applyAuditUserName == null ? "" : applyAuditUserName.trim(); + } + + public void setApplyAuditUserName(String applyAuditUserName) { + this.applyAuditUserName = applyAuditUserName; + } + + public String getApplyAuditTime() { + return applyAuditTime == null ? "" : applyAuditTime.trim(); + } + + public void setApplyAuditTime(String applyAuditTime) { + this.applyAuditTime = applyAuditTime; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + +} diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java new file mode 100644 index 0000000..708e99e --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java @@ -0,0 +1,189 @@ +package cn.com.tenlion.pojo.dtos.apply; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: ApplyDTO + * @Description: 报名信息 + * @Author: CodeFactory + * @Date: 2021-05-01 18:49:41 + * @Version: 3.0 + **/ +@ApiModel +public class ApplyDTO { + + @ApiModelProperty(name = "applyId", value = "报名信息ID") + private String applyId; + @ApiModelProperty(name = "applyClassId", value = "报名班级ID") + private String applyClassId; + @ApiModelProperty(name = "applyName", value = "报名人姓名") + private String applyName; + @ApiModelProperty(name = "applySex", value = "报名人性别 1男 2女【数据字典】") + private String applySex; + @ApiModelProperty(name = "applyDataBirth", value = "报名人出生日期") + private String applyDataBirth; + @ApiModelProperty(name = "applyCardType", value = "报名人证件类型【数据字典】") + private String applyCardType; + @ApiModelProperty(name = "applyCardNumber", value = "报名人证件号码") + private String applyCardNumber; + @ApiModelProperty(name = "applyPhone", value = "报名人手机号码") + private Integer applyPhone; + @ApiModelProperty(name = "applyAddress", value = "报名人通讯地址") + private String applyAddress; + @ApiModelProperty(name = "applyCultureLevel", value = "报名人文化程度【数据字典】") + private String applyCultureLevel; + @ApiModelProperty(name = "applyPostcode", value = "报名人邮编") + private String applyPostcode; + @ApiModelProperty(name = "applyPhysicalState", value = "报名人身体状态【数据字典】") + private String applyPhysicalState; + @ApiModelProperty(name = "applyUnitName", value = "报名人单位名称") + private String applyUnitName; + @ApiModelProperty(name = "applyUnitPhone", value = "报名人单位电话") + private Integer applyUnitPhone; + @ApiModelProperty(name = "applyUnitAddress", value = "报名人单位地址") + private String applyUnitAddress; + @ApiModelProperty(name = "applyUserCardPhoto", value = "证件照片") + private String applyUserCardPhoto; + @ApiModelProperty(name = "applyAuditState", value = "报名状态 0 待审核 1用户撤回 2审核通过 3未报到 4报名完成-1审核不通过") + private Integer applyAuditState; + + public String getApplyId() { + return applyId == null ? "" : applyId.trim(); + } + + public void setApplyId(String applyId) { + this.applyId = applyId; + } + + public String getApplyClassId() { + return applyClassId == null ? "" : applyClassId.trim(); + } + + public void setApplyClassId(String applyClassId) { + this.applyClassId = applyClassId; + } + + public String getApplyName() { + return applyName == null ? "" : applyName.trim(); + } + + public void setApplyName(String applyName) { + this.applyName = applyName; + } + + public String getApplySex() { + return applySex == null ? "" : applySex.trim(); + } + + public void setApplySex(String applySex) { + this.applySex = applySex; + } + + public String getApplyDataBirth() { + return applyDataBirth == null ? "" : applyDataBirth.trim(); + } + + public void setApplyDataBirth(String applyDataBirth) { + this.applyDataBirth = applyDataBirth; + } + + public String getApplyCardType() { + return applyCardType == null ? "" : applyCardType.trim(); + } + + public void setApplyCardType(String applyCardType) { + this.applyCardType = applyCardType; + } + + public String getApplyCardNumber() { + return applyCardNumber == null ? "" : applyCardNumber.trim(); + } + + public void setApplyCardNumber(String applyCardNumber) { + this.applyCardNumber = applyCardNumber; + } + + public Integer getApplyPhone() { + return applyPhone == null ? 0 : applyPhone; + } + + public void setApplyPhone(Integer applyPhone) { + this.applyPhone = applyPhone; + } + + public String getApplyAddress() { + return applyAddress == null ? "" : applyAddress.trim(); + } + + public void setApplyAddress(String applyAddress) { + this.applyAddress = applyAddress; + } + + public String getApplyCultureLevel() { + return applyCultureLevel == null ? "" : applyCultureLevel.trim(); + } + + public void setApplyCultureLevel(String applyCultureLevel) { + this.applyCultureLevel = applyCultureLevel; + } + + public String getApplyPostcode() { + return applyPostcode == null ? "" : applyPostcode.trim(); + } + + public void setApplyPostcode(String applyPostcode) { + this.applyPostcode = applyPostcode; + } + + public String getApplyPhysicalState() { + return applyPhysicalState == null ? "" : applyPhysicalState.trim(); + } + + public void setApplyPhysicalState(String applyPhysicalState) { + this.applyPhysicalState = applyPhysicalState; + } + + public String getApplyUnitName() { + return applyUnitName == null ? "" : applyUnitName.trim(); + } + + public void setApplyUnitName(String applyUnitName) { + this.applyUnitName = applyUnitName; + } + + public Integer getApplyUnitPhone() { + return applyUnitPhone == null ? 0 : applyUnitPhone; + } + + public void setApplyUnitPhone(Integer applyUnitPhone) { + this.applyUnitPhone = applyUnitPhone; + } + + public String getApplyUnitAddress() { + return applyUnitAddress == null ? "" : applyUnitAddress.trim(); + } + + public void setApplyUnitAddress(String applyUnitAddress) { + this.applyUnitAddress = applyUnitAddress; + } + + public String getApplyUserCardPhoto() { + return applyUserCardPhoto == null ? "" : applyUserCardPhoto.trim(); + } + + public void setApplyUserCardPhoto(String applyUserCardPhoto) { + this.applyUserCardPhoto = applyUserCardPhoto; + } + + public Integer getApplyAuditState() { + return applyAuditState == null ? 0 : applyAuditState; + } + + public void setApplyAuditState(Integer applyAuditState) { + this.applyAuditState = applyAuditState; + } + + +} diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java new file mode 100644 index 0000000..6d2229e --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java @@ -0,0 +1,99 @@ +package cn.com.tenlion.pojo.dtos.applyauditlog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: ApplyAuditLogDTO + * @Description: 报名信息审核日志 + * @Author: CodeFactory + * @Date: 2021-05-01 18:51:28 + * @Version: 3.0 + **/ +@ApiModel +public class ApplyAuditLogDTO { + + @ApiModelProperty(name = "applyAuditLogId", value = "审核ID") + private String applyAuditLogId; + @ApiModelProperty(name = "applyId", value = "报名ID") + private String applyId; + @ApiModelProperty(name = "applyAuditState", value = "审核结果 2审核通过 4报名完成-1审核不通过") + private Integer applyAuditState; + @ApiModelProperty(name = "applyAuditExplain", value = "审核说明") + private String applyAuditExplain; + @ApiModelProperty(name = "applyAuditUserId", value = "审核人ID") + private String applyAuditUserId; + @ApiModelProperty(name = "applyAuditUserName", value = "审核人姓名") + private String applyAuditUserName; + @ApiModelProperty(name = "applyAuditTime", value = "审核时间") + private String applyAuditTime; + @ApiModelProperty(name = "isDelete", value = "删除状态") + private Integer isDelete; + + public String getApplyAuditLogId() { + return applyAuditLogId == null ? "" : applyAuditLogId.trim(); + } + + public void setApplyAuditLogId(String applyAuditLogId) { + this.applyAuditLogId = applyAuditLogId; + } + + public String getApplyId() { + return applyId == null ? "" : applyId.trim(); + } + + public void setApplyId(String applyId) { + this.applyId = applyId; + } + + public Integer getApplyAuditState() { + return applyAuditState == null ? 0 : applyAuditState; + } + + public void setApplyAuditState(Integer applyAuditState) { + this.applyAuditState = applyAuditState; + } + + public String getApplyAuditExplain() { + return applyAuditExplain == null ? "" : applyAuditExplain.trim(); + } + + public void setApplyAuditExplain(String applyAuditExplain) { + this.applyAuditExplain = applyAuditExplain; + } + + public String getApplyAuditUserId() { + return applyAuditUserId == null ? "" : applyAuditUserId.trim(); + } + + public void setApplyAuditUserId(String applyAuditUserId) { + this.applyAuditUserId = applyAuditUserId; + } + + public String getApplyAuditUserName() { + return applyAuditUserName == null ? "" : applyAuditUserName.trim(); + } + + public void setApplyAuditUserName(String applyAuditUserName) { + this.applyAuditUserName = applyAuditUserName; + } + + public String getApplyAuditTime() { + return applyAuditTime == null ? "" : applyAuditTime.trim(); + } + + public void setApplyAuditTime(String applyAuditTime) { + this.applyAuditTime = applyAuditTime; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + +} diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeDTO.java index a1439c1..2f239ec 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeDTO.java @@ -18,6 +18,8 @@ public class WorkTypeDTO { private String workTypeId; @ApiModelProperty(name = "workTypeParentId", value = "工种父级节点") private String workTypeParentId; + @ApiModelProperty(name = "workTypeParentName", value = "工种父级节点名称") + private String workTypeParentName; @ApiModelProperty(name = "workTypeName", value = "工种名称") private String workTypeName; @ApiModelProperty(name = "workTypeCode", value = "工种编码") @@ -76,4 +78,11 @@ public class WorkTypeDTO { } + public String getWorkTypeParentName() { + return workTypeParentName; + } + + public void setWorkTypeParentName(String workTypeParentName) { + this.workTypeParentName = workTypeParentName; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeZTreeDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeZTreeDTO.java index 83bceaa..25e1154 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeZTreeDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeZTreeDTO.java @@ -54,11 +54,11 @@ public class WorkTypeZTreeDTO { this.name = name; } - public Boolean getParent() { + public Boolean getIsParent() { return isParent; } - public void setParent(Boolean parent) { + public void setIsParent(Boolean parent) { isParent = parent; } } diff --git a/src/main/java/cn/com/tenlion/pojo/pos/apply/ApplyPO.java b/src/main/java/cn/com/tenlion/pojo/pos/apply/ApplyPO.java new file mode 100644 index 0000000..59c7fce --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/pos/apply/ApplyPO.java @@ -0,0 +1,213 @@ +package cn.com.tenlion.pojo.pos.apply; + +/** + * + * @ClassName: ApplyPO + * @Description: 报名信息 + * @Author: CodeFactory + * @Date: 2021-05-01 18:49:41 + * @Version: 3.0 + **/ +public class ApplyPO { + + private String applyId; + private String applyClassId; + private String applyName; + private String applySex; + private String applyDataBirth; + private String applyCardType; + private String applyCardNumber; + private Integer applyPhone; + private String applyAddress; + private String applyCultureLevel; + private String applyPostcode; + private String applyPhysicalState; + private String applyUnitName; + private Integer applyUnitPhone; + private String applyUnitAddress; + private String applyUserCardPhoto; + private Integer applyAuditState; + private String creator; + private String gmtCreate; + private String modifier; + private String gmtModified; + private Integer isDelete; + + public String getApplyId() { + return applyId == null ? "" : applyId.trim(); + } + + public void setApplyId(String applyId) { + this.applyId = applyId; + } + + public String getApplyClassId() { + return applyClassId == null ? "" : applyClassId.trim(); + } + + public void setApplyClassId(String applyClassId) { + this.applyClassId = applyClassId; + } + + public String getApplyName() { + return applyName == null ? "" : applyName.trim(); + } + + public void setApplyName(String applyName) { + this.applyName = applyName; + } + + public String getApplySex() { + return applySex == null ? "" : applySex.trim(); + } + + public void setApplySex(String applySex) { + this.applySex = applySex; + } + + public String getApplyDataBirth() { + return applyDataBirth == null ? "" : applyDataBirth.trim(); + } + + public void setApplyDataBirth(String applyDataBirth) { + this.applyDataBirth = applyDataBirth; + } + + public String getApplyCardType() { + return applyCardType == null ? "" : applyCardType.trim(); + } + + public void setApplyCardType(String applyCardType) { + this.applyCardType = applyCardType; + } + + public String getApplyCardNumber() { + return applyCardNumber == null ? "" : applyCardNumber.trim(); + } + + public void setApplyCardNumber(String applyCardNumber) { + this.applyCardNumber = applyCardNumber; + } + + public Integer getApplyPhone() { + return applyPhone == null ? 0 : applyPhone; + } + + public void setApplyPhone(Integer applyPhone) { + this.applyPhone = applyPhone; + } + + public String getApplyAddress() { + return applyAddress == null ? "" : applyAddress.trim(); + } + + public void setApplyAddress(String applyAddress) { + this.applyAddress = applyAddress; + } + + public String getApplyCultureLevel() { + return applyCultureLevel == null ? "" : applyCultureLevel.trim(); + } + + public void setApplyCultureLevel(String applyCultureLevel) { + this.applyCultureLevel = applyCultureLevel; + } + + public String getApplyPostcode() { + return applyPostcode == null ? "" : applyPostcode.trim(); + } + + public void setApplyPostcode(String applyPostcode) { + this.applyPostcode = applyPostcode; + } + + public String getApplyPhysicalState() { + return applyPhysicalState == null ? "" : applyPhysicalState.trim(); + } + + public void setApplyPhysicalState(String applyPhysicalState) { + this.applyPhysicalState = applyPhysicalState; + } + + public String getApplyUnitName() { + return applyUnitName == null ? "" : applyUnitName.trim(); + } + + public void setApplyUnitName(String applyUnitName) { + this.applyUnitName = applyUnitName; + } + + public Integer getApplyUnitPhone() { + return applyUnitPhone == null ? 0 : applyUnitPhone; + } + + public void setApplyUnitPhone(Integer applyUnitPhone) { + this.applyUnitPhone = applyUnitPhone; + } + + public String getApplyUnitAddress() { + return applyUnitAddress == null ? "" : applyUnitAddress.trim(); + } + + public void setApplyUnitAddress(String applyUnitAddress) { + this.applyUnitAddress = applyUnitAddress; + } + + public String getApplyUserCardPhoto() { + return applyUserCardPhoto == null ? "" : applyUserCardPhoto.trim(); + } + + public void setApplyUserCardPhoto(String applyUserCardPhoto) { + this.applyUserCardPhoto = applyUserCardPhoto; + } + + public Integer getApplyAuditState() { + return applyAuditState == null ? 0 : applyAuditState; + } + + public void setApplyAuditState(Integer applyAuditState) { + this.applyAuditState = applyAuditState; + } + + public String getCreator() { + return creator == null ? "" : creator.trim(); + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getGmtCreate() { + return gmtCreate == null ? "" : gmtCreate.trim(); + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getModifier() { + return modifier == null ? "" : modifier.trim(); + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getGmtModified() { + return gmtModified == null ? "" : gmtModified.trim(); + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + +} diff --git a/src/main/java/cn/com/tenlion/pojo/pos/applyauditlog/ApplyAuditLogPO.java b/src/main/java/cn/com/tenlion/pojo/pos/applyauditlog/ApplyAuditLogPO.java new file mode 100644 index 0000000..1f45bb4 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/pos/applyauditlog/ApplyAuditLogPO.java @@ -0,0 +1,87 @@ +package cn.com.tenlion.pojo.pos.applyauditlog; + +/** + * + * @ClassName: ApplyAuditLogPO + * @Description: 报名信息审核日志 + * @Author: CodeFactory + * @Date: 2021-05-01 18:51:28 + * @Version: 3.0 + **/ +public class ApplyAuditLogPO { + + private String applyAuditLogId; + private String applyId; + private Integer applyAuditState; + private String applyAuditExplain; + private String applyAuditUserId; + private String applyAuditUserName; + private String applyAuditTime; + private Integer isDelete; + + public String getApplyAuditLogId() { + return applyAuditLogId == null ? "" : applyAuditLogId.trim(); + } + + public void setApplyAuditLogId(String applyAuditLogId) { + this.applyAuditLogId = applyAuditLogId; + } + + public String getApplyId() { + return applyId == null ? "" : applyId.trim(); + } + + public void setApplyId(String applyId) { + this.applyId = applyId; + } + + public Integer getApplyAuditState() { + return applyAuditState == null ? 0 : applyAuditState; + } + + public void setApplyAuditState(Integer applyAuditState) { + this.applyAuditState = applyAuditState; + } + + public String getApplyAuditExplain() { + return applyAuditExplain == null ? "" : applyAuditExplain.trim(); + } + + public void setApplyAuditExplain(String applyAuditExplain) { + this.applyAuditExplain = applyAuditExplain; + } + + public String getApplyAuditUserId() { + return applyAuditUserId == null ? "" : applyAuditUserId.trim(); + } + + public void setApplyAuditUserId(String applyAuditUserId) { + this.applyAuditUserId = applyAuditUserId; + } + + public String getApplyAuditUserName() { + return applyAuditUserName == null ? "" : applyAuditUserName.trim(); + } + + public void setApplyAuditUserName(String applyAuditUserName) { + this.applyAuditUserName = applyAuditUserName; + } + + public String getApplyAuditTime() { + return applyAuditTime == null ? "" : applyAuditTime.trim(); + } + + public void setApplyAuditTime(String applyAuditTime) { + this.applyAuditTime = applyAuditTime; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + +} diff --git a/src/main/java/cn/com/tenlion/pojo/vos/apply/ApplyVO.java b/src/main/java/cn/com/tenlion/pojo/vos/apply/ApplyVO.java new file mode 100644 index 0000000..a696a99 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/vos/apply/ApplyVO.java @@ -0,0 +1,185 @@ +package cn.com.tenlion.pojo.vos.apply; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: ApplyVO + * @Description: 报名信息 + * @Author: CodeFactory + * @Date: 2021-05-01 18:49:41 + * @Version: 3.0 + **/ +@ApiModel +public class ApplyVO { + + @ApiModelProperty(name = "applyClassId", value = "报名班级ID") + private String applyClassId; + @ApiModelProperty(name = "applyName", value = "报名人姓名") + private String applyName; + @ApiModelProperty(name = "applySex", value = "报名人性别 1男 2女【数据字典】") + private String applySex; + @ApiModelProperty(name = "applyDataBirth", value = "报名人出生日期") + @CheckEmptyAnnotation(name = "报名人出生日期", verifyType = "date") + private String applyDataBirth; + @ApiModelProperty(name = "applyCardType", value = "报名人证件类型【数据字典】") + private String applyCardType; + @ApiModelProperty(name = "applyCardNumber", value = "报名人证件号码") + private String applyCardNumber; + @ApiModelProperty(name = "applyPhone", value = "报名人手机号码") + @CheckNumberAnnotation(name = "报名人手机号码") + private Integer applyPhone; + @ApiModelProperty(name = "applyAddress", value = "报名人通讯地址") + private String applyAddress; + @ApiModelProperty(name = "applyCultureLevel", value = "报名人文化程度【数据字典】") + private String applyCultureLevel; + @ApiModelProperty(name = "applyPostcode", value = "报名人邮编") + private String applyPostcode; + @ApiModelProperty(name = "applyPhysicalState", value = "报名人身体状态【数据字典】") + private String applyPhysicalState; + @ApiModelProperty(name = "applyUnitName", value = "报名人单位名称") + private String applyUnitName; + @ApiModelProperty(name = "applyUnitPhone", value = "报名人单位电话") + @CheckNumberAnnotation(name = "报名人单位电话") + private Integer applyUnitPhone; + @ApiModelProperty(name = "applyUnitAddress", value = "报名人单位地址") + private String applyUnitAddress; + @ApiModelProperty(name = "applyUserCardPhoto", value = "证件照片") + private String applyUserCardPhoto; + @ApiModelProperty(name = "applyAuditState", value = "报名状态 0 待审核 1用户撤回 2审核通过 3未报到 4报名完成-1审核不通过") + @CheckNumberAnnotation(name = "报名状态 0 待审核 1用户撤回 2审核通过 3未报到 4报名完成-1审核不通过") + private Integer applyAuditState; + + public String getApplyClassId() { + return applyClassId == null ? "" : applyClassId.trim(); + } + + public void setApplyClassId(String applyClassId) { + this.applyClassId = applyClassId; + } + + public String getApplyName() { + return applyName == null ? "" : applyName.trim(); + } + + public void setApplyName(String applyName) { + this.applyName = applyName; + } + + public String getApplySex() { + return applySex == null ? "" : applySex.trim(); + } + + public void setApplySex(String applySex) { + this.applySex = applySex; + } + + public String getApplyDataBirth() { + return applyDataBirth == null ? "" : applyDataBirth.trim(); + } + + public void setApplyDataBirth(String applyDataBirth) { + this.applyDataBirth = applyDataBirth; + } + + public String getApplyCardType() { + return applyCardType == null ? "" : applyCardType.trim(); + } + + public void setApplyCardType(String applyCardType) { + this.applyCardType = applyCardType; + } + + public String getApplyCardNumber() { + return applyCardNumber == null ? "" : applyCardNumber.trim(); + } + + public void setApplyCardNumber(String applyCardNumber) { + this.applyCardNumber = applyCardNumber; + } + + public Integer getApplyPhone() { + return applyPhone == null ? 0 : applyPhone; + } + + public void setApplyPhone(Integer applyPhone) { + this.applyPhone = applyPhone; + } + + public String getApplyAddress() { + return applyAddress == null ? "" : applyAddress.trim(); + } + + public void setApplyAddress(String applyAddress) { + this.applyAddress = applyAddress; + } + + public String getApplyCultureLevel() { + return applyCultureLevel == null ? "" : applyCultureLevel.trim(); + } + + public void setApplyCultureLevel(String applyCultureLevel) { + this.applyCultureLevel = applyCultureLevel; + } + + public String getApplyPostcode() { + return applyPostcode == null ? "" : applyPostcode.trim(); + } + + public void setApplyPostcode(String applyPostcode) { + this.applyPostcode = applyPostcode; + } + + public String getApplyPhysicalState() { + return applyPhysicalState == null ? "" : applyPhysicalState.trim(); + } + + public void setApplyPhysicalState(String applyPhysicalState) { + this.applyPhysicalState = applyPhysicalState; + } + + public String getApplyUnitName() { + return applyUnitName == null ? "" : applyUnitName.trim(); + } + + public void setApplyUnitName(String applyUnitName) { + this.applyUnitName = applyUnitName; + } + + public Integer getApplyUnitPhone() { + return applyUnitPhone == null ? 0 : applyUnitPhone; + } + + public void setApplyUnitPhone(Integer applyUnitPhone) { + this.applyUnitPhone = applyUnitPhone; + } + + public String getApplyUnitAddress() { + return applyUnitAddress == null ? "" : applyUnitAddress.trim(); + } + + public void setApplyUnitAddress(String applyUnitAddress) { + this.applyUnitAddress = applyUnitAddress; + } + + public String getApplyUserCardPhoto() { + return applyUserCardPhoto == null ? "" : applyUserCardPhoto.trim(); + } + + public void setApplyUserCardPhoto(String applyUserCardPhoto) { + this.applyUserCardPhoto = applyUserCardPhoto; + } + + public Integer getApplyAuditState() { + return applyAuditState == null ? 0 : applyAuditState; + } + + public void setApplyAuditState(Integer applyAuditState) { + this.applyAuditState = applyAuditState; + } + + +} diff --git a/src/main/java/cn/com/tenlion/pojo/vos/applyauditlog/ApplyAuditLogVO.java b/src/main/java/cn/com/tenlion/pojo/vos/applyauditlog/ApplyAuditLogVO.java new file mode 100644 index 0000000..93dd93c --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/vos/applyauditlog/ApplyAuditLogVO.java @@ -0,0 +1,83 @@ +package cn.com.tenlion.pojo.vos.applyauditlog; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: ApplyAuditLogVO + * @Description: 报名信息审核日志 + * @Author: CodeFactory + * @Date: 2021-05-01 18:51:28 + * @Version: 3.0 + **/ +@ApiModel +public class ApplyAuditLogVO { + + @ApiModelProperty(name = "applyId", value = "报名ID") + private String applyId; + @ApiModelProperty(name = "applyAuditState", value = "审核结果 2审核通过 4报名完成-1审核不通过") + @CheckNumberAnnotation(name = "审核结果 2审核通过 4报名完成-1审核不通过") + private Integer applyAuditState; + @ApiModelProperty(name = "applyAuditExplain", value = "审核说明") + private String applyAuditExplain; + @ApiModelProperty(name = "applyAuditUserId", value = "审核人ID") + private String applyAuditUserId; + @ApiModelProperty(name = "applyAuditUserName", value = "审核人姓名") + private String applyAuditUserName; + @ApiModelProperty(name = "applyAuditTime", value = "审核时间") + @CheckEmptyAnnotation(name = "审核时间", verifyType = "datetime") + private String applyAuditTime; + + public String getApplyId() { + return applyId == null ? "" : applyId.trim(); + } + + public void setApplyId(String applyId) { + this.applyId = applyId; + } + + public Integer getApplyAuditState() { + return applyAuditState == null ? 0 : applyAuditState; + } + + public void setApplyAuditState(Integer applyAuditState) { + this.applyAuditState = applyAuditState; + } + + public String getApplyAuditExplain() { + return applyAuditExplain == null ? "" : applyAuditExplain.trim(); + } + + public void setApplyAuditExplain(String applyAuditExplain) { + this.applyAuditExplain = applyAuditExplain; + } + + public String getApplyAuditUserId() { + return applyAuditUserId == null ? "" : applyAuditUserId.trim(); + } + + public void setApplyAuditUserId(String applyAuditUserId) { + this.applyAuditUserId = applyAuditUserId; + } + + public String getApplyAuditUserName() { + return applyAuditUserName == null ? "" : applyAuditUserName.trim(); + } + + public void setApplyAuditUserName(String applyAuditUserName) { + this.applyAuditUserName = applyAuditUserName; + } + + public String getApplyAuditTime() { + return applyAuditTime == null ? "" : applyAuditTime.trim(); + } + + public void setApplyAuditTime(String applyAuditTime) { + this.applyAuditTime = applyAuditTime; + } + + +} diff --git a/src/main/java/cn/com/tenlion/service/apply/IApplyService.java b/src/main/java/cn/com/tenlion/service/apply/IApplyService.java new file mode 100644 index 0000000..d70f7a0 --- /dev/null +++ b/src/main/java/cn/com/tenlion/service/apply/IApplyService.java @@ -0,0 +1,188 @@ +package cn.com.tenlion.service.apply; + +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.pojo.vos.apply.ApplyVO; +import cn.com.tenlion.pojo.bos.apply.ApplyBO; +import cn.com.tenlion.pojo.pos.apply.ApplyPO; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IApplyService + * @Description: 报名信息 + * @Author: CodeFactory + * @Date: 2021-05-01 18:49:41 + * @Version: 3.0 + **/ +public interface IApplyService { + + /** + * 新增报名信息 + * + * @param applyVO + * @return + */ + void save(ApplyVO applyVO); + + /** + * 新增报名信息 + * + * @param token + * @param applyVO + * @return + */ + void save(String token, ApplyVO applyVO); + + /** + * 新增报名信息 + * + * @param applyVO + * @return applyId + */ + String saveReturnId(ApplyVO applyVO); + + /** + * 新增报名信息 + * + * @param token + * @param applyVO + * @return applyId + */ + String saveReturnId(String token, ApplyVO applyVO); + + /** + * 删除报名信息 + * + * @param ids id列表 + * @return + */ + void remove(List ids); + + + /** + * 删除报名信息 + * + * @param token + * @param ids id列表 + * @return + */ + void remove(String token, List ids); + + /** + * 删除报名信息（物理删除） + * + * @param ids id列表 + */ + void delete(List ids); + + /** + * 修改报名信息 + * + * @param applyId + * @param applyVO + * @return + */ + void update(String applyId, ApplyVO applyVO); + + /** + * 修改报名信息 + * + * @param token + * @param applyId + * @param applyVO + * @return + */ + void update(String token, String applyId, ApplyVO applyVO); + + /** + * 报名信息详情 + * + * @param params 参数Map + * @return + */ + ApplyDTO get(Map params); + + /** + * 报名信息详情 + * + * @param applyId + * @return + */ + ApplyDTO get(String applyId); + + /** + * 报名信息详情 + * + * @param params 参数Map + * @return + */ + ApplyBO getBO(Map params); + + /** + * 报名信息详情 + * + * @param applyId + * @return + */ + ApplyBO getBO(String applyId); + + /** + * 报名信息详情 + * + * @param params 参数Map + * @return + */ + ApplyPO getPO(Map params); + + /** + * 报名信息详情 + * + * @param applyId + * @return + */ + ApplyPO getPO(String applyId); + + /** + * 报名信息列表 + * + * @param params + * @return + */ + List list(Map params); + + /** + * 报名信息列表 + * + * @param params + * @return + */ + List listBO(Map params); + + /** + * 报名信息列表 + * + * @param params + * @return + */ + List listPO(Map params); + + /** + * 报名信息分页列表 + * + * @param page + * @return + */ + SuccessResultList> listPage(ListPage page); + + /** + * 报名信息统计 + * + * @param params + * @return + */ + Integer count(Map params); + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java new file mode 100644 index 0000000..25457e2 --- /dev/null +++ b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java @@ -0,0 +1,171 @@ +package cn.com.tenlion.service.apply.impl; + +import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.util.map.HashMapUtil; +import ink.wgink.util.UUIDUtil; +import cn.com.tenlion.dao.apply.IApplyDao; +import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.pojo.vos.apply.ApplyVO; +import cn.com.tenlion.pojo.bos.apply.ApplyBO; +import cn.com.tenlion.pojo.pos.apply.ApplyPO; +import cn.com.tenlion.service.apply.IApplyService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * @ClassName: ApplyServiceImpl + * @Description: 报名信息 + * @Author: CodeFactory + * @Date: 2021-05-01 18:49:41 + * @Version: 3.0 + **/ +@Service +public class ApplyServiceImpl extends DefaultBaseService implements IApplyService { + + @Autowired + private IApplyDao applyDao; + + @Override + public void save(ApplyVO applyVO) { + saveReturnId(applyVO); + } + + @Override + public void save(String token, ApplyVO applyVO) { + saveReturnId(token, applyVO); + } + + @Override + public String saveReturnId(ApplyVO applyVO) { + return saveReturnId(null, applyVO); + } + + @Override + public String saveReturnId(String token, ApplyVO applyVO) { + String applyId = UUIDUtil.getUUID(); + Map params = HashMapUtil.beanToMap(applyVO); + params.put("applyId", applyId); + if (StringUtils.isBlank(token)) { + setSaveInfo(params); + } else { + setAppSaveInfo(token, params); + } + applyDao.save(params); + return applyId; + } + + @Override + public void remove(List ids) { + remove(null, ids); + } + + @Override + public void remove(String token, List ids) { + Map params = getHashMap(2); + params.put("applyIds", ids); + if (StringUtils.isBlank(token)) { + setUpdateInfo(params); + } else { + setAppUpdateInfo(token, params); + } + applyDao.remove(params); + } + + @Override + public void delete(List ids) { + Map params = getHashMap(2); + params.put("applyIds", ids); + applyDao.delete(params); + } + + @Override + public void update(String applyId, ApplyVO applyVO) { + update(null, applyId, applyVO); + } + + @Override + public void update(String token, String applyId, ApplyVO applyVO) { + Map params = HashMapUtil.beanToMap(applyVO); + params.put("applyId", applyId); + if (StringUtils.isBlank(token)) { + setUpdateInfo(params); + } else { + setAppUpdateInfo(token, params); + } + applyDao.update(params); + } + + @Override + public ApplyDTO get(Map params) { + return applyDao.get(params); + } + + @Override + public ApplyDTO get(String applyId) { + Map params = super.getHashMap(2); + params.put("applyId", applyId); + return get(params); + } + + @Override + public ApplyBO getBO(Map params) { + return applyDao.getBO(params); + } + + @Override + public ApplyBO getBO(String applyId) { + Map params = super.getHashMap(2); + params.put("applyId", applyId); + return getBO(params); + } + + @Override + public ApplyPO getPO(Map params) { + return applyDao.getPO(params); + } + + @Override + public ApplyPO getPO(String applyId) { + Map params = super.getHashMap(2); + params.put("applyId", applyId); + return getPO(params); + } + + @Override + public List list(Map params) { + return applyDao.list(params); + } + + @Override + public List listBO(Map params) { + return applyDao.listBO(params); + } + + @Override + public List listPO(Map params) { + return applyDao.listPO(params); + } + + @Override + public SuccessResultList> listPage(ListPage page) { + PageHelper.startPage(page.getPage(), page.getRows()); + List applyDTOs = list(page.getParams()); + PageInfo pageInfo = new PageInfo<>(applyDTOs); + return new SuccessResultList<>(applyDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + + @Override + public Integer count(Map params) { + Integer count = applyDao.count(params); + return count == null ? 0 : count; + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/service/applyauditlog/IApplyAuditLogService.java b/src/main/java/cn/com/tenlion/service/applyauditlog/IApplyAuditLogService.java new file mode 100644 index 0000000..75cf3fd --- /dev/null +++ b/src/main/java/cn/com/tenlion/service/applyauditlog/IApplyAuditLogService.java @@ -0,0 +1,188 @@ +package cn.com.tenlion.service.applyauditlog; + +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.applyauditlog.ApplyAuditLogDTO; +import cn.com.tenlion.pojo.vos.applyauditlog.ApplyAuditLogVO; +import cn.com.tenlion.pojo.bos.applyauditlog.ApplyAuditLogBO; +import cn.com.tenlion.pojo.pos.applyauditlog.ApplyAuditLogPO; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IApplyAuditLogService + * @Description: 报名信息审核日志 + * @Author: CodeFactory + * @Date: 2021-05-01 18:51:28 + * @Version: 3.0 + **/ +public interface IApplyAuditLogService { + + /** + * 新增报名信息审核日志 + * + * @param applyAuditLogVO + * @return + */ + void save(ApplyAuditLogVO applyAuditLogVO); + + /** + * 新增报名信息审核日志 + * + * @param token + * @param applyAuditLogVO + * @return + */ + void save(String token, ApplyAuditLogVO applyAuditLogVO); + + /** + * 新增报名信息审核日志 + * + * @param applyAuditLogVO + * @return applyAuditLogId + */ + String saveReturnId(ApplyAuditLogVO applyAuditLogVO); + + /** + * 新增报名信息审核日志 + * + * @param token + * @param applyAuditLogVO + * @return applyAuditLogId + */ + String saveReturnId(String token, ApplyAuditLogVO applyAuditLogVO); + + /** + * 删除报名信息审核日志 + * + * @param ids id列表 + * @return + */ + void remove(List ids); + + + /** + * 删除报名信息审核日志 + * + * @param token + * @param ids id列表 + * @return + */ + void remove(String token, List ids); + + /** + * 删除报名信息审核日志（物理删除） + * + * @param ids id列表 + */ + void delete(List ids); + + /** + * 修改报名信息审核日志 + * + * @param applyAuditLogId + * @param applyAuditLogVO + * @return + */ + void update(String applyAuditLogId, ApplyAuditLogVO applyAuditLogVO); + + /** + * 修改报名信息审核日志 + * + * @param token + * @param applyAuditLogId + * @param applyAuditLogVO + * @return + */ + void update(String token, String applyAuditLogId, ApplyAuditLogVO applyAuditLogVO); + + /** + * 报名信息审核日志详情 + * + * @param params 参数Map + * @return + */ + ApplyAuditLogDTO get(Map params); + + /** + * 报名信息审核日志详情 + * + * @param applyAuditLogId + * @return + */ + ApplyAuditLogDTO get(String applyAuditLogId); + + /** + * 报名信息审核日志详情 + * + * @param params 参数Map + * @return + */ + ApplyAuditLogBO getBO(Map params); + + /** + * 报名信息审核日志详情 + * + * @param applyAuditLogId + * @return + */ + ApplyAuditLogBO getBO(String applyAuditLogId); + + /** + * 报名信息审核日志详情 + * + * @param params 参数Map + * @return + */ + ApplyAuditLogPO getPO(Map params); + + /** + * 报名信息审核日志详情 + * + * @param applyAuditLogId + * @return + */ + ApplyAuditLogPO getPO(String applyAuditLogId); + + /** + * 报名信息审核日志列表 + * + * @param params + * @return + */ + List list(Map params); + + /** + * 报名信息审核日志列表 + * + * @param params + * @return + */ + List listBO(Map params); + + /** + * 报名信息审核日志列表 + * + * @param params + * @return + */ + List listPO(Map params); + + /** + * 报名信息审核日志分页列表 + * + * @param page + * @return + */ + SuccessResultList> listPage(ListPage page); + + /** + * 报名信息审核日志统计 + * + * @param params + * @return + */ + Integer count(Map params); + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java b/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java new file mode 100644 index 0000000..03e39ef --- /dev/null +++ b/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java @@ -0,0 +1,171 @@ +package cn.com.tenlion.service.applyauditlog.impl; + +import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.util.map.HashMapUtil; +import ink.wgink.util.UUIDUtil; +import cn.com.tenlion.dao.applyauditlog.IApplyAuditLogDao; +import cn.com.tenlion.pojo.dtos.applyauditlog.ApplyAuditLogDTO; +import cn.com.tenlion.pojo.vos.applyauditlog.ApplyAuditLogVO; +import cn.com.tenlion.pojo.bos.applyauditlog.ApplyAuditLogBO; +import cn.com.tenlion.pojo.pos.applyauditlog.ApplyAuditLogPO; +import cn.com.tenlion.service.applyauditlog.IApplyAuditLogService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * @ClassName: ApplyAuditLogServiceImpl + * @Description: 报名信息审核日志 + * @Author: CodeFactory + * @Date: 2021-05-01 18:51:28 + * @Version: 3.0 + **/ +@Service +public class ApplyAuditLogServiceImpl extends DefaultBaseService implements IApplyAuditLogService { + + @Autowired + private IApplyAuditLogDao applyAuditLogDao; + + @Override + public void save(ApplyAuditLogVO applyAuditLogVO) { + saveReturnId(applyAuditLogVO); + } + + @Override + public void save(String token, ApplyAuditLogVO applyAuditLogVO) { + saveReturnId(token, applyAuditLogVO); + } + + @Override + public String saveReturnId(ApplyAuditLogVO applyAuditLogVO) { + return saveReturnId(null, applyAuditLogVO); + } + + @Override + public String saveReturnId(String token, ApplyAuditLogVO applyAuditLogVO) { + String applyAuditLogId = UUIDUtil.getUUID(); + Map params = HashMapUtil.beanToMap(applyAuditLogVO); + params.put("applyAuditLogId", applyAuditLogId); + if (StringUtils.isBlank(token)) { + setSaveInfo(params); + } else { + setAppSaveInfo(token, params); + } + applyAuditLogDao.save(params); + return applyAuditLogId; + } + + @Override + public void remove(List ids) { + remove(null, ids); + } + + @Override + public void remove(String token, List ids) { + Map params = getHashMap(2); + params.put("applyAuditLogIds", ids); + if (StringUtils.isBlank(token)) { + setUpdateInfo(params); + } else { + setAppUpdateInfo(token, params); + } + applyAuditLogDao.remove(params); + } + + @Override + public void delete(List ids) { + Map params = getHashMap(2); + params.put("applyAuditLogIds", ids); + applyAuditLogDao.delete(params); + } + + @Override + public void update(String applyAuditLogId, ApplyAuditLogVO applyAuditLogVO) { + update(null, applyAuditLogId, applyAuditLogVO); + } + + @Override + public void update(String token, String applyAuditLogId, ApplyAuditLogVO applyAuditLogVO) { + Map params = HashMapUtil.beanToMap(applyAuditLogVO); + params.put("applyAuditLogId", applyAuditLogId); + if (StringUtils.isBlank(token)) { + setUpdateInfo(params); + } else { + setAppUpdateInfo(token, params); + } + applyAuditLogDao.update(params); + } + + @Override + public ApplyAuditLogDTO get(Map params) { + return applyAuditLogDao.get(params); + } + + @Override + public ApplyAuditLogDTO get(String applyAuditLogId) { + Map params = super.getHashMap(2); + params.put("applyAuditLogId", applyAuditLogId); + return get(params); + } + + @Override + public ApplyAuditLogBO getBO(Map params) { + return applyAuditLogDao.getBO(params); + } + + @Override + public ApplyAuditLogBO getBO(String applyAuditLogId) { + Map params = super.getHashMap(2); + params.put("applyAuditLogId", applyAuditLogId); + return getBO(params); + } + + @Override + public ApplyAuditLogPO getPO(Map params) { + return applyAuditLogDao.getPO(params); + } + + @Override + public ApplyAuditLogPO getPO(String applyAuditLogId) { + Map params = super.getHashMap(2); + params.put("applyAuditLogId", applyAuditLogId); + return getPO(params); + } + + @Override + public List list(Map params) { + return applyAuditLogDao.list(params); + } + + @Override + public List listBO(Map params) { + return applyAuditLogDao.listBO(params); + } + + @Override + public List listPO(Map params) { + return applyAuditLogDao.listPO(params); + } + + @Override + public SuccessResultList> listPage(ListPage page) { + PageHelper.startPage(page.getPage(), page.getRows()); + List applyAuditLogDTOs = list(page.getParams()); + PageInfo pageInfo = new PageInfo<>(applyAuditLogDTOs); + return new SuccessResultList<>(applyAuditLogDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + + @Override + public Integer count(Map params) { + Integer count = applyAuditLogDao.count(params); + return count == null ? 0 : count; + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/service/worktype/impl/WorkTypeServiceImpl.java b/src/main/java/cn/com/tenlion/service/worktype/impl/WorkTypeServiceImpl.java index 950253e..1d6671c 100644 --- a/src/main/java/cn/com/tenlion/service/worktype/impl/WorkTypeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/worktype/impl/WorkTypeServiceImpl.java @@ -38,8 +38,17 @@ public class WorkTypeServiceImpl extends DefaultBaseService implements IWorkType public List listZTree(Map params){ - List list = workTypeDao.listZTree(params); + for (WorkTypeZTreeDTO workTypeZTreeDTO : list) { + Map data = new HashMap<>(); + data.put("workTypeParentId",workTypeZTreeDTO.getId()); + Integer count = count(data); + if (count > 0){ + workTypeZTreeDTO.setIsParent(true); + }else{ + workTypeZTreeDTO.setIsParent(false); + } + } return list; } @@ -124,7 +133,11 @@ public class WorkTypeServiceImpl extends DefaultBaseService implements IWorkType @Override public WorkTypeDTO get(Map params) { - return workTypeDao.get(params); + WorkTypeDTO workTypeDTO = workTypeDao.get(params); + if ("0".equals(workTypeDTO.getWorkTypeParentId())){ + workTypeDTO.setWorkTypeParentName("根节点"); + } + return workTypeDTO; } @Override diff --git a/src/main/resources/mybatis/mapper/apply/apply-mapper.xml b/src/main/resources/mybatis/mapper/apply/apply-mapper.xml new file mode 100644 index 0000000..a89f636 --- /dev/null +++ b/src/main/resources/mybatis/mapper/apply/apply-mapper.xml @@ -0,0 +1,474 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO e_apply( + apply_id, + apply_class_id, + apply_name, + apply_sex, + apply_data_birth, + apply_card_type, + apply_card_number, + apply_phone, + apply_address, + apply_culture_level, + apply_postcode, + apply_physical_state, + apply_unit_name, + apply_unit_phone, + apply_unit_address, + apply_user_card_photo, + apply_audit_state, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete + ) VALUES( + #{applyId}, + #{applyClassId}, + #{applyName}, + #{applySex}, + #{applyDataBirth}, + #{applyCardType}, + #{applyCardNumber}, + #{applyPhone}, + #{applyAddress}, + #{applyCultureLevel}, + #{applyPostcode}, + #{applyPhysicalState}, + #{applyUnitName}, + #{applyUnitPhone}, + #{applyUnitAddress}, + #{applyUserCardPhoto}, + #{applyAuditState}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete} + ) + + + + + UPDATE + e_apply + SET + gmt_modified = #{gmtModified}, + modifier = #{modifier}, + is_delete = 1 + WHERE + apply_id IN + + #{applyIds[${index}]} + + + + + + DELETE FROM + e_apply + WHERE + apply_id IN + + #{applyIds[${index}]} + + + + + + UPDATE + e_apply + SET + + apply_class_id = #{applyClassId}, + + + apply_name = #{applyName}, + + + apply_sex = #{applySex},w + + + apply_data_birth = #{applyDataBirth}, + + + apply_card_type = #{applyCardType},w + + + apply_card_number = #{applyCardNumber}, + + + apply_phone = #{applyPhone}, + + + apply_address = #{applyAddress}, + + + apply_culture_level = #{applyCultureLevel},w + + + apply_postcode = #{applyPostcode}, + + + apply_physical_state = #{applyPhysicalState},w + + + apply_unit_name = #{applyUnitName}, + + + apply_unit_phone = #{applyUnitPhone}, + + + apply_unit_address = #{applyUnitAddress}, + + + apply_user_card_photo = #{applyUserCardPhoto}, + + + apply_audit_state = #{applyAuditState}, + + gmt_modified = #{gmtModified}, + modifier = #{modifier}, + apply_id = apply_id + WHERE + apply_id = #{applyId} + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/applyauditlog/apply-audit-log-mapper.xml b/src/main/resources/mybatis/mapper/applyauditlog/apply-audit-log-mapper.xml new file mode 100644 index 0000000..6d16627 --- /dev/null +++ b/src/main/resources/mybatis/mapper/applyauditlog/apply-audit-log-mapper.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO e_apply_audit_log( + apply_audit_log_id, + apply_id, + apply_audit_state, + apply_audit_explain, + apply_audit_user_id, + apply_audit_user_name, + apply_audit_time, + is_delete + ) VALUES( + #{applyAuditLogId}, + #{applyId}, + #{applyAuditState}, + #{applyAuditExplain}, + #{applyAuditUserId}, + #{applyAuditUserName}, + #{applyAuditTime}, + #{isDelete} + ) + + + + + UPDATE + e_apply_audit_log + SET + is_delete = 1 + WHERE + apply_audit_log_id IN + + #{applyAuditLogIds[${index}]} + + + + + + DELETE FROM + e_apply_audit_log + WHERE + apply_audit_log_id IN + + #{applyAuditLogIds[${index}]} + + + + + + UPDATE + e_apply_audit_log + SET + + apply_id = #{applyId}, + + + apply_audit_state = #{applyAuditState}, + + + apply_audit_explain = #{applyAuditExplain}, + + + apply_audit_user_id = #{applyAuditUserId}, + + + apply_audit_user_name = #{applyAuditUserName}, + + + apply_audit_time = #{applyAuditTime}, + + apply_audit_log_id = apply_audit_log_id + WHERE + apply_audit_log_id = #{applyAuditLogId} + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml b/src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml index 5fb1fff..b91591e 100644 --- a/src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml +++ b/src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml @@ -5,6 +5,7 @@ + @@ -158,9 +159,12 @@ t1.work_type_code, t1.work_type_sort, t1.work_type_written_document, - t1.work_type_id + t1.work_type_id, + t2.work_type_name AS work_type_parent_name FROM e_work_type t1 + LEFT JOIN e_work_type t2 + ON t1.work_type_parent_id = t2.work_type_id WHERE t1.is_delete = 0 @@ -225,11 +229,14 @@ t1.work_type_name, t1.work_type_code, t1.work_type_sort, - t1.work_type_written_document + t1.work_type_written_document, + t2.work_type_name AS work_type_parent_name FROM e_work_type t1 + LEFT JOIN e_work_type t2 + ON t1.work_type_parent_id = t2.work_type_id WHERE - t1.is_delete = 0 + t1.is_delete = 0 AND t1.work_type_parent_id = #{workTypeParentId} AND ( @@ -251,6 +258,7 @@ #{workTypeIds[${index}]} + ORDER BY t1.work_type_sort @@ -292,6 +300,7 @@ #{workTypeIds[${index}]} + ORDER BY t1.work_type_sort @@ -333,6 +342,7 @@ #{workTypeIds[${index}]} + ORDER BY t1.work_type_sort @@ -343,6 +353,9 @@ e_work_type t1 WHERE t1.is_delete = 0 + + AND work_type_parent_id = #{workTypeParentId} + \ No newline at end of file diff --git a/src/main/resources/static/route/apply/list.html b/src/main/resources/static/route/apply/list.html new file mode 100644 index 0000000..83f0637 --- /dev/null +++ b/src/main/resources/static/route/apply/list.html @@ -0,0 +1,372 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/apply/save.html b/src/main/resources/static/route/apply/save.html new file mode 100644 index 0000000..d38b3d7 --- /dev/null +++ b/src/main/resources/static/route/apply/save.html @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 新增内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/apply/update.html b/src/main/resources/static/route/apply/update.html new file mode 100644 index 0000000..c63a2f3 --- /dev/null +++ b/src/main/resources/static/route/apply/update.html @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 编辑内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/applyauditlog/list.html b/src/main/resources/static/route/applyauditlog/list.html new file mode 100644 index 0000000..37a6eb3 --- /dev/null +++ b/src/main/resources/static/route/applyauditlog/list.html @@ -0,0 +1,291 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/applyauditlog/save.html b/src/main/resources/static/route/applyauditlog/save.html new file mode 100644 index 0000000..2e0c040 --- /dev/null +++ b/src/main/resources/static/route/applyauditlog/save.html @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 新增内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/applyauditlog/update.html b/src/main/resources/static/route/applyauditlog/update.html new file mode 100644 index 0000000..59a3fcc --- /dev/null +++ b/src/main/resources/static/route/applyauditlog/update.html @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 编辑内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/traininginstitution/list.html b/src/main/resources/static/route/traininginstitution/list.html new file mode 100644 index 0000000..e697fce --- /dev/null +++ b/src/main/resources/static/route/traininginstitution/list.html @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/traininginstitution/save.html b/src/main/resources/static/route/traininginstitution/save.html new file mode 100644 index 0000000..fc5cc15 --- /dev/null +++ b/src/main/resources/static/route/traininginstitution/save.html @@ -0,0 +1,408 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 新增内容 + +
+
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+ + + +
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/traininginstitution/update.html b/src/main/resources/static/route/traininginstitution/update.html new file mode 100644 index 0000000..1298dd8 --- /dev/null +++ b/src/main/resources/static/route/traininginstitution/update.html @@ -0,0 +1,443 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 编辑内容 + +
+
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+ + + +
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/worktype/list.html b/src/main/resources/static/route/worktype/list.html index 73a7757..296c1a6 100644 --- a/src/main/resources/static/route/worktype/list.html +++ b/src/main/resources/static/route/worktype/list.html @@ -1,7 +1,7 @@ - + @@ -67,6 +67,12 @@ var resizeTimeout = null; var tableUrl = 'api/worktype/listpage'; + var workTypeParentId = top.restAjax.params(window.location.href).workTypeParentId; + + + + + // 初始化表格 function initTable() { table.render({ @@ -82,21 +88,20 @@ pageName: 'page', limitName: 'rows' }, + where: { + workTypeParentId:workTypeParentId + }, cols: [ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'workTypeId', width: 180, title: '工种ID', align:'center', + {field: 'workTypeParentName', width: 180, title: '上级工种', align:'center', templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; + var workTypeParentId = row['workTypeParentId'] + if(workTypeParentId === '0'){ + return '根节点' } - return rowData; - } - }, - {field: 'workTypeParentId', width: 180, title: '工种父级节点', align:'center', - templet: function(row) { + var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { return '-'; @@ -130,16 +135,7 @@ } return rowData; } - }, - {field: 'workTypeWrittenDocument', width: 180, title: '工种承诺书', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, + } ] ], page: true, @@ -156,11 +152,12 @@ // 重载表格 function reloadTable(currentPage) { table.reload('dataTable', { - url: top.restAjax.path(tableUrl, []), + url: top.restAjax.path(tableUrl, [workTypeParentId]), where: { keywords: $('#keywords').val(), startTime: $('#startTime').val(), - endTime: $('#endTime').val() + endTime: $('#endTime').val(), + workTypeParentId:workTypeParentId }, page: { curr: currentPage @@ -228,7 +225,7 @@ area: ['100%', '100%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/worktype/save.html', []), + content: top.restAjax.path('route/worktype/save.html?workTypeParentId={workTypeParentId}', [workTypeParentId]), end: function() { reloadTable(); } diff --git a/src/main/resources/static/route/worktype/save.html b/src/main/resources/static/route/worktype/save.html index 4675500..5c63b5e 100644 --- a/src/main/resources/static/route/worktype/save.html +++ b/src/main/resources/static/route/worktype/save.html @@ -1,7 +1,7 @@ - + @@ -23,21 +23,22 @@
- +
- + +
- +
- +
@@ -49,7 +50,7 @@
- +
@@ -64,6 +65,8 @@
+ + @@ -81,6 +84,10 @@ var wangEditor = window.wangEditor; var wangEditorObj = {}; var viewerObj = {}; + var ueEditorObj = {}; + + var workTypeParentId = top.restAjax.params(window.location.href).workTypeParentId; + function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); @@ -139,15 +146,47 @@ // 初始化内容 function initData() { + initWorkTypeWrittenDocumentText(); + parentName(); } initData(); + //初始化父级节点名称 + function parentName(){ + var loadLayerIndex; + top.restAjax.get(top.restAjax.path('api/worktype/get/{workTypeId}', [workTypeParentId]), {}, null, function(code, data) { + var dataFormData = {}; + dataFormData['workTypeParentId'] = data.workTypeId; + dataFormData['workTypeParentName'] = data.workTypeName; + form.val('dataForm', dataFormData); + form.render(null, 'dataForm'); + }, function(code, data) { + top.dialog.msg(data.msg); + }, function() { + loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3}); + }, function() { + top.dialog.close(loadLayerIndex); + }); + } + + + + // 初始化承诺书富文本 + function initWorkTypeWrittenDocumentText() { + var editor = UE.getEditor('workTypeWrittenDocument', {autoHeightEnabled: false}); + editor.ready(function() { + editor.setHeight(400); + }); + ueEditorObj['workTypeWrittenDocument'] = editor; + } + // 提交表单 form.on('submit(submitForm)', function(formData) { top.dialog.confirm(top.dataMessage.commit, function(index) { top.dialog.close(index); var loadLayerIndex; top.restAjax.post(top.restAjax.path('api/worktype/save', []), formData.field, null, function(code, data) { + parent.parent.common.refreshTree('leftTree'); var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no], diff --git a/src/main/resources/static/route/worktype/tree.html b/src/main/resources/static/route/worktype/tree.html index eac1929..37d749f 100644 --- a/src/main/resources/static/route/worktype/tree.html +++ b/src/main/resources/static/route/worktype/tree.html @@ -1,7 +1,7 @@ - + @@ -81,7 +81,7 @@ }, callback: { onClick: function (event, treeId, treeNode) { - indexLibParentId = treeNode.id; + workTypeParentId = treeNode.id; initIFrame(); return false; } diff --git a/src/main/resources/static/route/worktype/update.html b/src/main/resources/static/route/worktype/update.html index e7ba191..de4eccf 100644 --- a/src/main/resources/static/route/worktype/update.html +++ b/src/main/resources/static/route/worktype/update.html @@ -1,7 +1,7 @@ - + @@ -23,21 +23,22 @@
- +
- + +
- +
- +
@@ -49,7 +50,7 @@
- +
@@ -64,6 +65,8 @@
+ + @@ -83,6 +86,7 @@ var wangEditor = window.wangEditor; var wangEditorObj = {}; var viewerObj = {}; + var ueEditorObj = {}; function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); @@ -147,6 +151,7 @@ for(var i in data) { dataFormData[i] = data[i] +''; } + initWorkTypeWrittenDocumentText(); form.val('dataForm', dataFormData); form.render(null, 'dataForm'); }, function(code, data) { @@ -158,13 +163,24 @@ }); } initData(); - + + // 初始化承诺书富文本 + function initWorkTypeWrittenDocumentText() { + var editor = UE.getEditor('workTypeWrittenDocument', {autoHeightEnabled: false}); + editor.ready(function() { + editor.setHeight(400); + }); + ueEditorObj['workTypeWrittenDocument'] = editor; + } + + // 提交表单 form.on('submit(submitForm)', function(formData) { top.dialog.confirm(top.dataMessage.commit, function(index) { top.dialog.close(index); var loadLayerIndex; top.restAjax.put(top.restAjax.path('api/worktype/update/{workTypeId}', [workTypeId]), formData.field, null, function(code, data) { + parent.parent.common.refreshTree('leftTree'); var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no],