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 4c462325..bc827753 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 @@ -47,7 +47,7 @@ public class WorkerController extends BaseController { public AjaxResult updateWorker(@RequestBody Worker worker){ try { workerService.updateWorker(worker); - return AjaxResult.success(""); + return AjaxResult.success("修改成功"); }catch (Exception e){ logger.error(ExceptionUtil.getExceptionMessage(e)); return AjaxResult.error(e.getMessage()); diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java index 7785ec2d..3f098a77 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java @@ -28,6 +28,9 @@ public class Worker extends BaseEntity { @Excel(name = "密码", cellType = Excel.ColumnType.STRING) private String password; + @Excel(name = "0 服务商 1供应商", cellType = Excel.ColumnType.NUMERIC) + private Integer type; + @Excel(name = "微信open_id", cellType = Excel.ColumnType.STRING) private String openId; diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml index bc6a2132..ddeb13fc 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml @@ -10,6 +10,7 @@ + @@ -25,7 +26,7 @@ SELECT w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.dept_id, sd.dept_name, w.status, w.worker_logo_url, - w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time, w.remark + w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time, w.remark, w.type FROM worker w LEFT JOIN sys_dept sd ON w.dept_id = sd.dept_id @@ -74,6 +75,7 @@ update worker + type = #{type}, account = #{account}, phone = #{phone}, leader_team_rate = #{leaderTeamRate},