用户信息稽核和发信息任务调整

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCinfoResult.java

@@ -46,11 +46,16 @@ public class SmsCheckCinfoResult implements Serializable {
     @ApiModelProperty(value = "用户编号")
     private String userNo;
 
-
     /** 稽核字段（1：合同到期时间，2：码号证书到期时间，3：备案通知到期时间，4：增值业务许可证到期时间，5：营业执照到期时间） */
     @Excel(name = "稽核字段（1：合同到期时间，2：码号证书到期时间，3：备案通知到期时间，4：增值业务许可证到期时间，5：营业执照到期时间）")
     @ApiModelProperty(value = "稽核字段")
     private Integer dateType;
+
+    /** 用户编号 */
+    @Excel(name = "员工账号（客户经理）", width = 15)
+    @ApiModelProperty(value = "员工账号")
+    private String staffUsername;
+
     /** 稽核字段值 */
     @Excel(name = "稽核字段值")
     @ApiModelProperty(value = "稽核字段值")

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCinfoResultMapper.java

@@ -30,7 +30,7 @@ public interface SmsCheckCinfoResultMapper extends BaseMapper<SmsCheckCinfoResul
     @SelectProvider(type = SqlProvider.class,method = "update_by_param_sql")
     public String update_by_param(SmsCheckCinfoResult entity,Map<String,String> param);
 
-    @Select("select t.task_id,any_value(t.customer_no) customer_no,any_value(t.user_no) user_no,t.date_type,t.date_val,count(1) num from sms_check_cinfo_result t where t.date_state=2 and t.msg_level=1 and t.msg_num<t.msg_total GROUP BY t.task_id,t.date_type,t.date_val")
+    @Select("select t.task_id,t.staff_username,t.date_type,t.date_val,count(1) num from sms_check_cinfo_result t where t.date_state=2 and t.msg_level=1 and t.msg_num<t.msg_total GROUP BY t.task_id,t.staff_username,t.date_type,t.date_val")
     public List<Map<String,Object>> list2notice();
 
     class SqlProvider{

tnc-system/src/main/java/org/jeecg/modules/quartz/job/CustomerCheckJob.java

@@ -93,14 +93,14 @@ public class CustomerCheckJob implements Job {
 		int msg_num = 0;
 		Object msg_num_obj = parameterMap.get("msg_num");
 		if(msg_num_obj!=null){
-			msg_num_obj = Integer.valueOf(msg_num_obj.toString());
+			msg_num = Integer.valueOf(msg_num_obj.toString());
 		}
 
 		// 短信发送间隔（天）
 		int msg_interval = 0;
 		Object msg_interval_obj = parameterMap.get("msg_interval");
 		if(msg_interval_obj!=null){
-			msg_interval_obj = Integer.valueOf(msg_interval_obj.toString());
+			msg_interval = Integer.valueOf(msg_interval_obj.toString());
 		}
 
 
@@ -165,6 +165,7 @@ public class CustomerCheckJob implements Job {
 
 		String customerNo = info.getCustomerNo();
 		String userNo = info.getUserNo();
+		String staffUsername = info.getStaffUsername();
 
 		String msg_context = "";
 
@@ -176,6 +177,7 @@ public class CustomerCheckJob implements Job {
 			cinfoResult.setTaskId(task_id);
 			cinfoResult.setCustomerNo(customerNo);
 			cinfoResult.setUserNo(userNo);
+			cinfoResult.setStaffUsername(staffUsername);
 
 			cinfoResult.setMsgLevel(msg_level);
 			cinfoResult.setMsgTotal(msg_num);

tnc-system/src/main/java/org/jeecg/modules/quartz/job/CustomerSendMsgJob.java

@@ -73,9 +73,7 @@ public class CustomerSendMsgJob implements Job {
 		/*LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();*/
 
 		String taskId = (String)cinfo.get("task_id");
-		String customerNo = (String)cinfo.get("customer_no");
-		String userNo = (String)cinfo.get("user_no");
-		if(StringUtils.isBlank(taskId) || StringUtils.isBlank(customerNo) || StringUtils.isBlank(userNo)){
+		if(StringUtils.isBlank(taskId)){
 			return false;
 		}
 
@@ -83,12 +81,6 @@ public class CustomerSendMsgJob implements Job {
 		LambdaQueryWrapper<SmsCheckTask> task_queryWrapper = new LambdaQueryWrapper<>();
 		task_queryWrapper.eq(SmsCheckTask::getId,taskId);
 		SmsCheckTask task = smsCheckTaskService.getOne(task_queryWrapper);
-		// 查询客户信息
-		LambdaQueryWrapper<SmsCheckCustomerInfo> info_queryWrapper = new LambdaQueryWrapper<>();
-		info_queryWrapper.eq(SmsCheckCustomerInfo::getTaskId,taskId);
-		info_queryWrapper.eq(SmsCheckCustomerInfo::getCustomerNo,customerNo);
-		info_queryWrapper.eq(SmsCheckCustomerInfo::getUserNo,userNo);
-		SmsCheckCustomerInfo info = customerInfoService.getOne(info_queryWrapper);
 
 		Object date_type_obj = cinfo.get("date_type");
 		String date_type = date_type_obj==null?"":date_type_obj.toString();
@@ -112,21 +104,17 @@ public class CustomerSendMsgJob implements Job {
 		}
 
 		// 收信人
-		String accountManager = info.getAccountManager();
-		LoginUser toUser = sysBaseAPI.getUserByWorkNo(accountManager);
-		String username = "B12345";
-		if(toUser!=null){
-			username = toUser.getUsername();
-		}
+		Object staff_username_obj = cinfo.get("staff_username");
+		String staff_username = staff_username_obj==null?null:staff_username_obj.toString();
 
-		String msg_text = get_msg_text(cinfo, task, info);
+		String msg_text = get_msg_text(cinfo, task);
 
-		log.info("发信详情："+username+","+msg_text);
+		log.info("发信详情："+staff_username+","+msg_text);
 		MessageDTO message = new MessageDTO();
 		message.setTitle("行短稽核："+date_type+"到期提醒");
 		message.setContent(msg_text);
 		message.setFromUser("北区稽核平台");
-		message.setToUser(username);
+		message.setToUser(staff_username);
 		sysBaseAPI.sendSysAnnouncement(message);
 		return true;
 	}
@@ -134,12 +122,11 @@ public class CustomerSendMsgJob implements Job {
 
 	/**
 	 * 构建信息文本
-	 * @param info
+	 * @param cinfo
 	 * @param task
-	 * @param info
 	 * @return
 	 */
-	private String get_msg_text(Map<String, Object> cinfo,SmsCheckTask task,SmsCheckCustomerInfo info) throws ParseException {
+	private String get_msg_text(Map<String, Object> cinfo,SmsCheckTask task) throws ParseException {
 		String taskName = task.getTaskName();
 		taskName = taskName==null?"":taskName;