From c22b5eb143260a98b9aab8fc3281ffa2a5ca2eed Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 28 十月 2022 18:07:42 +0800
Subject: [PATCH] 修改
---
ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java | 24 +++-
ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java | 23 +++-
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml | 116 ++++++++++------------
ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java | 7 +
ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java | 4
ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java | 2
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 12 ++
ycl-common/src/main/java/com/ycl/controller/FileController.java | 2
ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java | 3
ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java | 2
ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java | 37 ++++++-
ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java | 2
ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java | 5 -
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 2
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 2
ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java | 3
ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml | 24 +++-
17 files changed, 168 insertions(+), 102 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/FileController.java b/ycl-common/src/main/java/com/ycl/controller/FileController.java
index a4bcc03..f0f1623 100644
--- a/ycl-common/src/main/java/com/ycl/controller/FileController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/FileController.java
@@ -38,7 +38,7 @@
return CommonResult.success(res, "ok");
} catch (Exception e) {
- return CommonResult.failed("fail!");
+ return CommonResult.failed("鍥剧墖鏍煎紡鍙兘涓簀pg銆乯peg銆乸ng,鍙慨鏀规枃浠剁殑鍚庣紑鏃犳晥!");
}
}
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index f811128..dee13d0 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -80,6 +80,8 @@
@TableField(exist = false)
private String departName;
+
+
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
private Byte userType;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java
index 7bd5278..70e9b29 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java
@@ -22,10 +22,10 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_menu")
-@ApiModel(value="UmsMenu瀵硅薄", description="鍚庡彴鑿滃崟琛�")
+@ApiModel(value = "UmsMenu瀵硅薄", description = "鍚庡彴鑿滃崟琛�")
public class UmsMenu implements Serializable {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@@ -39,6 +39,9 @@
@ApiModelProperty(value = "鑿滃崟鍚嶇О")
private String title;
+ @ApiModelProperty(value = "url璺敱")
+ private String url;
+
@ApiModelProperty(value = "鑿滃崟绾ф暟")
private Integer level;
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java
index ee55ce7..3983880 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java
@@ -43,4 +43,6 @@
List<UmsMenuVo> ListTreeMyself(Long id);
String getPermission(Long userId);
+
+ UmsMenuNode covertMenuNode(UmsMenu menu, List<UmsMenu> menuList);
}
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
index 685f7f3..02a3f4c 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.dto.UmsMenuNode;
import com.ycl.entity.user.UmsMenu;
import com.ycl.entity.user.UmsResource;
import com.ycl.entity.user.UmsRole;
@@ -32,7 +33,7 @@
/**
* 鏍规嵁绠＄悊鍛業D鑾峰彇瀵瑰簲鑿滃崟
*/
- List<UmsMenu> getMenuList(Long adminId);
+ List<UmsMenuNode> getMenuList(Long adminId);
/**
* 鑾峰彇瑙掕壊鐩稿叧鑿滃崟
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
index d0c2e46..3038c3c 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
@@ -146,7 +146,7 @@
umsDepartManage.setDepartId(departId);
umsDepartManageMapper.insert(umsDepartManage);
UmsAdmin umsAdmin = new UmsAdmin();
- umsAdmin.setDepartmentId(departId);
+ //umsAdmin.setDepartmentId(departId);
umsAdmin.setId(userId);
umsAdminService.updateById(umsAdmin);
}
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java
index 03238c5..846b1bc 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java
@@ -129,7 +129,8 @@
/**
* 灏哢msMenu杞寲涓篣msMenuNode骞惰缃甤hildren灞炴��
*/
- private UmsMenuNode covertMenuNode(UmsMenu menu, List<UmsMenu> menuList) {
+ @Override
+ public UmsMenuNode covertMenuNode(UmsMenu menu, List<UmsMenu> menuList) {
UmsMenuNode node = new UmsMenuNode();
BeanUtils.copyProperties(menu, node);
List<UmsMenuNode> children = menuList.stream()
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
index d610315..68dde62 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
@@ -5,16 +5,15 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.dto.UmsMenuNode;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.user.*;
import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.mapper.user.UmsMenuMapper;
import com.ycl.mapper.user.UmsResourceMapper;
import com.ycl.mapper.user.UmsRoleMapper;
-import com.ycl.service.user.UmsAdminCacheService;
-import com.ycl.service.user.UmsRoleMenuRelationService;
-import com.ycl.service.user.UmsRoleResourceRelationService;
-import com.ycl.service.user.UmsRoleService;
+import com.ycl.service.user.*;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,6 +35,13 @@
private UmsRoleMenuRelationService roleMenuRelationService;
@Autowired
private UmsRoleResourceRelationService roleResourceRelationService;
+
+ private UmsMenuService umsMenuService;
+ @Autowired
+ public void setUmsMenuService(UmsMenuService umsMenuService) {
+ this.umsMenuService = umsMenuService;
+ }
+
@Resource
private UmsMenuMapper umsMenuMapper;
@Resource
@@ -83,10 +89,15 @@
}
@Override
- public List<UmsMenu> getMenuList(Long adminId) {
- return umsMenuMapper.getMenuList(adminId);
+ public List<UmsMenuNode> getMenuList(Long adminId) {
+ List<UmsMenu> menuList = umsMenuMapper.getMenuList(adminId);
+ List<UmsMenuNode> result = menuList.stream()
+ .filter(menu -> menu.getParentId().equals(0L))
+ .map(menu -> umsMenuService.covertMenuNode(menu, menuList)).collect(Collectors.toList());
+ return result;
}
+
@Override
public List<UmsMenu> listMenu(Long roleId) {
return umsMenuMapper.getMenuListByRoleId(roleId);
diff --git a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
index af61816..cccc442 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -4,79 +4,69 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsMenu">
- <id column="id" property="id" />
- <result column="parent_id" property="parentId" />
- <result column="create_time" property="createTime" />
- <result column="title" property="title" />
- <result column="level" property="level" />
- <result column="sort" property="sort" />
- <result column="name" property="name" />
- <result column="icon" property="icon" />
- <result column="hidden" property="hidden" />
+ <id column="id" property="id"/>
+ <result column="parent_id" property="parentId"/>
+ <result column="create_time" property="createTime"/>
+ <result column="title" property="title"/>
+ <result column="level" property="level"/>
+ <result column="sort" property="sort"/>
+ <result column="name" property="name"/>
+ <result column="icon" property="icon"/>
+ <result column="hidden" property="hidden"/>
</resultMap>
<select id="getMenuList" resultType="com.ycl.entity.user.UmsMenu">
- SELECT
- m.id id,
- m.parent_id parentId,
- m.create_time createTime,
- m.title title,
- m.level level,
- m.sort sort,
- m.name name,
- m.icon icon,
- m.hidden hidden
- FROM
- ums_admin_role_relation arr
- LEFT JOIN ums_role r ON arr.role_id = r.id
- LEFT JOIN ums_role_menu_relation rmr ON r.id = rmr.role_id
- LEFT JOIN ums_menu m ON rmr.menu_id = m.id
- WHERE
- arr.admin_id = #{adminId}
+ SELECT distinct m.id,
+ m.parent_id parentId,
+ m.create_time createTime,
+ m.title,
+ m.url,
+ m.level,
+ m.sort,
+ m.name,
+ m.icon,
+ m.hidden
+ FROM ums_admin_role_relation arr
+ LEFT JOIN ums_role r ON arr.role_id = r.id
+ LEFT JOIN ums_role_menu_relation rmr ON r.id = rmr.role_id
+ LEFT JOIN ums_menu m ON rmr.menu_id = m.id
+ WHERE arr.admin_id = #{adminId}
AND m.id IS NOT NULL
- GROUP BY
- m.id
+ Order BY m.`level`, m.sort
</select>
<select id="getMenuListByRoleId" resultType="com.ycl.entity.user.UmsMenu">
- SELECT
- m.id id,
- m.parent_id parentId,
- m.create_time createTime,
- m.title title,
- m.level level,
- m.sort sort,
- m.name name,
- m.icon icon,
- m.hidden hidden
- FROM
- ums_role_menu_relation rmr
- LEFT JOIN ums_menu m ON rmr.menu_id = m.id
- WHERE
- rmr.role_id = #{roleId}
+ SELECT m.id id,
+ m.parent_id parentId,
+ m.create_time createTime,
+ m.title title,
+ m.level level,
+ m.sort sort,
+ m.name name,
+ m.icon icon,
+ m.hidden hidden
+ FROM ums_role_menu_relation rmr
+ LEFT JOIN ums_menu m ON rmr.menu_id = m.id and m.leaf = 1
+ WHERE rmr.role_id = #{roleId}
AND m.id IS NOT NULL
- GROUP BY
- m.id
+ GROUP BY m.id
</select>
<select id="adminMenuRelation" resultType="com.ycl.entity.user.vo.UmsMenuVo">
- SELECT
- amr.id AS relationId,
- amr.is_start AS isStart,
- amr.sort,
- m.id,
- m.parent_id AS parentId,
- m.title,
- m.url,
- m.`level`,
- m.description,
- m.create_time as createTime,
- m.hidden,
- m.icon
- FROM
- `ums_admin_menu_relation` AS amr
- JOIN ums_menu AS m ON amr.menu_id = m.id
- WHERE
- amr.admin_id = #{id}
+ SELECT amr.id AS relationId,
+ amr.is_start AS isStart,
+ amr.sort,
+ m.id,
+ m.parent_id AS parentId,
+ m.title,
+ m.url,
+ m.`level`,
+ m.description,
+ m.create_time as createTime,
+ m.hidden,
+ m.icon
+ FROM `ums_admin_menu_relation` AS amr
+ JOIN ums_menu AS m ON amr.menu_id = m.id
+ WHERE amr.admin_id = #{id}
</select>
</mapper>
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
index 2fdab6a..7eab9c8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
@@ -81,7 +81,7 @@
@RequestMapping(value = "/delete", method = RequestMethod.POST)
@ResponseBody
public CommonResult delete(@RequestParam("ids") List<Long> ids) {
- boolean success = iMessageService.removeBatchByIds(ids);
+ boolean success = iMessageService.deleteMessages(ids);
if (success) {
return CommonResult.success(null);
}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java b/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
index 8c3359c..1647888 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
@@ -47,6 +47,12 @@
@ApiModelProperty(value = "瀹℃牳浜篒d")
private Long auditId;
/**
+ * 鐪熷疄瀹℃牳Id
+ */
+ @TableField("real_audit_id")
+ @ApiModelProperty(value = "瀹℃牳浜篒d")
+ private Long realAuditId;
+ /**
* 瀹℃牳鐘舵��
*/
@TableField("audit_status")
@@ -89,13 +95,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
-
- /**
- * 瀹℃牳浜烘枃鏈�
- */
- @ApiModelProperty(value = "瀹℃牳浜烘枃鏈�")
- @TableField(value = "audit_text",exist = false)
- private String auditText;
/**
* 鏍囬
*/
@@ -109,10 +108,34 @@
@TableField(value = "body",exist = false)
private String body;
/**
+ * 瀹℃牳浜烘枃鏈�
+ */
+ @ApiModelProperty(value = "瀹℃牳浜烘枃鏈�")
+ @TableField(value = "audit_text",exist = false)
+ private String auditText;
+ /**
+ * 鐪熷疄瀹℃牳浜�
+ */
+ @ApiModelProperty(value = "鐪熷疄瀹℃牳浜�")
+ @TableField(value = "real_audit_text",exist = false)
+ private String realAuditText;
+ /**
* 鍒涘缓浜烘枃鏈�
*/
@ApiModelProperty(value = "鍒涘缓浜烘枃鏈�")
@TableField(value = "create_user_text",exist = false)
private String createUserText;
+ /**
+ * 鏇存柊浜烘枃鏈�
+ */
+ @ApiModelProperty(value = "鏇存柊浜烘枃鏈�")
+ @TableField(value = "update_user_text",exist = false)
+ private String updateUserText;
+ /**
+ * 瀹℃牳鐘舵�佹枃鏈�
+ */
+ @ApiModelProperty(value = "瀹℃牳鐘舵�佹枃鏈�")
+ @TableField(value = "audit_status_text",exist = false)
+ private String auditStatusText;
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java b/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
index 692e6ef..80c087c 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
@@ -5,6 +5,8 @@
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
+import java.util.List;
+
/**
* <p>
* 娑堟伅鏈嶅姟绫�
@@ -17,4 +19,6 @@
Message sendMessage(MessageParam messageParam);
IPage<Message> list(MessageParam messageParam);
+
+ Boolean deleteMessages(List<Long> ids);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java b/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
index 8dc65ed..8375855 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
@@ -81,6 +81,8 @@
for (String id : ids) {
Message messageAdd = new Message();
BeanUtils.copyProperties(message, messageAdd);
+ //瀛愮被id璁剧疆涓虹┖
+ messageAdd.setId(null);
//璁剧疆鐖剁被Id
messageAdd.setParentId(message.getId());
//璁剧疆鎺ユ敹鑰�
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java b/ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java
index 8b3fcc7..2ab66a5 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java
@@ -54,11 +54,6 @@
if (messageParam.getStatus() == 1) {
//鍙戣捣瀹℃牳
iSmsAuditService.startAuditSms(message);
- //id鎹㈡垚閭鍙�
- String targetToPhone = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
- message.setTargetTo(targetToPhone);
- //鍙戦�佺煭淇″彂閫�
- sendSms(message);
}
return message;
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index f25618d..fa273a6 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -100,5 +100,15 @@
return result;
}
-
+ @Override
+ public Boolean deleteMessages(List<Long> ids) {
+ LambdaQueryWrapper<Message> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(Message::getId, ids).or().in(Message::getParentId,ids);
+ List<Message> messages = baseMapper.selectList(queryWrapper);
+ if (CommonUtils.isNotEmpty(messages)) {
+ List<Long> deleteIds = messages.stream().map(Message::getId).collect(Collectors.toList());
+ baseMapper.deleteBatchIds(deleteIds);
+ }
+ return true;
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
index 6712c0c..ceedd48 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
@@ -79,9 +79,14 @@
LambdaQueryWrapper<UmsDepartManage> queryDeptLeadWrapper = new LambdaQueryWrapper<>();
queryDeptLeadWrapper.in(UmsDepartManage::getDepartId, deptLeadIds).eq(UmsDepartManage::getIsLeader,1);
List<UmsDepartManage> deptLeads = umsDepartManageMapper.selectList(queryDeptLeadWrapper);
+
+ //瀹℃牳鍘婚噸
+ List<UmsDepartManage> uniqueLeads = deptLeads.stream().collect(
+ Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o->o.getUserId()))),
+ ArrayList::new));
//娣诲姞鐭俊瀹℃牳
List<SmsAudit> audits = new ArrayList<>();
- for (UmsDepartManage depart : deptLeads) {
+ for (UmsDepartManage depart : uniqueLeads) {
SmsAudit audit = new SmsAudit();
audit.setMessageId(message.getId());
audit.setAuditId(depart.getUserId());
@@ -135,20 +140,27 @@
LambdaQueryWrapper<Message> updateWrapper = new LambdaQueryWrapper<>();
updateWrapper.eq(Message::getMessageNumber, message.getMessageNumber());
messageMapper.update(updateMessage, updateWrapper);
-
- baseMapper.updateById(packageData(messageSmsParam));
+ //瀹℃牳鐭俊鏇存柊
+ updateSmsAudit(messageSmsParam);
}
@Transactional
public void noPassMethod(MessageSmsParam messageSmsParam) {
- baseMapper.updateById(packageData(messageSmsParam));
+ //瀹℃牳鐭俊鏇存柊
+ updateSmsAudit(messageSmsParam);
+ }
+ public void updateSmsAudit(MessageSmsParam messageSmsParam) {
+ SmsAudit smsAudit = packageData(messageSmsParam);
+ LambdaQueryWrapper<SmsAudit> smsAuditUpdate = new LambdaQueryWrapper<>();
+ smsAuditUpdate.eq(SmsAudit::getMessageId, messageSmsParam.getMessageId());
+ baseMapper.update(smsAudit,smsAuditUpdate);
}
public SmsAudit packageData(MessageSmsParam messageSmsParam) {
SmsAudit smsAudit = new SmsAudit();
- smsAudit.setId(messageSmsParam.getId());
+ smsAudit.setMessageId(messageSmsParam.getMessageId());
smsAudit.setAuditStatus(messageSmsParam.getStatus());
smsAudit.setAuditOpinion(messageSmsParam.getAuditOpinion());
smsAudit.setAuditResult(messageSmsParam.getResult());
- smsAudit.setAuditId(messageSmsParam.getUpdateUser());
+ smsAudit.setRealAuditId(messageSmsParam.getUpdateUser());
smsAudit.setUpdateTime(new Date());
smsAudit.setUpdateUser(messageSmsParam.getUpdateUser());
return smsAudit;
diff --git a/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml b/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml
index 4a4dff9..49d491f 100644
--- a/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml
@@ -7,6 +7,7 @@
<id column="id" property="id"/>
<result column="message_id" property="messageId"/>
<result column="audit_id" property="auditId"/>
+ <result column="real_audit_id" property="realAuditId"/>
<result column="audit_status" property="auditStatus"/>
<result column="audit_result" property="auditResult"/>
<result column="audit_opinion" property="auditOpinion"/>
@@ -16,10 +17,13 @@
<result column="update_time" property="updateTime"/>
</resultMap>
<resultMap type="com.ycl.entity.message.SmsAudit" id="CondMapResultMap" extends="BaseResultMap">
- <result column="audit_text" property="auditText"/>
<result column="title" property="title"/>
<result column="body" property="body"/>
+ <result column="audit_text" property="auditText"/>
+ <result column="real_audit_text" property="realAuditText"/>
<result column="create_user_text" property="createUserText"/>
+ <result column="update_user_text" property="updateUserText"/>
+ <result column="audit_status_text" property="auditStatusText"/>
</resultMap>
<select id="selectCondPage" parameterType="com.ycl.entity.message.SmsAudit" resultMap="CondMapResultMap">
@@ -28,13 +32,19 @@
um.head title,
um.body,
ua.username audit_text,
- ua2.username create_user_text
+ ua2.username create_user_text,
+ ua3.username update_user_text,
+ ua4.username real_audit_text,
+ ( CASE usa.audit_status WHEN '1' THEN '宸插鏍�' ELSE '寰呭鏍�' END ) audit_status_text
FROM
- ums_sms_audit usa
- LEFT JOIN ums_message um ON usa.message_id = um.id
- LEFT JOIN ums_admin ua ON usa.audit_id = ua.id
- LEFT JOIN ums_admin ua2 ON usa.create_user = ua2.id
- where 1=1
+ ums_sms_audit usa
+ LEFT JOIN ums_message um ON usa.message_id = um.id
+ LEFT JOIN ums_admin ua ON usa.audit_id = ua.id
+ LEFT JOIN ums_admin ua2 ON usa.create_user = ua2.id
+ LEFT JOIN ums_admin ua3 ON usa.update_user = ua3.id
+ LEFT JOIN ums_admin ua4 ON usa.real_audit_id = ua4.id
+ WHERE
+ 1 =1
<if test="smsAudit.auditId !=null and smsAudit.auditId >=0 ">
AND usa.audit_id = #{smsAudit.auditId}
</if>
--
Gitblit v1.8.0