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

Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

Browse Source
This commit is contained in:
=
2026-05-22 08:50:20 +08:00
parent 80ae31a930 5dd39c463b
commit 5cfd2c418f
8 changed files with 105 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java
+1
View File
@@ -126,6 +126,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
httpRequest.body(JSONUtil.toJsonStr(Map.of()));
String resBody = httpRequest.execute().body();
log.info("接口返回数据: {}", resBody);
JSONObject jsonBody = JSONUtil.parseObj(resBody);
if (jsonBody.getInt("code") != 200) {
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java
+6 -3
View File
@@ -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<NutMap> mapList = healthCheckupSingleService.listMap(sql);
if(CollectionUtil.isEmpty(mapList)) return Result.success();
List<String> userIds = mapList.stream().map(v -> v.getString("id")).toList();
List<String> userIds = mapList.stream().map(v -> v.getString("id")).filter(Strings::isNotBlank).toList();
//去年项目的人
List<HealthCheckupUserSelection> 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<HealthCheckupUserSelection> lastYearSelectionList = dao.query(HealthCheckupUserSelection.class, aNew);
//去年项目下的医院
List<HealthCheckupProjectSubject> lastYearSubjectList = dao.query(HealthCheckupProjectSubject.class,
src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceRosterController.java
+5 -3
View File
@@ -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<ExcelExportEntity> 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));
src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/model/MutualInsuranceRosterUser.java
+5
View File
@@ -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)
src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/param/MutualInsuranceRosterUserPageForm.java
+3
View File
@@ -43,6 +43,9 @@ public class MutualInsuranceRosterUserPageForm extends PageForm {
@ApiModelProperty("人员类型")
private String[] personTypes;
@ApiModelProperty("证件类型")
private String[] idCardTypes;
@ApiModelProperty("聘用方式")
private String[] preparedBys;
src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/service/impl/MutualInsuranceRosterUserServiceImpl.java
+47 -5
View File
@@ -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<MutualInsuranceRosterUser> 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<Mutual
row.setErrInfo("导入文件中工号重复", i + 1);
continue;
}
if (!isValidImportMobile(row.getMobile())) {
row.setErrInfo("手机号格式不正确", i + 1);
continue;
}
View_user user = users.stream()
.filter(item -> loginName.equals(item.getLoginname()))
.findFirst()
@@ -108,7 +115,7 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl<Mutual
row.setErrInfo("工号在系统中不存在", i + 1);
continue;
}
upsertRosterUser(project, user);
upsertRosterUser(project, user, row);
successCount++;
}
fillImportResult(result, importRows, successCount);
@@ -131,7 +138,8 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl<Mutual
u.unitName,
u.unionId,
u.unionName,
u.member
u.member,
u.idCardType
FROM vw_user u
LEFT JOIN mutual_insurance_roster_user info ON u.id = info.userId
AND info.projectId = @projectId
@@ -162,6 +170,7 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl<Mutual
u.unionId,
u.unionName,
u.mobile,
u.idCardType,
u.idCard
FROM vw_user u
$condition
@@ -255,12 +264,33 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl<Mutual
private Sql buildRosterSql(Integer year, String projectId, String unionId, String unitId,
String searchKeyword, String isAudit) {
// 列表和导出需展示用户表当前证件类型，避免历史名单快照为空时页面缺失。
Sql sql = Sqls.create("""
SELECT
info.*,
info.id,
info.year,
info.projectId,
info.projectName,
info.userId,
info.loginName,
info.userName,
info.sex,
info.unionId,
info.unionName,
info.unitId,
info.unitName,
info.mobile,
u.idCardType AS idCardType,
info.idCard,
info.importTime,
info.isAudit,
info.auditTime,
info.auditUser,
info.createdAt,
project.year AS projectYear
FROM mutual_insurance_roster_user info
LEFT JOIN mutual_insurance_project project ON project.id = info.projectId
LEFT JOIN sys_user u ON u.id = info.userId
$condition
""");
Cnd cnd = Cnd.NEW();
@@ -295,7 +325,7 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl<Mutual
return sql;
}
private void upsertRosterUser(MutualInsuranceProject project, View_user user) {
private void upsertRosterUser(MutualInsuranceProject project, View_user user, MutualInsuranceUserImportTemp row) {
MutualInsuranceRosterUser info = dao().fetch(MutualInsuranceRosterUser.class,
Cnd.where("projectId", "=", project.getId()).and("userId", "=", user.getId()));
if (info == null) {
@@ -315,7 +345,9 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl<Mutual
info.setUnitName(user.getUnitName());
info.setUnionId(user.getUnionId());
info.setUnionName(user.getUnionName());
info.setMobile(user.getMobile());
// 导入名单时手机号允许按 Excel 覆盖；未填写时继续使用系统用户档案中的手机号。
info.setMobile(StrUtil.blankToDefault(Strings.trim(row.getMobile()), user.getMobile()));
info.setIdCardType(user.getIdCardType());
info.setIdCard(user.getIdCard());
dao().insertOrUpdate(info);
}
@@ -341,6 +373,7 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl<Mutual
info.setUnionId(user.getString("unionId"));
info.setUnionName(user.getString("unionName"));
info.setMobile(user.getString("mobile"));
info.setIdCardType(user.getString("idCardType"));
info.setIdCard(user.getString("idCard"));
dao().insertOrUpdate(info);
}
@@ -378,6 +411,7 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl<Mutual
cnd.andEX("u.unionId", "=", pageForm.getUnionId());
cnd.andEX("u.unitId", "in", pageForm.getUnitIds());
cnd.andEX("u.personType", "in", pageForm.getPersonTypes());
cnd.andEX("u.idCardType", "in", pageForm.getIdCardTypes());
cnd.andEX("u.preparedBy", "in", pageForm.getPreparedBys());
cnd.andEX("u.userState", "in", pageForm.getUserStates());
cnd.andEX("u.member", "=", pageForm.getIsMember());
@@ -419,4 +453,12 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl<Mutual
result.setErrorDetails(rows.stream().filter(row -> StrUtil.isNotBlank(row.getErrMsg())).collect(Collectors.toList()));
result.setFailedCount(result.getErrorDetails().size());
}
/**
* 导入手机号允许为空，非空时必须是 11 位中国大陆手机号，避免错误联系方式写入名单快照。
*/
private boolean isValidImportMobile(String mobile) {
String value = Strings.trim(mobile);
return StrUtil.isBlank(value) || MOBILE_PATTERN.matcher(value).matches();
}
}
src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/template/MutualInsuranceUserImportTemp.java
+6
View File
@@ -20,4 +20,10 @@ public class MutualInsuranceUserImportTemp extends ExcelImportError {
@ExcelProperty("姓名")
private String userName;
@ExcelProperty("证件类型")
private String idCardType;
@ExcelProperty("手机号")
private String mobile;
}