Skip to content

A
attendance-performance-platform
Commit 230fd3b8 authored by 姬鋆屾's avatar 姬鋆屾
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

parents 030eadf3 ce77bd1c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5985 additions and 2903 deletions
attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue
View file @ 230fd3b8
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
<el-tab-pane label="设计问卷" name="1"> <el-tab-pane label="设计问卷" name="1">
<fc-designer style="height: 79vh;" ref="designer"> <fc-designer style="height: 79vh;" ref="designer">
<template slot="handle"> <template slot="handle">
<ElButton icon="el-icon-upload" type="success" size="small" @click="showDrawer" round>移动端预览 <ElButton style="margin-left: 10px;" icon="el-icon-upload" type="primary" size="small"
@click="issueBtn" round>问卷发布
</ElButton>
<ElButton icon="el-icon-view" type="success" size="small" @click="showDrawer" round>H5预览
</ElButton> </ElButton>
</template> </template>
</fc-designer> </fc-designer>
...@@ -31,6 +34,30 @@ ...@@ -31,6 +34,30 @@
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
<el-dialog title="问卷发布" :visible.sync="issueDialog" width="30%" top="25vh">
<el-form :model="issueForm">
<el-form-item label="问卷封面：" label-width="125px">
<div style="display: flex;align-items: center;">
<img style="width:80px; height: 50px; margin-right: 10px;cursor: pointer;"
v-for="i in issueForm.cover" :src="i" alt="">
</div>
<!-- <el-input v-model="issueForm.cover" autocomplete="off"></el-input> -->
</el-form-item>
<el-form-item label="反馈期限：" label-width="125px">
<el-date-picker v-model="issueForm.time" type="datetimerange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="邀请人员：" label-width="125px">
<el-button type="success" size="small">选择人员</el-button>
</el-form-item>
<div style="text-align: center;">
<el-button size="small" @click="issueDialog = false">取消</el-button>
<el-button type="primary" size="small" @click="issueFormBtn">发布</el-button>
</div>
</el-form>
</el-dialog>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
...@@ -43,8 +70,15 @@ export default { ...@@ -43,8 +70,15 @@ export default {
return { return {
tabs: '1', tabs: '1',
drawer: 0, drawer: 0,
Frule: '', Frule: [],
Fopthion: '', Fopthion: '',
issueDialog: false,
issueForm: {
cover: [
'http://sy.scsmile.cn/YX-JXgl/v1.0/HT/images/%E6%96%B0%E5%A2%9E%E5%8F%8D%E9%A6%88_%E7%AC%AC3%E6%AD%A5_/u26101.svg',
'http://sy.scsmile.cn/YX-JXgl/v1.0/HT/images/%E6%96%B0%E5%A2%9E%E5%8F%8D%E9%A6%88_%E7%AC%AC3%E6%AD%A5_/u26102.svg'
]
},
} }
}, },
mounted() { mounted() {
...@@ -75,11 +109,31 @@ export default { ...@@ -75,11 +109,31 @@ export default {
this.$refs.designer.removeMenuItem("timePicker") this.$refs.designer.removeMenuItem("timePicker")
this.$refs.designer.removeMenuItem("switch") this.$refs.designer.removeMenuItem("switch")
this.$refs.designer.removeMenuItem("tree") this.$refs.designer.removeMenuItem("tree")
this.$refs.designer.removeMenuItem("inputNumber")
this.$refs.designer.removeMenuItem("select")
this.$refs.designer.removeMenuItem("fc-editor")
this.$refs.designer.removeMenuItem("el-button")
this.$refs.designer.removeMenuItem("el-divider")
//配置组件生成规则---直接配置显示在页面上 //配置组件生成规则---直接配置显示在页面上
// const rule = [{ "type": "input", "field": "int", "title": "输入框", "info": "", "_fc_drag_tag": "input", "hidden": false, "display": true }] // const rule = [{ "type": "input", "field": "int", "title": "输入框", "info": "", "_fc_drag_tag": "input", "hidden": false, "display": true }]
// this.$refs.designer.setRule(rule) // this.$refs.designer.setRule(rule)
}, },
methods: { methods: {
//问卷发布
issueBtn() {
this.Frule = formCreate.parseJson(this.getFormJson())
this.Fopthion = formCreate.parseJson(this.getFormOption())
console.log(this.Frule)
//判断是否配置了表单
if (this.Frule.length > 0) {
this.issueDialog = true
} else {
this.$message({
message: '请配置表单后发布',
type: 'warning'
});
}
},
//预览生成按钮的输出 //预览生成按钮的输出
onSubmit(formData) { onSubmit(formData) {
console.log(formData) console.log(formData)
...@@ -101,12 +155,20 @@ export default { ...@@ -101,12 +155,20 @@ export default {
const FcDesignerOptions = this.$refs.designer.getOption(); const FcDesignerOptions = this.$refs.designer.getOption();
console.log(FcDesignerOptions) console.log(FcDesignerOptions)
return JSON.stringify(FcDesignerOptions) return JSON.stringify(FcDesignerOptions)
},
issueFormBtn() {
console.log(this.issueForm)
} }
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/deep/._fc-m-tools {
flex-direction: row-reverse;
justify-content: flex-start;
}
/deep/._fc-l-title { /deep/._fc-l-title {
text-align: center; text-align: center;
margin-bottom: 10px; margin-bottom: 10px;
......
attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue
View file @ 230fd3b8
...@@ -18,22 +18,65 @@ ...@@ -18,22 +18,65 @@
</div> </div>
<div class="content"> <div class="content">
<div class="cLeft"></div> <div class="cLeft">
<div class="title">
全部数据（220）
<span style="font-weight: 400; font-size: 16px;margin-left: 20px;">已反馈（1）</span>
<span style="font-weight: 400; font-size: 16px;margin-left: 20px;">未反馈（219）</span>
</div>
<el-button class="m15" type="primary" size="small">导出数据</el-button>
<div class="lBox m15">
<div class="treeS">
<el-tree :data="treeData" :props="defaultProps" @node-click="treeSub"></el-tree>
</div>
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column label="日期" width="120">
<template slot-scope="scope">{{ scope.row.date }}</template>
</el-table-column>
<el-table-column prop="name" label="姓名" width="120">
</el-table-column>
<el-table-column prop="address" label="地址" show-overflow-tooltip>
</el-table-column>
</el-table>
</div>
</div>
<div class="cRight"> <div class="cRight">
<div class="title"> <div class="title">
题型数据分析 题型数据分析
</div> </div>
<div class="box"> <div class="scroll">
<div class="box" v-for="i in 2">
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<el-tag type="primary" effect="plain">单项选择</el-tag> <el-tag type="primary" effect="plain">单项选择</el-tag>
<div style="margin-left: 10px;">1.你是男性还是女性</div> <div style="margin-left: 10px;">1.你是男性还是女性</div>
</div> </div>
<div> <div class="m15"
<el-progress type="circle" :percentage="45">男</el-progress> style="display: flex;align-items: center;justify-content: space-around; width: 40%;">
<el-progress type="circle" :percentage="55">女</el-progress> <div style="text-align: center;">
<el-progress type="circle" :percentage="45" show-text width="75">男</el-progress>
<div>男</div>
</div>
<div style="text-align: center;">
<el-progress type="circle" :percentage="45" show-text width="75">男</el-progress>
<div>女</div>
</div>
</div> </div>
</div> </div>
<div class="box m15" v-for="i in 4">
<div style="display: flex;align-items: center;">
<el-tag type="primary" effect="plain">单项选择</el-tag>
<div style="margin-left: 10px;">1.你是男性还是女性</div>
</div>
<el-button class="m15" type="primary" size="small"
@click="drawerAnswer = 1">查看详情答案</el-button>
</div>
</div>
</div> </div>
</div> </div>
...@@ -51,6 +94,22 @@ ...@@ -51,6 +94,22 @@
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
<el-drawer :visible.sync="drawerAnswer" title="反馈详情" size="40%">
<div class="answerBox">
<div class="aTop">
问题：你的具体想法？
</div>
<el-table class="m15" :data="tableData" border style="width: 100%;">
<el-table-column prop="date" label="日期" width="180">
</el-table-column>
<el-table-column prop="name" label="姓名" width="180">
</el-table-column>
<el-table-column prop="address" label="地址">
</el-table-column>
</el-table>
</div>
</el-drawer>
</div> </div>
</template> </template>
...@@ -63,6 +122,63 @@ export default { ...@@ -63,6 +122,63 @@ export default {
drawer: false, drawer: false,
Frule: '', Frule: '',
Fopthion: '', Fopthion: '',
drawerAnswer: false,
tableData: [{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
}, {
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
}, {
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
}],
treeData: [{
label: '一级 1',
children: [{
label: '二级 1-1',
children: [{
label: '三级 1-1-1'
}]
}]
}, {
label: '一级 2',
children: [{
label: '二级 2-1',
children: [{
label: '三级 2-1-1'
}]
}, {
label: '二级 2-2',
children: [{
label: '三级 2-2-1'
}]
}]
}, {
label: '一级 3',
children: [{
label: '二级 3-1',
children: [{
label: '三级 3-1-1'
}]
}, {
label: '二级 3-2',
children: [{
label: '三级 3-2-1'
}]
}]
}],
defaultProps: {
children: 'children',
label: 'label'
}
} }
}, },
mounted() { mounted() {
...@@ -158,11 +274,32 @@ export default { ...@@ -158,11 +274,32 @@ export default {
"resetBtn": false "resetBtn": false
} }
},
methods: {
treeSub(data) {
console.log(data)
},
handleSelectionChange(val) {
this.multipleSelection = val;
}
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.treeS {
width: 20%;
margin-left: 10px;
}
/deep/.el-tree {
background-color: transparent;
}
.m15 {
margin-top: 15px;
}
.font { .font {
font-size: 16px; font-size: 16px;
line-height: 1.5; line-height: 1.5;
...@@ -240,6 +377,21 @@ export default { ...@@ -240,6 +377,21 @@ export default {
} }
} }
.answerBox {
padding: 0 20px;
box-sizing: border-box;
.aTop {
border-left: 4px solid #3377ff;
background-color: #eff4ff;
color: #3377ff;
line-height: 70px;
padding-left: 20px;
box-sizing: border-box;
font-weight: bold;
}
}
.content { .content {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -252,6 +404,15 @@ export default { ...@@ -252,6 +404,15 @@ export default {
height: 100%; height: 100%;
border-radius: 4px; border-radius: 4px;
width: 49%; width: 49%;
box-sizing: border-box;
padding: 20px;
.lBox {
display: flex;
// align-items: center
justify-content: space-between;
}
} }
.cRight { .cRight {
...@@ -261,6 +422,32 @@ export default { ...@@ -261,6 +422,32 @@ export default {
width: 49%; width: 49%;
box-sizing: border-box; box-sizing: border-box;
padding: 20px; padding: 20px;
.scroll {
height: 93%;
overflow-y: auto;
overflow-x: hidden;
// border: 1px solid;
}
/* 侧边滚动条 */
.scroll::-webkit-scrollbar {
width: 3px;
}
/* 滚动条上的滚动滑块 */
.scroll::-webkit-scrollbar-thumb {
background: #CCCCCC;
border-radius: 4px;
}
/* 滚动条轨道 */
.scroll::-webkit-scrollbar-track {
background: #EEEEEE;
border-radius: 4px;
}
} }
.title { .title {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/role/service/RoleUserService.java
View file @ 230fd3b8
...@@ -27,4 +27,11 @@ public interface RoleUserService extends ICRUDService<RoleUserEntity,Long> { ...@@ -27,4 +27,11 @@ public interface RoleUserService extends ICRUDService<RoleUserEntity,Long> {
void doDistributionUser(RoleUserQuery query); void doDistributionUser(RoleUserQuery query);
void doDistributionRole(RoleUserQuery query); void doDistributionRole(RoleUserQuery query);
/**
* 给用户分配角色
* @param query
*/
void assignRoleToUser(RoleUserQuery query);
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/role/service/impl/RoleUserServiceImpl.java
View file @ 230fd3b8
...@@ -70,6 +70,26 @@ public class RoleUserServiceImpl extends AbstractCRUDServiceImpl<RoleUserDao,Rol ...@@ -70,6 +70,26 @@ public class RoleUserServiceImpl extends AbstractCRUDServiceImpl<RoleUserDao,Rol
this.dao.insertBatch(list); this.dao.insertBatch(list);
} }
@Override
public void assignRoleToUser(RoleUserQuery query) {
//删除当前用户所有关联角色
Long userId = query.getUserId();
Map<String, Object> condition = new HashMap<>(1);
condition.put("userId", userId);
dao.delete(condition);
//新增用户角色
List<Long> roleIdList = query.getRoleIdList();
List<RoleUserEntity> list = new ArrayList<>();
for (Long roleId : roleIdList) {
RoleUserEntity rolseUser = new RoleUserEntity();
rolseUser.setRoleId(roleId);
rolseUser.setUserId(userId);
list.add(rolseUser);
}
this.save(list);
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/task/service/impl/TaskServiceImpl.java
View file @ 230fd3b8
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
package com.mortals.xhx.base.system.task.service.impl; package com.mortals.xhx.base.system.task.service.impl;
import cn.hutool.core.net.NetUtil;
import com.mortals.framework.ap.GlobalSysInfo; import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.common.code.ExcuteStatus; import com.mortals.framework.common.code.ExcuteStatus;
import com.mortals.framework.common.code.TaskExcuteStrategy; import com.mortals.framework.common.code.TaskExcuteStrategy;
...@@ -148,7 +149,8 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity ...@@ -148,7 +149,8 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
@Override @Override
public void start() throws AppException { public void start() throws AppException {
final String localIp = SystemUtil.getLocalHostIp(); // final String localIp = SystemUtil.getLocalHostIp();
final String localIp = NetUtil.getLocalhostStr();
log.info("任务执行线程启动...-->" + localIp); log.info("任务执行线程启动...-->" + localIp);
thread = new Thread(() -> { thread = new Thread(() -> {
// 将本机上次执行而未完成的任务状态变更 // 将本机上次执行而未完成的任务状态变更
......
attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
View file @ 230fd3b8
...@@ -48,7 +48,7 @@ public class UserEntity extends UserVo implements IUser { ...@@ -48,7 +48,7 @@ public class UserEntity extends UserVo implements IUser {
*/ */
private String qq; private String qq;
/** /**
* 用户类型(0.系统用户,1.普通用户,2.工作人员) * 用户类型(0.系统用户,1.普通用户,2.工作人员,3.普通员工)
*/ */
private Integer userType; private Integer userType;
...@@ -86,6 +86,11 @@ public class UserEntity extends UserVo implements IUser { ...@@ -86,6 +86,11 @@ public class UserEntity extends UserVo implements IUser {
*/ */
private String lastLoginAddress; private String lastLoginAddress;
/**
* 员工id
*/
private Long customerId;
public UserEntity(){} public UserEntity(){}
...@@ -227,7 +232,7 @@ public class UserEntity extends UserVo implements IUser { ...@@ -227,7 +232,7 @@ public class UserEntity extends UserVo implements IUser {
this.qq = qq; this.qq = qq;
} }
/** /**
* 获取 用户类型(0.系统用户,1.普通用户,2.工作人员) * 获取 用户类型(0.系统用户,1.普通用户,2.工作人员,3.普通员工)
* @return Integer * @return Integer
*/ */
public Integer getUserType(){ public Integer getUserType(){
...@@ -253,7 +258,7 @@ public class UserEntity extends UserVo implements IUser { ...@@ -253,7 +258,7 @@ public class UserEntity extends UserVo implements IUser {
@Override @Override
public Long getCustomerId() { public Long getCustomerId() {
return null; return this.customerId;
} }
@Override @Override
...@@ -358,7 +363,9 @@ public class UserEntity extends UserVo implements IUser { ...@@ -358,7 +363,9 @@ public class UserEntity extends UserVo implements IUser {
} }
public void setCustomerId(Long customerId) {
this.customerId = customerId;
}
@Override @Override
public int hashCode() { public int hashCode() {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/FeedbackReq.java 0 → 100644
View file @ 230fd3b8
package com.mortals.xhx.busiz.req;
import com.mortals.xhx.busiz.BaseReq;
import lombok.Data;
@Data
public class FeedbackReq extends BaseReq {
//反馈开始时间
private String feedBackStartDate;
//反馈结束时间
private String feedBackEndDate;
//反馈状态（1.未反馈，2.已反馈）
private Integer feedbackStatus;
//详细
private Long Id;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformInfo.java
View file @ 230fd3b8
...@@ -55,5 +55,10 @@ public class PerformInfo { ...@@ -55,5 +55,10 @@ public class PerformInfo {
*/ */
private BigDecimal score; private BigDecimal score;
/**
* 类型
*/
private String performType;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiLoginController.java
View file @ 230fd3b8
...@@ -6,6 +6,7 @@ import com.mortals.framework.ap.CookieService; ...@@ -6,6 +6,7 @@ import com.mortals.framework.ap.CookieService;
import com.mortals.framework.ap.GlobalSysInfo; import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.ap.SysConstains; import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.IAuthTokenService; import com.mortals.framework.service.IAuthTokenService;
import com.mortals.framework.service.ICacheService; import com.mortals.framework.service.ICacheService;
import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
...@@ -32,6 +33,8 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -32,6 +33,8 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
...@@ -40,40 +43,18 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT; ...@@ -40,40 +43,18 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
@RestController @RestController
@Slf4j @Slf4j
@RequestMapping("/api/v1/") @RequestMapping("/api/v1/login")
public class ApiLoginController extends BaseJsonBodyController { public class ApiLoginController extends BaseJsonBodyController {
@Autowired @Autowired
private UserService userService; private UserService userService;
@Autowired @Autowired
private ValidCodeService validCodeService;
@Autowired
private ResourceService resourceService;
@Autowired
private MenuService menuService;
// @Autowired
// private ITokenService tokenService;
@Autowired
private ICacheService cacheService;
@Autowired
private IAuthTokenService authTokenService; private IAuthTokenService authTokenService;
@RequestMapping("login") @RequestMapping("login")
public String login(@RequestBody LoginForm loginForm) throws Exception { public String login(@RequestBody LoginForm loginForm) throws Exception {
/*
JSONObject ret = new JSONObject();
String loginName = loginForm.getLoginName();
String password = loginForm.getPassword();
UserPdu userPdu = new UserPdu();
userPdu.setLoginName(loginName);
userPdu.setPassword(password);
String resp = userFeign.portalLogin(userPdu);
return resp;
*/
JSONObject ret = new JSONObject(); JSONObject ret = new JSONObject();
String loginName = loginForm.getLoginName(); String loginName = loginForm.getLoginName();
String password = loginForm.getPassword(); String password = loginForm.getPassword();
...@@ -88,42 +69,35 @@ public class ApiLoginController extends BaseJsonBodyController { ...@@ -88,42 +69,35 @@ public class ApiLoginController extends BaseJsonBodyController {
loginForm.validate(); loginForm.validate();
userEntity = userService.doLogin(loginName, password, ip); userEntity = userService.doLogin(loginName, password, ip);
userEntity.setLastLoginAddress(ip); userEntity.setLastLoginAddress(ip);
recordSysLog(request, userEntity, "H5用户登录系统成功!");
recordSysLog(request, userEntity, "用户登录系统成功!");
// 返回拥有的菜单数据
Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
String currUserName = userEntity.getRealName(); String currUserName = userEntity.getRealName();
if (currUserName == null || currUserName.trim().length() == 0) { if (currUserName == null || currUserName.trim().length() == 0) {
currUserName = "管理员"; currUserName = "管理员";
} }
JSONObject data = new JSONObject(); JSONObject data = new JSONObject();
data.put("currUserName", currUserName); data.put("currUserName", currUserName);
data.put("barList", outlookBarList);
data.put("id", userEntity.getId()); data.put("id", userEntity.getId());
data.put("userType", userEntity.getUserType()); data.put("userType", userEntity.getUserType());
HashSet<Integer> set = new HashSet<>();
set.add(1);
set.add(2);
if (ObjectUtils.isEmpty(userEntity.getUserType()) || !set.contains(userEntity.getUserType())) {
throw new AppException("当前用户不支持H5登录!");
}
userEntity.setLoginTime(System.currentTimeMillis()); userEntity.setLoginTime(System.currentTimeMillis());
userEntity.setToken(IdUtil.fastSimpleUUID()); userEntity.setToken(IdUtil.fastSimpleUUID());
userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime()); userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
userEntity.setMenuUrl(generateMenuUrlCode(urls));
String token = authTokenService.createToken(userEntity); String token = authTokenService.createToken(userEntity);
data.put("token", token); data.put("token", token);
//设置token 和过期时间
//data.put("expiresTime", DateUtils.addCurrDate(7).getTime());
generateMenuUrlCode(urls);
//this.generateBlackCookie(request, response, loginName, urls);
ret.put(KEY_RESULT_DATA, data); ret.put(KEY_RESULT_DATA, data);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "用户登录系统成功!"); ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
ret.put("resources", urls);
return ret.toJSONString(); return ret.toJSONString();
} catch (Exception e) { } catch (Exception e) {
log.error("login error ", e); log.error("h5 login error ", e);
if (userEntity == null) {
userEntity = new UserEntity();
userEntity.setLoginName(loginName);
}
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE); ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, super.convertException(e)); ret.put(KEY_RESULT_MSG, super.convertException(e));
return ret.toJSONString(); return ret.toJSONString();
...@@ -136,78 +110,6 @@ public class ApiLoginController extends BaseJsonBodyController { ...@@ -136,78 +110,6 @@ public class ApiLoginController extends BaseJsonBodyController {
super.removeCurrUser(request); super.removeCurrUser(request);
} }
@RequestMapping("index")
public String index() throws Exception {
JSONObject ret = new JSONObject();
IUser user = this.getCurUser();
if (user == null) {
return JSONObject.toJSONString(Rest.fail(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT));
}
Set<String> urls = resourceService.findUrlSetByUserId(user.getId());
List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
String currUserName = user.getRealName();
if (currUserName == null || currUserName.trim().length() == 0) {
currUserName = "管理员";
}
JSONObject data = new JSONObject();
String token = authTokenService.getToken(request);
data.put("token", token);
data.put("currUserName", currUserName);
data.put("barList", outlookBarList);
data.put("id", user.getId());
data.put("userType", user.getUserType());
ret.put(KEY_RESULT_DATA, data);
//this.generateBlackCookie(request, response, user.getLoginName(), urls);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
ret.put("resources", urls);
return ret.toJSONString();
}
private void generateBlackCookie(HttpServletRequest request, HttpServletResponse response, String loginName, Set<String> urls) {
try {
String cacheKey = RedisKey.KEY_MENU_CACHE + loginName;
String securityKey = GlobalSysInfo.getPropertyValue(SysConstains.PROP_COOKIE_SECURITY_KEY);
//应为Cookie会超长，所以改为仅存储key将值放入redis
//CookieService.setCookieForAuth(request, response, securityKey, null);
StringBuilder sb = new StringBuilder();
if (urls != null && urls.size() > 0) {
for (String url : urls) {
int index = url.hashCode() & (Integer.MAX_VALUE - 1);
sb.append(index).append(",");
}
}
String menuUrl = sb.toString();
menuUrl = AESUtil.encrypt(menuUrl, securityKey);
cacheService.set(cacheKey, menuUrl, 604800);
HttpUtil.setCookieValue(request, response, SysConstains.COOKIE_MENU, cacheKey, -1);
} catch (Throwable e) {
}
}
private String generateMenuUrlCode(Set<String> urls) {
try {
String securityKey = GlobalSysInfo.getPropertyValue(SysConstains.PROP_COOKIE_SECURITY_KEY);
StringBuilder sb = new StringBuilder();
if (urls != null && urls.size() > 0) {
for (String url : urls) {
int index = url.hashCode() & (Integer.MAX_VALUE - 1);
sb.append(index).append(",");
}
}
String menuUrl = sb.toString();
return AESUtil.encrypt(menuUrl, securityKey);
} catch (Throwable e) {
log.error("编码异常", e);
return null;
}
}
@RequestMapping("parseToken") @RequestMapping("parseToken")
public IUser parseToken() throws Exception { public IUser parseToken() throws Exception {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java
View file @ 230fd3b8
...@@ -33,7 +33,7 @@ import java.util.List; ...@@ -33,7 +33,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Slf4j @Slf4j
@RequestMapping("/api/v1/") @RequestMapping("/api/v1/appeal")
public class AppealApiController extends BaseJsonBodyController { public class AppealApiController extends BaseJsonBodyController {
@Autowired @Autowired
...@@ -55,7 +55,7 @@ public class AppealApiController extends BaseJsonBodyController { ...@@ -55,7 +55,7 @@ public class AppealApiController extends BaseJsonBodyController {
/** /**
* 个人申诉绩效统计 * 个人申诉绩效统计
*/ */
@PostMapping(value = "appeal/stat") @PostMapping(value = "stat")
public Rest<AppealStatInfo> appealStat() { public Rest<AppealStatInfo> appealStat() {
String busiDesc = "H5个人申诉绩效统计"; String busiDesc = "H5个人申诉绩效统计";
Rest<AppealStatInfo> rest = Rest.ok(busiDesc + " 【成功】"); Rest<AppealStatInfo> rest = Rest.ok(busiDesc + " 【成功】");
...@@ -72,7 +72,7 @@ public class AppealApiController extends BaseJsonBodyController { ...@@ -72,7 +72,7 @@ public class AppealApiController extends BaseJsonBodyController {
/** /**
* 申诉列表 * 申诉列表
*/ */
@PostMapping(value = "appeal/list") @PostMapping(value = "list")
public Rest<List<PerformAttendAppealEntity>> performList(@RequestBody AppealReq appealReq) { public Rest<List<PerformAttendAppealEntity>> performList(@RequestBody AppealReq appealReq) {
String busiDesc = "个人申诉列表"; String busiDesc = "个人申诉列表";
Rest<List<PerformAttendAppealEntity>> rest = Rest.ok(busiDesc + " 【成功】"); Rest<List<PerformAttendAppealEntity>> rest = Rest.ok(busiDesc + " 【成功】");
...@@ -95,8 +95,8 @@ public class AppealApiController extends BaseJsonBodyController { ...@@ -95,8 +95,8 @@ public class AppealApiController extends BaseJsonBodyController {
/** /**
* 申诉详细 * 申诉详细
*/ */
@PostMapping(value = "appeal/detail") @PostMapping(value = "info")
public Rest<PerformAttendAppealEntity> performDetail(@RequestBody AppealReq appealReq) { public Rest<PerformAttendAppealEntity> performInfo(@RequestBody AppealReq appealReq) {
String busiDesc = "个人申诉详细"; String busiDesc = "个人申诉详细";
Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】"); Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
try { try {
...@@ -116,7 +116,7 @@ public class AppealApiController extends BaseJsonBodyController { ...@@ -116,7 +116,7 @@ public class AppealApiController extends BaseJsonBodyController {
/** /**
* 申诉新增 * 申诉新增
*/ */
@PostMapping(value = "appeal/save") @PostMapping(value = "save")
public Rest<String> appealSave(@RequestBody PerformAttendAppealEntity appealEntity) { public Rest<String> appealSave(@RequestBody PerformAttendAppealEntity appealEntity) {
String busiDesc = "个人申诉新增"; String busiDesc = "个人申诉新增";
Rest<String> rest = Rest.ok(busiDesc + " 【成功】"); Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java 0 → 100644
View file @ 230fd3b8
package com.mortals.xhx.busiz.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.busiz.req.AppealReq;
import com.mortals.xhx.busiz.req.FeedbackReq;
import com.mortals.xhx.busiz.rsp.AppealStatInfo;
import com.mortals.xhx.module.check.service.*;
import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.List;
/**
* h5 申诉
*
* @author: zxfei
* @date: 2023/7/7 15:08
*/
@RestController
@Slf4j
@RequestMapping("/api/v1/feedback")
public class FeedbackApiController extends BaseJsonBodyController {
@Autowired
private CheckAttendRecordService checkAttendRecordService;
@Autowired
private CheckReviewRecordService checkReviewRecordService;
@Autowired
private CheckComplainRecordService checkComplainRecordService;
@Autowired
private CheckEffectRecordService checkEffectRecordService;
@Autowired
private CheckGoworkRecordService checkGoworkRecordService;
@Autowired
private CheckOtherRecordService checkOtherRecordService;
/**
* 反馈列表
*/
@PostMapping(value = "list")
public Rest<List<PerformAttendAppealEntity>> feedbackList(@RequestBody FeedbackReq feedbackReq) {
String busiDesc = "个人反馈列表";
Rest<List<PerformAttendAppealEntity>> rest = Rest.ok(busiDesc + " 【成功】");
try {
if (ObjectUtils.isEmpty(feedbackReq.getFeedbackStatus())) {
//未设置时间的情况，默认为当月
feedbackReq.setFeedBackStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
feedbackReq.setFeedBackEndDate(DateUtil.today());
}
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
/**
* 反馈详细
*/
@PostMapping(value = "question")
public Rest<PerformAttendAppealEntity> performDetail(@RequestBody AppealReq appealReq) {
String busiDesc = "个人申诉详细";
Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
try {
if (ObjectUtils.isEmpty(appealReq.getId())) {
throw new AppException("详细查询id不能为空!");
}
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
/**
* 申诉新增
*/
@PostMapping(value = "save")
public Rest<String> feedbackSave(@RequestBody PerformAttendAppealEntity appealEntity) {
String busiDesc = "反馈回答";
Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
try {
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
public static void main(String[] args) {
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java
View file @ 230fd3b8
...@@ -27,7 +27,7 @@ import java.util.List; ...@@ -27,7 +27,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Slf4j @Slf4j
@RequestMapping("/api/v1/") @RequestMapping("/api/v1/perform")
public class PerformApiController extends BaseJsonBodyController { public class PerformApiController extends BaseJsonBodyController {
@Autowired @Autowired
...@@ -47,7 +47,7 @@ public class PerformApiController extends BaseJsonBodyController { ...@@ -47,7 +47,7 @@ public class PerformApiController extends BaseJsonBodyController {
/** /**
* 个人当天绩效统计 * 个人当天绩效统计
*/ */
@PostMapping(value = "perform/stat") @PostMapping(value = "stat")
public Rest<PerformStatInfo> performStat() { public Rest<PerformStatInfo> performStat() {
String busiDesc = "H5 个人绩效统计"; String busiDesc = "H5 个人绩效统计";
Rest<PerformStatInfo> rest = Rest.ok(busiDesc + " 【成功】"); Rest<PerformStatInfo> rest = Rest.ok(busiDesc + " 【成功】");
...@@ -65,7 +65,7 @@ public class PerformApiController extends BaseJsonBodyController { ...@@ -65,7 +65,7 @@ public class PerformApiController extends BaseJsonBodyController {
/** /**
* 个人当月绩效加分扣分列表 * 个人当月绩效加分扣分列表
*/ */
@PostMapping(value = "perform/list") @PostMapping(value = "list")
public Rest<List<PerformInfo>> performList(@RequestBody PerformReq performReq) { public Rest<List<PerformInfo>> performList(@RequestBody PerformReq performReq) {
String busiDesc = "个人绩效列表"; String busiDesc = "个人绩效列表";
Rest<List<PerformInfo>> rest = Rest.ok(busiDesc + " 【成功】"); Rest<List<PerformInfo>> rest = Rest.ok(busiDesc + " 【成功】");
...@@ -107,7 +107,7 @@ public class PerformApiController extends BaseJsonBodyController { ...@@ -107,7 +107,7 @@ public class PerformApiController extends BaseJsonBodyController {
/** /**
* 详细 * 详细
*/ */
@PostMapping(value = "perform/info") @PostMapping(value = "info")
public Rest<PerformDetailInfo> performInfo(@RequestBody PerformReq performReq) { public Rest<PerformDetailInfo> performInfo(@RequestBody PerformReq performReq) {
String busiDesc = "个人绩效增减详细"; String busiDesc = "个人绩效增减详细";
Rest<PerformDetailInfo> rest = Rest.ok(busiDesc + " 【成功】"); Rest<PerformDetailInfo> rest = Rest.ok(busiDesc + " 【成功】");
......
attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckTypeEnum.java 0 → 100644
View file @ 230fd3b8
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/***
* 核查类型枚举(1.考勤绩效,2.效能绩效,3.评价绩效,4.办件绩效,5.评价差评绩效,6.其它绩效)
*/
public enum CheckTypeEnum {
考勤绩效(1, "考勤绩效"),
效能绩效(2, "效能绩效"),
评价绩效(3, "评价绩效"),
办件绩效(4, "办件绩效"),
差评绩效(5, "差评绩效"),
其它绩效(6, "其它绩效"),
;
private Integer value;
private String desc;
CheckTypeEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static CheckTypeEnum getByValue(Integer value) {
for (CheckTypeEnum checkTypeEnum : CheckTypeEnum.values()) {
if (checkTypeEnum.getValue() == value) {
return checkTypeEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (CheckTypeEnum item : CheckTypeEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java
View file @ 230fd3b8
...@@ -2,6 +2,7 @@ package com.mortals.xhx.daemon.task; ...@@ -2,6 +2,7 @@ package com.mortals.xhx.daemon.task;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.PageUtil; import cn.hutool.core.util.PageUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
...@@ -115,7 +116,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService { ...@@ -115,7 +116,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
List<AttendanceRecordHikEntity> attRecords = doorEventsRest.getData().getList().stream().map(item -> { List<AttendanceRecordHikEntity> attRecords = doorEventsRest.getData().getList().stream().map(item -> {
AttendanceRecordHikEntity recordHikEntity = new AttendanceRecordHikEntity(); AttendanceRecordHikEntity recordHikEntity = new AttendanceRecordHikEntity();
recordHikEntity.initAttrValue(); recordHikEntity.initAttrValue();
StaffEntity staffCache = staffService.getExtCache(item.getJobNo()); StaffEntity staffCache = staffService.getExtCache(StrUtil.padPre(item.getJobNo(), 8, "0"));
if (ObjectUtils.isEmpty(staffCache)) { if (ObjectUtils.isEmpty(staffCache)) {
log.info("staff is null !staffCode:{}",item.getJobNo()); log.info("staff is null !staffCode:{}",item.getJobNo());
return null; return null;
......
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
View file @ 230fd3b8
package com.mortals.xhx.daemon.task; package com.mortals.xhx.daemon.task;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
...@@ -57,8 +58,6 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -57,8 +58,6 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
@Autowired @Autowired
private DeptService deptService; private DeptService deptService;
@Autowired
private StaffService service;
@Autowired @Autowired
private AttendanceStatService attendanceStatService; private AttendanceStatService attendanceStatService;
...@@ -70,12 +69,11 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -70,12 +69,11 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
@Override @Override
public void excuteTask(ITask task) throws AppException { public void excuteTask(ITask task) throws AppException {
log.info("同步用户--部门");
try { try {
//同步部门 log.info("同步用户");
syncDepts();
//同步员工
syncPersons(); syncPersons();
log.info("同步部门");
syncDepts();
} catch (Exception e) { } catch (Exception e) {
log.error("同步人事异常", e); log.error("同步人事异常", e);
} }
...@@ -89,7 +87,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -89,7 +87,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
if (personRest.getCode() == YesNoEnum.YES.getValue()) { if (personRest.getCode() == YesNoEnum.YES.getValue()) {
List<PersonInfo> personInfoList = personRest.getData().getList(); List<PersonInfo> personInfoList = personRest.getData().getList();
for (PersonInfo personInfo : personInfoList) { for (PersonInfo personInfo : personInfoList) {
StaffEntity staffEntity = staffService.getExtCache(personInfo.getJobNo()); StaffEntity staffEntity = staffService.getExtCache(StrUtil.padPre(personInfo.getJobNo(), 8, "0"));
DeptEntity deptEntity = deptService.selectOne(new DeptQuery().deptCode(personInfo.getOrgIndexCode())); DeptEntity deptEntity = deptService.selectOne(new DeptQuery().deptCode(personInfo.getOrgIndexCode()));
// AttendanceVacationBalanceEntity balanceEntity = balanceService.selectOne(new AttendanceVacationBalanceQuery().staffId(staffEntity.getId())); // AttendanceVacationBalanceEntity balanceEntity = balanceService.selectOne(new AttendanceVacationBalanceQuery().staffId(staffEntity.getId()));
// AttendanceStatEntity statEntity = attendanceStatService.selectOne(new AttendanceStatQuery().staffId(staffEntity.getId())); // AttendanceStatEntity statEntity = attendanceStatService.selectOne(new AttendanceStatQuery().staffId(staffEntity.getId()));
...@@ -111,7 +109,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -111,7 +109,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
staffEntity.setPhoneNumber(personInfo.getPhoneNo()); staffEntity.setPhoneNumber(personInfo.getPhoneNo());
staffEntity.setCreateUserId(1L); staffEntity.setCreateUserId(1L);
staffEntity.setCreateTime(new Date()); staffEntity.setCreateTime(new Date());
service.save(staffEntity); staffService.save(staffEntity);
AttendanceVacationBalanceEntity balanceEntity = new AttendanceVacationBalanceEntity(); AttendanceVacationBalanceEntity balanceEntity = new AttendanceVacationBalanceEntity();
balanceEntity.initAttrValue(); balanceEntity.initAttrValue();
...@@ -181,7 +179,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -181,7 +179,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
staffEntity.setPhoneNumber(personInfo.getPhoneNo()); staffEntity.setPhoneNumber(personInfo.getPhoneNo());
staffEntity.setUpdateUserId(1L); staffEntity.setUpdateUserId(1L);
staffEntity.setUpdateTime(new Date()); staffEntity.setUpdateTime(new Date());
service.update(staffEntity); staffService.update(staffEntity);
//统计各级部门员工数量 //统计各级部门员工数量
String ancestor = deptEntity.getAncestors().split(",", 2)[1]; String ancestor = deptEntity.getAncestors().split(",", 2)[1];
String[] ancestors = ancestor.split(","); String[] ancestors = ancestor.split(",");
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckAllRecordDao.java 0 → 100644
View file @ 230fd3b8
package com.mortals.xhx.module.check.dao;
import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import java.util.List;
/**
* 全部类型核查信息Dao
*/
public interface CheckAllRecordDao {
List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query);
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckAllRecordDaoImpl.java 0 → 100644
View file @ 230fd3b8
package com.mortals.xhx.module.check.dao.ibatis;
import com.mortals.xhx.module.check.dao.CheckAllRecordDao;
import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.support.SqlSessionDaoSupport;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 全部类型核查信息Dao
*/
@Repository("checkAllRecordDao")
public class CheckAllRecordDaoImpl extends SqlSessionDaoSupport implements CheckAllRecordDao {
protected String namespace = this.getClass().getName();
@Autowired
public void setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
super.setSqlSessionFactory(sqlSessionFactory);
}
protected String getSqlId(String id) {
return this.namespace + "." + id;
}
@Override
public List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query) {
return this.getSqlSession().selectList(this.getSqlId("getList"), query);
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAllRecordQuery.java 0 → 100644
View file @ 230fd3b8
package com.mortals.xhx.module.check.model;
import lombok.Data;
@Data
public class CheckAllRecordQuery {
/**
* 员工ID
*/
private Long staffId;
/**
* 处理状态(1.未处理,2.已处理)
*/
private Integer checkStatus;
private String createTimeStart;
private String createTimeEnd;
private Long createUserId;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
View file @ 230fd3b8
...@@ -9,11 +9,11 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -9,11 +9,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo; import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo;
import lombok.Data; import lombok.Data;
/** /**
* 考勤绩效记录核查信息实体对象 * 考勤绩效记录核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-07 * @date 2023-07-08
*/ */
@Data @Data
public class CheckAttendRecordEntity extends CheckAttendRecordVo { public class CheckAttendRecordEntity extends CheckAttendRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -113,6 +113,21 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -113,6 +113,21 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
* 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
*/ */
private Integer subMethod; private Integer subMethod;
/**
* 说明
*/
@Excel(name = "说明")
private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -176,5 +191,11 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -176,5 +191,11 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.subMethod = 1; this.subMethod = 1;
this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java
View file @ 230fd3b8
...@@ -5,11 +5,11 @@ import java.util.Date; ...@@ -5,11 +5,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity; import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
/** /**
* 考勤绩效记录核查信息查询对象 * 考勤绩效记录核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-07 * @date 2023-07-08
*/ */
public class CheckAttendRecordQuery extends CheckAttendRecordEntity { public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -277,6 +277,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity { ...@@ -277,6 +277,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)排除列表 */ /** 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)排除列表 */
private List <Integer> subMethodNotList; private List <Integer> subMethodNotList;
/** 说明 */
private List<String> remarkList;
/** 说明排除列表 */
private List <String> remarkNotList;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckAttendRecordQuery> orConditionList; private List<CheckAttendRecordQuery> orConditionList;
...@@ -1769,6 +1784,102 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity { ...@@ -1769,6 +1784,102 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
} }
/**
* 获取 说明
* @return remarkList
*/
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 说明
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 获取 说明
* @return remarkNotList
*/
public List<String> getRemarkNotList(){
return this.remarkNotList;
}
/**
* 设置 说明
* @param remarkNotList
*/
public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2613,6 +2724,63 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity { ...@@ -2613,6 +2724,63 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
return this; return this;
} }
/**
* 设置 说明
* @param remark
*/
public CheckAttendRecordQuery remark(String remark){
setRemark(remark);
return this;
}
/**
* 设置 说明
* @param remarkList
*/
public CheckAttendRecordQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public CheckAttendRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public CheckAttendRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public CheckAttendRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public CheckAttendRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 评价绩效投诉核查信息实体对象 * 评价绩效投诉核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckComplainRecordEntity extends CheckComplainRecordVo { public class CheckComplainRecordEntity extends CheckComplainRecordVo {
...@@ -29,14 +29,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -29,14 +29,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -45,14 +48,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -45,14 +48,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 投诉标题 * 投诉标题
*/ */
@Excel(name = "投诉标题")
private String complainTitle; private String complainTitle;
/** /**
* 投诉内容 * 投诉内容
*/ */
@Excel(name = "投诉内容")
private String complainContent; private String complainContent;
/** /**
* 投诉人真实姓名 * 投诉人真实姓名
...@@ -61,6 +67,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -61,6 +67,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 联系电话 * 联系电话
*/ */
@Excel(name = "联系电话")
private String contact; private String contact;
/** /**
* 投诉时间 * 投诉时间
...@@ -89,6 +96,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -89,6 +96,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -101,6 +109,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -101,6 +109,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
...@@ -109,10 +118,12 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -109,10 +118,12 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -122,6 +133,16 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -122,6 +133,16 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -191,5 +212,9 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -191,5 +212,9 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckComplainRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
* 评价绩效投诉核查信息查询对象 * 评价绩效投诉核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class CheckComplainRecordQuery extends CheckComplainRecordEntity { public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -271,6 +271,16 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity { ...@@ -271,6 +271,16 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckComplainRecordQuery> orConditionList; private List<CheckComplainRecordQuery> orConditionList;
...@@ -1761,6 +1771,70 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity { ...@@ -1761,6 +1771,70 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2610,6 +2684,44 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity { ...@@ -2610,6 +2684,44 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public CheckComplainRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public CheckComplainRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public CheckComplainRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public CheckComplainRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 效能绩效核查信息实体对象 * 效能绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckEffectRecordEntity extends CheckEffectRecordVo { public class CheckEffectRecordEntity extends CheckEffectRecordVo {
...@@ -29,14 +29,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -29,14 +29,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -45,14 +48,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -45,14 +48,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉) * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/ */
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
private Integer irregularType; private Integer irregularType;
/** /**
* 发生时间 * 发生时间
*/ */
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime; private Date happenTime;
/** /**
* 持续时间，秒 * 持续时间，秒
...@@ -81,6 +87,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -81,6 +87,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -93,6 +100,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -93,6 +100,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
...@@ -101,10 +109,12 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -101,10 +109,12 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -114,6 +124,16 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -114,6 +124,16 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -179,5 +199,9 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -179,5 +199,9 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckEffectRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
* 效能绩效核查信息查询对象 * 效能绩效核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class CheckEffectRecordQuery extends CheckEffectRecordEntity { public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -282,6 +282,16 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity { ...@@ -282,6 +282,16 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckEffectRecordQuery> orConditionList; private List<CheckEffectRecordQuery> orConditionList;
...@@ -1806,6 +1816,70 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity { ...@@ -1806,6 +1816,70 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2669,6 +2743,44 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity { ...@@ -2669,6 +2743,44 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public CheckEffectRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public CheckEffectRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public CheckEffectRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public CheckEffectRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 办件绩效核查信息实体对象 * 办件绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
...@@ -29,6 +29,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -29,6 +29,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
...@@ -37,6 +38,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -37,6 +38,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -45,22 +47,27 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -45,22 +47,27 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 办件编码 * 办件编码
*/ */
@Excel(name = "办件编码")
private String goworkCode; private String goworkCode;
/** /**
* 办件所属部门 * 办件所属部门
*/ */
@Excel(name = "办件所属部门")
private String goworkDepts; private String goworkDepts;
/** /**
* 事项名称 * 事项名称
*/ */
@Excel(name = "事项名称")
private String matterlName; private String matterlName;
/** /**
* 办理时间 * 办理时间
*/ */
@Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime; private Date goworkTime;
/** /**
* 绩效规则id * 绩效规则id
...@@ -69,6 +76,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -69,6 +76,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
...@@ -77,6 +85,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -77,6 +85,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -85,10 +94,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -85,10 +94,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
...@@ -97,10 +108,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -97,10 +108,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -110,6 +123,16 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -110,6 +123,16 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -173,5 +196,9 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -173,5 +196,9 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
* 办件绩效核查信息查询对象 * 办件绩效核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity { public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -256,6 +256,16 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity { ...@@ -256,6 +256,16 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckGoworkRecordQuery> orConditionList; private List<CheckGoworkRecordQuery> orConditionList;
...@@ -1650,6 +1660,70 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity { ...@@ -1650,6 +1660,70 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2442,6 +2516,44 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity { ...@@ -2442,6 +2516,44 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public CheckGoworkRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public CheckGoworkRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public CheckGoworkRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public CheckGoworkRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 其它绩效核查信息实体对象 * 其它绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckOtherRecordEntity extends CheckOtherRecordVo { public class CheckOtherRecordEntity extends CheckOtherRecordVo {
...@@ -89,6 +89,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -89,6 +89,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
...@@ -97,10 +98,12 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -97,10 +98,12 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -110,6 +113,16 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -110,6 +113,16 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -173,5 +186,9 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -173,5 +186,9 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckOtherRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
* 其它绩效核查信息查询对象 * 其它绩效核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class CheckOtherRecordQuery extends CheckOtherRecordEntity { public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -276,6 +276,16 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity { ...@@ -276,6 +276,16 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckOtherRecordQuery> orConditionList; private List<CheckOtherRecordQuery> orConditionList;
...@@ -1768,6 +1778,70 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity { ...@@ -1768,6 +1778,70 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2630,6 +2704,44 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity { ...@@ -2630,6 +2704,44 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public CheckOtherRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public CheckOtherRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public CheckOtherRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public CheckOtherRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 评价差评绩效核查信息实体对象 * 评价差评绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckReviewRecordEntity extends CheckReviewRecordVo { public class CheckReviewRecordEntity extends CheckReviewRecordVo {
...@@ -29,14 +29,17 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -29,14 +29,17 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -57,6 +60,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -57,6 +60,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它) * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/ */
@Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
private String reviewSource; private String reviewSource;
/** /**
* 评价设备 * 评价设备
...@@ -69,6 +73,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -69,6 +73,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
...@@ -77,6 +82,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -77,6 +82,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -85,10 +91,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -85,10 +91,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
...@@ -97,10 +105,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -97,10 +105,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -110,6 +120,16 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -110,6 +120,16 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -173,5 +193,9 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -173,5 +193,9 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckReviewRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
* 评价差评绩效核查信息查询对象 * 评价差评绩效核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class CheckReviewRecordQuery extends CheckReviewRecordEntity { public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -266,6 +266,16 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity { ...@@ -266,6 +266,16 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckReviewRecordQuery> orConditionList; private List<CheckReviewRecordQuery> orConditionList;
...@@ -1709,6 +1719,70 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity { ...@@ -1709,6 +1719,70 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2536,6 +2610,44 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity { ...@@ -2536,6 +2610,44 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public CheckReviewRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public CheckReviewRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public CheckReviewRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public CheckReviewRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java 0 → 100644
View file @ 230fd3b8
package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* 全部类型核查信息视图对象
*/
@Data
public class CheckAllRecordVo extends BaseEntityLong {
private static final long serialVersionUID = 1L;
/**
* 记录ID
*/
private Long recordId;
/**
* 员工ID
*/
private Long staffId;
/**
* 员工姓名
*/
private String staffName;
/**
* 工号
*/
private String workNum;
/**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 绩效规则id
*/
private Long ruleId;
/**
* 规则名称
*/
private String ruleName;
/**
* 增减类型(1.增加,2.扣除)
*/
private Integer subAddType;
/**
* 扣分或增加分值
*/
private BigDecimal score;
/**
* 核查时间
*/
private Date checkTime;
/**
* 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
*/
private Integer subMethod;
/**
* 扣分时间
*/
private Date deductTime;
/**
* 核查类型(1.考勤绩效,2.效能绩效,3.评价绩效,4.办件绩效,5.评价差评绩效,6.其它绩效)
*/
private Integer checkType;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity; import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 考勤绩效记录核查信息视图对象 * 考勤绩效记录核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckAttendRecordVo extends BaseEntityLong { public class CheckAttendRecordVo extends BaseEntityLong {
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckComplainRecordEntity; import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 评价绩效投诉核查信息视图对象 * 评价绩效投诉核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckComplainRecordVo extends BaseEntityLong { public class CheckComplainRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 投诉标题
*/
@Excel(name = "投诉标题")
private String complainTitle;
/**
* 投诉内容
*/
@Excel(name = "投诉内容")
private String complainContent;
/**
* 联系电话
*/
@Excel(name = "联系电话")
private String contact;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckEffectRecordEntity; import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 效能绩效核查信息视图对象 * 效能绩效核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckEffectRecordVo extends BaseEntityLong { public class CheckEffectRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
private Integer irregularType;
/**
* 发生时间
*/
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity; import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 办件绩效核查信息视图对象 * 办件绩效核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckGoworkRecordVo extends BaseEntityLong { public class CheckGoworkRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 办件编码
*/
@Excel(name = "办件编码")
private String goworkCode;
/**
* 办件所属部门
*/
@Excel(name = "办件所属部门")
private String goworkDepts;
/**
* 事项名称
*/
@Excel(name = "事项名称")
private String matterlName;
/**
* 办理时间
*/
@Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime;
/**
* 规则名称
*/
@Excel(name = "规则名称")
private String ruleName;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分或增加分值
*/
@Excel(name = "扣分或增加分值")
private BigDecimal score;
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckOtherRecordEntity; import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 其它绩效核查信息视图对象 * 其它绩效核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckOtherRecordVo extends BaseEntityLong { public class CheckOtherRecordVo extends BaseEntityLong {
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckReviewRecordEntity; import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 评价差评绩效核查信息视图对象 * 评价差评绩效核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckReviewRecordVo extends BaseEntityLong { public class CheckReviewRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/
@Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
private String reviewSource;
/**
* 规则名称
*/
@Excel(name = "规则名称")
private String ruleName;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分或增加分值
*/
@Excel(name = "扣分或增加分值")
private BigDecimal score;
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckAllRecordService.java 0 → 100644
View file @ 230fd3b8
package com.mortals.xhx.module.check.service;
import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import java.util.List;
/**
* 全部类型核查信息Dao
*/
public interface CheckAllRecordService {
List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query);
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAllRecordServiceImpl.java 0 → 100644
View file @ 230fd3b8
package com.mortals.xhx.module.check.service.impl;
import com.mortals.xhx.module.check.dao.CheckAllRecordDao;
import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import com.mortals.xhx.module.check.service.CheckAllRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("checkAllRecordService")
@Slf4j
public class CheckAllRecordServiceImpl implements CheckAllRecordService {
@Autowired
private CheckAllRecordDao checkAllRecordDao;
@Override
public List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query) {
return checkAllRecordDao.getAllCheckRecord(query);
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAllRecordController.java 0 → 100644
View file @ 230fd3b8
package com.mortals.xhx.module.check.web;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.common.code.SubAddTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import com.mortals.xhx.module.check.service.CheckAllRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 全部类型核查信息Dao
*/
@RestController
@RequestMapping("check/all/record")
public class CheckAllRecordController extends BaseJsonBodyController {
@Autowired
private CheckAllRecordService checkAllRecordService;
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
}
@PostMapping({"list"})
@UnAuth
public Rest<Object> list(@RequestBody CheckAllRecordQuery query) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "查询所以类型绩效核查信息";
int code=1;
try {
List<CheckAllRecordVo> result = checkAllRecordService.getAllCheckRecord(query);
model.put("data", result);
model.put("message_info", busiDesc + "成功");
if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
this.recordSysLog(this.request, busiDesc + " 【成功】");
}
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
this.init(model, context);
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 考勤绩效记录信息实体对象 * 考勤绩效记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformAttendRecordEntity extends PerformAttendRecordVo { public class PerformAttendRecordEntity extends PerformAttendRecordVo {
...@@ -81,6 +81,7 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo { ...@@ -81,6 +81,7 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -102,6 +103,16 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo { ...@@ -102,6 +103,16 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -161,5 +172,9 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo { ...@@ -161,5 +172,9 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
* 考勤绩效记录信息查询对象 * 考勤绩效记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformAttendRecordQuery extends PerformAttendRecordEntity { public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -257,6 +257,16 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity { ...@@ -257,6 +257,16 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformAttendRecordQuery> orConditionList; private List<PerformAttendRecordQuery> orConditionList;
...@@ -1636,6 +1646,70 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity { ...@@ -1636,6 +1646,70 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2407,6 +2481,44 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity { ...@@ -2407,6 +2481,44 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public PerformAttendRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public PerformAttendRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public PerformAttendRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public PerformAttendRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 评价绩效投诉记录信息实体对象 * 评价绩效投诉记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformComplainRecordEntity extends PerformComplainRecordVo { public class PerformComplainRecordEntity extends PerformComplainRecordVo {
...@@ -25,14 +25,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -25,14 +25,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -41,14 +44,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -41,14 +44,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 投诉标题 * 投诉标题
*/ */
@Excel(name = "投诉标题")
private String complainTitle; private String complainTitle;
/** /**
* 投诉内容 * 投诉内容
*/ */
@Excel(name = "投诉内容")
private String complainContent; private String complainContent;
/** /**
* 投诉人真实姓名 * 投诉人真实姓名
...@@ -57,6 +63,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -57,6 +63,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/** /**
* 联系电话 * 联系电话
*/ */
@Excel(name = "联系电话")
private String contact; private String contact;
/** /**
* 投诉时间 * 投诉时间
...@@ -85,6 +92,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -85,6 +92,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -97,11 +105,22 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -97,11 +105,22 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/** /**
* 处理状态(1.未核查,2.已核查) * 处理状态(1.未核查,2.已核查)
*/ */
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus; private Integer processStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -161,5 +180,9 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -161,5 +180,9 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
* 评价绩效投诉记录信息查询对象 * 评价绩效投诉记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformComplainRecordQuery extends PerformComplainRecordEntity { public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -235,6 +235,16 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity { ...@@ -235,6 +235,16 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformComplainRecordQuery> orConditionList; private List<PerformComplainRecordQuery> orConditionList;
...@@ -1516,6 +1526,70 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity { ...@@ -1516,6 +1526,70 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2253,6 +2327,44 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity { ...@@ -2253,6 +2327,44 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public PerformComplainRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public PerformComplainRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public PerformComplainRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public PerformComplainRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 效能绩效记录信息实体对象 * 效能绩效记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformEffectRecordEntity extends PerformEffectRecordVo { public class PerformEffectRecordEntity extends PerformEffectRecordVo {
...@@ -25,14 +25,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo { ...@@ -25,14 +25,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -41,14 +44,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo { ...@@ -41,14 +44,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉) * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/ */
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
private Integer irregularType; private Integer irregularType;
/** /**
* 发生时间 * 发生时间
*/ */
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime; private Date happenTime;
/** /**
* 持续时间，秒 * 持续时间，秒
...@@ -77,6 +83,7 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo { ...@@ -77,6 +83,7 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -89,11 +96,22 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo { ...@@ -89,11 +96,22 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/** /**
* 处理状态(1.未核查,2.已核查) * 处理状态(1.未核查,2.已核查)
*/ */
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus; private Integer processStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -149,5 +167,9 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo { ...@@ -149,5 +167,9 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
* 效能绩效记录信息查询对象 * 效能绩效记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformEffectRecordQuery extends PerformEffectRecordEntity { public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -246,6 +246,16 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity { ...@@ -246,6 +246,16 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformEffectRecordQuery> orConditionList; private List<PerformEffectRecordQuery> orConditionList;
...@@ -1561,6 +1571,70 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity { ...@@ -1561,6 +1571,70 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2312,6 +2386,44 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity { ...@@ -2312,6 +2386,44 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public PerformEffectRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public PerformEffectRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public PerformEffectRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public PerformEffectRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 办件绩效记录信息实体对象 * 办件绩效记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
...@@ -25,6 +25,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -25,6 +25,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
...@@ -33,6 +34,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -33,6 +34,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -41,22 +43,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -41,22 +43,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 办件编码 * 办件编码
*/ */
@Excel(name = "办件编码")
private String goworkCode; private String goworkCode;
/** /**
* 办件所属部门 * 办件所属部门
*/ */
@Excel(name = "办件所属部门")
private String goworkDepts; private String goworkDepts;
/** /**
* 事项名称 * 事项名称
*/ */
@Excel(name = "事项名称")
private String matterlName; private String matterlName;
/** /**
* 办理时间 * 办理时间
*/ */
@Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime; private Date goworkTime;
/** /**
* 绩效规则id * 绩效规则id
...@@ -65,6 +72,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -65,6 +72,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
...@@ -73,6 +81,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -73,6 +81,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -81,15 +90,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -81,15 +90,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 处理状态(1.未核查,2.已核查) * 处理状态(1.未核查,2.已核查)
*/ */
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus; private Integer processStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -143,5 +164,9 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -143,5 +164,9 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
* 办件绩效记录信息查询对象 * 办件绩效记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity { public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -220,6 +220,16 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity { ...@@ -220,6 +220,16 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformGoworkRecordQuery> orConditionList; private List<PerformGoworkRecordQuery> orConditionList;
...@@ -1405,6 +1415,70 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity { ...@@ -1405,6 +1415,70 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2085,6 +2159,44 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity { ...@@ -2085,6 +2159,44 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public PerformGoworkRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public PerformGoworkRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public PerformGoworkRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public PerformGoworkRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 其它绩效记录信息实体对象 * 其它绩效记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformOtherRecordEntity extends PerformOtherRecordVo { public class PerformOtherRecordEntity extends PerformOtherRecordVo {
...@@ -90,6 +90,16 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo { ...@@ -90,6 +90,16 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -143,5 +153,9 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo { ...@@ -143,5 +153,9 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
* 其它绩效记录信息查询对象 * 其它绩效记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformOtherRecordQuery extends PerformOtherRecordEntity { public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -240,6 +240,16 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity { ...@@ -240,6 +240,16 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformOtherRecordQuery> orConditionList; private List<PerformOtherRecordQuery> orConditionList;
...@@ -1523,6 +1533,70 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity { ...@@ -1523,6 +1533,70 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2273,6 +2347,44 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity { ...@@ -2273,6 +2347,44 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public PerformOtherRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public PerformOtherRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public PerformOtherRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public PerformOtherRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordEntity.java
View file @ 230fd3b8
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 评价差评绩效记录信息实体对象 * 评价差评绩效记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformReviewRecordEntity extends PerformReviewRecordVo { public class PerformReviewRecordEntity extends PerformReviewRecordVo {
...@@ -25,14 +25,17 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -25,14 +25,17 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -53,6 +56,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -53,6 +56,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/** /**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它) * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/ */
@Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
private String reviewSource; private String reviewSource;
/** /**
* 评价设备 * 评价设备
...@@ -65,6 +69,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -65,6 +69,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
...@@ -73,6 +78,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -73,6 +78,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -81,6 +87,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -81,6 +87,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 处理状态(1.未核查,2.已核查) * 处理状态(1.未核查,2.已核查)
...@@ -90,6 +97,16 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -90,6 +97,16 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称，多个逗号分割
*/
@Excel(name = "附件名称，多个逗号分割")
private String fileNames;
/**
* 附件下载地址，多个逗号分割
*/
@Excel(name = "附件下载地址，多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -143,5 +160,9 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -143,5 +160,9 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordQuery.java
View file @ 230fd3b8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
* 评价差评绩效记录信息查询对象 * 评价差评绩效记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformReviewRecordQuery extends PerformReviewRecordEntity { public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -230,6 +230,16 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity { ...@@ -230,6 +230,16 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称，多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称，多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址，多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址，多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformReviewRecordQuery> orConditionList; private List<PerformReviewRecordQuery> orConditionList;
...@@ -1464,6 +1474,70 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity { ...@@ -1464,6 +1474,70 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称，多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址，多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2179,6 +2253,44 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity { ...@@ -2179,6 +2253,44 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
} }
/**
* 设置 附件名称，多个逗号分割
* @param fileNames
*/
public PerformReviewRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称，多个逗号分割
* @param fileNamesList
*/
public PerformReviewRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePaths
*/
public PerformReviewRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址，多个逗号分割
* @param filePathsList
*/
public PerformReviewRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity; import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 考勤绩效记录信息视图对象 * 考勤绩效记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformAttendRecordVo extends BaseEntityLong { public class PerformAttendRecordVo extends BaseEntityLong {
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity; import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 评价绩效投诉记录信息视图对象 * 评价绩效投诉记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformComplainRecordVo extends BaseEntityLong { public class PerformComplainRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 投诉标题
*/
@Excel(name = "投诉标题")
private String complainTitle;
/**
* 投诉内容
*/
@Excel(name = "投诉内容")
private String complainContent;
/**
* 联系电话
*/
@Excel(name = "联系电话")
private String contact;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 处理状态(1.未核查,2.已核查)
*/
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity; import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 效能绩效记录信息视图对象 * 效能绩效记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformEffectRecordVo extends BaseEntityLong { public class PerformEffectRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
private Integer irregularType;
/**
* 发生时间
*/
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 处理状态(1.未核查,2.已核查)
*/
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity; import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 办件绩效记录信息视图对象 * 办件绩效记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformGoworkRecordVo extends BaseEntityLong { public class PerformGoworkRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 办件编码
*/
@Excel(name = "办件编码")
private String goworkCode;
/**
* 办件所属部门
*/
@Excel(name = "办件所属部门")
private String goworkDepts;
/**
* 事项名称
*/
@Excel(name = "事项名称")
private String matterlName;
/**
* 办理时间
*/
@Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime;
/**
* 规则名称
*/
@Excel(name = "规则名称")
private String ruleName;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分或增加分值
*/
@Excel(name = "扣分或增加分值")
private BigDecimal score;
/**
* 处理状态(1.未核查,2.已核查)
*/
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java
View file @ 230fd3b8
...@@ -4,15 +4,16 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity; ...@@ -4,15 +4,16 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 其它绩效记录信息视图对象 * 其它绩效记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformOtherRecordVo extends BaseEntityLong { public class PerformOtherRecordVo extends BaseEntityLong {
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java
View file @ 230fd3b8
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity; import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 评价差评绩效记录信息视图对象 * 评价差评绩效记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformReviewRecordVo extends BaseEntityLong { public class PerformReviewRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/
@Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
private String reviewSource;
/**
* 规则名称
*/
@Excel(name = "规则名称")
private String ruleName;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分或增加分值
*/
@Excel(name = "扣分或增加分值")
private BigDecimal score;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
View file @ 230fd3b8
package com.mortals.xhx.module.staff.service.impl; package com.mortals.xhx.module.staff.service.impl;
import cn.hutool.core.util.StrUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
import com.mortals.framework.util.SecurityUtil;
import com.mortals.xhx.base.system.role.model.RoleUserQuery;
import com.mortals.xhx.base.system.role.service.RoleUserService;
import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.StaffSatusEnum; import com.mortals.xhx.common.code.StaffSatusEnum;
import com.mortals.xhx.common.code.StaffTypeEnum; import com.mortals.xhx.common.code.StaffTypeEnum;
import com.mortals.xhx.common.code.StatusEnum; import com.mortals.xhx.common.code.StatusEnum;
import com.mortals.xhx.common.code.UserStatus;
import com.mortals.xhx.module.staff.dao.StaffDao; import com.mortals.xhx.module.staff.dao.StaffDao;
import com.mortals.xhx.module.staff.dao.ibatis.StaffDaoImpl; import com.mortals.xhx.module.staff.dao.ibatis.StaffDaoImpl;
import com.mortals.xhx.module.staff.dao.ibatis.StaffLeaveDaoImpl; import com.mortals.xhx.module.staff.dao.ibatis.StaffLeaveDaoImpl;
...@@ -13,8 +22,10 @@ import com.mortals.xhx.module.staff.model.vo.StaffInfoVo; ...@@ -13,8 +22,10 @@ import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
import com.mortals.xhx.module.staff.service.StaffService; import com.mortals.xhx.module.staff.service.StaffService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -29,10 +40,17 @@ import java.util.stream.Collectors; ...@@ -29,10 +40,17 @@ import java.util.stream.Collectors;
@Service("staffService") @Service("staffService")
public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, StaffEntity, Long> implements StaffService { public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, StaffEntity, Long> implements StaffService {
@Autowired
private UserService userService;
@Autowired
private RoleUserService roleUserService;
@Override @Override
protected String getExtKey(StaffEntity data) { protected String getExtKey(StaffEntity data) {
//工号作为redis 扩展key //工号作为redis 扩展key
return data.getWorkNum(); return StrUtil.padPre(data.getWorkNum(), 8, "0");
// return "1000"+data.getWorkNum();
} }
@Override @Override
...@@ -68,4 +86,51 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -68,4 +86,51 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
return staffEntities.size(); return staffEntities.size();
} }
@Override
protected void saveAfter(StaffEntity entity, Context context) throws AppException {
try {
UserEntity userEntity = new UserEntity();
if (ObjectUtils.isEmpty(entity.getLoginName())) {
//姓名加工号作为登录名
entity.setLoginName(entity.getName() + entity.getWorkNum());
}
if (ObjectUtils.isEmpty(entity.getLoginPwd())) {
//设置初始密码
entity.setLoginPwd("123456");
}
userEntity.setLoginName(StrUtil.cleanBlank(entity.getLoginName()));
userEntity.setRealName(entity.getName());
userEntity.setUserType(2);
userEntity.setSiteIds("1");
userEntity.setAreaCodes("511500000000");
userEntity.setStatus(UserStatus.NORMAL.getValue());
userEntity.setCreateUserId(this.getContextUserId(context));
userEntity.setCreateTime(new Date());
userEntity.setCustomerId(entity.getId());
userEntity.setLoginPwd(SecurityUtil.md5DoubleEncoding(entity.getLoginPwd()));
int insert = userService.getUserDao().insert(userEntity);
if (insert > 0) {
RoleUserQuery roleUserQuery = new RoleUserQuery();
roleUserQuery.setUserId(userEntity.getId());
roleUserQuery.setRoleIdList(Arrays.asList(4L));
roleUserService.assignRoleToUser(roleUserQuery);
}
} catch (Exception e) {
throw new RuntimeException(e);
}
super.saveAfter(entity, context);
}
public static void main(String[] args) {
System.out.println("1" + StrUtil.padPre("125", 7, "0"));
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/base/system/user.xml
View file @ 230fd3b8
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<result property="siteIds" column="siteIds" /> <result property="siteIds" column="siteIds" />
<result property="areaCodes" column="areaCodes" /> <result property="areaCodes" column="areaCodes" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="customerId" column="customerId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createUserName" column="createUserName" /> <result property="createUserName" column="createUserName" />
...@@ -77,6 +78,9 @@ ...@@ -77,6 +78,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status, a.status,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('customerId') or colPickMode == 1 and data.containsKey('customerId')))">
a.customerId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
...@@ -97,18 +101,18 @@ ...@@ -97,18 +101,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_user insert into mortals_xhx_user
(loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress) (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
VALUES VALUES
(#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{deptId},#{deptName},#{siteIds},#{areaCodes},#{status},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress}) (#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{deptId},#{deptName},#{siteIds},#{areaCodes},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_user insert into mortals_xhx_user
(loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress) (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.deptId},#{item.deptName},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress}) (#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.deptId},#{item.deptName},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.customerId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress})
</foreach> </foreach>
</insert> </insert>
...@@ -169,6 +173,12 @@ ...@@ -169,6 +173,12 @@
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))"> <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement}, a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('customerId')) or (colPickMode==1 and !data.containsKey('customerId'))">
a.customerId=#{data.customerId},
</if>
<if test="(colPickMode==0 and data.containsKey('customerIdIncrement')) or (colPickMode==1 and !data.containsKey('customerIdIncrement'))">
a.customerId=ifnull(a.customerId,0) + #{data.customerIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
...@@ -312,6 +322,18 @@ ...@@ -312,6 +322,18 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="customerId=(case" suffix="ELSE customerId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('customerId')) or (colPickMode==1 and !item.containsKey('customerId'))">
when a.id=#{item.id} then #{item.customerId}
</when>
<when test="(colPickMode==0 and item.containsKey('customerIdIncrement')) or (colPickMode==1 and !item.containsKey('customerIdIncrement'))">
when a.id=#{item.id} then ifnull(a.customerId,0) + #{item.customerIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
...@@ -807,6 +829,33 @@ ...@@ -807,6 +829,33 @@
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd} ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if> </if>
<if test="conditionParamRef.containsKey('customerId')">
<if test="conditionParamRef.customerId != null ">
${_conditionType_} a.customerId = #{${_conditionParam_}.customerId}
</if>
<if test="conditionParamRef.customerId == null">
${_conditionType_} a.customerId is null
</if>
</if>
<if test="conditionParamRef.containsKey('customerIdList') and conditionParamRef.customerIdList.size() > 0">
${_conditionType_} a.customerId in
<foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerIdNotList') and conditionParamRef.customerIdNotList.size() > 0">
${_conditionType_} a.customerId not in
<foreach collection="conditionParamRef.customerIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null">
${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart}
</if>
<if test="conditionParamRef.containsKey('customerIdEnd') and conditionParamRef.customerIdEnd != null">
${_conditionType_} a.customerId <![CDATA[ <= ]]> #{${_conditionParam_}.customerIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -994,6 +1043,11 @@ ...@@ -994,6 +1043,11 @@
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if> <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('customerId')">
a.customerId
<if test='orderCol.customerId != null and "DESC".equalsIgnoreCase(orderCol.customerId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
......
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml 0 → 100644
View file @ 230fd3b8
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckAllRecordDaoImpl">
<select id="getList" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllRecordVo">
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType FROM mortals_xhx_check_attend_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType FROM mortals_xhx_check_effect_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType FROM mortals_xhx_check_complain_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType FROM mortals_xhx_check_gowork_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType FROM mortals_xhx_check_review_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType FROM mortals_xhx_check_other_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
</select>
</mapper>
\ No newline at end of file
db/add.sql
View file @ 230fd3b8
...@@ -278,3 +278,54 @@ PRIMARY KEY (`id`) ...@@ -278,3 +278,54 @@ PRIMARY KEY (`id`)
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-查看', '/feedback/staff/list,/feedback/staff/view,/feedback/staff/info,/feedback/staff/export,/feedback/staff/exportExcel,/feedback/staff/downloadTemplate,/feedback/staff/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-查看', '/feedback/staff/list,/feedback/staff/view,/feedback/staff/info,/feedback/staff/export,/feedback/staff/exportExcel,/feedback/staff/downloadTemplate,/feedback/staff/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-维护', '/feedback/staff/add,/feedback/staff/edit,/feedback/staff/delete,/feedback/staff/logicDelete,/feedback/staff/save,/feedback/staff/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-维护', '/feedback/staff/add,/feedback/staff/edit,/feedback/staff/delete,/feedback/staff/logicDelete,/feedback/staff/save,/feedback/staff/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
2023-7-08
-- ----------------------------
ALTER TABLE mortals_xhx_user ADD COLUMN `customerId` bigint(20) DEFAULT -1 COMMENT '员工id' AFTER status;
ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `remark` varchar(256) DEFAULT '' COMMENT '备注' AFTER checkStatus;
ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_perform_review_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_review_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_perform_complain_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_complain_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_perform_gowork_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_gowork_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_perform_effect_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_effect_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称，多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment