diff --git a/src/main/java/cn/com/tenlion/controller/api/traininginstitutionserviceuser/TrainingInstitutionServiceUserController.java b/src/main/java/cn/com/tenlion/controller/api/traininginstitutionserviceuser/TrainingInstitutionServiceUserController.java new file mode 100644 index 0000000..3b00b2e --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/api/traininginstitutionserviceuser/TrainingInstitutionServiceUserController.java @@ -0,0 +1,111 @@ +package cn.com.tenlion.controller.api.traininginstitutionserviceuser; + +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.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; +import cn.com.tenlion.pojo.vos.traininginstitutionserviceuser.TrainingInstitutionServiceUserVO; +import cn.com.tenlion.service.traininginstitutionserviceuser.ITrainingInstitutionServiceUserService; +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: TrainingInstitutionServiceUserController + * @Description: 机构客服人员 + * @Author: CodeFactory + * @Date: 2021-05-26 13:54:44 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "机构客服人员接口") +@RestController +@RequestMapping(ISystemConstant.API_PREFIX + "/traininginstitutionserviceuser") +public class TrainingInstitutionServiceUserController extends DefaultBaseController { + + @Autowired + private ITrainingInstitutionServiceUserService trainingInstitutionServiceUserService; + + @ApiOperation(value = "新增机构客服人员", notes = "新增机构客服人员接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestBody TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO) { + trainingInstitutionServiceUserService.save(trainingInstitutionServiceUserVO); + 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) { + trainingInstitutionServiceUserService.remove(Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改机构客服人员", notes = "修改机构客服人员接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "trainingInstitutionServiceUserId", value = "机构客服人员ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update/{trainingInstitutionServiceUserId}") + @CheckRequestBodyAnnotation + public SuccessResult update(@PathVariable("trainingInstitutionServiceUserId") String trainingInstitutionServiceUserId, @RequestBody TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO) { + trainingInstitutionServiceUserService.update(trainingInstitutionServiceUserId, trainingInstitutionServiceUserVO); + return new SuccessResult(); + } + + @ApiOperation(value = "机构客服人员详情", notes = "机构客服人员详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "trainingInstitutionServiceUserId", value = "机构客服人员ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{trainingInstitutionServiceUserId}") + public TrainingInstitutionServiceUserDTO get(@PathVariable("trainingInstitutionServiceUserId") String trainingInstitutionServiceUserId) { + return trainingInstitutionServiceUserService.get(trainingInstitutionServiceUserId); + } + + @ApiOperation(value = "机构客服人员列表", notes = "机构客服人员列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list() { + Map params = requestParams(); + return trainingInstitutionServiceUserService.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 trainingInstitutionServiceUserService.listPage(page); + } + + @ApiOperation(value = "机构客服人员统计", notes = "机构客服人员统计接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count") + SuccessResultData count() { + Map params = requestParams(); + return new SuccessResultData<>(trainingInstitutionServiceUserService.count(params)); + } + +} \ No newline at end of file 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 index a8d2983..081b5e3 100644 --- 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 @@ -59,6 +59,18 @@ public class ApplyAppController extends DefaultBaseController { } + @ApiOperation(value = "工种报名培训机构列表", notes = "工种报名培训机构列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "workTypeId", value = "工种ID", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-apply-work-type") + public List listApplyWorkType(@RequestHeader("token") String token) throws Exception{ + Map params = requestParams(); + return applyService.listApplyWorkType(token,params); + } + @ApiOperation(value = "我的报名信息分页列表", notes = "我的报名信息分页列表接口") diff --git a/src/main/java/cn/com/tenlion/dao/traininginstitutionserviceuser/ITrainingInstitutionServiceUserDao.java b/src/main/java/cn/com/tenlion/dao/traininginstitutionserviceuser/ITrainingInstitutionServiceUserDao.java new file mode 100644 index 0000000..7dd77ed --- /dev/null +++ b/src/main/java/cn/com/tenlion/dao/traininginstitutionserviceuser/ITrainingInstitutionServiceUserDao.java @@ -0,0 +1,129 @@ +package cn.com.tenlion.dao.traininginstitutionserviceuser; + +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.traininginstitutionserviceuser.TrainingInstitutionServiceUserBO; +import cn.com.tenlion.pojo.pos.traininginstitutionserviceuser.TrainingInstitutionServiceUserPO; +import cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: ITrainingInstitutionServiceUserDao + * @Description: 机构客服人员 + * @Author: CodeFactory + * @Date: 2021-05-26 13:54:44 + * @Version: 3.0 + **/ +@Repository +public interface ITrainingInstitutionServiceUserDao { + + /** + * 新增机构客服人员 + * + * @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 + */ + TrainingInstitutionServiceUserDTO get(Map params) throws SearchException; + + /** + * 机构客服人员详情 + * + * @param params + * @return + * @throws SearchException + */ + TrainingInstitutionServiceUserBO getBO(Map params) throws SearchException; + + /** + * 机构客服人员详情 + * + * @param params + * @return + * @throws SearchException + */ + TrainingInstitutionServiceUserPO 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; + + + /** + * 修改客服人员 根据机构ID + * @param params + * @throws UpdateException + */ + void updateByInstitutionId(Map params) throws UpdateException; + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionserviceuser/TrainingInstitutionServiceUserBO.java b/src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionserviceuser/TrainingInstitutionServiceUserBO.java new file mode 100644 index 0000000..4d05c7e --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionserviceuser/TrainingInstitutionServiceUserBO.java @@ -0,0 +1,121 @@ +package cn.com.tenlion.pojo.bos.traininginstitutionserviceuser; + +/** + * + * @ClassName: TrainingInstitutionServiceUserBO + * @Description: 机构客服人员 + * @Author: CodeFactory + * @Date: 2021-05-26 13:54:44 + * @Version: 3.0 + **/ +public class TrainingInstitutionServiceUserBO { + + private String trainingInstitutionServiceUserId; + private String institutionId; + private String serviceUserName; + private String serviceUserPhone; + private String serviceUserCode; + private String serviceUserDescribe; + private String serviceUserStatus; + private String creator; + private String gmtCreate; + private String modifier; + private String gmtModified; + private Integer isDelete; + + public String getTrainingInstitutionServiceUserId() { + return trainingInstitutionServiceUserId == null ? "" : trainingInstitutionServiceUserId.trim(); + } + + public void setTrainingInstitutionServiceUserId(String trainingInstitutionServiceUserId) { + this.trainingInstitutionServiceUserId = trainingInstitutionServiceUserId; + } + + public String getInstitutionId() { + return institutionId == null ? "" : institutionId.trim(); + } + + public void setInstitutionId(String institutionId) { + this.institutionId = institutionId; + } + + public String getServiceUserName() { + return serviceUserName == null ? "" : serviceUserName.trim(); + } + + public void setServiceUserName(String serviceUserName) { + this.serviceUserName = serviceUserName; + } + + public String getServiceUserPhone() { + return serviceUserPhone == null ? "" : serviceUserPhone.trim(); + } + + public void setServiceUserPhone(String serviceUserPhone) { + this.serviceUserPhone = serviceUserPhone; + } + + public String getServiceUserCode() { + return serviceUserCode == null ? "" : serviceUserCode.trim(); + } + + public void setServiceUserCode(String serviceUserCode) { + this.serviceUserCode = serviceUserCode; + } + + public String getServiceUserStatus() { + return serviceUserStatus == null ? "" : serviceUserStatus.trim(); + } + + public void setServiceUserStatus(String serviceUserStatus) { + this.serviceUserStatus = serviceUserStatus; + } + + 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; + } + + public String getServiceUserDescribe() { + return serviceUserDescribe; + } + + public void setServiceUserDescribe(String serviceUserDescribe) { + this.serviceUserDescribe = serviceUserDescribe; + } +} diff --git a/src/main/java/cn/com/tenlion/pojo/bos/worktype/WorkTypeBO.java b/src/main/java/cn/com/tenlion/pojo/bos/worktype/WorkTypeBO.java index 4554d75..56fb2a1 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/worktype/WorkTypeBO.java +++ b/src/main/java/cn/com/tenlion/pojo/bos/worktype/WorkTypeBO.java @@ -15,6 +15,7 @@ public class WorkTypeBO { private String workTypeName; private String workTypeCode; private Integer workTypeSort; + private String workTypeEducation; private String workTypeWrittenDocument; private String creator; private String gmtCreate; @@ -62,6 +63,14 @@ public class WorkTypeBO { this.workTypeSort = workTypeSort; } + public String getWorkTypeEducation() { + return workTypeEducation; + } + + public void setWorkTypeEducation(String workTypeEducation) { + this.workTypeEducation = workTypeEducation; + } + public String getWorkTypeWrittenDocument() { return workTypeWrittenDocument == null ? "" : workTypeWrittenDocument.trim(); } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java index 783382e..7d33141 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java @@ -18,8 +18,12 @@ public class ApplyWorkTypeInstitutionDTO extends InstitutionDTO { private Integer applyUserNum3; @ApiModelProperty(name = "qrCode", value = "机构二维码") private String qrCode; - @ApiModelProperty(name = "applyStatus", value = "是否可以进行报名 true 可以 false 不可以") - private boolean applyStatus; + @ApiModelProperty(name = "applyStatus", value = "是否可以进行报名 applyTrue 可以报名 applyFalse 已报名 当前机构不能报名examCheckFalse") + private String applyStatus; + @ApiModelProperty(name = "workTypeName", value = "报名工种中文名称") + private String workTypeName; + + public Integer getApplyUserNum1() { return applyUserNum1; @@ -53,11 +57,19 @@ public class ApplyWorkTypeInstitutionDTO extends InstitutionDTO { this.qrCode = qrCode; } - public boolean isApplyStatus() { + public String getApplyStatus() { return applyStatus; } - public void setApplyStatus(boolean applyStatus) { + public void setApplyStatus(String applyStatus) { this.applyStatus = applyStatus; } + + public String getWorkTypeName() { + return workTypeName; + } + + public void setWorkTypeName(String workTypeName) { + this.workTypeName = workTypeName; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionserviceuser/TrainingInstitutionServiceUserDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionserviceuser/TrainingInstitutionServiceUserDTO.java new file mode 100644 index 0000000..07e0607 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionserviceuser/TrainingInstitutionServiceUserDTO.java @@ -0,0 +1,88 @@ +package cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: TrainingInstitutionServiceUserDTO + * @Description: 机构客服人员 + * @Author: CodeFactory + * @Date: 2021-05-26 13:54:44 + * @Version: 3.0 + **/ +@ApiModel +public class TrainingInstitutionServiceUserDTO { + + @ApiModelProperty(name = "trainingInstitutionServiceUserId", value = "") + private String trainingInstitutionServiceUserId; + @ApiModelProperty(name = "institutionId", value = "机构ID") + private String institutionId; + @ApiModelProperty(name = "serviceUserName", value = "客服人员姓名") + private String serviceUserName; + @ApiModelProperty(name = "serviceUserPhone", value = "联系电话") + private String serviceUserPhone; + @ApiModelProperty(name = "serviceUserCode", value = "客服人员二维码") + private String serviceUserCode; + @ApiModelProperty(name = "serviceUserDescribe", value = "客服人员简介") + private String serviceUserDescribe; + @ApiModelProperty(name = "serviceUserStatus", value = "1 启用 2禁用") + private String serviceUserStatus; + + public String getTrainingInstitutionServiceUserId() { + return trainingInstitutionServiceUserId == null ? "" : trainingInstitutionServiceUserId.trim(); + } + + public void setTrainingInstitutionServiceUserId(String trainingInstitutionServiceUserId) { + this.trainingInstitutionServiceUserId = trainingInstitutionServiceUserId; + } + + public String getInstitutionId() { + return institutionId == null ? "" : institutionId.trim(); + } + + public void setInstitutionId(String institutionId) { + this.institutionId = institutionId; + } + + public String getServiceUserName() { + return serviceUserName == null ? "" : serviceUserName.trim(); + } + + public void setServiceUserName(String serviceUserName) { + this.serviceUserName = serviceUserName; + } + + public String getServiceUserPhone() { + return serviceUserPhone == null ? "" : serviceUserPhone.trim(); + } + + public void setServiceUserPhone(String serviceUserPhone) { + this.serviceUserPhone = serviceUserPhone; + } + + public String getServiceUserCode() { + return serviceUserCode == null ? "" : serviceUserCode.trim(); + } + + public void setServiceUserCode(String serviceUserCode) { + this.serviceUserCode = serviceUserCode; + } + + public String getServiceUserStatus() { + return serviceUserStatus == null ? "" : serviceUserStatus.trim(); + } + + public void setServiceUserStatus(String serviceUserStatus) { + this.serviceUserStatus = serviceUserStatus; + } + + + public String getServiceUserDescribe() { + return serviceUserDescribe; + } + + public void setServiceUserDescribe(String serviceUserDescribe) { + this.serviceUserDescribe = serviceUserDescribe; + } +} 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 2f239ec..260bf87 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 @@ -26,6 +26,10 @@ public class WorkTypeDTO { private String workTypeCode; @ApiModelProperty(name = "workTypeSort", value = "工种排序") private Integer workTypeSort; + @ApiModelProperty(name = "workTypeEducation", value = "工种最低学历") + private String workTypeEducation; + @ApiModelProperty(name = "workTypeEducationName", value = "工种最低学历名称") + private String workTypeEducationName; @ApiModelProperty(name = "workTypeWrittenDocument", value = "工种承诺书") private String workTypeWrittenDocument; @@ -69,6 +73,15 @@ public class WorkTypeDTO { this.workTypeSort = workTypeSort; } + + public String getWorkTypeEducation() { + return workTypeEducation; + } + + public void setWorkTypeEducation(String workTypeEducation) { + this.workTypeEducation = workTypeEducation; + } + public String getWorkTypeWrittenDocument() { return workTypeWrittenDocument == null ? "" : workTypeWrittenDocument.trim(); } @@ -85,4 +98,13 @@ public class WorkTypeDTO { public void setWorkTypeParentName(String workTypeParentName) { this.workTypeParentName = workTypeParentName; } + + + public String getWorkTypeEducationName() { + return workTypeEducationName; + } + + public void setWorkTypeEducationName(String workTypeEducationName) { + this.workTypeEducationName = workTypeEducationName; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionserviceuser/TrainingInstitutionServiceUserPO.java b/src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionserviceuser/TrainingInstitutionServiceUserPO.java new file mode 100644 index 0000000..84c20c8 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionserviceuser/TrainingInstitutionServiceUserPO.java @@ -0,0 +1,121 @@ +package cn.com.tenlion.pojo.pos.traininginstitutionserviceuser; + +/** + * + * @ClassName: TrainingInstitutionServiceUserPO + * @Description: 机构客服人员 + * @Author: CodeFactory + * @Date: 2021-05-26 13:54:44 + * @Version: 3.0 + **/ +public class TrainingInstitutionServiceUserPO { + + private String trainingInstitutionServiceUserId; + private String institutionId; + private String serviceUserName; + private String serviceUserPhone; + private String serviceUserCode; + private String serviceUserDescribe; + private String serviceUserStatus; + private String creator; + private String gmtCreate; + private String modifier; + private String gmtModified; + private Integer isDelete; + + public String getTrainingInstitutionServiceUserId() { + return trainingInstitutionServiceUserId == null ? "" : trainingInstitutionServiceUserId.trim(); + } + + public void setTrainingInstitutionServiceUserId(String trainingInstitutionServiceUserId) { + this.trainingInstitutionServiceUserId = trainingInstitutionServiceUserId; + } + + public String getInstitutionId() { + return institutionId == null ? "" : institutionId.trim(); + } + + public void setInstitutionId(String institutionId) { + this.institutionId = institutionId; + } + + public String getServiceUserName() { + return serviceUserName == null ? "" : serviceUserName.trim(); + } + + public void setServiceUserName(String serviceUserName) { + this.serviceUserName = serviceUserName; + } + + public String getServiceUserPhone() { + return serviceUserPhone == null ? "" : serviceUserPhone.trim(); + } + + public void setServiceUserPhone(String serviceUserPhone) { + this.serviceUserPhone = serviceUserPhone; + } + + public String getServiceUserCode() { + return serviceUserCode == null ? "" : serviceUserCode.trim(); + } + + public void setServiceUserCode(String serviceUserCode) { + this.serviceUserCode = serviceUserCode; + } + + public String getServiceUserStatus() { + return serviceUserStatus == null ? "" : serviceUserStatus.trim(); + } + + public void setServiceUserStatus(String serviceUserStatus) { + this.serviceUserStatus = serviceUserStatus; + } + + 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; + } + + public String getServiceUserDescribe() { + return serviceUserDescribe; + } + + public void setServiceUserDescribe(String serviceUserDescribe) { + this.serviceUserDescribe = serviceUserDescribe; + } +} diff --git a/src/main/java/cn/com/tenlion/pojo/pos/worktype/WorkTypePO.java b/src/main/java/cn/com/tenlion/pojo/pos/worktype/WorkTypePO.java index a19c1c2..95f02b8 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/worktype/WorkTypePO.java +++ b/src/main/java/cn/com/tenlion/pojo/pos/worktype/WorkTypePO.java @@ -15,6 +15,7 @@ public class WorkTypePO { private String workTypeName; private String workTypeCode; private Integer workTypeSort; + private String workTypeEducation; private String workTypeWrittenDocument; private String creator; private String gmtCreate; @@ -62,6 +63,14 @@ public class WorkTypePO { this.workTypeSort = workTypeSort; } + public String getWorkTypeEducation() { + return workTypeEducation; + } + + public void setWorkTypeEducation(String workTypeEducation) { + this.workTypeEducation = workTypeEducation; + } + public String getWorkTypeWrittenDocument() { return workTypeWrittenDocument == null ? "" : workTypeWrittenDocument.trim(); } diff --git a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionserviceuser/TrainingInstitutionServiceUserVO.java b/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionserviceuser/TrainingInstitutionServiceUserVO.java new file mode 100644 index 0000000..09115d0 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionserviceuser/TrainingInstitutionServiceUserVO.java @@ -0,0 +1,89 @@ +package cn.com.tenlion.pojo.vos.traininginstitutionserviceuser; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: TrainingInstitutionServiceUserVO + * @Description: 机构客服人员 + * @Author: CodeFactory + * @Date: 2021-05-26 13:54:44 + * @Version: 3.0 + **/ +@ApiModel +public class TrainingInstitutionServiceUserVO { + + @ApiModelProperty(name = "trainingInstitutionServiceUserId", value = "") + private String trainingInstitutionServiceUserId; + @ApiModelProperty(name = "institutionId", value = "机构ID") + private String institutionId; + @ApiModelProperty(name = "serviceUserName", value = "客服人员姓名") + private String serviceUserName; + @ApiModelProperty(name = "serviceUserPhone", value = "联系电话") + private String serviceUserPhone; + @ApiModelProperty(name = "serviceUserCode", value = "客服人员二维码") + private String serviceUserCode; + @ApiModelProperty(name = "serviceUserDescribe", value = "客服人员简介") + private String serviceUserDescribe; + @ApiModelProperty(name = "serviceUserStatus", value = "1 启用 2禁用") + private String serviceUserStatus; + + public String getTrainingInstitutionServiceUserId() { + return trainingInstitutionServiceUserId == null ? "" : trainingInstitutionServiceUserId.trim(); + } + + public void setTrainingInstitutionServiceUserId(String trainingInstitutionServiceUserId) { + this.trainingInstitutionServiceUserId = trainingInstitutionServiceUserId; + } + + public String getInstitutionId() { + return institutionId == null ? "" : institutionId.trim(); + } + + public void setInstitutionId(String institutionId) { + this.institutionId = institutionId; + } + + public String getServiceUserName() { + return serviceUserName == null ? "" : serviceUserName.trim(); + } + + public void setServiceUserName(String serviceUserName) { + this.serviceUserName = serviceUserName; + } + + public String getServiceUserPhone() { + return serviceUserPhone == null ? "" : serviceUserPhone.trim(); + } + + public void setServiceUserPhone(String serviceUserPhone) { + this.serviceUserPhone = serviceUserPhone; + } + + public String getServiceUserCode() { + return serviceUserCode == null ? "" : serviceUserCode.trim(); + } + + public void setServiceUserCode(String serviceUserCode) { + this.serviceUserCode = serviceUserCode; + } + + public String getServiceUserStatus() { + return serviceUserStatus == null ? "" : serviceUserStatus.trim(); + } + + public void setServiceUserStatus(String serviceUserStatus) { + this.serviceUserStatus = serviceUserStatus; + } + + public String getServiceUserDescribe() { + return serviceUserDescribe; + } + + public void setServiceUserDescribe(String serviceUserDescribe) { + this.serviceUserDescribe = serviceUserDescribe; + } +} diff --git a/src/main/java/cn/com/tenlion/pojo/vos/worktype/WorkTypeVO.java b/src/main/java/cn/com/tenlion/pojo/vos/worktype/WorkTypeVO.java index bb51b87..853b749 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/worktype/WorkTypeVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/worktype/WorkTypeVO.java @@ -19,12 +19,17 @@ public class WorkTypeVO { @ApiModelProperty(name = "workTypeParentId", value = "工种父级节点") private String workTypeParentId; @ApiModelProperty(name = "workTypeName", value = "工种名称") + @CheckEmptyAnnotation(name = "工种名称") private String workTypeName; @ApiModelProperty(name = "workTypeCode", value = "工种编码") + @CheckEmptyAnnotation(name = "工种编码") private String workTypeCode; @ApiModelProperty(name = "workTypeSort", value = "工种排序") @CheckNumberAnnotation(name = "工种排序") private Integer workTypeSort; + @ApiModelProperty(name = "workTypeEducation", value = "工资最低学历") + @CheckEmptyAnnotation(name = "工种最低学历") + private String workTypeEducation; @ApiModelProperty(name = "workTypeWrittenDocument", value = "工种承诺书") private String workTypeWrittenDocument; @@ -68,5 +73,11 @@ public class WorkTypeVO { this.workTypeWrittenDocument = workTypeWrittenDocument; } + public String getWorkTypeEducation() { + return workTypeEducation; + } + public void setWorkTypeEducation(String workTypeEducation) { + this.workTypeEducation = workTypeEducation; + } } diff --git a/src/main/java/cn/com/tenlion/service/apply/IApplyService.java b/src/main/java/cn/com/tenlion/service/apply/IApplyService.java index 51fcc6f..8ed1e46 100644 --- a/src/main/java/cn/com/tenlion/service/apply/IApplyService.java +++ b/src/main/java/cn/com/tenlion/service/apply/IApplyService.java @@ -52,6 +52,17 @@ public interface IApplyService { */ SuccessResultList> listPageApplyWorkType(String token,ListPage page) throws Exception; + + /** + * 工种培训机构列表 + * @param token + * @param params + * @return + * @throws Exception + */ + List listApplyWorkType(String token,Map params) throws Exception; + + /** * 报名信息审核 * @param applyAuditVO 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 index 029c31f..69849be 100644 --- a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java @@ -8,7 +8,9 @@ import cn.com.tenlion.pojo.dtos.apply.ApplyClassPlanDTO; import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; import cn.com.tenlion.pojo.dtos.apply.ApplyWorkTypeInstitutionDTO; import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; import cn.com.tenlion.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; +import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; import cn.com.tenlion.pojo.pos.apply.ApplyPO; import cn.com.tenlion.pojo.vos.apply.ApplyAuditVO; import cn.com.tenlion.pojo.vos.apply.ApplyVO; @@ -18,8 +20,10 @@ import cn.com.tenlion.service.applyauditlog.IApplyAuditLogService; import cn.com.tenlion.service.classplan.IClassPlanService; import cn.com.tenlion.service.examcheck.IExamCheckService; import cn.com.tenlion.service.examination.distributioncard.IDistributionCardService; +import cn.com.tenlion.service.traininginstitutionserviceuser.ITrainingInstitutionServiceUserService; import cn.com.tenlion.service.traininginstitutionuser.ITrainingInstitutionUserService; import cn.com.tenlion.service.traininginstitutionworktype.ITrainingInstitutionWorkTypeService; +import cn.com.tenlion.service.worktype.IWorkTypeService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; @@ -28,6 +32,8 @@ import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.login.base.manager.ConfigManager; +import ink.wgink.module.dictionary.pojo.dtos.DataDTO; +import ink.wgink.module.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.app.AppTokenUser; import ink.wgink.pojo.dtos.user.UserDTO; @@ -85,6 +91,13 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic private String defaultPassword; @Autowired private ServerProperties serverProperties; + @Autowired + private IDataService dataService; + @Autowired + private IWorkTypeService workTypeService; + @Autowired + private ITrainingInstitutionServiceUserService trainingInstitutionServiceUserService; + /** * 修改报名机构 @@ -150,7 +163,7 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic } params.put("creator", userId); params.put("modifier", userId); - checkSaveData(userId,applyVO.getApplyWorkTypeId(),applyVO.getApplyInstitutionId()); + checkSaveData(userId,applyVO); applyDao.save(params); return applyId; } @@ -257,6 +270,49 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic return new SuccessResultList<>(list, classPlanDTOList.getPage(), classPlanDTOList.getTotal()); } + public List listApplyWorkType(String token,Map params) throws Exception{ + String workTypeId = params.get("workTypeId").toString(); + AppTokenUser appTokenUser = getAppTokenUser(token); + List list= new ArrayList<>(); + if(StringUtils.isBlank(workTypeId)){ + throw new ParamsException("请选择报考的工种"); + } + List trainingInstitutionWorkTypeList = trainingInstitutionWorkTypeService.list(params); + for (TrainingInstitutionWorkTypeDTO row : trainingInstitutionWorkTypeList) { + ApplyWorkTypeInstitutionDTO trainingInstitutionWorkTypeDTO = new ApplyWorkTypeInstitutionDTO(); + InstitutionDTO institutionDTO = iInstitutionService.get(row.getInstitutionId()); + BeanUtils.copyProperties(trainingInstitutionWorkTypeDTO,institutionDTO); + //统计机构报名数量 + List states = new ArrayList<>(); + states.add("0"); + states.add("1"); + states.add("2"); + states.add("-1"); + Integer num2 = countApplyNum(workTypeId,row.getInstitutionId(),states); + //统计机构报名审核通过数量 + states.clear(); + states.add("2"); + Integer num3 = countApplyNum(workTypeId,row.getInstitutionId(),states); + Object applyClassPlanUserNum = ConfigManager.getInstance().getConfig().get("applyClassPlanUserNum"); + trainingInstitutionWorkTypeDTO.setApplyUserNum1(applyClassPlanUserNum == null ? 0:Integer.valueOf(applyClassPlanUserNum.toString())); + trainingInstitutionWorkTypeDTO.setApplyUserNum2(num2); + trainingInstitutionWorkTypeDTO.setApplyUserNum3(num3); + //判断当前机构是否可以报名 + if(checkApplyIsFirst(appTokenUser.getId(),workTypeId,row.getInstitutionId()) != 0){ + trainingInstitutionWorkTypeDTO.setApplyStatus("applyFalse"); + }else{ + Boolean b = examCheckService.getExamCheckFailOrBack(workTypeId,row.getInstitutionId()); + trainingInstitutionWorkTypeDTO.setApplyStatus(b == true ? "applyTrue":"examCheckFalse"); + } + TrainingInstitutionServiceUserDTO byByInstitutionId = trainingInstitutionServiceUserService.getByByInstitutionId(row.getInstitutionId()); + trainingInstitutionWorkTypeDTO.setQrCode(byByInstitutionId != null ? byByInstitutionId.getServiceUserCode() : ""); + trainingInstitutionWorkTypeDTO.setWorkTypeName(row.getWorkTypeName()); + list.add(trainingInstitutionWorkTypeDTO); + } + return list; + } + + public SuccessResultList> listPageApplyWorkType(String token,ListPage page) throws Exception{ @@ -288,11 +344,14 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic trainingInstitutionWorkTypeDTO.setApplyUserNum2(num2); trainingInstitutionWorkTypeDTO.setApplyUserNum3(num3); //判断当前机构是否可以报名 + //判断当前机构是否可以报名 if(checkApplyIsFirst(appTokenUser.getId(),workTypeId,row.getInstitutionId()) != 0){ - trainingInstitutionWorkTypeDTO.setApplyStatus(false); + trainingInstitutionWorkTypeDTO.setApplyStatus("applyFalse"); }else{ - trainingInstitutionWorkTypeDTO.setApplyStatus(examCheckService.getExamCheckFailOrBack(workTypeId,row.getInstitutionId())); + Boolean b = examCheckService.getExamCheckFailOrBack(workTypeId,row.getInstitutionId()); + trainingInstitutionWorkTypeDTO.setApplyStatus(b == true ? "applyTrue":"examCheckFalse"); } + trainingInstitutionWorkTypeDTO.setQrCode(createQrCode(row.getInstitutionId())); list.add(trainingInstitutionWorkTypeDTO); @@ -354,7 +413,7 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic setAppSaveInfo(token, params); } //检查报名数据 - checkSaveData(params.get("creator").toString(),applyVO.getApplyWorkTypeId(),applyVO.getApplyInstitutionId()); + checkSaveData(params.get("creator").toString(),applyVO); applyDao.save(params); //增加操作日志 ApplyAuditLogVO auditLogVO = new ApplyAuditLogVO(); @@ -365,11 +424,14 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic return applyId; } - public void checkSaveData(String creator,String applyWorkTypeId,String applyInstitutionId){ + public void checkSaveData(String creator,ApplyVO applyVO){ // if(countApplyCardNumber(applyCardNumber,ApplyClassId) != 0){ // throw new SaveException("您以报名过该项目"); // } + String applyWorkTypeId = applyVO.getApplyWorkTypeId(); + String applyInstitutionId = applyVO.getApplyInstitutionId(); + if(checkApplyIsFirst(creator,applyWorkTypeId,applyInstitutionId) != 0){ throw new SaveException("您已报名过该机构"); } @@ -379,10 +441,19 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic if(!examCheckService.getExamCheckFailOrBack(applyWorkTypeId,applyInstitutionId)){ throw new SaveException("该机构暂时不能报名"); } - - - - + //最低学历效验 + WorkTypeDTO workTypeDTO = workTypeService.get(applyWorkTypeId); + if(workTypeDTO == null){ + throw new SaveException("未获取到工种信息"); + } + String workTypeEducation = workTypeDTO.getWorkTypeEducation(); + if(!StringUtils.isBlank(workTypeEducation)){ + DataDTO workTypeEducationDTO = dataService.get(workTypeEducation);//工种配置最低学历 + DataDTO applyCultureLevelDTO = dataService.get(applyVO.getApplyCultureLevel());//报名学历 + if(!(Integer.valueOf(applyCultureLevelDTO.getDataSort()) <= Integer.valueOf(workTypeEducationDTO.getDataSort()))){ + throw new SaveException("您填写的学历不满足报名工种要求的最低学历"); + } + } // ClassPlanDTO classPlanDTO = classPlanService.get(ApplyClassId); // if(classPlanDTO == null){ // throw new ParamsException("未查询到计划信息"); @@ -415,7 +486,9 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic } - public void checkUpdateData(String creator,String applyId,String applyWorkTypeId,String applyInstitutionId){ + public void checkUpdateData(String creator,String applyId,ApplyVO applyVO){ + String applyWorkTypeId = applyVO.getApplyWorkTypeId(); + String applyInstitutionId = applyVO.getApplyInstitutionId(); ApplyDTO applyDTO = this.get(applyId); if(applyDTO == null){ throw new SearchException("未获取到报名信息"); @@ -434,6 +507,20 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic throw new SaveException("该机构以截止报名"); } + //最低学历效验 + WorkTypeDTO workTypeDTO = workTypeService.get(applyWorkTypeId); + if(workTypeDTO == null){ + throw new SaveException("未获取到工种信息"); + } + String workTypeEducation = workTypeDTO.getWorkTypeEducation(); + if(!StringUtils.isBlank(workTypeEducation)){ + DataDTO workTypeEducationDTO = dataService.get(workTypeEducation);//工种配置最低学历 + DataDTO applyCultureLevelDTO = dataService.get(applyVO.getApplyCultureLevel());//报名学历 + if(!(Integer.valueOf(applyCultureLevelDTO.getDataSort()) <= Integer.valueOf(workTypeEducationDTO.getDataSort()))){ + throw new SaveException("您不满足报名工种的最低学历"); + } + } + } @@ -479,7 +566,7 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic } else { setAppUpdateInfo(token, params); } - checkUpdateData(params.get("modifier").toString(),applyId,applyVO.getApplyWorkTypeId(),applyVO.getApplyInstitutionId()); + checkUpdateData(params.get("modifier").toString(),applyId,applyVO); applyDao.update(params); //增加操作日志 ApplyAuditLogVO auditLogVO = new ApplyAuditLogVO(); diff --git a/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/ITrainingInstitutionServiceUserService.java b/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/ITrainingInstitutionServiceUserService.java new file mode 100644 index 0000000..544802f --- /dev/null +++ b/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/ITrainingInstitutionServiceUserService.java @@ -0,0 +1,196 @@ +package cn.com.tenlion.service.traininginstitutionserviceuser; + +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; +import cn.com.tenlion.pojo.vos.traininginstitutionserviceuser.TrainingInstitutionServiceUserVO; +import cn.com.tenlion.pojo.bos.traininginstitutionserviceuser.TrainingInstitutionServiceUserBO; +import cn.com.tenlion.pojo.pos.traininginstitutionserviceuser.TrainingInstitutionServiceUserPO; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: ITrainingInstitutionServiceUserService + * @Description: 机构客服人员 + * @Author: CodeFactory + * @Date: 2021-05-26 13:54:44 + * @Version: 3.0 + **/ +public interface ITrainingInstitutionServiceUserService { + + + /** + * 获取机构启用的客服人员 (一位) + * @param institutionId + * @return + */ + TrainingInstitutionServiceUserDTO getByByInstitutionId(String institutionId); + + /** + * 新增机构客服人员 + * + * @param trainingInstitutionServiceUserVO + * @return + */ + void save(TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO); + + /** + * 新增机构客服人员 + * + * @param token + * @param trainingInstitutionServiceUserVO + * @return + */ + void save(String token, TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO); + + /** + * 新增机构客服人员 + * + * @param trainingInstitutionServiceUserVO + * @return trainingInstitutionServiceUserId + */ + String saveReturnId(TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO); + + /** + * 新增机构客服人员 + * + * @param token + * @param trainingInstitutionServiceUserVO + * @return trainingInstitutionServiceUserId + */ + String saveReturnId(String token, TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO); + + /** + * 删除机构客服人员 + * + * @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 trainingInstitutionServiceUserId + * @param trainingInstitutionServiceUserVO + * @return + */ + void update(String trainingInstitutionServiceUserId, TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO); + + /** + * 修改机构客服人员 + * + * @param token + * @param trainingInstitutionServiceUserId + * @param trainingInstitutionServiceUserVO + * @return + */ + void update(String token, String trainingInstitutionServiceUserId, TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO); + + /** + * 机构客服人员详情 + * + * @param params 参数Map + * @return + */ + TrainingInstitutionServiceUserDTO get(Map params); + + /** + * 机构客服人员详情 + * + * @param trainingInstitutionServiceUserId + * @return + */ + TrainingInstitutionServiceUserDTO get(String trainingInstitutionServiceUserId); + + /** + * 机构客服人员详情 + * + * @param params 参数Map + * @return + */ + TrainingInstitutionServiceUserBO getBO(Map params); + + /** + * 机构客服人员详情 + * + * @param trainingInstitutionServiceUserId + * @return + */ + TrainingInstitutionServiceUserBO getBO(String trainingInstitutionServiceUserId); + + /** + * 机构客服人员详情 + * + * @param params 参数Map + * @return + */ + TrainingInstitutionServiceUserPO getPO(Map params); + + /** + * 机构客服人员详情 + * + * @param trainingInstitutionServiceUserId + * @return + */ + TrainingInstitutionServiceUserPO getPO(String trainingInstitutionServiceUserId); + + /** + * 机构客服人员列表 + * + * @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/traininginstitutionserviceuser/impl/TrainingInstitutionServiceUserServiceImpl.java b/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/impl/TrainingInstitutionServiceUserServiceImpl.java new file mode 100644 index 0000000..00da3f5 --- /dev/null +++ b/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/impl/TrainingInstitutionServiceUserServiceImpl.java @@ -0,0 +1,214 @@ +package cn.com.tenlion.service.traininginstitutionserviceuser.impl; + +import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; +import cn.com.tenlion.service.traininginstitutionuser.ITrainingInstitutionUserService; +import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.exceptions.SaveException; +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.traininginstitutionserviceuser.ITrainingInstitutionServiceUserDao; +import cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; +import cn.com.tenlion.pojo.vos.traininginstitutionserviceuser.TrainingInstitutionServiceUserVO; +import cn.com.tenlion.pojo.bos.traininginstitutionserviceuser.TrainingInstitutionServiceUserBO; +import cn.com.tenlion.pojo.pos.traininginstitutionserviceuser.TrainingInstitutionServiceUserPO; +import cn.com.tenlion.service.traininginstitutionserviceuser.ITrainingInstitutionServiceUserService; +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: TrainingInstitutionServiceUserServiceImpl + * @Description: 机构客服人员 + * @Author: CodeFactory + * @Date: 2021-05-26 13:54:44 + * @Version: 3.0 + **/ +@Service +public class TrainingInstitutionServiceUserServiceImpl extends DefaultBaseService implements ITrainingInstitutionServiceUserService { + + @Autowired + private ITrainingInstitutionServiceUserDao trainingInstitutionServiceUserDao; + @Autowired + private ITrainingInstitutionUserService trainingInstitutionUserService; + + + + @Override + public void save(TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO) { + InstitutionDTO byUserId = trainingInstitutionUserService.getByUserId(securityComponent.getCurrentUser().getUserId()); + if(byUserId == null){ + throw new SaveException("未获取到机构信息"); + } + trainingInstitutionServiceUserVO.setInstitutionId(byUserId.getInstitutionId()); + saveReturnId(trainingInstitutionServiceUserVO); + } + + @Override + public void save(String token, TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO) { + saveReturnId(token, trainingInstitutionServiceUserVO); + } + + @Override + public String saveReturnId(TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO) { + return saveReturnId(null, trainingInstitutionServiceUserVO); + } + + @Override + public String saveReturnId(String token, TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO) { + if("1".equals(trainingInstitutionServiceUserVO.getServiceUserStatus())){ + updateByInstitutionId(trainingInstitutionServiceUserVO.getInstitutionId(),"2"); + } + String trainingInstitutionServiceUserId = UUIDUtil.getUUID(); + Map params = HashMapUtil.beanToMap(trainingInstitutionServiceUserVO); + params.put("trainingInstitutionServiceUserId", trainingInstitutionServiceUserId); + if (StringUtils.isBlank(token)) { + setSaveInfo(params); + } else { + setAppSaveInfo(token, params); + } + trainingInstitutionServiceUserDao.save(params); + return trainingInstitutionServiceUserId; + } + + @Override + public void remove(List ids) { + remove(null, ids); + } + + @Override + public void remove(String token, List ids) { + Map params = getHashMap(2); + params.put("trainingInstitutionServiceUserIds", ids); + if (StringUtils.isBlank(token)) { + setUpdateInfo(params); + } else { + setAppUpdateInfo(token, params); + } + trainingInstitutionServiceUserDao.remove(params); + } + + @Override + public void delete(List ids) { + Map params = getHashMap(2); + params.put("trainingInstitutionServiceUserIds", ids); + trainingInstitutionServiceUserDao.delete(params); + } + + @Override + public void update(String trainingInstitutionServiceUserId, TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO) { + update(null, trainingInstitutionServiceUserId, trainingInstitutionServiceUserVO); + } + + @Override + public void update(String token, String trainingInstitutionServiceUserId, TrainingInstitutionServiceUserVO trainingInstitutionServiceUserVO) { + if("1".equals(trainingInstitutionServiceUserVO.getServiceUserStatus())){ + updateByInstitutionId(trainingInstitutionServiceUserVO.getInstitutionId(),"2"); + } + Map params = HashMapUtil.beanToMap(trainingInstitutionServiceUserVO); + params.put("trainingInstitutionServiceUserId", trainingInstitutionServiceUserId); + if (StringUtils.isBlank(token)) { + setUpdateInfo(params); + } else { + setAppUpdateInfo(token, params); + } + trainingInstitutionServiceUserDao.update(params); + } + + @Override + public TrainingInstitutionServiceUserDTO get(Map params) { + return trainingInstitutionServiceUserDao.get(params); + } + + @Override + public TrainingInstitutionServiceUserDTO get(String trainingInstitutionServiceUserId) { + Map params = super.getHashMap(2); + params.put("trainingInstitutionServiceUserId", trainingInstitutionServiceUserId); + return get(params); + } + + @Override + public TrainingInstitutionServiceUserBO getBO(Map params) { + return trainingInstitutionServiceUserDao.getBO(params); + } + + @Override + public TrainingInstitutionServiceUserBO getBO(String trainingInstitutionServiceUserId) { + Map params = super.getHashMap(2); + params.put("trainingInstitutionServiceUserId", trainingInstitutionServiceUserId); + return getBO(params); + } + + @Override + public TrainingInstitutionServiceUserPO getPO(Map params) { + return trainingInstitutionServiceUserDao.getPO(params); + } + + @Override + public TrainingInstitutionServiceUserPO getPO(String trainingInstitutionServiceUserId) { + Map params = super.getHashMap(2); + params.put("trainingInstitutionServiceUserId", trainingInstitutionServiceUserId); + return getPO(params); + } + + @Override + public List list(Map params) { + return trainingInstitutionServiceUserDao.list(params); + } + + @Override + public List listBO(Map params) { + return trainingInstitutionServiceUserDao.listBO(params); + } + + @Override + public List listPO(Map params) { + return trainingInstitutionServiceUserDao.listPO(params); + } + + @Override + public SuccessResultList> listPage(ListPage page) { + InstitutionDTO byUserId = trainingInstitutionUserService.getByUserId(securityComponent.getCurrentUser().getUserId()); + page.getParams().put("institutionId",byUserId == null ? "99":byUserId.getInstitutionId()); + + PageHelper.startPage(page.getPage(), page.getRows()); + List trainingInstitutionServiceUserDTOs = list(page.getParams()); + PageInfo pageInfo = new PageInfo<>(trainingInstitutionServiceUserDTOs); + return new SuccessResultList<>(trainingInstitutionServiceUserDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + + @Override + public Integer count(Map params) { + Integer count = trainingInstitutionServiceUserDao.count(params); + return count == null ? 0 : count; + } + + + public void updateByInstitutionId(String institutionId,String status){ + Map params = new HashMap<>(2); + params.put("institutionId",institutionId); + params.put("serviceUserStatus",status); + trainingInstitutionServiceUserDao.updateByInstitutionId(params); + } + + + public TrainingInstitutionServiceUserDTO getByByInstitutionId(String institutionId){ + TrainingInstitutionServiceUserDTO dto = null; + Map params = new HashMap<>(3); + params.put("institutionId",institutionId); + params.put("serviceUserStatus","1"); + List list = this.list(params); + if(list.size() != 0){ + dto = list.get(0); + } + return dto; + } + + +} \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/traininginstitutionserviceuser/training-institution-service-user-mapper.xml b/src/main/resources/mybatis/mapper/traininginstitutionserviceuser/training-institution-service-user-mapper.xml new file mode 100644 index 0000000..f3caf9b --- /dev/null +++ b/src/main/resources/mybatis/mapper/traininginstitutionserviceuser/training-institution-service-user-mapper.xml @@ -0,0 +1,348 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO e_training_institution_service_user( + training_institution_service_user_id, + institution_id, + service_user_name, + service_user_phone, + service_user_code, + service_user_describe, + service_user_status, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete + ) VALUES( + #{trainingInstitutionServiceUserId}, + #{institutionId}, + #{serviceUserName}, + #{serviceUserPhone}, + #{serviceUserCode}, + #{serviceUserDescribe}, + #{serviceUserStatus}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete} + ) + + + + + UPDATE + e_training_institution_service_user + SET + gmt_modified = #{gmtModified}, + modifier = #{modifier}, + is_delete = 1 + WHERE + training_institution_service_user_id IN + + #{trainingInstitutionServiceUserIds[${index}]} + + + + + + DELETE FROM + e_training_institution_service_user + WHERE + training_institution_service_user_id IN + + #{trainingInstitutionServiceUserIds[${index}]} + + + + + + UPDATE + e_training_institution_service_user + SET + + service_user_name = #{serviceUserName}, + + + service_user_phone = #{serviceUserPhone}, + + + service_user_code = #{serviceUserCode}, + + + service_user_describe = #{serviceUserDescribe}, + + + service_user_status = #{serviceUserStatus}, + + gmt_modified = #{gmtModified}, + modifier = #{modifier} + WHERE + training_institution_service_user_id = #{trainingInstitutionServiceUserId} + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE + e_training_institution_service_user + SET + service_user_status = #{serviceUserStatus} + WHERE + institution_id = #{institutionId} + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/traininginstitutionworktype/training-institution-work-type-mapper.xml b/src/main/resources/mybatis/mapper/traininginstitutionworktype/training-institution-work-type-mapper.xml index e18fea2..fc78ebe 100644 --- a/src/main/resources/mybatis/mapper/traininginstitutionworktype/training-institution-work-type-mapper.xml +++ b/src/main/resources/mybatis/mapper/traininginstitutionworktype/training-institution-work-type-mapper.xml @@ -139,12 +139,14 @@ e_training_institution_work_type t1 LEFT JOIN e_work_type e1 ON t1.work_type_id = e1.work_type_id + LEFT JOIN m_institution m + ON t1.institution_id = m.institution_id WHERE t1.is_delete = 0 AND ( - e1.work_type_name LIKE CONCAT('%', #{keywords}, '%') + m.institution_name LIKE CONCAT('%', #{keywords}, '%') ) 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 a6979e1..1cb9d6f 100644 --- a/src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml +++ b/src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml @@ -9,6 +9,8 @@ + + @@ -18,6 +20,7 @@ + @@ -32,6 +35,7 @@ + @@ -78,6 +82,7 @@ work_type_name, work_type_code, work_type_sort, + work_type_education, work_type_written_document, creator, gmt_create, @@ -90,6 +95,7 @@ #{workTypeName}, #{workTypeCode}, #{workTypeSort}, + #{workTypeEducation}, #{workTypeWrittenDocument}, #{creator}, #{gmtCreate}, @@ -139,6 +145,9 @@ work_type_code = #{workTypeCode}, + + work_type_education = #{workTypeEducation}, + work_type_sort = #{workTypeSort}, @@ -158,6 +167,7 @@ t1.work_type_name, t1.work_type_code, t1.work_type_sort, + t1.work_type_education, t1.work_type_written_document, t1.work_type_id, t2.work_type_name AS work_type_parent_name @@ -181,6 +191,7 @@ t1.work_type_name, t1.work_type_code, t1.work_type_sort, + t1.work_type_education, t1.work_type_written_document, t1.creator, t1.gmt_create, @@ -205,6 +216,7 @@ t1.work_type_name, t1.work_type_code, t1.work_type_sort, + t1.work_type_education, t1.work_type_written_document, t1.creator, t1.gmt_create, @@ -229,12 +241,16 @@ t1.work_type_name, t1.work_type_code, t1.work_type_sort, + t1.work_type_education, t1.work_type_written_document, - t2.work_type_name AS work_type_parent_name + t2.work_type_name AS work_type_parent_name, + d.data_name AS work_type_education_name FROM e_work_type t1 LEFT JOIN e_work_type t2 ON t1.work_type_parent_id = t2.work_type_id + LEFT JOIN data_data d + ON t1.work_type_education = d.data_id WHERE t1.is_delete = 0 AND t1.work_type_parent_id = #{workTypeParentId} @@ -269,6 +285,7 @@ t1.work_type_name, t1.work_type_code, t1.work_type_sort, + t1.work_type_education, t1.work_type_written_document, t1.creator, t1.gmt_create, @@ -311,6 +328,7 @@ t1.work_type_name, t1.work_type_code, t1.work_type_sort, + t1.work_type_education, t1.work_type_written_document, t1.creator, t1.gmt_create, diff --git a/src/main/resources/static/route/traininginstitutionserviceuser/list.html b/src/main/resources/static/route/traininginstitutionserviceuser/list.html new file mode 100644 index 0000000..dca857c --- /dev/null +++ b/src/main/resources/static/route/traininginstitutionserviceuser/list.html @@ -0,0 +1,269 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/traininginstitutionserviceuser/save.html b/src/main/resources/static/route/traininginstitutionserviceuser/save.html new file mode 100644 index 0000000..7d1c64d --- /dev/null +++ b/src/main/resources/static/route/traininginstitutionserviceuser/save.html @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + +
+
+ +
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/traininginstitutionserviceuser/update.html b/src/main/resources/static/route/traininginstitutionserviceuser/update.html new file mode 100644 index 0000000..23f9113 --- /dev/null +++ b/src/main/resources/static/route/traininginstitutionserviceuser/update.html @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + +
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + + + + \ 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 00f903a..ffbebd7 100644 --- a/src/main/resources/static/route/worktype/list.html +++ b/src/main/resources/static/route/worktype/list.html @@ -135,7 +135,17 @@ } return rowData; } - } + }, + {field: 'workTypeEducationName', width: 250, title: '工种最低学历', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } + }, + ] ], page: true, diff --git a/src/main/resources/static/route/worktype/save.html b/src/main/resources/static/route/worktype/save.html index e031c7d..58b7e3d 100644 --- a/src/main/resources/static/route/worktype/save.html +++ b/src/main/resources/static/route/worktype/save.html @@ -10,6 +10,9 @@ +
@@ -47,6 +50,18 @@
+
+ +
+ +
@@ -144,10 +159,23 @@ } + // 初始化工种最低学历 + function initWorkTypeEducationSelect() { + top.restAjax.get(top.restAjax.path('api/data/listbyparentid/d6b9f026-6ea9-456a-b48b-0c18d502523b', []), {}, null, function(code, data, args) { + laytpl(document.getElementById('workTypeEducationTemplate').innerHTML).render(data, function(html) { + document.getElementById('workTypeEducationTemplateBox').innerHTML = html; + }); + form.render('select', 'workTypeEducationTemplateBox'); + }, function(code, data) { + top.dialog.msg(data.msg); + }); + } + // 初始化内容 function initData() { initWorkTypeWrittenDocumentText(); parentName(); + initWorkTypeEducationSelect(); } initData(); diff --git a/src/main/resources/static/route/worktype/update.html b/src/main/resources/static/route/worktype/update.html index 7a0c698..dcf504a 100644 --- a/src/main/resources/static/route/worktype/update.html +++ b/src/main/resources/static/route/worktype/update.html @@ -10,6 +10,9 @@ +
@@ -47,6 +50,18 @@
+
+ +
+ +
@@ -142,6 +157,21 @@ } } + // 初始化工种最低学历 + function initWorkTypeEducationSelect(obj) { + top.restAjax.get(top.restAjax.path('api/data/listbyparentid/d6b9f026-6ea9-456a-b48b-0c18d502523b', []), {}, null, function(code, data, args) { + laytpl(document.getElementById('workTypeEducationTemplate').innerHTML).render(data, function(html) { + document.getElementById('workTypeEducationTemplateBox').innerHTML = html; + }); + form.render('select', 'workTypeEducationTemplateBox'); + var selectObj = {}; + selectObj['workTypeEducation'] = obj; + form.val('dataForm', selectObj); + }, function(code, data) { + top.dialog.msg(data.msg); + }); + } + // 初始化内容 function initData() { @@ -152,6 +182,7 @@ dataFormData[i] = data[i] +''; } initWorkTypeWrittenDocumentText(); + initWorkTypeEducationSelect(data['workTypeEducation']); form.val('dataForm', dataFormData); form.render(null, 'dataForm'); }, function(code, data) {