diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/SpecialSkillController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/SpecialSkillController.java
index 43e77a45..0c5d93c4 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/SpecialSkillController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/SpecialSkillController.java
@@ -23,7 +23,7 @@ public class SpecialSkillController {
@PostMapping("list")
@ResponseBody
- public AjaxResult list(SpecialSkill specialSkill) {
+ public AjaxResult list(@RequestBody SpecialSkill specialSkill) {
return AjaxResult.success(specialSkillService.list(specialSkill));
}
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 9d095df6..ec7ee615 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
@@ -4,7 +4,6 @@ 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.utils.ExceptionUtil;
-import com.ghy.common.utils.StringUtils;
import com.ghy.web.pojo.vo.WorkerSettledRequest;
import com.ghy.worker.domain.Worker;
import com.ghy.worker.service.WorkerAreaService;
@@ -15,10 +14,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
-import java.lang.reflect.Field;
import java.util.List;
/**
@@ -85,6 +82,7 @@ public class WorkerController extends BaseController {
specialSkillService.updateWorkerSpecialSkill(request.getWorkerId(), request.getSpecialSkills());
return AjaxResult.success("保存成功");
} catch (Exception e) {
+ e.printStackTrace();
logger.error(ExceptionUtil.getExceptionMessage(e));
return AjaxResult.error(e.getMessage());
}
diff --git a/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java b/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java
index b4f0a0fd..55fed6be 100644
--- a/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java
+++ b/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java
@@ -280,6 +280,7 @@ public class ShiroConfig
filterChainDefinitionMap.put("/pay/**", "anon");
filterChainDefinitionMap.put("/order/**", "anon");
filterChainDefinitionMap.put("/worker/**", "anon");
+ filterChainDefinitionMap.put("/special/skill/**", "anon");
filterChainDefinitionMap.put("/customer/**", "anon");
filterChainDefinitionMap.put("/goods/**", "anon");
filterChainDefinitionMap.put("/financial/**", "anon");
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 06369d89..8f253e16 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
@@ -1,9 +1,11 @@
package com.ghy.worker.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ghy.common.core.domain.BaseEntity;
import lombok.Data;
import java.time.LocalDate;
+import java.util.Date;
/**
* 师傅特殊技能关系表
@@ -36,9 +38,11 @@ public class WorkerSpecialSkill extends BaseEntity {
/**
* 保险生效日期
*/
- private LocalDate insuranceStart;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date insuranceStart;
/**
* 保险截止日期
*/
- private LocalDate insuranceEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date insuranceEnd;
}
diff --git a/ghy-worker/src/main/resources/mapper/worker/SpecialSkillMapper.xml b/ghy-worker/src/main/resources/mapper/worker/SpecialSkillMapper.xml
index a5116ec2..e2a7c8ba 100644
--- a/ghy-worker/src/main/resources/mapper/worker/SpecialSkillMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/SpecialSkillMapper.xml
@@ -55,7 +55,7 @@
special_skill_id = #{specialSkillId}
special_skill_name = #{specialSkillName}
- goods_category_id = #{provinceId}
+ goods_category_id = #{goodsCategoryId}
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerSpecialSkillMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerSpecialSkillMapper.xml
index 41d3f5a4..c368d0ec 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerSpecialSkillMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerSpecialSkillMapper.xml
@@ -47,7 +47,7 @@
create_by, create_time)
VALUES
- (#{item.workerId}, #{item.specialSkillId}, #{item.credential}, #{item.insurance}, #{item.insuranceStart}
+ (#{item.workerId}, #{item.specialSkillId}, #{item.credential}, #{item.insurance}, #{item.insuranceStart},
#{item.insuranceEnd}, #{item.workerId}, sysdate())