Преглед изворни кода

1.导入客户资料放入用户信息

liuhy пре 3 година
родитељ
комит
55500c08d7

+ 13 - 8
tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckTaskController.java

@@ -24,14 +24,9 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.smscheck.entity.SmsCheckCompany;
-import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
-import org.jeecg.modules.smscheck.entity.SmsCheckSmsNumber;
-import org.jeecg.modules.smscheck.entity.SmsCheckTask;
-import org.jeecg.modules.smscheck.service.ISmsCheckCompanyService;
-import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
-import org.jeecg.modules.smscheck.service.ISmsCheckSmsNumberService;
-import org.jeecg.modules.smscheck.service.ISmsCheckTaskService;
+import org.jeecg.common.system.vo.SysUserCacheInfo;
+import org.jeecg.modules.smscheck.entity.*;
+import org.jeecg.modules.smscheck.service.*;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoVo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;
@@ -68,6 +63,9 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	private ISmsCheckSmsNumberService smsNumberService;
     @Autowired
 	private ISysBaseAPI sysBaseApi;
+
+	@Autowired
+	private ISysUserService sysUserService;
 	 /**
 	  * 分页列表查询
 	  *
@@ -260,6 +258,13 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 			 infoVo.setTaskId(taskId);
 			 SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
 			 BeanUtil.copyProperties(infoVo, info, true);
+			 SysUser user = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
+					 .eq(SysUser::getWorkNo, infoVo.getStaffNo()));
+			 //放入用户信息
+			 if ( user == null){
+				 continue;
+			 }
+			 info.setStaffUsername(user.getUsername());
 			 info.setDelFlag(CommonConstant.DEL_FLAG_0);
 			 // 0:未处理;1:未完善;2:待稽核;3:待整改;4:已整改;5:稽核通过;
 			 info.setCheckState(0);

+ 181 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SysUser.java

@@ -0,0 +1,181 @@
+package org.jeecg.modules.smscheck.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户表
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 登录账号
+     */
+    @Excel(name = "登录账号", width = 15)
+    private String username;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "真实姓名", width = 15)
+    private String realname;
+
+    /**
+     * 密码
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String password;
+
+    /**
+     * md5密码盐
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String salt;
+
+    /**
+     * 头像
+     */
+    @Excel(name = "头像", width = 15,type = 2)
+    private String avatar;
+
+    /**
+     * 生日
+     */
+    @Excel(name = "生日", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;
+
+    /**
+     * 性别(1:男 2:女)
+     */
+    @Excel(name = "性别", width = 15,dicCode="sex")
+    @Dict(dicCode = "sex")
+    private Integer sex;
+
+    /**
+     * 电子邮件
+     */
+    @Excel(name = "电子邮件", width = 15)
+    private String email;
+
+    /**
+     * 电话
+     */
+    @Excel(name = "电话", width = 15)
+    private String phone;
+
+    /**
+     * 部门code(当前选择登录部门)
+     */
+    private String orgCode;
+
+    /**部门名称*/
+    private transient String orgCodeTxt;
+
+    /**
+     * 状态(1:正常  2:冻结 )
+     */
+    @Excel(name = "状态", width = 15,dicCode="user_status")
+    @Dict(dicCode = "user_status")
+    private Integer status;
+
+    /**
+     * 删除状态(0,正常,1已删除)
+     */
+    @Excel(name = "删除状态", width = 15,dicCode="del_flag")
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 工号,唯一键
+     */
+    @Excel(name = "工号", width = 15)
+    private String workNo;
+
+    /**
+     * 职务,关联职务表
+     */
+    @Excel(name = "职务", width = 15)
+    @Dict(dictTable ="sys_position",dicText = "name",dicCode = "code")
+    private String post;
+
+    /**
+     * 座机号
+     */
+    @Excel(name = "座机号", width = 15)
+    private String telephone;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 同步工作流引擎1同步0不同步
+     */
+    private Integer activitiSync;
+
+    /**
+     * 身份(0 普通成员 1 上级)
+     */
+    @Excel(name="(1普通成员 2上级)",width = 15)
+    private Integer userIdentity;
+
+    /**
+     * 负责部门
+     */
+    @Excel(name="负责部门",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
+    @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
+    private String departIds;
+
+    /**
+     * 多租户id配置,编辑用户的时候设置
+     */
+    private String relTenantIds;
+
+    /**设备id uniapp推送用*/
+    private String clientId;
+}

+ 19 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SysSmsUserMapper.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.smscheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.smscheck.entity.SysUser;
+
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户表 Mapper 接口
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-20
+ */
+public interface SysSmsUserMapper extends BaseMapper<SysUser> {
+
+}

+ 19 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/ISysUserService.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.smscheck.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.smscheck.entity.SysUser;
+
+/**
+ * <p>
+ * 用户表 服务类
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-20
+ */
+public interface ISysUserService extends IService<SysUser> {
+
+
+
+}

+ 28 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SysSmsUserServiceImpl.java

@@ -0,0 +1,28 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.smscheck.entity.SysUser;
+
+import org.jeecg.modules.smscheck.mapper.SysSmsUserMapper;
+import org.jeecg.modules.smscheck.service.ISysUserService;
+
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 用户表 服务实现类
+ * </p>
+ *
+ * @Author: scott
+ * @Date: 2018-12-20
+ */
+@Service
+@Slf4j
+public class SysSmsUserServiceImpl extends ServiceImpl<SysSmsUserMapper, SysUser> implements ISysUserService {
+	
+
+
+}