From 1970ec921d0b6b04964b7864151e4aa0eb50237b Mon Sep 17 00:00:00 2001 From: donqi Date: Fri, 17 Jun 2022 17:05:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E5=85=A5=E9=A9=BB=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B8=88=E5=82=85=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/worker/WorkerController.java | 6 ++++ .../com/ghy/common/enums/WorkerStatus.java | 31 +++++++++++++++++++ .../com/ghy/worker/domain/WorkerArea.java | 1 + .../worker/domain/WorkerGoodsCategory.java | 2 ++ .../ghy/worker/domain/WorkerSpecialSkill.java | 4 +++ .../mapper/worker/WorkerAreaMapper.xml | 11 ++++++- .../worker/WorkerGoodsCategoryMapper.xml | 11 ++++++- .../resources/mapper/worker/WorkerMapper.xml | 1 + .../worker/WorkerSpecialSkillMapper.xml | 14 +++++++-- 9 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 ghy-common/src/main/java/com/ghy/common/enums/WorkerStatus.java diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java index ec7ee615..0bcfef74 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java @@ -3,6 +3,7 @@ package com.ghy.web.controller.worker; import com.ghy.common.core.controller.BaseController; import com.ghy.common.core.domain.AjaxResult; import com.ghy.common.core.page.TableDataInfo; +import com.ghy.common.enums.WorkerStatus; import com.ghy.common.utils.ExceptionUtil; import com.ghy.web.pojo.vo.WorkerSettledRequest; import com.ghy.worker.domain.Worker; @@ -80,6 +81,11 @@ public class WorkerController extends BaseController { workerGoodsCategoryService.updateWorkerGoodsCategory(request.getWorkerId(), request.getGoodsCategories()); // 入驻特殊技能信息持久化 specialSkillService.updateWorkerSpecialSkill(request.getWorkerId(), request.getSpecialSkills()); + // 更新师傅状态为审核中 + Worker worker = new Worker(); + worker.setWorkerId(request.getWorkerId()); + worker.setStatus(WorkerStatus.AUDITING.getCode()); + workerService.updateWorker(worker); return AjaxResult.success("保存成功"); } catch (Exception e) { e.printStackTrace(); diff --git a/ghy-common/src/main/java/com/ghy/common/enums/WorkerStatus.java b/ghy-common/src/main/java/com/ghy/common/enums/WorkerStatus.java new file mode 100644 index 00000000..12ceab95 --- /dev/null +++ b/ghy-common/src/main/java/com/ghy/common/enums/WorkerStatus.java @@ -0,0 +1,31 @@ +package com.ghy.common.enums; + +/** + * 师傅状态 + * + * @author ydq + * @date : 2022-06-17 15:32 + */ +public enum WorkerStatus { + OK(0, "正常"), + DISABLE(1, "冻结"), + DELETED(2, "删除"), + AUDITING(3, "审核中"), + AUDITFAILED(4, "审核未通过"); + + private final Integer code; + private final String desc; + + WorkerStatus(Integer code, String desc) { + this.code = code; + this.desc = desc; + } + + public Integer getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerArea.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerArea.java index 70780d66..f480e2fd 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerArea.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerArea.java @@ -29,4 +29,5 @@ public class WorkerArea extends BaseEntity { @Excel(name = "街道区域id", cellType = Excel.ColumnType.NUMERIC) private Long streetId; + private String mergerName; } diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerGoodsCategory.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerGoodsCategory.java index e619e320..f3eada0d 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerGoodsCategory.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerGoodsCategory.java @@ -25,4 +25,6 @@ public class WorkerGoodsCategory extends BaseEntity { * 商品类目主键 */ private Long goodsCategoryId; + + private String goodsCategoryName; } diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSpecialSkill.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSpecialSkill.java index 8f253e16..37877438 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSpecialSkill.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSpecialSkill.java @@ -45,4 +45,8 @@ public class WorkerSpecialSkill extends BaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date insuranceEnd; + + private String specialSkillName; + + private String dangerous; } diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerAreaMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerAreaMapper.xml index 4f1fa2b8..2771b368 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerAreaMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerAreaMapper.xml @@ -14,8 +14,16 @@ + + + SELECT wa.worker_area_id, wa.worker_id, wa.province_id, wa.city_id, wa.district_id, wa.street_id, wa.create_by, wa.create_time, + wa.update_by, wa.update_time, wa.remark, sa.area_name, sa.merger_name + FROM worker_area wa + LEFT JOIN sys_area sa on wa.street_id = sa.area_id + + INSERT INTO worker_area( worker_id, @@ -48,7 +56,8 @@ diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerGoodsCategoryMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerGoodsCategoryMapper.xml index 279879be..ac3bea66 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerGoodsCategoryMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerGoodsCategoryMapper.xml @@ -11,8 +11,16 @@ + + + SELECT wgc.worker_goods_category_id, wgc.worker_id, wgc.goods_category_id, wgc.create_by, wgc.create_time, wgc.update_by, + wgc.update_time, wgc.remark, gc.goods_category_name + FROM worker_goods_category wgc + LEFT JOIN goods_category gc on gc.goods_category_id = wgc.goods_category_id + + INSERT INTO worker_goods_category( worker_id, @@ -38,7 +46,8 @@ diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml index ddeb13fc..a146aead 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml @@ -76,6 +76,7 @@ update worker type = #{type}, + status = #{status}, account = #{account}, phone = #{phone}, leader_team_rate = #{leaderTeamRate}, diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerSpecialSkillMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerSpecialSkillMapper.xml index c368d0ec..ce3a52ac 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerSpecialSkillMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerSpecialSkillMapper.xml @@ -15,8 +15,17 @@ + + + + SELECT wss.worker_special_skill_id, wss.worker_id, wss.special_skill_id, wss.credential, wss.insurance, wss.insurance_start, + wss.insurance_end, wss.create_by, wss.create_time, wss.update_by, wss.update_time, wss.remark, ss.special_skill_name, ss.dangerous + FROM worker_special_skill wss + LEFT JOIN special_skill ss on ss.special_skill_id = wss.special_skill_id + + INSERT INTO worker_special_skill( @@ -53,9 +62,8 @@