1.工种管理新增最低学历

2.报名逻辑增加最低学历判断
3.机构增加客服人员功能

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<TrainingInstitutionServiceUserDTO> list() {
+        Map<String, Object> 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<List<TrainingInstitutionServiceUserDTO>> listPage(ListPage page) {
+        Map<String, Object> params = requestParams();
+        page.setParams(params);
+        return trainingInstitutionServiceUserService.listPage(page);
+    }
+
+    @ApiOperation(value = "机构客服人员统计", notes = "机构客服人员统计接口")
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("count")
+    SuccessResultData<Integer> count() {
+        Map<String, Object> params = requestParams();
+        return new SuccessResultData<>(trainingInstitutionServiceUserService.count(params));
+    }
+
+}

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<ApplyWorkTypeInstitutionDTO> listApplyWorkType(@RequestHeader("token") String token) throws Exception{
+        Map<String, Object> params = requestParams();
+        return applyService.listApplyWorkType(token,params);
+    }
+
 
 
     @ApiOperation(value = "我的报名信息分页列表", notes = "我的报名信息分页列表接口")

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<String, Object> params) throws SaveException;
+
+    /**
+     * 删除机构客服人员
+     *
+     * @param params
+     * @throws RemoveException
+     */
+    void remove(Map<String, Object> params) throws RemoveException;
+
+    /**
+     * 删除机构客服人员（物理）
+     *
+     * @param params
+     * @throws RemoveException
+     */
+    void delete(Map<String, Object> params) throws RemoveException;
+
+    /**
+     * 修改机构客服人员
+     *
+     * @param params
+     * @throws UpdateException
+     */
+    void update(Map<String, Object> params) throws UpdateException;
+
+
+    /**
+     * 机构客服人员详情
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    TrainingInstitutionServiceUserDTO get(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 机构客服人员详情
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    TrainingInstitutionServiceUserBO getBO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 机构客服人员详情
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    TrainingInstitutionServiceUserPO getPO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 机构客服人员列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<TrainingInstitutionServiceUserDTO> list(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 机构客服人员列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<TrainingInstitutionServiceUserBO> listBO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 机构客服人员列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<TrainingInstitutionServiceUserPO> listPO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 机构客服人员统计
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    Integer count(Map<String, Object> params) throws SearchException;
+
+
+    /**
+     * 修改客服人员 根据机构ID
+     * @param params
+     * @throws UpdateException
+     */
+    void updateByInstitutionId(Map<String, Object> params) throws UpdateException;
+
+}

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;
+    }
+}

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();
     }

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;
+    }
 }

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;
+    }
+}

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;
+    }
 }

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;
+    }
+}

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();
     }

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;
+    }
+}

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;
+    }
 }

src/main/java/cn/com/tenlion/service/apply/IApplyService.java

