c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除自聘字段

Browse Source
This commit is contained in:
c-zhangr1
2026-04-16 16:11:15 +08:00
parent 77d54b439a
commit ddb5a1ffcb
7 changed files with 12 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java
+4 -23
View File
@@ -99,7 +99,7 @@ public class HealthCheckupListController {
@ApiOperation("分页查询")
@SaCheckPermission("healthCheckup.list.mange")
public Result pageData(PageForm pageForm, String projectId, String subjectId,
String unionId, String unitId, String isEmployed, String physicalExaminationStatus) {
String unionId, String unitId, String physicalExaminationStatus) {
List<HealthCheckupUnionConfirm> confirms = dao.query(HealthCheckupUnionConfirm.class, Cnd.where("projectId", "=", projectId));
HealthCheckupProject project = healthCheckupProjectService.findOne(projectId);
@@ -119,8 +119,7 @@ public class HealthCheckupListController {
hcus.subjectId,
hcu.bz,
hcus.receiveAddress,
ca.campusName,
hcu.isEmployed
ca.campusName
FROM
health_checkup_user hcu
LEFT JOIN health_checkup_user_selection hcus ON hcu.userId = hcus.selectUserId
@@ -133,7 +132,6 @@ public class HealthCheckupListController {
cnd.andEX("hcu.unionId", "=", unionId);
cnd.andEX("hcu.unitId", "=", unitId);
cnd.andEX("hcus.subjectId", "=", subjectId);
cnd.andEX("hcu.isEmployed", "=", isEmployed);
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
@@ -206,7 +204,7 @@ public class HealthCheckupListController {
@ApiOperation("体检名单管理员编辑选择记录")
@SLog(type = "healthCheckup", tag = "体检管理", msg = "管理员编辑了一条选择记录")
@SaCheckPermission("healthCheckup.list.mange")
public Result doEditHealthCheckupData(String subjectId, String campus, String projectId, String userId, String isEmployed, String bz) {
public Result doEditHealthCheckupData(String subjectId, String campus, String projectId, String userId, String bz) {
if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(),RoleConstant.HEALTH_ADMIN.name())) {
return Result.error("您没有操作此按钮的权限");
}
@@ -227,12 +225,6 @@ public class HealthCheckupListController {
}
}
healthCheckupProjectService.dao().update(
HealthCheckupUser.class,
Chain.make("isEmployed", isEmployed),
Cnd.NEW().and("projectId", "=", projectId).and("userId", "=", userId)
);
//查询用户有没有选择过套餐
HealthCheckupUserSelection userSelection = healthCheckupProjectService.dao().fetch(HealthCheckupUserSelection.class,
Cnd.where("projectId", "=", projectId)
@@ -301,10 +293,6 @@ public class HealthCheckupListController {
excel.setErrInfo("重复数据", i + 1);
}
if(StringUtils.isNotBlank(excel.getIsEmployed()) && !(excel.getIsEmployed().contains("是") || excel.getIsEmployed().contains("否"))){
excel.setErrInfo("是否自聘：值只能为 \'是\' 或 \'否\'", i + 1);
}
View_user user = userList.stream().filter(s -> s.getLoginname().equals(excel.getLoginName())).findFirst().orElse(null);
if (user == null) {
excel.setErrInfo("无此用户：" + excel.getLoginName(), i + 1);
@@ -322,9 +310,6 @@ public class HealthCheckupListController {
if(StringUtils.isNotBlank(excel.getPhone())){
chain.add("phone", excel.getPhone());
}
if(StringUtils.isNotBlank(excel.getIsEmployed())) {
chain.add("isEmployed", excel.getIsEmployed());
}
dao.update(
HealthCheckupUser.class,chain,
Cnd.NEW().and(HealthCheckupUser::getUserId, "=", user.getId())
@@ -351,7 +336,6 @@ public class HealthCheckupListController {
newHealthUser.setPhone(excel.getPhone());
newHealthUser.setMarriage(user.getMarriage());
newHealthUser.setPersonType(projectName);
newHealthUser.setIsEmployed(excel.getIsEmployed());
healthCheckupUsersToAdd.add(newHealthUser);
successCount++;
}
@@ -381,7 +365,6 @@ public class HealthCheckupListController {
entities.add(new ExcelExportEntity("工号", "loginName", 20));
entities.add(new ExcelExportEntity("姓名", "userName", 20));
entities.add(new ExcelExportEntity("手机号", "phone", 20));
entities.add(new ExcelExportEntity("是否自聘", "isEmployed", 20));
ExportParams exportParams = new ExportParams();
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entities, Collections.emptyList());
CommonDownloadUtil.download("参加人员导入模版.xlsx", workbook, response);
@@ -604,8 +587,7 @@ public class HealthCheckupListController {
hcus.subjectId,
hcu.bz,
hcus.receiveAddress,
ca.campusName,
hcu.isEmployed
ca.campusName
FROM health_checkup_user hcu
LEFT JOIN health_checkup_user_selection hcus ON hcu.userId = hcus.selectUserId
AND hcus.projectId=@projectId
@@ -671,7 +653,6 @@ public class HealthCheckupListController {
add(new ExcelExportEntity("选择时间", "selectTime", 50));
add(new ExcelExportEntity("是否确认", "isAudit", 50));
add(new ExcelExportEntity("确认时间", "auditTime", 50));
add(new ExcelExportEntity("是否自聘", "isEmployed", 50));
add(new ExcelExportEntity("备注", "bz", 50));
}};
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java
+2 -3
View File
@@ -78,9 +78,8 @@ public class HealthCheckupSingleController {
@ApiOperation("首页查询")
@SaCheckPermission("healthCheckup.statisticsSingle")
public Result pageData(String projectId,
String unionId,
String isEmployed) {
NutMap nutMap = healthCheckupSingleService.pageData(projectId, unionId, isEmployed);
String unionId) {
NutMap nutMap = healthCheckupSingleService.pageData(projectId, unionId);
return Result.success(nutMap);
}
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupSingleService.java
+1 -1
View File
@@ -15,7 +15,7 @@ public interface HealthCheckupSingleService extends BaseService<HealthCheckupPro
* @param projectId 福利id
* @return
*/
NutMap pageData(String projectId,String unionId, String isEmployed);
NutMap pageData(String projectId,String unionId);
/**
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
+5 -10
View File
@@ -32,17 +32,17 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
private HealthCheckupProjectService healthCheckupProjectService;
@Override
public NutMap pageData(String projectId, String unionId, String isEmployed) {
public NutMap pageData(String projectId, String unionId) {
HealthCheckupProject project = healthCheckupProjectService.findOne(projectId);
Sql sql = Sqls.create("""
SELECT
su.id,
su.name unionName,
(SELECT count( 1 ) FROM `health_checkup_user` hcu WHERE hcu.projectId=@projectId and hcu.unionId = su.id and isEmployed = @isEmployed ) sumCount
(SELECT count( 1 ) FROM `health_checkup_user` hcu WHERE hcu.projectId=@projectId and hcu.unionId = su.id ) sumCount
FROM
sys_union su
$condition
""").setParam("projectId", projectId).setParam("isEmployed",isEmployed);
""").setParam("projectId", projectId);
Cnd cnd = Cnd.NEW();
cnd.andEX("su.id", "=", unionId);
cnd.asc("su.unionCode");
@@ -61,7 +61,6 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
.filter(x ->
x.getString("unionId").equals(healthCheckup.getString("id"))
&& x.getString("projectId").equals(projectId)
&& x.getString("isEmployed").equals(isEmployed)
)
.collect(Collectors.toList());
@@ -80,7 +79,6 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
optionCountCnd.andEX("hcu.unionId", "=", healthCheckup.getString("id"));
optionCountCnd.andEX("hs.projectId", "=", projectId);
optionCountCnd.andEX("hs.subjectId", "=", o.getId());
optionCountCnd.andEX("hcu.isEmployed", "=", isEmployed);
optionCountSql.setCondition(optionCountCnd);
int count = count(optionCountSql);
healthCheckup.put(o.getOptionName(), count);
@@ -119,8 +117,7 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
hu.selectTime,
hu.projectId,
hu.selectUserId,
hcu.unionId,
hcu.isEmployed
hcu.unionId
FROM
`health_checkup_user_selection` hu
LEFT JOIN `health_checkup_user` hcu ON hcu.userId = hu.selectUserId and hcu.projectId=@projectId
@@ -226,7 +223,6 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
hcu.unionName,
hcu.phone as mobile,
hcu.card as idCard,
hcu.isEmployed as isEmployed,
hcps.optionName subjectName,
hcc.campusName,
hcpsm.money,
@@ -268,8 +264,7 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
hcu.unitName,
hcu.unionName,
u.idcard idCard,
u.mobile,
hcu.isEmployed as isEmployed
u.mobile
FROM
`health_checkup_user` hcu
LEFT JOIN `vw_user` u ON u.id = hcu.userId
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/template/HealthCheckupImportTemp.java
-3
View File
@@ -28,7 +28,4 @@ public class HealthCheckupImportTemp extends ExcelImportError {
@ExcelProperty("体检报告")
private String medicalExamination;
@ExcelProperty("是否自聘")
private String isEmployed;
}