diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java index 4e9263dc..de3ad919 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java @@ -22,10 +22,12 @@ import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProject import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProjectSubject; import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProjectSubjectMoney; import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupUserSelection; +import com.budwk.app.zhgh.dayofficework.healthCheckup.service.HealthCheckupProjectService; import com.budwk.app.zhgh.dayofficework.healthCheckup.service.HealthCheckupSingleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; @@ -66,6 +68,8 @@ public class HealthCheckupSingleController { private HealthCheckupSingleService healthCheckupSingleService; @Inject private ManyAddOrRenewUtil manyAddOrRenewUtil; + @Inject + private HealthCheckupProjectService healthCheckupProjectService; @At("") @Ok("beetl:/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html") @@ -430,13 +434,18 @@ public class HealthCheckupSingleController { @SaCheckPermission("healthCheckup.statisticsSingle") @SLog(type = "healthCheckup", tag = "体检管理", msg = "管理员给未选的人发送提醒") public Result msgNotSelect(@Valid String projectId) { + List userList = healthCheckupSingleService.receivePageData(projectId, null, "1"); if(CollectionUtil.isNotEmpty(userList)){ + HealthCheckupProject project = healthCheckupProjectService.dao().fetch(HealthCheckupProject.class, Cnd.where("id", "=", projectId)); + String smsMessage = StringUtils.defaultIfBlank( + project.getSmsMessage(), + "系统显示您本年度体检医院信息尚未维护,请尽快登录小程序完成体检医院选择及个人信息确认,以免影响正常体检安排。"); List loginNameList = userList.stream() .map(e -> e.getString("loginName")) .collect(Collectors.toList()); smsService.massSendTextCard(loginNameList, - "系统显示您本年度体检医院信息尚未维护,请尽快登录小程序完成体检医院选择及个人信息确认,以免影响正常体检安排。", + smsMessage, "#", Globals.AppDomain); return Result.success("提醒成功"); @@ -445,6 +454,4 @@ public class HealthCheckupSingleController { } } - - } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProject.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProject.java index 91a8f7e8..466aff60 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProject.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProject.java @@ -83,6 +83,11 @@ public class HealthCheckupProject extends BaseModel implements Serializable, Sys @Many(field = "projectId") private List healthCheckupProjectSubjects; + @Column + @Comment("短信信息") + @ColDefine(type = ColType.TEXT) + private String smsMessage; + @Override public Sys_home_activity covertToSysHomeActivity() { Sys_home_activity sysHomeActivity = new Sys_home_activity(); diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html index be29328c..6f1bf721 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html @@ -145,6 +145,11 @@ layout("/layouts/platform.html"){ + + + + +