@@ -52,6 +52,17 @@ public interface IApplyService {
      */
     SuccessResultList<List<ApplyWorkTypeInstitutionDTO>> listPageApplyWorkType(String token,ListPage page) throws Exception;
 
+
+    /**
+     * 工种培训机构列表
+     * @param token
+     * @param params
+     * @return
+     * @throws Exception
+     */
+    List<ApplyWorkTypeInstitutionDTO> listApplyWorkType(String token,Map<String, Object> params) throws Exception;
+
+
     /**
      * 报名信息审核
      * @param applyAuditVO

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<ApplyWorkTypeInstitutionDTO> listApplyWorkType(String token,Map<String,Object> params) throws Exception{
+        String workTypeId = params.get("workTypeId").toString();
+        AppTokenUser appTokenUser = getAppTokenUser(token);
+        List<ApplyWorkTypeInstitutionDTO> list= new ArrayList<>();
+        if(StringUtils.isBlank(workTypeId)){
+            throw new ParamsException("请选择报考的工种");
+        }
+        List<TrainingInstitutionWorkTypeDTO> trainingInstitutionWorkTypeList = trainingInstitutionWorkTypeService.list(params);
+        for (TrainingInstitutionWorkTypeDTO row : trainingInstitutionWorkTypeList) {
+            ApplyWorkTypeInstitutionDTO trainingInstitutionWorkTypeDTO = new ApplyWorkTypeInstitutionDTO();
+            InstitutionDTO institutionDTO = iInstitutionService.get(row.getInstitutionId());
+            BeanUtils.copyProperties(trainingInstitutionWorkTypeDTO,institutionDTO);
+            //统计机构报名数量
+            List<String> 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<List<ApplyWorkTypeInstitutionDTO>> 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();

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<String> ids);
+
+
+    /**
+     * 删除机构客服人员
+     *
+     * @param token
+     * @param ids id列表
+     * @return
+     */
+    void remove(String token, List<String> ids);
+
+    /**
+     * 删除机构客服人员（物理删除）
+     *
+     * @param ids id列表
+     */
+    void delete(List<String> 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<String, Object> params);
+
+    /**
+     * 机构客服人员详情
+     *
+     * @param trainingInstitutionServiceUserId
+     * @return
+     */
+    TrainingInstitutionServiceUserDTO get(String trainingInstitutionServiceUserId);
+
+    /**
+     * 机构客服人员详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    TrainingInstitutionServiceUserBO getBO(Map<String, Object> params);
+
+    /**
+     * 机构客服人员详情
+     *
+     * @param trainingInstitutionServiceUserId
+     * @return
+     */
+    TrainingInstitutionServiceUserBO getBO(String trainingInstitutionServiceUserId);
+
+    /**
+     * 机构客服人员详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    TrainingInstitutionServiceUserPO getPO(Map<String, Object> params);
+
+    /**
+     * 机构客服人员详情
+     *
+     * @param trainingInstitutionServiceUserId
+     * @return
+     */
+    TrainingInstitutionServiceUserPO getPO(String trainingInstitutionServiceUserId);
+
+    /**
+     * 机构客服人员列表
+     *
+     * @param params
+     * @return
+     */
+    List<TrainingInstitutionServiceUserDTO> list(Map<String, Object> params);
+
+    /**
+     * 机构客服人员列表
+     *
+     * @param params
+     * @return
+     */
+    List<TrainingInstitutionServiceUserBO> listBO(Map<String, Object> params);
+
+    /**
+     * 机构客服人员列表
+     *
+     * @param params
+     * @return
+     */
+    List<TrainingInstitutionServiceUserPO> listPO(Map<String, Object> params);
+
+    /**
+     * 机构客服人员分页列表
+     *
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<TrainingInstitutionServiceUserDTO>> listPage(ListPage page);
+
+    /**
+     * 机构客服人员统计
+     *
+     * @param params
+     * @return
+     */
+    Integer count(Map<String, Object> params);
+
+}

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<String, Object> 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<String> ids) {
+        remove(null, ids);
+    }
+
+    @Override
+    public void remove(String token, List<String> ids) {
+        Map<String, Object> 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<String> ids) {
+        Map<String, Object> 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<String, Object> 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<String, Object> params) {
+        return trainingInstitutionServiceUserDao.get(params);
+    }
+
+    @Override
+    public TrainingInstitutionServiceUserDTO get(String trainingInstitutionServiceUserId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("trainingInstitutionServiceUserId", trainingInstitutionServiceUserId);
+        return get(params);
+    }
+
+    @Override
+    public TrainingInstitutionServiceUserBO getBO(Map<String, Object> params) {
+        return trainingInstitutionServiceUserDao.getBO(params);
+    }
+
+    @Override
+    public TrainingInstitutionServiceUserBO getBO(String trainingInstitutionServiceUserId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("trainingInstitutionServiceUserId", trainingInstitutionServiceUserId);
+        return getBO(params);
+    }
+
+    @Override
+    public TrainingInstitutionServiceUserPO getPO(Map<String, Object> params) {
+        return trainingInstitutionServiceUserDao.getPO(params);
+    }
+
+    @Override
+    public TrainingInstitutionServiceUserPO getPO(String trainingInstitutionServiceUserId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("trainingInstitutionServiceUserId", trainingInstitutionServiceUserId);
+        return getPO(params);
+    }
+
+    @Override
+    public List<TrainingInstitutionServiceUserDTO> list(Map<String, Object> params) {
+        return trainingInstitutionServiceUserDao.list(params);
+    }
+
+    @Override
+    public List<TrainingInstitutionServiceUserBO> listBO(Map<String, Object> params) {
+        return trainingInstitutionServiceUserDao.listBO(params);
+    }
+
+    @Override
+    public List<TrainingInstitutionServiceUserPO> listPO(Map<String, Object> params) {
+        return trainingInstitutionServiceUserDao.listPO(params);
+    }
+
+    @Override
+    public SuccessResultList<List<TrainingInstitutionServiceUserDTO>> 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<TrainingInstitutionServiceUserDTO> trainingInstitutionServiceUserDTOs = list(page.getParams());
+        PageInfo<TrainingInstitutionServiceUserDTO> pageInfo = new PageInfo<>(trainingInstitutionServiceUserDTOs);
+        return new SuccessResultList<>(trainingInstitutionServiceUserDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
+    }
+
+    @Override
+    public Integer count(Map<String, Object> params) {
+        Integer count = trainingInstitutionServiceUserDao.count(params);
+        return count == null ? 0 : count;
+    }
+
+
+    public void updateByInstitutionId(String institutionId,String status){
+        Map<String, Object> params = new HashMap<>(2);
+        params.put("institutionId",institutionId);
+        params.put("serviceUserStatus",status);
+        trainingInstitutionServiceUserDao.updateByInstitutionId(params);
+    }
+
+
+    public TrainingInstitutionServiceUserDTO getByByInstitutionId(String institutionId){
+        TrainingInstitutionServiceUserDTO dto = null;
+        Map<String, Object> params = new HashMap<>(3);
+        params.put("institutionId",institutionId);
+        params.put("serviceUserStatus","1");
+        List<TrainingInstitutionServiceUserDTO> list = this.list(params);
+        if(list.size() != 0){
+            dto = list.get(0);
+        }
+        return dto;
+    }
+
+
+}

src/main/resources/mybatis/mapper/traininginstitutionserviceuser/training-institution-service-user-mapper.xml

