From 8a475647ab83b96edb2e6077df47703c0a1ab6e1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 08 Jul 2021 23:51:13 +0800
Subject: [PATCH] 1.派遣记录接口修改 2.新增从业记录批量新增修改接口 3.系统菜单接口修改，将 大写MODE 修改为小写
---
src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml | 8 ++--
src/main/java/org/springblade/modules/experience/service/IExperienceService.java | 6 +++
src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java | 6 +++
src/main/java/org/springblade/modules/experience/service/impl/ExperienceServiceImpl.java | 9 ++++
src/main/java/org/springblade/modules/experience/controller/ExperienceController.java | 32 +++++++++++++++-
src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.java | 7 +++
src/main/java/org/springblade/modules/system/controller/MenuController.java | 4 --
src/main/java/org/springblade/modules/system/excel/UserExcel.java | 2
src/main/java/org/springblade/modules/experience/entity/Experience.java | 1
src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.xml | 5 ++
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 9 +---
11 files changed, 72 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
index 2cb74f9..23b3138 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
@@ -83,4 +83,10 @@
private String dispatcherUnitId;
+ /**
+ * 派遣保安ids
+ */
+ @TableField("user_ids")
+ private String userIds;
+
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index 5492667..8660b45 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -10,13 +10,7 @@
<result column="dispatcher" property="dispatcher"/>
<result column="dispatcherTime" property="dispatchertime"/>
<result column="dispatcherAddress" property="dispatcheraddress"/>
- <result column="dispatchercompany" property="dispatchercompany"/>
</resultMap>
-
-
-<!-- <select id="selectDispatcherPage" resultMap="dispatcherResultMap">-->
-<!-- select * from sys_dispatcher where is_deleted = 0-->
-<!-- </select>-->
<!--派遣记录分页数据-->
<select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
@@ -29,6 +23,9 @@
on
sdu.id = sd.dispatcher_unit_id
where 1=1
+ <if test="dispatcher.dispatcherUnitId!=null">
+ and sd.dispatcher_unit_id = #{dispatcher.dispatcherUnitId}
+ </if>
<if test="dispatcher.name!=null and dispatcher.name!=''">
and sd.name like concat('%', #{dispatcher.name},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java b/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java
index bba2d21..8452146 100644
--- a/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java
+++ b/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.experience.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
@@ -33,9 +34,11 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
- * 控制器
+ * 用户从业控制器
*
* @author BladeX
* @since 2021-07-08
@@ -91,6 +94,31 @@
return R.status(experienceService.save(experience));
}
+
+ /**
+ * 新增或修改
+ */
+ @PostMapping("/saveOrUpdate")
+ public R save(@Valid @RequestBody Map<String,Object> experience ) {
+ String cardid = experience.get("cardid").toString();
+ //先删除原有的从业信息
+ experienceService.delbyCardId(cardid);
+ //重新新增从业信息
+ List<Experience> experiences = (List<Experience>)experience.get("userPractitionersInfo");
+ int count = 0;
+ if (experiences.size()>0){
+ for(int i = 0;i<experiences.size();i++){
+ Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)),Experience.class);
+ experienceService.save(e);
+ count++;
+ }
+ if(count<1){
+ return R.status(false);
+ }
+ }
+ return R.status(true);
+ }
+
/**
* 修改
*/
@@ -127,7 +155,7 @@
* @param cardid 身份证
* @return
*/
- @PostMapping("/selectExperienceInfo")
+ @GetMapping("/selectExperienceInfo")
public R selectExperienceInfo(String cardid) {
return R.data(experienceService.selectExperienceInfo(cardid));
}
diff --git a/src/main/java/org/springblade/modules/experience/entity/Experience.java b/src/main/java/org/springblade/modules/experience/entity/Experience.java
index 6da5ac4..afccb07 100644
--- a/src/main/java/org/springblade/modules/experience/entity/Experience.java
+++ b/src/main/java/org/springblade/modules/experience/entity/Experience.java
@@ -94,6 +94,7 @@
*/
@ApiModelProperty(value = "公司名称")
private String companyname;
+
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
diff --git a/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.java b/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.java
index ce2b704..886688f 100644
--- a/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.java
+++ b/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.vo.ExperienceVO;
@@ -41,4 +42,10 @@
*/
List<ExperienceVO> selectExperiencePage(IPage page, ExperienceVO experience);
List<Map<Object,String>> selectExperienceInfo(String cardid);
+
+ /**
+ * 根据 cardid 删除行业信息
+ * @param cardid 身份证号
+ */
+ void delbyCardId(@Param("cardid") String cardid);
}
diff --git a/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.xml b/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.xml
index 84f2e93..87d6b2f 100644
--- a/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.xml
+++ b/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.xml
@@ -26,4 +26,9 @@
select * from sys_experience where cardId=#{cardid}
</select>
+ <!--根据 cardid 删除行业信息-->
+ <delete id="delbyCardId">
+ delete from sys_experience where cardId=#{cardid}
+ </delete>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/experience/service/IExperienceService.java b/src/main/java/org/springblade/modules/experience/service/IExperienceService.java
index 5da77f9..8fc7939 100644
--- a/src/main/java/org/springblade/modules/experience/service/IExperienceService.java
+++ b/src/main/java/org/springblade/modules/experience/service/IExperienceService.java
@@ -41,4 +41,10 @@
*/
IPage<ExperienceVO> selectExperiencePage(IPage<ExperienceVO> page, ExperienceVO experience);
List<Map<Object,String>> selectExperienceInfo(String cardid);
+
+ /**
+ * 根据 cardid 删除行业信息
+ * @param cardid 身份证号
+ */
+ void delbyCardId(String cardid);
}
diff --git a/src/main/java/org/springblade/modules/experience/service/impl/ExperienceServiceImpl.java b/src/main/java/org/springblade/modules/experience/service/impl/ExperienceServiceImpl.java
index 22d9e4f..ec11566 100644
--- a/src/main/java/org/springblade/modules/experience/service/impl/ExperienceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/experience/service/impl/ExperienceServiceImpl.java
@@ -46,4 +46,13 @@
return baseMapper.selectExperienceInfo(cardid);
}
+
+ /**
+ * 根据 cardid 删除行业信息
+ * @param cardid 身份证号
+ */
+ @Override
+ public void delbyCardId(String cardid) {
+ baseMapper.delbyCardId(cardid);
+ }
}
diff --git a/src/main/java/org/springblade/modules/system/controller/MenuController.java b/src/main/java/org/springblade/modules/system/controller/MenuController.java
index dd3249e..1046fee 100644
--- a/src/main/java/org/springblade/modules/system/controller/MenuController.java
+++ b/src/main/java/org/springblade/modules/system/controller/MenuController.java
@@ -25,10 +25,8 @@
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.system.entity.Menu;
@@ -41,11 +39,9 @@
import org.springblade.modules.system.wrapper.MenuWrapper;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
-
import static org.springblade.core.cache.constant.CacheConstant.MENU_CACHE;
/**
diff --git a/src/main/java/org/springblade/modules/system/excel/UserExcel.java b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
index d062bea..7ab06b3 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -39,7 +39,7 @@
private static final long serialVersionUID = 1L;
@ColumnWidth(15)
- @ExcelProperty("租户编号")
+ @ExcelProperty("保安单位编号")
private String tenantId;
@ExcelIgnore
diff --git a/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml b/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml
index 42268d7..1abc53a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml
@@ -286,7 +286,7 @@
SELECT
id,
parent_id,
- NAME AS title,
+ name AS title,
id AS "value",
id AS "key"
FROM
@@ -320,7 +320,7 @@
SELECT
id,
parent_id,
- NAME AS title,
+ name AS title,
id AS "value",
id AS "key"
FROM
@@ -354,7 +354,7 @@
SELECT
id,
parent_id,
- NAME AS title,
+ name AS title,
id AS "value",
id AS "key"
FROM
@@ -418,7 +418,7 @@
SELECT
id,
parent_id,
- NAME AS title,
+ name AS title,
id AS "value",
id AS "key"
FROM
--
Gitblit v1.9.3