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

commit

Browse Source
This commit is contained in:
Paidax
2025-11-11 11:33:43 +08:00
parent 51a417ea20
commit dea071e25f
31 changed files with 348 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/base/utils/EasyExcelUtil.java → src/main/java/com/budwk/app/base/utils/easyexcel/EasyExcelUtil.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.budwk.app.base.utils;
package com.budwk.app.base.utils.easyexcel;
import com.alibaba.excel.EasyExcelFactory;
import org.apache.poi.ss.formula.functions.T;
src/main/java/com/budwk/app/base/utils/easyexcel/NoModelDataListener.java
+48
View File
@@ -0,0 +1,48 @@
package com.budwk.app.base.utils.easyexcel;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.read.listener.ReadListener;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.nutz.lang.util.NutMap;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @version 1.0
* @Author FKY
* @name：NoModelDataListener
* @Date 2025/11/8 15:22
* @注释 没有定义的数据对象的读取
*/
@Slf4j
public class NoModelDataListener implements ReadListener<Map<String, Object>> {
private boolean isFirstRow = true;
// 表头数据
@Getter
private List<String> headers = new ArrayList<>();
// 表内容数据
@Getter
private List<NutMap> dataList = new ArrayList<>();
@Override
public void invoke(Map<String, Object> rowMap, AnalysisContext context) {
if (isFirstRow) {
headers = new ArrayList<>(rowMap.keySet());
isFirstRow = false;
} else {
NutMap nutMap = new NutMap();
nutMap.putAll(rowMap);
dataList.add(nutMap);
}
}
@Override
public void doAfterAllAnalysed(AnalysisContext context) {
log.info("共读取 {} 行数据（不含表头）", dataList.size());
}
}
src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
+1 -1
View File
@@ -16,7 +16,7 @@ import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.sys.models.Sys_role;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope;
src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeUserDataController.java
+1 -1
View File
@@ -16,7 +16,7 @@ import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope;
import com.budwk.app.zhgh.activity.basic.template.UserTemp;
src/main/java/com/budwk/app/zhgh/benefit/service/impl/BenefitUserServiceImpl.java
+1 -1
View File
@@ -5,7 +5,7 @@ import cn.hutool.json.JSONUtil;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.sys.views.View_user;
import com.budwk.app.zhgh.benefit.mode.BenefitUserTemp;
import com.budwk.app.zhgh.benefit.models.BenefitUser;
src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java
+1 -3
View File
@@ -9,9 +9,8 @@ import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.sys.models.Sys_role;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.sys.models.Sys_user_role;
import com.budwk.app.sys.services.SysRoleService;
import com.budwk.app.sys.services.SysUserService;
@@ -30,7 +29,6 @@ import com.budwk.app.zhgh.club.service.SysClubUserService;
import com.budwk.app.zhgh.club.vo.ClubCommonPageVo;
import com.budwk.app.zhgh.club.vo.ClubUserImportVo;
import io.swagger.annotations.ApiOperation;
import org.apache.axis.utils.IDKey;
import org.apache.poi.ss.formula.functions.T;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Chain;
src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java
+1 -1
View File
@@ -4,7 +4,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.base.utils.ManyAddOrRenewUtil;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.zhgh.dayofficework.exerciseCard.model.ExerciseCard;
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java
+1 -1
View File
@@ -14,7 +14,7 @@ import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.sys.views.View_user;
import com.budwk.app.web.commons.auth.utils.AuthUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralManageController.java
+1 -1
View File
@@ -15,7 +15,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.sys.models.Sys_union;
import com.budwk.app.sys.views.View_user;
import com.budwk.app.zhgh.dayofficework.integral.model.IntegralDetail;
src/main/java/com/budwk/app/zhgh/dayofficework/retiresouvenirs/controller/RetireSouvenirsBatchController.java
+1 -2
View File
@@ -15,9 +15,8 @@ import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.sys.views.View_user;
import com.budwk.app.zhgh.dayofficework.healthCheckup.template.HealthCheckupImportTemp;
import com.budwk.app.zhgh.dayofficework.retiresouvenirs.model.RetireSouvenirsBatch;
import com.budwk.app.zhgh.dayofficework.retiresouvenirs.model.RetireSouvenirsLedger;
import com.budwk.app.zhgh.dayofficework.retiresouvenirs.service.RetireSouvenirsBatchService;
src/main/java/com/budwk/app/zhgh/dayofficework/womanSanitary/service/impl/WomanSanitaryUserServiceImpl.java
+1 -3
View File
@@ -4,11 +4,9 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.base.utils.ManyAddOrRenewUtil;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.zhgh.dayofficework.exerciseCard.model.ExerciseCard;
import com.budwk.app.zhgh.dayofficework.exerciseCard.vo.ExercisePeopleImportVo;
import com.budwk.app.zhgh.dayofficework.womanSanitary.model.WomanSanitaryUser;
import com.budwk.app.zhgh.dayofficework.womanSanitary.service.WomanSanitaryUserService;
import com.budwk.app.zhgh.dayofficework.womanSanitary.vo.WomanSanitaryUserImportVo;
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/verification/MemberListVerificationController.java
+1 -1
View File
@@ -9,7 +9,7 @@ import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.sys.models.Sys_union;
import com.budwk.app.sys.services.SysDictService;
import com.budwk.app.zhgh.benefit.mode.BenefitUserTemp;
src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java
+1
View File
@@ -11,6 +11,7 @@ import cn.hutool.json.JSONUtil;
import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.base.utils.*;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.sys.models.Sys_role;
import com.budwk.app.sys.models.Sys_unit;
import com.budwk.app.sys.models.Sys_user_role;
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskBranchAuditController.java
+18
View File
@@ -1,5 +1,12 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
/**
* @version 1.0
* @Author FKY
@@ -7,5 +14,16 @@ package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
* @Date 2025/10/15 10:48
* @注释
*/
@Slf4j
@IocBean
@Api("分工会审核核对")
@Ok("json:full")
@At("/platform/personnel/check/verification/branch")
public class CheckTaskBranchAuditController {
@At("/")
@SaCheckPermission("personnel.check.verification.branch")
@Ok("beetl:/platform/zhgh/staffmanage/personnelcheck/branch/index.html")
public void index() {
}
}
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskGroupAuditController.java
+15
View File
@@ -1,6 +1,11 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
/**
* @version 1.0
@@ -9,6 +14,16 @@ import org.nutz.ioc.loader.annotation.IocBean;
* @Date 2025/10/17 16:46
* @注释
*/
@Slf4j
@IocBean
@Api("工会小组审核核对")
@Ok("json:full")
@At("/platform/personnel/check/verification/group")
public class CheckTaskGroupAuditController {
@At("/")
@SaCheckPermission("personnel.check.verification.group")
@Ok("beetl:/platform/zhgh/staffmanage/personnelcheck/group/index.html")
public void index() {
}
}
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSchoolAuditController.java
+18
View File
@@ -1,5 +1,12 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
/**
* @version 1.0
* @Author FKY
@@ -7,5 +14,16 @@ package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
* @Date 2025/10/15 10:48
* @注释
*/
@Slf4j
@IocBean
@Api("校工会审核核对")
@Ok("json:full")
@At("/platform/personnel/check/verification/school")
public class CheckTaskSchoolAuditController {
@At("/")
@SaCheckPermission("personnel.check.verification.school")
@Ok("beetl:/platform/zhgh/staffmanage/personnelcheck/school/index.html")
public void index() {
}
}
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSingleController.java
+50 -1
View File
@@ -1,16 +1,23 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.zhgh.staffmanage.personnelcheck.service.CheckTaskCommonService;
import com.budwk.app.zhgh.staffmanage.personnelcheck.vo.pageform.CheckTaskCommonPageForm;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import javax.validation.Valid;
/**
* @version 1.0
* @Author FKY
@@ -39,7 +46,49 @@ public class CheckTaskSingleController {
@At
@SaCheckPermission("personnel.check.verification.single")
public Result getSingleCheckTask(){
public Result pageData(CheckTaskCommonPageForm pageForm) {
Sql sql = Sqls.create("""
SELECT
u.id AS userId,
u.sex,
u.loginname,
u.username,
u.mobile,
u.unitId,
u.unitName,
u.unionId,
u.unionName,
u.birthday,
u.manyUnit,
u.member,
u.userState,
u.preparedBy,
u.personType,
person.id,
person.currentStep
FROM
check_task_personnel person
LEFT JOIN `user` u ON u.loginname = person.loginname
$condition
""");
Cnd cnd = Cnd.NEW();
pageForm.buildSearch(cnd, "u.");
sql.setCondition(cnd);
Pagination pagination = checkTaskCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination);
}
@At
@SaCheckPermission("personnel.check.verification.single")
public Result doSave() {
return Result.success();
}
@At
@SaCheckPermission("personnel.check.verification.single")
public Result findOne(@Valid String id){
}
}
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskVerificationController.java
+11 -2
View File
@@ -26,6 +26,7 @@ import org.nutz.dao.sql.Sql;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.random.R;
import org.nutz.mvc.annotation.AdaptBy;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
@@ -33,6 +34,8 @@ import org.nutz.mvc.annotation.Param;
import org.nutz.mvc.upload.TempFile;
import org.nutz.mvc.upload.UploadAdaptor;
import java.util.List;
/**
* @version 1.0
* @Author FKY
@@ -102,12 +105,18 @@ public class CheckTaskVerificationController {
verification.setYear(DateUtil.year(verification.getCreateTime()));
dao.insertOrUpdate(verification);
// 3.往字段表里面插入数据，最好做下字段映射，把相关字段与数据库的字段对应
// 3.往字段表里面插入数据，最好做下字段映射，把相关字段与数据库的字段对应（忽略，前端做好了字段对应）
// todo 字段映射
List<CheckTaskFiledConfig> fieldConfig = vo.getFieldConfig();
fieldConfig.forEach(v -> {
v.setId(R.UU32());
v.setTaskId(verification.getId());
});
dao.insert(fieldConfig);
// 4.读取文件，构造数据（动态字段 data），往 CheckTaskPersonnel 表中插入数据
// todo 读取文件 转换成数据 同时还要把字段转化成数据库的字段来存储
List<CheckTaskPersonnel> personnelData = checkTaskCommonService.readFile(fieldConfig, file);
return Result.success();
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/model/CheckTaskFiledConfig.java
-5
View File
@@ -51,11 +51,6 @@ public class CheckTaskFiledConfig extends BaseModel {
@ColDefine(type = ColType.BOOLEAN)
private Boolean isRequired;
@Column
@Comment("是否在核对界面显示")
@ColDefine(type = ColType.BOOLEAN)
private Boolean isVisible;
@Column
@Comment("排序")
@ColDefine(type = ColType.INT)
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/model/CheckTaskPersonnel.java
+10 -7
View File
@@ -5,6 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
import org.nutz.lang.util.NutMap;
import java.util.List;
@@ -53,12 +54,7 @@ public class CheckTaskPersonnel extends BaseModel {
@Column
@Comment("动态扩展字段（用户表其余列）")
@ColDefine(type = ColType.MYSQL_JSON)
private List<String> data;
@Column
@Comment("审核意见")
@ColDefine(type = ColType.VARCHAR, width = 255)
private String remark;
private List<NutMap> data;
@Column
@Default("0")
@@ -72,7 +68,7 @@ public class CheckTaskPersonnel extends BaseModel {
private String checkUserId;
@Column
@Comment("核对人Id")
@Comment("核对人工号")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String checkLoginname;
@@ -85,4 +81,11 @@ public class CheckTaskPersonnel extends BaseModel {
@Comment("变更信息")
@ColDefine(type = ColType.MYSQL_JSON)
private String changeInfos;
@Column
@Comment("审核意见")
@ColDefine(type = ColType.VARCHAR, width = 255)
private String remark;
}
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/service/CheckTaskCommonService.java
+14
View File
@@ -1,7 +1,11 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.service;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskFiledConfig;
import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskPersonnel;
import org.nutz.mvc.upload.TempFile;
import java.util.List;
/**
* @version 1.0
@@ -11,4 +15,14 @@ import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskPersonnel;
* @注释
*/
public interface CheckTaskCommonService extends BaseService<CheckTaskPersonnel> {
/**
* 读取文件
* @param file 文件
* @return
*/
List<CheckTaskPersonnel> readFile(List<CheckTaskFiledConfig> fieldConfig, TempFile file);
}
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/service/impl/CheckTaskCommonServiceImpl.java
+31
View File
@@ -1,10 +1,20 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.service.impl;
import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.TypeReference;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.NoModelDataListener;
import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskFiledConfig;
import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskPersonnel;
import com.budwk.app.zhgh.staffmanage.personnelcheck.service.CheckTaskCommonService;
import org.apache.poi.ss.formula.functions.T;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.upload.TempFile;
import java.util.List;
/**
* @version 1.0
@@ -18,4 +28,25 @@ public class CheckTaskCommonServiceImpl extends BaseServiceImpl<CheckTaskPersonn
public CheckTaskCommonServiceImpl(Dao dao) {
super(dao);
}
@Override
public List<CheckTaskPersonnel> readFile(List<CheckTaskFiledConfig> fieldConfig, TempFile file) {
try {
NoModelDataListener listener = new NoModelDataListener();
EasyExcel.read(file.getInputStream(), listener)
.sheet()
.doRead();
// 表格数据列
List<NutMap> dataList = listener.getDataList();
} catch (Exception e) {
}
return null;
}
}
src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/vo/pageform/CheckTaskCommonPageForm.java
+63
View File
@@ -0,0 +1,63 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.vo.pageform;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.param.PageForm;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nutz.dao.Cnd;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import java.util.List;
/**
* @version 1.0
* @Author FKY
* @name：CheckTaskCommonPageForm
* @Date 2025/11/11 10:21
* @注释
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class CheckTaskCommonPageForm extends PageForm {
// 工会id
@ApiModelProperty("工会id")
private String unionId;
// 单位id
@ApiModelProperty("单位id")
private String unitId;
// 在职状态
@ApiModelProperty("在职状态")
private List<String> userStates;
// 在职状态
@ApiModelProperty("编制类别")
private List<String> preparedBys;
// 教职工类别
@ApiModelProperty("教职工类别")
private List<String> personTypes;
public void buildSearch(Cnd cnd, String prefix){
if (cnd == null) {
cnd = Cnd.NEW();
}
if (StrUtil.isNotBlank(this.getSearchKeyword())) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike(prefix + "username", this.getSearchKeyword());
seg.orLike(prefix + "loginname", this.getSearchKeyword());
cnd.and(seg);
}
cnd.andEX(prefix + "unionId", "=", this.getUnionId());
cnd.andEX(prefix + "unitId", "=", this.getUnitId());
cnd.andEX(prefix + "userState", "in", this.getUserStates());
cnd.andEX(prefix + "preparedBy", "in", this.getPreparedBys());
cnd.andEX(prefix + "personType", "in", this.getPersonTypes());
}
}
src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java
+1 -1
View File
@@ -12,7 +12,7 @@ import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.sys.services.SysUserService;
import com.budwk.app.zhgh.staffmanage.thirtyTeach.param.ThirtyTeachPageForm;
src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java
+1 -1
View File
@@ -13,7 +13,7 @@ import com.budwk.app.base.model.ExcelImportRes;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.EasyExcelUtil;
import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
import com.budwk.app.sys.views.View_user;
import com.budwk.app.zhgh.welfare.mode.WelfareUserImportExcel;
import com.budwk.app.zhgh.welfare.mode.WelfareUserTemp;
src/main/resources/views/layouts/v4/home/jcdt.js
+11 -3
View File
@@ -2,9 +2,9 @@ const jcdt = {
template: /*language=HTML*/ `
<div class="jcdt-wrapper">
<div class="jcdt-container">
<div class="jcdt-title">
<span>基层动态</span>
</div>
<!-- <div class="jcdt-title">-->
<!-- <span>基层动态</span>-->
<!-- </div> -->
<div class="jcdt-content">
<div class="jcdt-list">
<div class="jcdt-item" v-for="item in list" :key="item.title" @click="onLink(item)">
@@ -48,6 +48,12 @@ const jcdt = {
width: 80%;
max-width: 80%;
margin: 0 auto;
background-color: #FFFFFF;
border-radius: 12px;
padding: 20px;
margin-bottom: 10px;
box-shadow: 0 6px 20px rgba(0, 0, 0, 0.06);
}
.jcdt-title{
@@ -97,6 +103,8 @@ const jcdt = {
transition: all 0.3s ease;
cursor: pointer;
height: auto;
border-radius: 12px;
}
.jcdt-item:hover{
src/main/resources/views/layouts/v4/home/user.js
+3 -64
View File
@@ -133,67 +133,6 @@ const user = {
};
},
methods: {
getWeatherEmoji(iconCode) {
// 在 data 或 methods 外部定义（或作为 computed）
const WEATHER_ICON_EMOJI = {
'100': '☀️', // 晴
'101': '⛅', // 多云
'102': '🌤️', // 少云
'103': '🌥️', // 晴间多云
'104': '☁️', // 阴
'300': '🌦️', // 阵雨
'301': '🌧️', // 强阵雨
'302': '⛈️', // 雷阵雨
'303': '⛈️', // 强雷阵雨
'304': '⛈️', // 雷阵雨伴有冰雹
'305': '🌧️', // 小雨
'306': '🌧️', // 中雨
'307': '暴雨', // 暴雨及以上可用文字
'308': '🌧️',
'309': '🌧️',
'310': '🌧️',
'311': '🌨️', // 雨夹雪
'312': '🌨️',
'313': '🌨️',
'314': '🌨️',
'315': '🌨️',
'316': '🌨️',
'317': '🌨️',
'318': '🌨️',
'399': '🌧️', // 阵雨（其他）
'400': '🌨️', // 小雪
'401': '🌨️', // 中雪
'402': '❄️', // 大雪
'403': '❄️', // 暴雪
'404': '🌫️', // 雾
'405': '🌫️', // 冻雾
'406': '🌫️', // 强浓雾
'407': '🌫️', // 霾
'408': '🌫️', // 浮尘
'409': '🌫️', // 扬沙
'410': '🌫️', // 沙尘暴
'499': '🌫️',
'500': '🌪️', // 龙卷风
'501': '🌀', // 飓风
'502': '🌫️', // 热带风暴
'503': '🌫️', // 热带低压
'504': '🌫️', // 台风
'507': '🌫️', // 雾凇
'508': '🌫️', // 冰粒
'509': '🌫️', // 米雪
'510': '🌫️', // 雨凇
'511': '🌫️', // 冰雹
'512': '🌫️', // 尘卷风
'513': '🌫️', // 沙尘
'514': '🌫️', // 浓积云
'515': '🌫️', // 积雨云
'900': '❓', // 未知
'901': '🌫️', // 热
'902': '❄️', // 冷
'999': '❓'
};
return WEATHER_ICON_EMOJI[iconCode] || '🌤️';
},
getWeatherInfo(iconCode, temp) {
const info = {
emoji: '🌤️',
@@ -250,8 +189,8 @@ const user = {
async fetchWeather() {
try {
// 存localStorage 112.13,32.01 广州 113.27,23.14
const AppMapCenterPointX = '113.27'
const AppMapCenterPointY = '23.14'
const AppMapCenterPointX = await this.getConfigKey("AppMapCenterPointX")
const AppMapCenterPointY = await this.getConfigKey("AppMapCenterPointY")
// 1. 先通过城市名获取 locationId
this.$axios.get("https://mx5rk62kvj.re.qweatherapi.com/geo/v2/city/lookup?location=" + AppMapCenterPointX + "," + AppMapCenterPointY + "&key=" + this.QWEATHER_KEY).then((geoRes) => {
@@ -331,7 +270,7 @@ const user = {
this.getRoleNames()
},
mounted() {
// this.fetchWeather();
this.fetchWeather()
},
style: /*language=CSS*/ `
.user-wrapper {
src/main/resources/views/platform/zhgh/staffmanage/personnelcheck/branch/index.html
View File
src/main/resources/views/platform/zhgh/staffmanage/personnelcheck/group/index.html
View File
src/main/resources/views/platform/zhgh/staffmanage/personnelcheck/manage/add/importAndMap.js
+42 -10
View File
@@ -81,12 +81,9 @@ const importAndMap = {
<el-option
v-for="field in dbFieldOptions"
:key="field.value"
:label="field.label + '(' + field.value + ')'"
:label="field.label"
:value="field.value"
>
<span style="float: left">{{ field.value }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ field.label }}</span>
</el-option>
></el-option>
</el-select>
</template>
</el-table-column>
@@ -104,7 +101,7 @@ const importAndMap = {
:key="col"
:prop="col"
:label="col"
/>
></el-table-column>
</el-table>
</div>
</div>
@@ -164,7 +161,18 @@ const importAndMap = {
{ value: "arrivalAtSchoolDate", label: "来校时间" },
{ value: "teachingTime", label: "从教年月" },
{ value: "expectedLeaveSchoolDate", label: "预计/最后离校时间" },
]
],
excelToDbFieldMap:{
loginname: ['工号', '员工编号', '职工号', '学号', '账号', 'ID', '编号'],
username: ['姓名', '名字', '全名', '人员姓名'],
sex: ['性别', '男女性别'],
birthday: ['出生日期', '出生年月', '生日', 'DOB'],
mobile: ['电话', '手机号', '联系电话', '手机'],
idCard: ['身份证', '身份证号', '证件号码'],
arrivalAtSchoolDate: ['来校时间', '入职时间', '入职日期', '入职年月'],
}
}
},
computed: {
@@ -219,11 +227,12 @@ const importAndMap = {
this.headers = jsonData[0].filter(h => h)
this.rawData = jsonData.slice(1)
// 初始化字段选择列表（所有字段默认可编辑？或让用户选）
// 初始化字段选择列表
this.headerList = this.headers.map((h, idx) => ({
name: h,
sample: this.rawData[0] ? this.rawData[0][idx] : '',
selected: true // 默认都允许修改，也可以让用户决定
selected: true,
dbField: this.autoMatchDbField(h)
}))
this.$message.success('成功加载 ' + this.rawData.length + ' 条数据，共 ' + this.headers.length + ' 个字段')
@@ -256,6 +265,29 @@ const importAndMap = {
this.fileList = []
},
// 自动匹配数据库字段
autoMatchDbField(excelHeader) {
const cleanHeader = (excelHeader || '').toString().trim();
if (!cleanHeader) return '';
// 遍历所有数据库字段
for (const [dbField, keywords] of Object.entries(this.excelToDbFieldMap)) {
if (keywords.some(keyword => cleanHeader.includes(keyword))) {
return dbField;
}
}
// 如果没匹配上，也可以尝试精确匹配
const exactMatch = this.dbFieldOptions.find(opt =>
opt.label === cleanHeader || opt.value === cleanHeader
);
if (exactMatch) {
return exactMatch.value;
}
return ''; // 未匹配
},
generatePreview() {
try {
this.previewData = this.rawData.slice(0, 5).map(row => {
@@ -314,7 +346,7 @@ const importAndMap = {
} finally {
this.submitting = false
}
}
},
},
mounted() {
const s = document.createElement("script")
src/main/resources/views/platform/zhgh/staffmanage/personnelcheck/school/index.html
View File