diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolEvent.java b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolEvent.java index 94c00c6b..173741b0 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolEvent.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolEvent.java @@ -18,7 +18,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data @Comment("体育活动活动项目关联表") -@Table("Activity_school_event") +@Table("activity_school_event") public class ActivitySchoolEvent extends BaseModel implements Serializable { @Column diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java index 52e9e356..216e0134 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java @@ -102,6 +102,7 @@ public class HealthCheckupListController { hcus.campus, hcus.subjectId, hcus.bz, + hcus.receiveAddress, ca.campusName FROM health_checkup_user hcu 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 4ae55484..a91705d5 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 @@ -126,7 +126,7 @@ public class HealthCheckupSingleController { add(new ExcelExportEntity("部门", "unitName", 20)); // add(new ExcelExportEntity("部门编码", "unitCode", 20)); add(new ExcelExportEntity("医院", "subjectName", 20)); -// add(new ExcelExportEntity("自选院区", "campusName", 50)); + add(new ExcelExportEntity("邮寄地址", "receiveAddress", 50)); }}; List list; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/h5controller/H5HealthCheckupController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/h5controller/H5HealthCheckupController.java index 407260f1..be0c21cd 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/h5controller/H5HealthCheckupController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/h5controller/H5HealthCheckupController.java @@ -62,6 +62,12 @@ public class H5HealthCheckupController { public void list() { } + @At("/projectManageForm") + @Ok("beetl:/platform/zhghh5/dayofficework/healthCheckup/projectManageForm/index.html") + @SaCheckPermission("h5.healthCheckup.list") + public void projectManageForm() { + } + @At("/mine") @Ok("beetl:/platform/zhghh5/dayofficework/healthCheckup/mine/index.html") @SaCheckPermission("h5.healthCheckup.mine") @@ -114,10 +120,12 @@ public class H5HealthCheckupController { p.name, p.choiceTimeStart, p.choiceTimeEnd, - p.cover + p.cover, + sub.optionName FROM health_checkup_user_selection us LEFT JOIN health_checkup_project p ON us.projectId = p.id + LEFT JOIN health_checkup_project_subject sub on sub.id=us.subjectId $condition """); Cnd cnd = Cnd.NEW(); 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 738ac9bd..e73b3c2d 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 @@ -1,5 +1,6 @@ package com.budwk.app.zhgh.dayofficework.healthCheckup.model; +import cn.hutool.json.JSONObject; import com.budwk.app.base.model.BaseModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -72,6 +73,9 @@ public class HealthCheckupProject extends BaseModel implements Serializable { private String cover; + + + @Many(field = "projectId") private List healthCheckupProjectSubjects; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubject.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubject.java index 5cf9bd15..55386ecf 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubject.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubject.java @@ -1,5 +1,6 @@ package com.budwk.app.zhgh.dayofficework.healthCheckup.model; +import cn.hutool.json.JSONObject; import com.budwk.app.base.model.BaseModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -53,6 +54,11 @@ public class HealthCheckupProjectSubject extends BaseModel implements Serializab @ColDefine(type = ColType.TEXT) private String description; + @Column + @Comment("医院方提供材料") + @ColDefine(type = ColType.MYSQL_JSON) + private List files; + @Many(field = "subjectId") private List subjectMoneys; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubjectMoney.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubjectMoney.java index 2a1fb1ff..75654488 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubjectMoney.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubjectMoney.java @@ -43,6 +43,11 @@ public class HealthCheckupProjectSubjectMoney extends BaseModel implements Seria @ColDefine(customType = "decimal(10,2)") private BigDecimal money; + @Column + @Comment("结算金额") + @ColDefine(customType = "decimal(10,2)") + private BigDecimal settlementMoney; + @Column @Comment("名称") @ColDefine(type = ColType.VARCHAR, width = 32) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUserSelection.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUserSelection.java index 1cbfa310..90afd8c4 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUserSelection.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUserSelection.java @@ -70,6 +70,16 @@ public class HealthCheckupUserSelection extends BaseModel implements Serializabl @ColDefine(type = ColType.VARCHAR,width = 100) private String bz; + @Column + @Comment("邮寄地址") + @ColDefine(type = ColType.VARCHAR,width = 100) + private String receiveAddress; + + @Column + @Comment("邮寄地址模式(1.自己单位2.自己选择)") + @ColDefine(type = ColType.VARCHAR,width = 10) + private String postMethod; + @Many(field = "userSelectionId") private List companionList; } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java index e2f6db8e..57e911ad 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java @@ -218,6 +218,7 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl StrUtil.isNotBlank(s.getErrMsg())).collect(Collectors.toList())); excelImportRes.setFailedCount(excelImportRes.getErrorDetails().size()); + excelImportRes.setSuccessCount(excelList.size() - excelImportRes.getFailedCount()); return Result.success(excelImportRes); } diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java index 452510ee..44dbddfb 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java @@ -7,6 +7,7 @@ import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.welfare.model.WelfareList; +import com.budwk.app.zhgh.welfare.model.WelfareProject; import com.budwk.app.zhgh.welfare.model.WelfareUserSelection; import com.budwk.app.zhgh.welfare.service.WelfareProjectService; import io.swagger.annotations.ApiOperation; @@ -22,8 +23,10 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; +import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Objects; @IocBean @Ok("json:full") @@ -81,9 +84,16 @@ public class WelfareUserSelectController { @SaCheckPermission("welfare.user.select") public Result confirmSelect(@Param("selections") WelfareUserSelection[] selections, String projectId) { int count = dao.count(WelfareList.class, Cnd.where(WelfareList::getProjectId, "=", projectId).and(WelfareList::getUserId, "=", SecurityUtil.getUserId())); - if(count==0){ + if (count == 0) { return Result.error("您没有选择的权限"); } + WelfareProject project = dao.fetch(WelfareProject.class, projectId); + + int sum = Arrays.stream(selections).mapToInt(selection -> Objects.requireNonNullElse(selection.getSelectNum(), 0)).sum(); + if (sum > project.getMultiSelectNum()) { + return Result.error("选择的数量不能超过" + project.getMultiSelectNum()); + } + //删除上次选择的 dao.clear(WelfareUserSelection.class, Cnd.where(WelfareUserSelection::getWelfareId, "=", projectId).and(WelfareUserSelection::getSelectUserId, "=", SecurityUtil.getUserId())); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java index 0ecd04fc..04a161d4 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java @@ -42,7 +42,7 @@ public class WelfareProjectServiceImpl extends BaseServiceImpl i @Override public WelfareProject projectInfo(String projectId) { WelfareProject project = fetch(projectId); - fetchLinks(project, "options"); + fetchLinks(project, "options",Cnd.NEW().asc("optionSort")); return project; } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html index 7e00dc97..f373bcee 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html @@ -195,6 +195,7 @@ layout("/layouts/platform.html"){ {prop: 'unitName', label: '所属单位', sortable: true}, {prop: 'optionName', label: '所选套餐'}, {prop: 'selectTime', label: '选择时间', width: "160px"}, + {prop: 'receiveAddress', label: '邮寄地址', width: "160px"}, {prop: 'isAudit', label: '是否确认'}, {prop: 'auditTime', label: '确认时间'}, {prop: 'bz', label: '备注',width: "200px"}, 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 3113c8f7..9653a59b 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 @@ -69,9 +69,9 @@ layout("/layouts/platform.html"){ - + 二维码 @@ -181,6 +181,18 @@ layout("/layouts/platform.html"){ + + + 医院方提供材料: +
+ +
+
+
@@ -192,7 +204,7 @@ layout("/layouts/platform.html"){ > - + + + +