diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java index d8833485..e3b67c4a 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java @@ -126,6 +126,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl httpRequest.body(JSONUtil.toJsonStr(Map.of())); String resBody = httpRequest.execute().body(); + log.info("接口返回数据: {}", resBody); JSONObject jsonBody = JSONUtil.parseObj(resBody); if (jsonBody.getInt("code") != 200) { 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 b507d624..36252ee8 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 @@ -323,6 +323,7 @@ public class HealthCheckupSingleController { $projectCnd $condition """); cnd.and("hcu.projectId", "=", projectId); + sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )"); cnd.groupBy("u.loginname"); @@ -330,11 +331,13 @@ public class HealthCheckupSingleController { List mapList = healthCheckupSingleService.listMap(sql); if(CollectionUtil.isEmpty(mapList)) return Result.success(); - List userIds = mapList.stream().map(v -> v.getString("id")).toList(); + List userIds = mapList.stream().map(v -> v.getString("id")).filter(Strings::isNotBlank).toList(); //去年项目的人 - List lastYearSelectionList = dao.query(HealthCheckupUserSelection.class, Cnd.where(HealthCheckupUserSelection::getProjectId, "=", lastYearProject.getId()) - .and(HealthCheckupUserSelection::getSelectUserId, "in", userIds)); + Cnd aNew = Cnd.NEW(); + aNew.and(HealthCheckupUserSelection::getProjectId, "=", lastYearProject.getId()) + .and(HealthCheckupUserSelection::getSelectUserId, "in", userIds); + List lastYearSelectionList = dao.query(HealthCheckupUserSelection.class, aNew); //去年项目下的医院 List lastYearSubjectList = dao.query(HealthCheckupProjectSubject.class, diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceRosterController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceRosterController.java index 992771df..75c1cb17 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceRosterController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceRosterController.java @@ -132,7 +132,7 @@ public class MutualInsuranceRosterController { @At @ApiOperation("按勾选人员删除名单") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("mutualInsurance.roster") + @SaCheckPermission("mutualInsurance.roster.delete") @SLog(type = "mutualInsurance", tag = "省级互助保障", msg = "按勾选人员删除名单") public Result deleteSelected(String ids) { String[] idArray = parseIds(ids); @@ -146,11 +146,13 @@ public class MutualInsuranceRosterController { @At @Ok("void") @ApiOperation("下载人员名单导入模板") - @SaCheckPermission("mutualInsurance.roster") + @SaCheckPermission("mutualInsurance.roster.import") public void downloadTem(HttpServletResponse response) { List entities = new ArrayList<>(); entities.add(new ExcelExportEntity("工号", "loginName", 20)); entities.add(new ExcelExportEntity("姓名", "userName", 20)); + entities.add(new ExcelExportEntity("证件类型", "idCardType", 20)); + entities.add(new ExcelExportEntity("手机号", "mobile", 20)); ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entities, Collections.emptyList()); @@ -231,8 +233,8 @@ public class MutualInsuranceRosterController { entityList.add(new ExcelExportEntity("性别", "sex", 20)); entityList.add(new ExcelExportEntity("所属工会", "unionName", 20)); entityList.add(new ExcelExportEntity("所属单位", "unitName", 20)); - entityList.add(new ExcelExportEntity("事项名称", "projectName", 30)); entityList.add(new ExcelExportEntity("手机号", "mobile", 20)); + entityList.add(new ExcelExportEntity("证件类型", "idCardType", 20)); entityList.add(new ExcelExportEntity("身份证号", "idCard", 25)); entityList.add(new ExcelExportEntity("是否确认", "isAuditText", 20)); entityList.add(new ExcelExportEntity("确认时间", "auditTimeText", 25)); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/model/MutualInsuranceRosterUser.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/model/MutualInsuranceRosterUser.java index d9707ae3..b031e095 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/model/MutualInsuranceRosterUser.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/model/MutualInsuranceRosterUser.java @@ -85,6 +85,11 @@ public class MutualInsuranceRosterUser extends BaseModel implements Serializable @ColDefine(type = ColType.VARCHAR, width = 50) private String mobile; + @Column + @Comment("证件类型") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String idCardType; + @Column @Comment("身份证号") @ColDefine(type = ColType.VARCHAR, width = 20) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/param/MutualInsuranceRosterUserPageForm.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/param/MutualInsuranceRosterUserPageForm.java index c3735bed..ba73c88b 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/param/MutualInsuranceRosterUserPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/param/MutualInsuranceRosterUserPageForm.java @@ -43,6 +43,9 @@ public class MutualInsuranceRosterUserPageForm extends PageForm { @ApiModelProperty("人员类型") private String[] personTypes; + @ApiModelProperty("证件类型") + private String[] idCardTypes; + @ApiModelProperty("聘用方式") private String[] preparedBys; diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/service/impl/MutualInsuranceRosterUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/service/impl/MutualInsuranceRosterUserServiceImpl.java index ce928e49..0891741f 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/service/impl/MutualInsuranceRosterUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/service/impl/MutualInsuranceRosterUserServiceImpl.java @@ -32,10 +32,13 @@ import java.io.File; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.regex.Pattern; import java.util.stream.Collectors; @IocBean(args = {"refer:dao"}) public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl implements MutualInsuranceRosterUserService { + private static final Pattern MOBILE_PATTERN = Pattern.compile("^1[3456789]\\d{9}$"); + public MutualInsuranceRosterUserServiceImpl(Dao dao) { super(dao); } @@ -100,6 +103,10 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl loginName.equals(item.getLoginname())) .findFirst() @@ -108,7 +115,7 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl - + - 问题反馈 + 问题反馈 导入名单 - 添加人员 + 添加人员 导出 按工会确认 按工会取消确认 勾选确认 勾选取消确认 - 批量删除 + 批量删除 - +