@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.tenlion.dao.traininginstitutionserviceuser.ITrainingInstitutionServiceUserDao">
+
+    <resultMap id="trainingInstitutionServiceUserDTO" type="cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO">
+        <result column="training_institution_service_user_id" property="trainingInstitutionServiceUserId"/>
+        <result column="institution_id" property="institutionId"/>
+        <result column="service_user_name" property="serviceUserName"/>
+        <result column="service_user_phone" property="serviceUserPhone"/>
+        <result column="service_user_code" property="serviceUserCode"/>
+        <result column="service_user_describe" property="serviceUserDescribe"/>
+        <result column="service_user_status" property="serviceUserStatus"/>
+    </resultMap>
+
+    <resultMap id="trainingInstitutionServiceUserBO" type="cn.com.tenlion.pojo.bos.traininginstitutionserviceuser.TrainingInstitutionServiceUserBO">
+        <result column="training_institution_service_user_id" property="trainingInstitutionServiceUserId"/>
+        <result column="institution_id" property="institutionId"/>
+        <result column="service_user_name" property="serviceUserName"/>
+        <result column="service_user_phone" property="serviceUserPhone"/>
+        <result column="service_user_code" property="serviceUserCode"/>
+        <result column="service_user_describe" property="serviceUserDescribe"/>
+        <result column="service_user_status" property="serviceUserStatus"/>
+        <result column="creator" property="creator"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="modifier" property="modifier"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="is_delete" property="isDelete"/>
+    </resultMap>
+
+    <resultMap id="trainingInstitutionServiceUserPO" type="cn.com.tenlion.pojo.pos.traininginstitutionserviceuser.TrainingInstitutionServiceUserPO">
+        <result column="training_institution_service_user_id" property="trainingInstitutionServiceUserId"/>
+        <result column="institution_id" property="institutionId"/>
+        <result column="service_user_name" property="serviceUserName"/>
+        <result column="service_user_phone" property="serviceUserPhone"/>
+        <result column="service_user_code" property="serviceUserCode"/>
+        <result column="service_user_describe" property="serviceUserDescribe"/>
+        <result column="service_user_status" property="serviceUserStatus"/>
+        <result column="creator" property="creator"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="modifier" property="modifier"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="is_delete" property="isDelete"/>
+    </resultMap>
+
+    <!-- 新增机构客服人员 -->
+    <insert id="save" parameterType="map">
+        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}
+        )
+    </insert>
+
+    <!-- 删除机构客服人员 -->
+    <update id="remove" parameterType="map">
+        UPDATE
+            e_training_institution_service_user
+        SET
+            gmt_modified = #{gmtModified},
+            modifier = #{modifier},
+            is_delete = 1
+        WHERE
+            training_institution_service_user_id IN
+        <foreach collection="trainingInstitutionServiceUserIds" index="index" open="(" separator="," close=")">
+            #{trainingInstitutionServiceUserIds[${index}]}
+        </foreach>
+    </update>
+
+    <!-- 删除机构客服人员（物理） -->
+    <update id="delete" parameterType="map">
+        DELETE FROM
+            e_training_institution_service_user
+        WHERE
+            training_institution_service_user_id IN
+        <foreach collection="trainingInstitutionServiceUserIds" index="index" open="(" separator="," close=")">
+            #{trainingInstitutionServiceUserIds[${index}]}
+        </foreach>
+    </update>
+
+    <!-- 修改机构客服人员 -->
+    <update id="update" parameterType="map">
+        UPDATE
+            e_training_institution_service_user
+        SET
+        <if test="serviceUserName != null and serviceUserName != ''">
+            service_user_name = #{serviceUserName},
+        </if>
+        <if test="serviceUserPhone != null and serviceUserPhone != ''">
+            service_user_phone = #{serviceUserPhone},
+        </if>
+        <if test="serviceUserCode != null and serviceUserCode != ''">
+            service_user_code = #{serviceUserCode},
+        </if>
+        <if test="serviceUserDescribe != null and serviceUserDescribe != ''">
+            service_user_describe = #{serviceUserDescribe},
+        </if>
+        <if test="serviceUserStatus != null and serviceUserStatus != ''">
+            service_user_status = #{serviceUserStatus},
+        </if>
+            gmt_modified = #{gmtModified},
+            modifier = #{modifier}
+        WHERE
+            training_institution_service_user_id = #{trainingInstitutionServiceUserId}
+    </update>
+
+    <!-- 机构客服人员详情 -->
+    <select id="get" parameterType="map" resultMap="trainingInstitutionServiceUserDTO">
+        SELECT
+            t1.training_institution_service_user_id,
+            t1.institution_id,
+            t1.service_user_name,
+            t1.service_user_phone,
+            t1.service_user_describe,
+            t1.service_user_code,
+            t1.service_user_status,
+            t1.training_institution_service_user_id
+        FROM
+            e_training_institution_service_user t1
+        WHERE
+            t1.is_delete = 0
+            <if test="trainingInstitutionServiceUserId != null and trainingInstitutionServiceUserId != ''">
+        AND
+            t1.training_institution_service_user_id = #{trainingInstitutionServiceUserId}
+            </if>
+    </select>
+
+    <!-- 机构客服人员详情 -->
+    <select id="getBO" parameterType="map" resultMap="trainingInstitutionServiceUserBO">
+        SELECT
+            t1.training_institution_service_user_id,
+            t1.institution_id,
+            t1.service_user_name,
+            t1.service_user_phone,
+            t1.service_user_describe,
+            t1.service_user_code,
+            t1.service_user_status,
+            t1.creator,
+            t1.gmt_create,
+            t1.modifier,
+            t1.gmt_modified,
+            t1.is_delete
+        FROM
+            e_training_institution_service_user t1
+        WHERE
+            t1.is_delete = 0
+            <if test="trainingInstitutionServiceUserId != null and trainingInstitutionServiceUserId != ''">
+        AND
+            t1.training_institution_service_user_id = #{trainingInstitutionServiceUserId}
+            </if>
+    </select>
+
+    <!-- 机构客服人员详情 -->
+    <select id="getPO" parameterType="map" resultMap="trainingInstitutionServiceUserPO">
+        SELECT
+            t1.training_institution_service_user_id,
+            t1.institution_id,
+            t1.service_user_name,
+            t1.service_user_phone,
+            t1.service_user_describe,
+            t1.service_user_code,
+            t1.service_user_status,
+            t1.creator,
+            t1.gmt_create,
+            t1.modifier,
+            t1.gmt_modified,
+            t1.is_delete
+        FROM
+            e_training_institution_service_user t1
+        WHERE
+            t1.is_delete = 0
+            <if test="trainingInstitutionServiceUserId != null and trainingInstitutionServiceUserId != ''">
+        AND
+            t1.training_institution_service_user_id = #{trainingInstitutionServiceUserId}
+            </if>
+    </select>
+
+    <!-- 机构客服人员列表 -->
+    <select id="list" parameterType="map" resultMap="trainingInstitutionServiceUserDTO">
+        SELECT
+            t1.training_institution_service_user_id,
+            t1.institution_id,
+            t1.service_user_name,
+            t1.service_user_phone,
+            t1.service_user_describe,
+            t1.service_user_code,
+            t1.service_user_status
+        FROM
+            e_training_institution_service_user t1
+        WHERE
+            t1.is_delete = 0
+        <if test="keywords != null and keywords != ''">
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+        <if test="startTime != null and startTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="institutionId != null and institutionId != ''">
+            AND t1.institution_id = #{institutionId}
+        </if>
+        <if test="serviceUserStatus != null and serviceUserStatus != ''">
+            AND t1.service_user_status = #{serviceUserStatus}
+        </if>
+        <if test="trainingInstitutionServiceUserIds != null and trainingInstitutionServiceUserIds.size > 0">
+        AND
+            t1.training_institution_service_user_id IN
+            <foreach collection="trainingInstitutionServiceUserIds" index="index" open="(" separator="," close=")">
+                #{trainingInstitutionServiceUserIds[${index}]}
+            </foreach>
+        </if>
+        ORDER BY t1.gmt_create DESC
+    </select>
+
+    <!-- 机构客服人员列表 -->
+    <select id="listBO" parameterType="map" resultMap="trainingInstitutionServiceUserBO">
+        SELECT
+            t1.training_institution_service_user_id,
+            t1.institution_id,
+            t1.service_user_name,
+            t1.service_user_phone,
+            t1.service_user_describe,
+            t1.service_user_code,
+            t1.service_user_status,
+            t1.creator,
+            t1.gmt_create,
+            t1.modifier,
+            t1.gmt_modified,
+            t1.is_delete
+        FROM
+            e_training_institution_service_user t1
+        WHERE
+            t1.is_delete = 0
+        <if test="keywords != null and keywords != ''">
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+        <if test="startTime != null and startTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="trainingInstitutionServiceUserIds != null and trainingInstitutionServiceUserIds.size > 0">
+        AND
+            t1.training_institution_service_user_id IN
+            <foreach collection="trainingInstitutionServiceUserIds" index="index" open="(" separator="," close=")">
+                #{trainingInstitutionServiceUserIds[${index}]}
+            </foreach>
+        </if>
+    </select>
+
+    <!-- 机构客服人员列表 -->
+    <select id="listPO" parameterType="map" resultMap="trainingInstitutionServiceUserPO">
+        SELECT
+            t1.training_institution_service_user_id,
+            t1.institution_id,
+            t1.service_user_name,
+            t1.service_user_phone,
+            t1.service_user_describe,
+            t1.service_user_code,
+            t1.service_user_status,
+            t1.creator,
+            t1.gmt_create,
+            t1.modifier,
+            t1.gmt_modified,
+            t1.is_delete
+        FROM
+            e_training_institution_service_user t1
+        WHERE
+            t1.is_delete = 0
+        <if test="keywords != null and keywords != ''">
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+        <if test="startTime != null and startTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="trainingInstitutionServiceUserIds != null and trainingInstitutionServiceUserIds.size > 0">
+        AND
+            t1.training_institution_service_user_id IN
+            <foreach collection="trainingInstitutionServiceUserIds" index="index" open="(" separator="," close=")">
+                #{trainingInstitutionServiceUserIds[${index}]}
+            </foreach>
+        </if>
+    </select>
+
+    <!-- 机构客服人员统计  -->
+    <select id="count" parameterType="map" resultType="Integer">
+        SELECT
+            COUNT(*)
+        FROM
+            e_training_institution_service_user t1
+        WHERE
+            t1.is_delete = 0
+    </select>
+
+
+    <!-- 修改机构客服人员 -->
+    <update id="updateByInstitutionId" parameterType="map">
+        UPDATE
+            e_training_institution_service_user
+        SET
+            service_user_status = #{serviceUserStatus}
+        WHERE
+            institution_id = #{institutionId}
+    </update>
+
+</mapper>

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
         <if test="keywords != null and keywords != ''">
         AND (
             <!-- 这里添加其他条件 -->
-            e1.work_type_name LIKE CONCAT('%', #{keywords}, '%')
+            m.institution_name LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
         <if test="institutionId != null and institutionId != ''">

src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml

@@ -9,6 +9,8 @@
         <result column="work_type_name" property="workTypeName"/>
         <result column="work_type_code" property="workTypeCode"/>
         <result column="work_type_sort" property="workTypeSort"/>
+        <result column="work_type_education" property="workTypeEducation"/>
+        <result column="work_type_education_name" property="workTypeEducationName"/>
         <result column="work_type_written_document" property="workTypeWrittenDocument"/>
     </resultMap>
 
@@ -18,6 +20,7 @@
         <result column="work_type_name" property="workTypeName"/>
         <result column="work_type_code" property="workTypeCode"/>
         <result column="work_type_sort" property="workTypeSort"/>
+        <result column="work_type_education" property="workTypeEducation"/>
         <result column="work_type_written_document" property="workTypeWrittenDocument"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
@@ -32,6 +35,7 @@
         <result column="work_type_name" property="workTypeName"/>
         <result column="work_type_code" property="workTypeCode"/>
         <result column="work_type_sort" property="workTypeSort"/>
+        <result column="work_type_education" property="workTypeEducation"/>
         <result column="work_type_written_document" property="workTypeWrittenDocument"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
@@ -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 @@
         <if test="workTypeCode != null and workTypeCode != ''">
             work_type_code = #{workTypeCode},
         </if>
+        <if test="workTypeEducation != null and workTypeEducation != ''">
+            work_type_education = #{workTypeEducation},
+        </if>
         <if test="workTypeSort != null">
             work_type_sort = #{workTypeSort},
         </if>
@@ -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}
         <if test="keywords != null and keywords != ''">
@@ -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,

src/main/resources/static/route/traininginstitutionserviceuser/list.html

@@ -0,0 +1,269 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/signup/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn" style="margin-bottom: 10px;">
+                        <div class="layui-inline">
+                            <input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                    <!-- 表头按钮组 -->
+                    <script type="text/html" id="headerToolBar">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
+                                <i class="fa fa-lg fa-plus"></i> 新增
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
+                                <i class="fa fa-lg fa-edit"></i> 编辑
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent">
+                                <i class="fa fa-lg fa-trash"></i> 删除
+                            </button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laydate', 'common'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var table = layui.table;
+        var admin = layui.admin;
+        var laydate = layui.laydate;
+        var common = layui.common;
+        var resizeTimeout = null;
+        var tableUrl = 'api/traininginstitutionserviceuser/listpage';
+
+        // 初始化表格
+        function initTable() {
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, []),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 90,
+                limit: 20,
+                limits: [20, 40, 60, 80, 100, 200],
+                toolbar: '#headerToolBar',
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [
+                    [
+                        {type:'checkbox', fixed: 'left'},
+                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                        {field: 'serviceUserCode', width: 180, title: '二维码', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                var downloadFile = '';
+                                var datas = rowData.split(',');
+                                for(var i = 0, item = datas[i]; item = datas[i++];) {
+                                    if(downloadFile.length > 0) {
+                                        downloadFile += ' | ';
+                                    }
+                                    downloadFile += '<a href="route/file/download/false/'+ item +'" target="_blank">点击下载</a>'
+                                }
+                                return downloadFile;
+                            }
+                        },
+                        {field: 'serviceUserName', width: 180, title: '姓名', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'serviceUserPhone', width: 180, title: '联系电话', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'serviceUserStatus', width: 180, title: '状态', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                if(rowData == 1) {
+                                    return '启用';
+                                }
+                                if(rowData == 2) {
+                                    return '禁用';
+                                }
+                                return rowData;
+                            }
+                        }
+                    ]
+                ],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                }
+            });
+        }
+        // 重载表格
+        function reloadTable(currentPage) {
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, []),
+                where: {
+                    keywords: $('#keywords').val(),
+                    startTime: $('#startTime').val(),
+                    endTime: $('#endTime').val()
+                },
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 90,
+            });
+        }
+        // 初始化日期
+        function initDate() {
+            // 日期选择
+            laydate.render({
+                elem: '#startTime',
+                format: 'yyyy-MM-dd'
+            });
+            laydate.render({
+                elem: '#endTime',
+                format: 'yyyy-MM-dd'
+            });
+        }
+        // 删除
+        function removeData(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/traininginstitutionserviceuser/remove/{ids}', [ids]), {}, null, function (code, data) {
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
+                        reloadTable();
+                    }, function (code, data) {
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+        initTable();
+        initDate();
+        // 事件 - 页面变化
+        $win.on('resize', function() {
+            clearTimeout(resizeTimeout);
+            resizeTimeout = setTimeout(function() {
+                reloadTable();
+            }, 500);
+        });
+        // 事件 - 搜索
+        $(document).on('click', '#search', function() {
+            reloadTable(1);
+        });
+        // 事件 - 增删改
+        table.on('toolbar(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            var checkStatus = table.checkStatus('dataTable');
+            var checkDatas = checkStatus.data;
+            if(layEvent === 'saveEvent') {
+                layer.open({
+                    type: 2,
+                    title: false,
+                    closeBtn: 0,
+                    area: ['100%', '100%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/traininginstitutionserviceuser/save.html', []),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+            } else if(layEvent === 'updateEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    layer.open({
+                        type: 2,
+                        title: false,
+                        closeBtn: 0,
+                        area: ['100%', '100%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/traininginstitutionserviceuser/update.html?trainingInstitutionServiceUserId={trainingInstitutionServiceUserId}', [checkDatas[0].trainingInstitutionServiceUserId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'removeEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectDelete);
+                } else {
+                    var ids = '';
+                    for(var i = 0, item; item = checkDatas[i++];) {
+                        if(i > 1) {
+                            ids += '_';
+                        }
+                        ids += item['trainingInstitutionServiceUserId'];
+                    }
+                    removeData(ids);
+                }
+            }
+        });
+    });
+</script>
+</body>
+</html>

src/main/resources/static/route/traininginstitutionserviceuser/save.html

@@ -0,0 +1,275 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/signup/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-card">
+        <div class="layui-card-header">
+            <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
+              <a class="close" href="javascript:void(0);">上级列表</a><span lay-separator="">/</span>
+              <a href="javascript:void(0);"><cite>新增内容</cite></a>
+            </span>
+        </div>
+        <div class="layui-card-body" style="padding: 15px;">
+            <form class="layui-form layui-form-pane" lay-filter="dataForm">
+                <div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">二维码</label>
+                    <div class="layui-input-block">
+                        <input type="hidden" id="serviceUserCode" name="serviceUserCode" lay-verify="code">
+                        <div class="layui-btn-container" id="serviceUserCodeFileBox" style="border: 1px solid #e6e6e6;"></div>
+                        <script id="serviceUserCodeFileDownload" type="text/html">
+                            {{# var fileName = 'serviceUserCode'; }}
+                            {{# if(d[fileName].length > 0) { }}
+                            {{#    var files = d[fileName];}}
+                            {{#    for(var i = 0, item = files[i]; item = files[i++];) { }}
+                            <div class="upload-image-box">
+                                <span class="upload-image-span">
+                                    <img src="route/file/download/false/{{item.fileId}}" align="加载失败">
+                                </span>
+                                <a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="serviceUserCodeRemoveFile">
+                                    <i class="fa fa-trash-o"></i>
+                                </a>
+                            </div>
+                            {{#    } }}
+                            {{# } }}
+                            {{# if(d[fileName].length < 1) { }}
+                            <div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">
+                                <a href="javascript:void(0);" lay-form-button data-explain="客服人员二维码" data-name="serviceUserCode" lay-filter="serviceUserCodeUploadFile">
+                                    <i class="fa fa-plus-square-o" style="font-size: 70px;"></i>
+                                </a>
+                            </div>
+                            {{# } }}
+                        </script>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">姓名</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="serviceUserName" name="serviceUserName" class="layui-input" value="" placeholder="请输入客服人员姓名"  maxlength="255" lay-verify="required">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">联系电话</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="serviceUserPhone" name="serviceUserPhone" class="layui-input" value="" placeholder="请输入联系电话"  maxlength="50" lay-verify="required">
+                    </div>
+                </div>
+                <div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">简介</label>
+                    <div class="layui-input-block">
+                        <textarea id="serviceUserDescribe" name="serviceUserDescribe" placeholder="请输入客服人员简介" class="layui-textarea" maxlength="255"></textarea>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">状态</label>
+                    <div class="layui-input-block">
+                        <select name="serviceUserStatus" lay-verify="required">
+                            <option value="">请选择状态</option>
+                            <option value="1">启用</option>
+                            <option value="2">禁用</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-form-item layui-layout-admin">
+                    <div class="layui-input-block">
+                        <div class="layui-footer" style="left: 0;">
+                            <button type="button" class="layui-btn" lay-submit lay-filter="submitForm">提交新增</button>
+                            <button type="button" class="layui-btn layui-btn-primary close">返回上级</button>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
+<script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'form', 'laydate', 'laytpl'], function(){
+        var $ = layui.$;
+        var form = layui.form;
+        var laytpl = layui.laytpl;
+        var laydate = layui.laydate;
+        var wangEditor = window.wangEditor;
+        var wangEditorObj = {};
+        var viewerObj = {};
+
+        function closeBox() {
+            parent.layer.close(parent.layer.getFrameIndex(window.name));
+        }
+
+        function refreshDownloadTemplet(fileName, file) {
+            var dataRander = {};
+            dataRander[fileName] = file;
+
+            laytpl(document.getElementById(fileName +'FileDownload').innerHTML).render(dataRander, function(html) {
+                document.getElementById(fileName +'FileBox').innerHTML = html;
+            });
+        }
+
+        // 初始化文件列表
+        function initFileList(fileName, ids, callback) {
+            var dataForm = {};
+            dataForm[fileName] = ids;
+            form.val('dataForm', dataForm);
+
+            if(!ids) {
+                refreshDownloadTemplet(fileName, []);
+                if(callback) {
+                    callback(fileName, []);
+                }
+                return;
+            }
+
+            top.restAjax.get(top.restAjax.path('api/file/list', []), {
+                ids: ids
+            }, null, function(code, data) {
+                refreshDownloadTemplet(fileName, data);
+                if(callback) {
+                    callback(fileName, data);
+                }
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+
+        // 初始化视频
+        function initVideo(fileName, data) {
+            for(var i = 0, item; item = data[i++];) {
+                var player = new ckplayer({
+                    container: '#'+ fileName + i,
+                    variable: 'player',
+                    flashplayer: false,
+                    video: {
+                        file: 'route/file/download/true/'+ item.fileId,
+                        type: 'video/mp4'
+                    }
+                });
+            }
+        }
+
+        // 初始化1 启用 2禁用图片上传
+        function initServiceUserCodeUploadFile() {
+            var files = $('#serviceUserCode').val();
+            initFileList('serviceUserCode', files, function(fileName) {
+                var viewer = new Viewer(document.getElementById(fileName +'FileBox'), {navbar: false});
+                viewerObj[fileName] = viewer;
+            });
+
+            form.on('button(serviceUserCodeUploadFile)', function(obj) {
+                var name = this.dataset.name;
+                var explain = this.dataset.explain;
+                top.dialog.file({
+                    type: 'image',
+                    title: '上传'+ explain,
+                    width: '400px',
+                    height: '420px',
+                    maxFileCount: '1',
+                    onClose: function() {
+                        var uploadFileArray = top.dialog.dialogData.uploadFileArray;
+                        if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) {
+                            var files = $('#'+ name).val();
+                            for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) {
+                                if(files.length > 0) {
+                                    files += ',';
+                                }
+                                files += file.data;
+                            }
+                            initFileList(name, files, function(fileName) {
+                                viewerObj[fileName].update();
+                            });
+                        }
+                    }
+                });
+            });
+
+            form.on('button(serviceUserCodeRemoveFile)', function(obj) {
+                var name = this.dataset.name;
+                var id = this.dataset.id;
+                var files = $('#'+ name).val().replace(id, '');
+                files = files.replace(/\,+/g, ',');
+                if(files.charAt(0) == ',') {
+                    files = files.substring(1);
+                }
+                if(files.charAt(files.length - 1) == ',') {
+                    files = files.substring(0, files.length - 1);
+                }
+                initFileList(name, files, function(fileName) {
+                    viewerObj[fileName].update();
+                });
+            });
+        }
+
+
+        // 初始化内容
+        function initData() {
+            initServiceUserCodeUploadFile();
+        }
+        initData();
+
+        // 提交表单
+        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/traininginstitutionserviceuser/save', []), formData.field, null, function(code, data) {
+                    var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
+                        time: 0,
+                        btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                        shade: 0.3,
+                        yes: function(index) {
+                            top.dialog.close(index);
+                            window.location.reload();
+                        },
+                        btn2: function() {
+                            closeBox();
+                        }
+                    });
+                }, function(code, data) {
+                    top.dialog.msg(data.msg);
+                }, function() {
+                    loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
+                }, function() {
+                    top.dialog.close(loadLayerIndex);
+                });
+            });
+            return false;
+        });
+
+        $('.close').on('click', function() {
+            closeBox();
+        });
+
+        // 校验
+        form.verify({
+            code:function(value, item){
+                if(value == ''){
+                    return '客服人员二维码不能为空'
+                }
+
+            }
+
+
+
+        });
+    });
+</script>
+</body>
+</html>

src/main/resources/static/route/traininginstitutionserviceuser/update.html

@@ -0,0 +1,291 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/signup/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-card">
+        <div class="layui-card-header">
+            <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
+              <a class="close" href="javascript:void(0);">上级列表</a><span lay-separator="">/</span>
+              <a href="javascript:void(0);"><cite>编辑内容</cite></a>
+            </span>
+        </div>
+        <div class="layui-card-body" style="padding: 15px;">
+            <form class="layui-form layui-form-pane" lay-filter="dataForm">
+                <input name="institutionId" type="hidden" value="">
+                <div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">二维码</label>
+                    <div class="layui-input-block">
+                        <input type="hidden" id="serviceUserCode" name="serviceUserCode" lay-verify="code">
+                        <div class="layui-btn-container" id="serviceUserCodeFileBox" style="border: 1px solid #e6e6e6;"></div>
+                        <script id="serviceUserCodeFileDownload" type="text/html">
+                            {{# var fileName = 'serviceUserCode'; }}
+                            {{# if(d[fileName].length > 0) { }}
+                            {{#    var files = d[fileName];}}
+                            {{#    for(var i = 0, item = files[i]; item = files[i++];) { }}
+                            <div class="upload-image-box">
+                                <span class="upload-image-span">
+                                    <img src="route/file/download/false/{{item.fileId}}" align="加载失败">
+                                </span>
+                                <a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="serviceUserCodeRemoveFile">
+                                    <i class="fa fa-trash-o"></i>
+                                </a>
+                            </div>
+                            {{#    } }}
+                            {{# } }}
+                            {{# if(d[fileName].length < 1) { }}
+                            <div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">
+                                <a href="javascript:void(0);" lay-form-button data-explain="客服人员二维码" data-name="serviceUserCode" lay-filter="serviceUserCodeUploadFile">
+                                    <i class="fa fa-plus-square-o" style="font-size: 70px;"></i>
+                                </a>
+                            </div>
+                            {{# } }}
+                        </script>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">姓名</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="serviceUserName" name="serviceUserName" class="layui-input" value="" placeholder="请输入客服人员姓名"  maxlength="255" lay-verify="required">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">联系电话</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="serviceUserPhone" name="serviceUserPhone" class="layui-input" value="" placeholder="请输入联系电话"  maxlength="50" lay-verify="required">
+                    </div>
+                </div>
+                <div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">简介</label>
+                    <div class="layui-input-block">
+                        <textarea id="serviceUserDescribe" name="serviceUserDescribe" placeholder="请输入客服人员简介" class="layui-textarea" maxlength="255"></textarea>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">状态</label>
+                    <div class="layui-input-block">
+                        <select name="serviceUserStatus" lay-verify="required">
+                            <option value="">请选择状态</option>
+                            <option value="1">启用</option>
+                            <option value="2">禁用</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-form-item layui-layout-admin">
+                    <div class="layui-input-block">
+                        <div class="layui-footer" style="left: 0;">
+                            <button type="button" class="layui-btn" lay-submit lay-filter="submitForm">提交编辑</button>
+                            <button type="button" class="layui-btn layui-btn-primary close">返回上级</button>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
+<script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'form', 'laydate', 'laytpl'], function(){
+        var $ = layui.$;
+        var form = layui.form;
+        var laytpl = layui.laytpl;
+        var laydate = layui.laydate;
+        var trainingInstitutionServiceUserId = top.restAjax.params(window.location.href).trainingInstitutionServiceUserId;
+
+        var wangEditor = window.wangEditor;
+        var wangEditorObj = {};
+        var viewerObj = {};
+
+        function closeBox() {
+            parent.layer.close(parent.layer.getFrameIndex(window.name));
+        }
+
+        function refreshDownloadTemplet(fileName, file) {
+            var dataRander = {};
+            dataRander[fileName] = file;
+
+            laytpl(document.getElementById(fileName +'FileDownload').innerHTML).render(dataRander, function(html) {
+                document.getElementById(fileName +'FileBox').innerHTML = html;
+            });
+        }
+
+        // 初始化文件列表
+        function initFileList(fileName, ids, callback) {
+            var dataForm = {};
+            dataForm[fileName] = ids;
+            form.val('dataForm', dataForm);
+
+            if(!ids) {
+                refreshDownloadTemplet(fileName, []);
+                if(callback) {
+                    callback(fileName, []);
+                }
+                return;
+            }
+
+            top.restAjax.get(top.restAjax.path('api/file/list', []), {
+                ids: ids
+            }, null, function(code, data) {
+                refreshDownloadTemplet(fileName, data);
+                if(callback) {
+                    callback(fileName, data);
+                }
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+
+        // 初始化视频
+        function initVideo(fileName, data) {
+            for(var i = 0, item; item = data[i++];) {
+                var player = new ckplayer({
+                    container: '#'+ fileName + i,
+                    variable: 'player',
+                    flashplayer: false,
+                    video: {
+                        file: 'route/file/download/true/'+ item.fileId,
+                        type: 'video/mp4'
+                    }
+                });
+            }
+        }
+
+        // 初始化1 启用 2禁用图片上传
+        function initServiceUserCodeUploadFile() {
+            var files = $('#serviceUserCode').val();
+            initFileList('serviceUserCode', files, function(fileName) {
+                var viewer = new Viewer(document.getElementById(fileName +'FileBox'), {navbar: false});
+                viewerObj[fileName] = viewer;
+            });
+
+            form.on('button(serviceUserCodeUploadFile)', function(obj) {
+                var name = this.dataset.name;
+                var explain = this.dataset.explain;
+                top.dialog.file({
+                    type: 'image',
+                    title: '上传'+ explain,
+                    width: '400px',
+                    height: '420px',
+                    maxFileCount: '1',
+                    onClose: function() {
+                        var uploadFileArray = top.dialog.dialogData.uploadFileArray;
+                        if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) {
+                            var files = $('#'+ name).val();
+                            for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) {
+                                if(files.length > 0) {
+                                    files += ',';
+                                }
+                                files += file.data;
+                            }
+                            initFileList(name, files, function(fileName) {
+                                viewerObj[fileName].update();
+                            });
+                        }
+                    }
+                });
+            });
+
+            form.on('button(serviceUserCodeRemoveFile)', function(obj) {
+                var name = this.dataset.name;
+                var id = this.dataset.id;
+                var files = $('#'+ name).val().replace(id, '');
+                files = files.replace(/\,+/g, ',');
+                if(files.charAt(0) == ',') {
+                    files = files.substring(1);
+                }
+                if(files.charAt(files.length - 1) == ',') {
+                    files = files.substring(0, files.length - 1);
+                }
+                initFileList(name, files, function(fileName) {
+                    viewerObj[fileName].update();
+                });
+            });
+        }
+
+
+        // 初始化内容
+        function initData() {
+            var loadLayerIndex;
+            top.restAjax.get(top.restAjax.path('api/traininginstitutionserviceuser/get/{trainingInstitutionServiceUserId}', [trainingInstitutionServiceUserId]), {}, null, function(code, data) {
+                var dataFormData = {};
+                for(var i in data) {
+                    dataFormData[i] = data[i] +'';
+                }
+                form.val('dataForm', dataFormData);
+                form.render(null, 'dataForm');
+                initServiceUserCodeUploadFile();
+            }, 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);
+            });
+        }
+        initData();
+        
+        // 提交表单
+        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/traininginstitutionserviceuser/update/{trainingInstitutionServiceUserId}', [trainingInstitutionServiceUserId]), formData.field, null, function(code, data) {
+                    var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
+                        time: 0,
+                        btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                        shade: 0.3,
+                        yes: function(index) {
+                            top.dialog.close(index);
+                            window.location.reload();
+                        },
+                        btn2: function() {
+                            closeBox();
+                        }
+                    });
+                }, function(code, data) {
+                    top.dialog.msg(data.msg);
+                }, function() {
+                    loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
+                }, function() {
+                    top.dialog.close(loadLayerIndex);
+                });
+            });
+            return false;
+        });
+
+        $('.close').on('click', function() {
+            closeBox();
+        });
+
+        // 校验
+        form.verify({
+            code:function(value, item){
+                if(value == ''){
+                    return '客服人员二维码不能为空'
+                }
+
+            }
+
+        });
+    });
+</script>
+</body>
+</html>

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,

src/main/resources/static/route/worktype/save.html

@@ -10,6 +10,9 @@
     <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
     <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
+    <style>
+        .layui-anim{z-index: 100000 !important;}
+    </style>
 </head>
 <body>
 <div class="layui-anim layui-anim-fadein">
@@ -47,6 +50,18 @@
                         <input type="number" id="workTypeSort" name="workTypeSort" class="layui-input" value="" placeholder="请输入工种排序" lay-verify="required">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">工种最低学历</label>
+                    <div class="layui-input-block layui-form" id="workTypeEducationTemplateBox" lay-filter="workTypeEducationTemplateBox"></div>
+                    <script id="workTypeEducationTemplate" type="text/html">
+                        <select id="workTypeEducation" name="workTypeEducation" lay-verify="required" >
+                            <option value="">请选择最低学历</option>
+                            {{# for(var i = 0, item; item = d[i++];) { }}
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
+                            {{# } }}
+                        </select>
+                    </script>
+                </div>
                 <div class="layui-form-item layui-form-text">
                     <label class="layui-form-label">工种承诺书</label>
                     <div class="layui-input-block">
@@ -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();
 

src/main/resources/static/route/worktype/update.html

@@ -10,6 +10,9 @@
     <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
     <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
+    <style>
+        .layui-anim{z-index: 100000 !important;}
+    </style>
 </head>
 <body>
 <div class="layui-anim layui-anim-fadein">
@@ -47,6 +50,18 @@
                         <input type="number" id="workTypeSort" name="workTypeSort" class="layui-input" value="" placeholder="请输入工种排序" lay-verify="required">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">工种最低学历</label>
+                    <div class="layui-input-block layui-form" id="workTypeEducationTemplateBox" lay-filter="workTypeEducationTemplateBox"></div>
+                    <script id="workTypeEducationTemplate" type="text/html">
+                        <select id="workTypeEducation" name="workTypeEducation" lay-verify="required" >
+                            <option value="">请选择最低学历</option>
+                            {{# for(var i = 0, item; item = d[i++];) { }}
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
+                            {{# } }}
+                        </select>
+                    </script>
+                </div>
                 <div class="layui-form-item layui-form-text">
                     <label class="layui-form-label">工种承诺书</label>
                     <div class="layui-input-block">
@@ -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) {