From 260687df882672c651f5f668d932b0f31c328ba4 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 05 七月 2022 16:20:01 +0800
Subject: [PATCH] 应急队伍新增
---
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml | 22 +++---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java | 6 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java | 3
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java | 3
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml | 12 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java | 6 +-
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml | 14 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 53 +++++++++--------
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java | 10 +-
10 files changed, 67 insertions(+), 66 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
index 5cb8b2e..766edf1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
@@ -147,10 +147,10 @@
", delFlag=" + delFlag +
", gmtCreate=" + gmtCreate +
", gmtModitify=" + gmtModitify +
- ", createUid='" + createUid + '\'' +
- ", updateUid='" + updateUid + '\'' +
+ ", createUid=" + createUid +
+ ", updateUid=" + updateUid +
", teamId=" + teamId +
- ", userUid='" + userUid + '\'' +
+ ", userUid=" + userUid +
", gender=" + gender +
", jobNumber='" + jobNumber + '\'' +
", name='" + name + '\'' +
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java
index f93b83f..ac9ad09 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java
@@ -9,7 +9,7 @@
private Long userUid;
- private Byte gender;
+ private Boolean gender;
private String jobNumber;
@@ -43,11 +43,11 @@
this.userUid = userUid;
}
- public Byte getGender() {
+ public Boolean getGender() {
return gender;
}
- public void setGender(Byte gender) {
+ public void setGender(Boolean gender) {
this.gender = gender;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
index dd1b6fd..1df9ec5 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
@@ -22,7 +22,7 @@
private List<EmergencyTeamFileReqDTO> fileList;
- private List<EmergencyTeamMemberReqDTO> MemberList;
+ private List<EmergencyTeamMemberReqDTO> memberList;
public Long getId() {
return id;
@@ -97,18 +97,18 @@
}
public List<EmergencyTeamMemberReqDTO> getMemberList() {
- return MemberList;
+ return memberList;
}
public void setMemberList(List<EmergencyTeamMemberReqDTO> memberList) {
- MemberList = memberList;
+ this.memberList = memberList;
}
@Override
public String toString() {
return "EmergencyTeamReqDTO{" +
"id=" + id +
- ", principalUid='" + principalUid + '\'' +
+ ", principalUid=" + principalUid +
", principalDepartmentId=" + principalDepartmentId +
", teamLevel='" + teamLevel + '\'' +
", teamName='" + teamName + '\'' +
@@ -116,7 +116,7 @@
", telephoneNumber='" + telephoneNumber + '\'' +
", teamDesc='" + teamDesc + '\'' +
", fileList=" + fileList +
- ", MemberList=" + MemberList +
+ ", memberList=" + memberList +
'}';
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java
index 770be9b..e22944d 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery;
@@ -16,5 +15,5 @@
List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, @Param("query") EmergencyTeamDBQuery emergencyTeamDBQuery);
- void addEmergencyTeam(EmergencyTeamFileInfo emergencyTeamFileInfo);
+ void addEmergencyTeam(EmergencyTeamInfo emergencyTeamInfo);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java
index bcc6a7a..d2d2a8f 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery;
@@ -14,5 +13,5 @@
List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, EmergencyTeamDBQuery emergencyTeamDBQuery);
- void addEmergencyTeam(EmergencyTeamFileInfo emergencyTeamFileInfo);
+ void addEmergencyTeam(EmergencyTeamInfo emergencyTeamInfo);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java
index aacf619..9500af5 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java
@@ -25,8 +25,8 @@
}
@Override
- public void addEmergencyTeam(EmergencyTeamFileInfo emergencyTeamFileInfo) {
- emergencyTeamInfoRepository.addEmergencyTeam(emergencyTeamFileInfo);
+ public void addEmergencyTeam(EmergencyTeamInfo emergencyTeamInfo) {
+ emergencyTeamInfoRepository.addEmergencyTeam(emergencyTeamInfo);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
index ba4fd5b..0a86114 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -10,6 +10,7 @@
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyServiceException;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
+import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamFileReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamFileRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamPageRespDTO;
@@ -52,9 +53,9 @@
}
List<EmergencyTeamPageRespDTO> respList = new ArrayList<>();
- List<EmergencyTeamInfoPageDO> emergencyTeamInfoPageDOList = emergencyTeamInfoService.selectEmergencyTeamList(page,emergencyTeamDBQuery);
+ List<EmergencyTeamInfoPageDO> emergencyTeamInfoPageDOList = emergencyTeamInfoService.selectEmergencyTeamList(page, emergencyTeamDBQuery);
- if (!CollectionUtils.isEmpty(emergencyTeamInfoPageDOList)){
+ if (!CollectionUtils.isEmpty(emergencyTeamInfoPageDOList)) {
for (EmergencyTeamInfoPageDO emergencyTeamInfoPageDO : emergencyTeamInfoPageDOList) {
List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(emergencyTeamInfoPageDO.getId());
List<EmergencyTeamFileRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamFileInfoDOList, EmergencyTeamFileRespDTO.class);
@@ -73,82 +74,84 @@
page.getTotal(),
respList,
ResultCodes.OK
- );
+ );
}
@Override
public ResultVO addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
- Date nowDate = new Date();
+
//必填项验证
checkRequired(emergencyTeamReqDTO);
+
+ Date nowDate = new Date();
//1.新增应急队伍
- EmergencyTeamFileInfo emergencyTeamFileInfo = new EmergencyTeamFileInfo();
- BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamFileInfo);
- emergencyTeamFileInfo.setDelFlag(false);
- emergencyTeamFileInfo.setCreateUid(uid);
- emergencyTeamFileInfo.setGmtCreate(nowDate);
- emergencyTeamInfoService.addEmergencyTeam(emergencyTeamFileInfo);
+ EmergencyTeamInfo emergencyTeamInfo = new EmergencyTeamInfo();
+ BeanUtils.copyProperties(emergencyTeamReqDTO, emergencyTeamInfo);
+ emergencyTeamInfo.setDelFlag(false);
+ emergencyTeamInfo.setCreateUid(uid);
+ emergencyTeamInfo.setGmtCreate(nowDate);
+ emergencyTeamInfoService.addEmergencyTeam(emergencyTeamInfo);
//2.新增应急队伍附件
- List<EmergencyTeamFileInfo> fileInfoList = new ArrayList<>();
- BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(),fileInfoList.getClass());
+ List<EmergencyTeamFileInfo> fileInfoList = BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(), EmergencyTeamFileInfo.class);
fileInfoList.forEach(EmergencyTeamFileInfo -> {
- EmergencyTeamFileInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
+ EmergencyTeamFileInfo.setTeamId(emergencyTeamInfo.getId());
EmergencyTeamFileInfo.setDelFlag(false);
EmergencyTeamFileInfo.setCreateUid(uid);
EmergencyTeamFileInfo.setGmtCreate(nowDate);
});
emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoList);
//3.新增应急队伍人员
- List<EmergencyTeamMemberInfo> memberInfoList = new ArrayList<>();
- BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(),memberInfoList.getClass());
+ List<EmergencyTeamMemberInfo> memberInfoList = BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(), EmergencyTeamMemberInfo.class);
memberInfoList.forEach(EmergencyTeamMemberInfo -> {
- EmergencyTeamMemberInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
+ EmergencyTeamMemberInfo.setTeamId(emergencyTeamInfo.getId());
EmergencyTeamMemberInfo.setDelFlag(false);
EmergencyTeamMemberInfo.setCreateUid(uid);
EmergencyTeamMemberInfo.setGmtCreate(nowDate);
});
emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoList);
- return ResultVO.success();
+ return new ResultVO(ResultCodes.OK);
}
/**
* 验证必填项
+ *
* @return
*/
- private void checkRequired(EmergencyTeamReqDTO emergencyTeamReqDTO){
+ private void checkRequired(EmergencyTeamReqDTO emergencyTeamReqDTO) {
//名称
- if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamName())){
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamName())) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_NAME_NULL);
}
//级别
- if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())){
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_LEVEL_NULL);
}
//负责人
- if(emergencyTeamReqDTO.getPrincipalUid() == null || emergencyTeamReqDTO.getPrincipalUid() == 0){
+ if (emergencyTeamReqDTO.getPrincipalUid() == null || emergencyTeamReqDTO.getPrincipalUid() == 0) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
}
//负责人部门
- if(emergencyTeamReqDTO.getPrincipalDepartmentId() == null || emergencyTeamReqDTO.getPrincipalDepartmentId() == 0){
+ if (emergencyTeamReqDTO.getPrincipalDepartmentId() == null || emergencyTeamReqDTO.getPrincipalDepartmentId() == 0) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL);
}
//负责人手机
- if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalPhone())){
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalPhone())) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_PHONE_NULL);
}
//固定电话
- if (StringUtils.isBlank(emergencyTeamReqDTO.getTelephoneNumber())){
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getTelephoneNumber())) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_TELEPHONE_NUMBER_NULL);
}
}
/**
* 验证数据库是否存在
+ *
* @return
*/
- public Boolean checkeExist(){
+ public Boolean checkeExist() {
return null;
}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
index c98c55a..92eccd9 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
@@ -19,23 +19,23 @@
insert into emergency_team_file(
<if test="id != null ">id,</if>
<if test="delFlag != null ">del_flag,</if>
- <if test="gmtCreate != null and gmtCreate != ''">gmt_create,</if>
- <if test="gmtModitify != null and gmtModitify != ''">gmt_moditify,</if>
+ <if test="gmtCreate != null ">gmt_create,</if>
+ <if test="gmtModitify != null ">gmt_moditify,</if>
<if test="createUid != null ">create_uid,</if>
<if test="updateUid != null ">update_uid,</if>
<if test="teamId != null ">team_id,</if>
<if test="fileUrl != null and fileUrl != ''">file_url,</if>
- <if test="fileName != null and fileName != ''">file_name,</if>
+ <if test="fileName != null and fileName != ''">file_name</if>
)values(
<if test="id != null ">#{id},</if>
<if test="delFlag != null ">#{delFlag},</if>
- <if test="gmtCreate != null and gmtCreate != ''">#{gmtCreate},</if>
- <if test="gmtModitify != null and gmtModitify != ''">#{gmtModitify},</if>
+ <if test="gmtCreate != null ">#{gmtCreate},</if>
+ <if test="gmtModitify != null ">#{gmtModitify},</if>
<if test="createUid != null ">#{createUid},</if>
<if test="updateUid != null ">#{updateUid},</if>
<if test="teamId != null ">#{teamId},</if>
<if test="fileUrl != null and fileUrl != ''">#{fileUrl},</if>
- <if test="fileName != null and fileName != ''">#{fileName},</if>
+ <if test="fileName != null and fileName != ''">#{fileName}</if>
)
</insert>
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
index 13c15bc..58a6b97 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
@@ -18,12 +18,12 @@
<if test="query.teamLevel != null and query.teamLevel != ''"> and `team_level` = #{query.teamLevel}</if>
</select>
- <insert id="addEmergencyTeam" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo">
+ <insert id="addEmergencyTeam" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo" keyProperty="id" useGeneratedKeys="true">
insert into emergency_team(
<if test="id != null ">id,</if>
<if test="delFlag != null ">del_flag,</if>
- <if test="gmtCreate != null and gmtCreate != ''">gmt_create,</if>
- <if test="gmtModitify != null and gmtModitify != ''">gmt_moditify,</if>
+ <if test="gmtCreate != null ">gmt_create,</if>
+ <if test="gmtModitify != null ">gmt_moditify,</if>
<if test="createUid != null ">create_uid,</if>
<if test="updateUid != null ">update_uid,</if>
<if test="principalUid != null ">principal_uid,</if>
@@ -32,12 +32,12 @@
<if test="teamName != null and teamName != ''">team_name,</if>
<if test="principalPhone != null and principalPhone != ''">principal_phone,</if>
<if test="telephoneNumber != null and telephoneNumber != ''">telephone_number,</if>
- <if test="teamDesc != null and teamDesc != ''">team_desc,</if>
+ <if test="teamDesc != null and teamDesc != ''">team_desc</if>
)values(
<if test="id != null ">#{id},</if>
<if test="delFlag != null ">#{delFlag},</if>
- <if test="gmtCreate != null and gmtCreate != ''">#{gmtCreate},</if>
- <if test="gmtModitify != null and gmtModitify != ''">#{gmtModitify},</if>
+ <if test="gmtCreate != null ">#{gmtCreate},</if>
+ <if test="gmtModitify != null ">#{gmtModitify},</if>
<if test="createUid != null ">#{createUid},</if>
<if test="updateUid != null ">#{updateUid},</if>
<if test="principalUid != null ">#{principalUid},</if>
@@ -46,7 +46,7 @@
<if test="teamName != null and teamName != ''">#{teamName},</if>
<if test="principalPhone != null and principalPhone != ''">#{principalPhone},</if>
<if test="telephoneNumber != null and telephoneNumber != ''">#{telephoneNumber},</if>
- <if test="teamDesc != null and teamDesc != ''">#{teamDesc},</if>
+ <if test="teamDesc != null and teamDesc != ''">#{teamDesc}</if>
)
</insert>
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
index 6aab788..adcd5e6 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
@@ -8,22 +8,22 @@
insert into emergency_team_Member(
<if test="id != null ">id,</if>
<if test="delFlag != null ">del_flag,</if>
- <if test="gmtCreate != null and gmtCreate != ''">gmt_create,</if>
- <if test="gmtModitify != null and gmtModitify != ''">gmt_moditify,</if>
+ <if test="gmtCreate != null ">gmt_create,</if>
+ <if test="gmtModitify != null ">gmt_moditify,</if>
<if test="createUid != null ">create_uid,</if>
<if test="updateUid != null ">update_uid,</if>
<if test="teamId != null ">team_id,</if>
- <if test="userUid != null ">#{user_uid},</if>
- <if test="gender != null ">#{gender},</if>
- <if test="jobNumber != null and jobNumber != ''">#{job_number},</if>
- <if test="name != null and name != ''">#{name},</if>
- <if test="phone != null and phone != ''">#{phone},</if>
- <if test="position != null and position != ''">#{position},</if>
+ <if test="userUid != null ">user_uid,</if>
+ <if test="gender != null ">gender,</if>
+ <if test="jobNumber != null and jobNumber != ''">job_number,</if>
+ <if test="name != null and name != ''">`name`,</if>
+ <if test="phone != null and phone != ''">phone,</if>
+ <if test="position != null and position != ''">`position`</if>
)values(
<if test="id != null ">#{id},</if>
<if test="delFlag != null ">#{delFlag},</if>
- <if test="gmtCreate != null and gmtCreate != ''">#{gmtCreate},</if>
- <if test="gmtModitify != null and gmtModitify != ''">#{gmtModitify},</if>
+ <if test="gmtCreate != null ">#{gmtCreate},</if>
+ <if test="gmtModitify != null ">#{gmtModitify},</if>
<if test="createUid != null ">#{createUid},</if>
<if test="updateUid != null ">#{updateUid},</if>
@@ -33,7 +33,7 @@
<if test="jobNumber != null and jobNumber != ''">#{jobNumber},</if>
<if test="name != null and name != ''">#{name},</if>
<if test="phone != null and phone != ''">#{phone},</if>
- <if test="position != null and position != ''">#{position},</if>
+ <if test="position != null and position != ''">#{position}</if>
)
</insert>
--
Gitblit v1.9.2